diff --git a/.backportrc.json b/.backportrc.json index d1d92740a7a05..1183ed5e2bb4d 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,5 +1,5 @@ { "upstream": "elastic/kibana", - "branches": [{ "name": "6.x", "checked": true }, "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"], + "branches": [{ "name": "6.x", "checked": true }, "6.5", "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"], "labels": ["backport"] } diff --git a/.ci/jobs.yml b/.ci/jobs.yml new file mode 100644 index 0000000000000..1740e1db33f2d --- /dev/null +++ b/.ci/jobs.yml @@ -0,0 +1,7 @@ +JOB: + - selenium + - intake + - x-pack + +# `~` is yaml for `null` +exclude: ~ diff --git a/.ci/run.sh b/.ci/run.sh new file mode 100755 index 0000000000000..32c138bd2f450 --- /dev/null +++ b/.ci/run.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +set -e + +# move to Kibana root +cd "$(dirname "$0")/.." + +case "$JOB" in +"selenium") + ./test/scripts/jenkins_selenium.sh + ;; +"intake") + ./test/scripts/jenkins_unit.sh + ;; +"x-pack") + ./test/scripts/jenkins_xpack.sh + ;; +*) + echo "JOB '$JOB' is not implemented." + exit 1 + ;; +esac diff --git a/.eslintignore b/.eslintignore index a9c0861b093d0..f697ad004caab 100644 --- a/.eslintignore +++ b/.eslintignore @@ -29,6 +29,6 @@ bower_components /x-pack/plugins/**/__tests__/fixtures/** /x-pack/plugins/canvas/common/lib/grammar.js /x-pack/plugins/canvas/canvas_plugin -/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/* +/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts **/*.js.snap !/.eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js index ad86cde9dc52c..131b3851e726b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -32,6 +32,7 @@ module.exports = { files: [ '.eslintrc.js', 'packages/eslint-plugin-kibana-custom/**/*', + 'packages/kbn-config-schema/**/*', 'packages/kbn-pm/**/*', 'packages/kbn-es/**/*', 'packages/kbn-datemath/**/*', @@ -314,6 +315,19 @@ module.exports = { }, }, + /** + * disable jsx-a11y for kbn-ui-framework + */ + { + files: ['packages/kbn-ui-framework/**'], + rules: { + 'jsx-a11y/click-events-have-key-events': 'off', + 'jsx-a11y/anchor-has-content': 'off', + 'jsx-a11y/tabindex-no-positive': 'off', + 'jsx-a11y/aria-role': 'off', + }, + }, + /** * Monitoring overrides */ @@ -392,20 +406,10 @@ module.exports = { ], }, }, - { - files: ['x-pack/plugins/canvas/*', 'x-pack/plugins/canvas/**/*'], - rules: { - 'import/no-extraneous-dependencies': [ - 'error', - { - packageDir: './x-pack/', - }, - ], - }, - }, { files: [ 'x-pack/plugins/canvas/gulpfile.js', + 'x-pack/plugins/canvas/scripts/*.js', 'x-pack/plugins/canvas/tasks/*.js', 'x-pack/plugins/canvas/tasks/**/*.js', 'x-pack/plugins/canvas/__tests__/**/*', @@ -417,7 +421,6 @@ module.exports = { { devDependencies: true, peerDependencies: true, - packageDir: './x-pack/', }, ], }, @@ -426,12 +429,6 @@ module.exports = { files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*'], globals: { canvas: true, $: true }, rules: { - 'import/no-extraneous-dependencies': [ - 'error', - { - packageDir: './x-pack/', - }, - ], 'import/no-unresolved': [ 'error', { @@ -440,5 +437,17 @@ module.exports = { ], }, }, + { + files: ['x-pack/plugins/canvas/public/**/*'], + env: { + browser: true, + }, + }, + { + files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*'], + env: { + jquery: true, + }, + }, ], }; diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 005849db0d8dc..d389c03e9beb0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,6 @@ # GitHub CODEOWNERS definition # See: https://help.github.com/articles/about-codeowners/ +/x-pack/plugins/apm/ @elastic/apm-ui /x-pack/plugins/security/ @elastic/kibana-security +**/*.scss @elastic/kibana-design diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f422e8138da6f..5a80a11c5cbea 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,19 @@ - \ No newline at end of file +## Summary + +Summarize your PR. If it involves visual changes include a screenshot or gif. + +### Checklist + +Use ~~strikethroughs~~ to remove checklist items you don't feel are applicable to this PR. + +- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) +- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md) +- [ ] [Documentation](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#writing-documentation) was added for features that require explanation or tutorials +- [ ] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios +- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist) + +### For maintainers + +- [ ] This was checked for breaking API changes and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process) +- [ ] This includes a feature addition or change that requires a release note and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process) + diff --git a/.i18nrc.json b/.i18nrc.json index 30301d72f36ec..68fa80b55fe6a 100644 --- a/.i18nrc.json +++ b/.i18nrc.json @@ -1,11 +1,27 @@ { "paths": { "common.ui": "src/ui", - "inputControl":"src/core_plugins/input_control_vis", + "console": "src/core_plugins/console", + "inputControl": "src/core_plugins/input_control_vis", "kbn": "src/core_plugins/kibana", + "kbnVislibVisTypes": "src/core_plugins/kbn_vislib_vis_types", "markdownVis": "src/core_plugins/markdown_vis", + "metricVis": "src/core_plugins/metric_vis", + "vega": "src/core_plugins/vega", + "tableVis": "src/core_plugins/table_vis", + "regionMap": "src/core_plugins/region_map", "statusPage": "src/core_plugins/status_page", - "xpack.idxMgmt": "x-pack/plugins/index_management" + "tileMap": "src/core_plugins/tile_map", + "timelion": "src/core_plugins/timelion", + "tagCloud": "src/core_plugins/tagcloud", + "xpack.grokDebugger": "x-pack/plugins/grokdebugger", + "xpack.idxMgmt": "x-pack/plugins/index_management", + "xpack.licenseMgmt": "x-pack/plugins/license_management", + "xpack.monitoring": "x-pack/plugins/monitoring", + "xpack.rollupJobs": "x-pack/plugins/rollup", + "xpack.searchProfiler": "x-pack/plugins/searchprofiler", + "xpack.security": "x-pack/plugins/security", + "xpack.watcher": "x-pack/plugins/watcher" }, "exclude": [ "src/ui/ui_render/bootstrap/app_bootstrap.js", diff --git a/.yarnrc b/.yarnrc new file mode 100644 index 0000000000000..b551f7d7ba438 --- /dev/null +++ b/.yarnrc @@ -0,0 +1 @@ +--ignore-workspace-root-check true diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f79fd011c4bb..9bb072317d053 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,6 +22,7 @@ A high level overview of our contributing guidelines. - [Setting Up SSL](#setting-up-ssl) - [Linting](#linting) - [Testing and Building](#testing-and-building) + - [Debugging server code](#debugging-server-code) - [Debugging Unit Tests](#debugging-unit-tests) - [Unit Testing Plugins](#unit-testing-plugins) - [Cross-browser compatibility](#cross-browser-compatibility) @@ -30,6 +31,7 @@ A high level overview of our contributing guidelines. - [Browser Automation Notes](#browser-automation-notes) - [Building OS packages](#building-os-packages) - [Writing documentation](#writing-documentation) + - [Release Notes Process](#release-notes-process) - [Signing the contributor license agreement](#signing-the-contributor-license-agreement) - [Submitting a Pull Request](#submitting-a-pull-request) - [Code Reviewing](#code-reviewing) @@ -189,9 +191,10 @@ node scripts/makelogs > Make sure to execute `node scripts/makelogs` *after* elasticsearch is up and running! Start the development server. - ```bash - yarn start - ``` + +```bash +yarn start +``` > On Windows, you'll need you use Git Bash, Cygwin, or a similar shell that exposes the `sh` command. And to successfully build you'll need Cygwin optional packages zip, tar, and shasum. @@ -279,7 +282,7 @@ macOS users on a machine with a discrete graphics card may see significant speed - Restart iTerm ### Debugging Server Code -`yarn debug` will start the server with Node's inspect flag. Kibana's development mode will start three processes. Chrome's developer tools can be configured to connect to all three under the connection tab. +`yarn debug` will start the server with Node's inspect flag. Kibana's development mode will start three processes on ports `9229`, `9230`, and `9231`. Chrome's developer tools need to be configured to connect to all three connections. Add `localhost:` for each Kibana process in Chrome's developer tools connection tab. ### Unit testing frameworks Kibana is migrating unit testing from Mocha to Jest. Legacy unit tests still exist in Mocha but all new unit tests should be written in Jest. @@ -405,6 +408,31 @@ README for getting the docs tooling set up. node scripts/docs.js --open ``` +### Release Notes Process + +Part of this process only applies to maintainers, since it requires access to Github labels. + +Kibana publishes major, minor and patch releases periodically through the year. During this process we run a script against this repo to collect the applicable PRs against that release and generate [Release Notes](https://www.elastic.co/guide/en/kibana/current/release-notes.html). To include your change in the Release Notes: + +1. In the title, summarize what the PR accomplishes in language that is meaningful to the user. In general, use present tense (for example, Adds, Fixes) in sentence case. +1. Label the PR with the targeted version (ex: 6.5). +1. Label the PR with the appropriate github labels: + * For a new feature or functionality, use `release_note:enhancement`. + * For an external-facing fix, use `release_note:fix`. Exception: docs, build, and test fixes do not go in the Release Notes. + * For a deprecated feature, use `release_note:deprecation`. + * For a breaking change, use `release-breaking:note`. + +We also produce a blog post that details more important breaking API changes every minor and major release. If the PR includes a breaking API change, apply the label `release_note:dev_docs`. Additionally add a brief summary of the break at the bottom of the PR using the format below: + + +``` +# Dev Docs + +## Name the feature with the break (ex: Visualize Loader) + +Summary of the change. Anything Under `#Dev Docs` will be used in the blog. +``` + ## Signing the contributor license agreement Please make sure you have signed the [Contributor License Agreement](http://www.elastic.co/contributor-agreement/). We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction. We ask this of all contributors in order to assure our users of the origin and continuing existence of the code. You only need to sign the CLA once. diff --git a/STYLEGUIDE.md b/STYLEGUIDE.md index 90860721357a1..ac84949aba890 100644 --- a/STYLEGUIDE.md +++ b/STYLEGUIDE.md @@ -22,3 +22,7 @@ All filenames should use `snake_case`. *Wrong:* - `src/kibana/IndexPatterns/IndexPattern.js` + +## TypeScript vs JavaScript + +Whenever possible, write code in TypeScript instead of javascript, especially if it's new code. Check out [TYPESCRIPT.md](TYPESCRIPT.md) for help with this process. \ No newline at end of file diff --git a/TYPESCRIPT.md b/TYPESCRIPT.md new file mode 100644 index 0000000000000..ebcac32d59409 --- /dev/null +++ b/TYPESCRIPT.md @@ -0,0 +1,243 @@ +## TypeScriptifying Kibana Tips + +### Converting existing code + +To convert existing code over to TypeScript: +1. rename the file from `.js` to either `.ts` (if there is no html or jsx in the file) or `.tsx` (if there is). +2. Ensure tslint is running and installed in the IDE of your choice. There will usually be some linter errors after the file rename. +3. Auto-fix what you can. This will save you a lot of time! VSCode can be set to auto fix tslint errors when files are saved. + +### How to fix common TypeScript errors + +The first thing that will probably happen when you convert a `.js` file in our system to `.ts` is that some imports will be lacking types. + +#### EUI component is missing types + +1. Check https://github.com/elastic/eui/issues/256 to see if they know it’s missing, if it’s not on there, add it. +2. Temporarily get around the issue by using a declared module and exporting the missing types with the most basic types available. Bonus points if you write a PR yourself to the EUI repo to add the types, but having them available back in Kibana will take some time, as a new EUI release will need to be generated, then that new release pointed to in Kibana. Best, to make forward progress, to do a temporary workaround. + +```ts +declare module '@elastic/eui' { + export const EuiPopoverTitle: React.SFC; +} + +import { EuiPopoverTitle } from '@elastic/eui'; +``` + +Some background on the differences between module declaration and augmentation: + +In TypeScript module declarations can not be merged, which means each module can only be declared once. But it is possible to augment previously declared modules. The documentation about the distinction between module declaration and augmentation is sparse. The observed rules for `declare module '...' {}` in a `.d.ts` file seem to be: + +* it is treated as a module declaration when the file itself is not a module +* it is treated as a module augmentation when the file itself is module + +A `.d.ts` file is treated as a module if it contains any top-level `import` or `export` statements. That means that in order to write a module declaration the `import`s must be contained within the `declare` block and none must be located on the topmost level. Conversely, to write a module augmentation there must be at least one top-level `import` or `export` and the `declare` block must not contain any `import` statements. + +Since `@elastic/eui` already ships with a module declaration, any local additions must be performed using module augmentation, e.g. + +```typescript +// file `my_plugin/types/eui.d.ts` +import { CommonProps } from '@elastic/eui'; +import { SFC } from 'react'; + +declare module '@elastic/eui' { + export type EuiNewComponentProps = CommonProps & { + additionalProp: string; + }; + export const EuiNewComponent: SFC; +} +``` + +#### Internal dependency is missing types. + +1. Open up the file and see how easy it would be to convert to TypeScript. +2. If it's very straightforward, go for it. +3. If it's not and you wish to stay focused on your own PR, get around the error by adding a type definition file in the same folder as the dependency, with the same name. +4. Minimally you will need to type what you are using in your PR. No need to go crazy to fully type the thing or you might be there for awhile depending on what's available. + +For example: + +metadata.js: +```js +export let metadata = null; + +export function __newPlatformInit__(legacyMetadata) { + ... +} +``` + +documentation_links.js: +```js +import { metadata } from './metadata'; + +export const DOC_LINK_VERSION = metadata.branch; +``` + +To TypeScript `documentation_links.js` you'll need to add a type definition for `metadata.js` + +metadata.d.ts +``` +declare interface Metadata { + public branch: string; +} + +declare const metadata: Metadata; + +export { metadata }; +``` + +#### External dependency is missing types + +1. See if types exist for this module and can be installed, by doing something like: + +`yarn add -D @types/markdown-it@8.4.1` + +Use the version number that we have installed in package.json. This may not always work, and you might get something like: + +`Please choose a version of "@types/markdown-it" from this list:` + +If that happens, just pick the closest one. + +If yarn doesn't find the module it may not have types. For example, our `rison_node` package doesn't have types. In this case you have a few options: + +1. Contribute types into the DefinitelyTyped repo itself, or +2. Create a top level `types` folder and point to that in the tsconfig. For example, Infra team already handled this for `rison_node` and added: `x-pack/plugins/infra/types/rison_node.d.ts`. Other code uses it too so we will need to pull it up. Or, +3. Add a `// @ts-ignore` line above the import. This should be used minimally, the above options are better. However, sometimes you have to resort to this method. For example, the `expect.js` module will require this line. We don't have type definitions installed for this library. Installing these types would conflict with the jest typedefs for expect, and since they aren't API compatible with each other, it's not possible to make both test frameworks happy. Since we are moving from mocha => jest, we don't see this is a big issue. + +### TypeScripting react files + +React has it's own concept of runtime types via `proptypes`. TypeScript gives you compile time types so I prefer those. + +Before: +```jsx + +import PropTypes from 'prop-types'; + + export class Button extends Component { + state = { + buttonWasClicked = false + }; + + render() { + return + } + } + + Button.proptypes = { + text: PropTypes.string, + } +``` + +After: +```tsx + +interface Props { + text: string; +} + +interface State { + buttonWasClicked: boolean; +} + + export class Button extends Component { + state = { + buttonWasClicked = false + }; + + render() { + return + } + } +``` + +Note that the name of `Props` and `State` doesn't matter, the order does. If you are exporting those interfaces to be used elsewhere, you probably should give them more fleshed out names, such as `ButtonProps` and `ButtonState`. + +### Typing functions + +In react proptypes, we often will use `PropTypes.func`. In TypeScript, a function is `() => void`, or you can more fully flesh it out, for example: + +- `(inputParamName: string) => string` +- `(newLanguage: string) => void` +- `() => Promise` + +### Typing destructured object parameters + +Especially since we often use the spread operator, this syntax is a little different and probably worth calling out. + +Before: +```js +function ({ title, description }) { + ... +} +``` + +After: +```ts +function ({ title, description }: {title: string, description: string}) { + ... +} + +or, use an interface + +interface Options { + title: string; + description: string; +} + +function ({ title, description }: Options) { + ... +} +``` + +## Use `any` as little as possible + +Using any is sometimes valid, but should rarely be used, even if to make quicker progress. Even `Unknown` is better than using `any` if you aren't sure of an input parameter. + +If you use a variable that isn't initially defined, you should give it a type or it will be `any` by default (and strangely this isn't a warning, even though I think it should be) + +Before - `color` will be type `any`: +```js +let color; + +if (danger) { + color = 'red'; +} else { + color = 'green'; +} +``` + +After - `color` will be type `string`: +```ts +let color: string; + +if (danger) { + color = 'red'; +} else { + color = 'green'; +} +``` + +Another quirk, default `Map\WeakMap\Set` constructors use any-based type signature like `Map\WeakMap\Set`. That means that TS won't complain about the piece of code below: + +```ts +const anyMap = new Map(); +anyMap.set('1', 2); +anyMap.set('2', '3'); +anyMap.set(3, '4'); + +const anySet = new Set(); +anySet.add(1); +anySet.add('2'); +``` + +So we should explicitly define types for default constructors whenever possible: +```ts +const typedMap = new Map(); +typedMap.set('1', 2); +typedMap.set('2', '3'); // TS error +typedMap.set(3, '4'); // TS error + +const typedSet = new Set(); +typedSet.add(1); +typedSet.add('2'); // TS error +``` diff --git a/docs/api.asciidoc b/docs/api.asciidoc index afe7722a0cec5..a650d016ce951 100644 --- a/docs/api.asciidoc +++ b/docs/api.asciidoc @@ -26,7 +26,7 @@ entirely. [float] == APIs - +* <> * <> * <> * <> @@ -34,6 +34,7 @@ entirely. * <> -- +include::api/spaces-management.asciidoc[] include::api/role-management.asciidoc[] include::api/saved-objects.asciidoc[] include::api/dashboard-import.asciidoc[] diff --git a/docs/api/dashboard-import/export.asciidoc b/docs/api/dashboard-import/export.asciidoc index ddafeb35f7cc0..861fa7626de91 100644 --- a/docs/api/dashboard-import/export.asciidoc +++ b/docs/api/dashboard-import/export.asciidoc @@ -13,7 +13,7 @@ index patterns. ==== Query Parameters -`dashboard` (optional):: +`dashboard` (required):: (array|string) The id(s) of the dashboard(s) to export ==== Response body diff --git a/docs/api/role-management/put.asciidoc b/docs/api/role-management/put.asciidoc index a2b2ed7368431..d6974c3b9e08c 100644 --- a/docs/api/role-management/put.asciidoc +++ b/docs/api/role-management/put.asciidoc @@ -30,7 +30,7 @@ that begin with `_` are reserved for system usage. `elasticsearch`:: (object) Optional {es} cluster and index privileges, valid keys are `cluster`, `indices` and `run_as`. For more information, see {xpack-ref}/defining-roles.html[Defining Roles]. -`kibana`:: (list) A list of objects that specify the <>. +`kibana`:: (object) An object that specifies the <>. Valid keys are `global` and `space`. Privileges defined in the `global` key will apply to all spaces within Kibana, and will take precedent over any privileges defined in the `space` key. For example, specifying `global: ["all"]` will grant full access to all spaces within Kibana, even if the role indicates that a specific space should only have `read` privileges. ===== Example @@ -50,11 +50,11 @@ PUT /api/security/role/my_kibana_role "grant" : [ "title", "body" ] }, "query" : "{\"match\": {\"title\": \"foo\"}}" - } ], + } ] }, - "kibana": [ { - "privileges": [ "all" ] - } ], + "kibana": { + "global": ["all"] + } } -------------------------------------------------- // KIBANA @@ -62,3 +62,37 @@ PUT /api/security/role/my_kibana_role ==== Response A successful call returns a response code of `204` and no response body. + + +==== Granting access to specific spaces +To grant access to individual spaces within {kib}, specify the space identifier within the `kibana` object. + +Note: granting access + +[source,js] +-------------------------------------------------- +PUT /api/security/role/my_kibana_role +{ + "metadata" : { + "version" : 1 + }, + "elasticsearch": { + "cluster" : [ "all" ], + "indices" : [ { + "names" : [ "index1", "index2" ], + "privileges" : [ "all" ], + "field_security" : { + "grant" : [ "title", "body" ] + }, + "query" : "{\"match\": {\"title\": \"foo\"}}" + } ] + }, + "kibana": { + "global": [], + "space": { + "marketing": ["all"], + "engineering": ["read"] + } + } +} +-------------------------------------------------- diff --git a/docs/api/spaces-management.asciidoc b/docs/api/spaces-management.asciidoc new file mode 100644 index 0000000000000..f5f9a9d81c2fc --- /dev/null +++ b/docs/api/spaces-management.asciidoc @@ -0,0 +1,17 @@ +[role="xpack"] +[[spaces-api]] +== Kibana Spaces API + +experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Spaces concepts are stable, but the APIs for managing Spaces are currently experimental.] + +The spaces API allows people to manage their spaces within {kib}. + +* <> +* <> +* <> +* <> + +include::spaces-management/post.asciidoc[] +include::spaces-management/put.asciidoc[] +include::spaces-management/get.asciidoc[] +include::spaces-management/delete.asciidoc[] diff --git a/docs/api/spaces-management/delete.asciidoc b/docs/api/spaces-management/delete.asciidoc new file mode 100644 index 0000000000000..c5ae025dd9e2e --- /dev/null +++ b/docs/api/spaces-management/delete.asciidoc @@ -0,0 +1,25 @@ +[[spaces-api-delete]] +=== Delete space + +experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Spaces concepts are stable, but the APIs for managing Spaces are currently experimental.] + +[WARNING] +================================================== +Deleting a space will automatically delete all saved objects that belong to that space. This operation cannot be undone! +================================================== + +==== Request + +To delete a space, submit a DELETE request to the `/api/spaces/space/` +endpoint: + +[source,js] +-------------------------------------------------- +DELETE /api/spaces/space/marketing +-------------------------------------------------- +// KIBANA + +==== Response + +If the space is successfully deleted, the response code is `204`; otherwise, the response +code is 404. diff --git a/docs/api/spaces-management/get.asciidoc b/docs/api/spaces-management/get.asciidoc new file mode 100644 index 0000000000000..c79a883a80e4b --- /dev/null +++ b/docs/api/spaces-management/get.asciidoc @@ -0,0 +1,77 @@ +[[spaces-api-get]] +=== Get Space + +experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Spaces concepts are stable, but the APIs for managing Spaces are currently experimental.] + +Retrieves all {kib} spaces, or a specific space. + +==== Get all {kib} spaces + +===== Request + +To retrieve all spaces, issue a GET request to the +/api/spaces/space endpoint. + +[source,js] +-------------------------------------------------- +GET /api/spaces/space +-------------------------------------------------- +// KIBANA + +===== Response + +A successful call returns a response code of `200` and a response body containing a JSON +representation of the spaces. + +[source,js] +-------------------------------------------------- +[ + { + "id": "default", + "name": "Default", + "description" : "This is the Default Space", + "_reserved": true + }, + { + "id": "marketing", + "name": "Marketing", + "description" : "This is the Marketing Space", + "color": "#aabbcc", + "initials": "MK" + }, + { + "id": "sales", + "name": "Sales", + "initials": "MK" + }, +] +-------------------------------------------------- + +==== Get a specific space + +===== Request + +To retrieve a specific space, issue a GET request to +the `/api/spaces/space/` endpoint: + +[source,js] +-------------------------------------------------- +GET /api/spaces/space/marketing +-------------------------------------------------- +// KIBANA + +===== Response + +A successful call returns a response code of `200` and a response body containing a JSON +representation of the space. + +[source,js] +-------------------------------------------------- +{ + "id": "marketing", + "name": "Marketing", + "description" : "This is the Marketing Space", + "color": "#aabbcc", + "initials": "MK" +} +-------------------------------------------------- diff --git a/docs/api/spaces-management/post.asciidoc b/docs/api/spaces-management/post.asciidoc new file mode 100644 index 0000000000000..38ff647051335 --- /dev/null +++ b/docs/api/spaces-management/post.asciidoc @@ -0,0 +1,50 @@ +[[spaces-api-post]] +=== Create Space + +experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Spaces concepts are stable, but the APIs for managing Spaces are currently experimental.] + +Creates a new {kib} space. To update an existing space, use the PUT command. + +==== Request + +To create a space, issue a POST request to the +`/api/spaces/space` endpoint. + +[source,js] +-------------------------------------------------- +POST /api/spaces/space +-------------------------------------------------- + +==== Request Body + +The following parameters can be specified in the body of a POST request to create a space: + +`id`:: (string) Required identifier for the space. This identifier becomes part of Kibana's URL when inside the space. This cannot be changed by the update operation. + +`name`:: (string) Required display name for the space. + +`description`:: (string) Optional description for the space. + +`initials`:: (string) Optionally specify the initials shown in the Space Avatar for this space. By default, the initials will be automatically generated from the space name. +If specified, initials should be either 1 or 2 characters. + +`color`:: (string) Optioanlly specify the hex color code used in the Space Avatar for this space. By default, the color will be automatically generated from the space name. + +===== Example + +[source,js] +-------------------------------------------------- +POST /api/spaces/space +{ + "id": "marketing", + "name": "Marketing", + "description" : "This is the Marketing Space", + "color": "#aabbcc", + "initials": "MK" +} +-------------------------------------------------- +// KIBANA + +==== Response + +A successful call returns a response code of `200` with the created Space. diff --git a/docs/api/spaces-management/put.asciidoc b/docs/api/spaces-management/put.asciidoc new file mode 100644 index 0000000000000..529742bf2ce66 --- /dev/null +++ b/docs/api/spaces-management/put.asciidoc @@ -0,0 +1,50 @@ +[[spaces-api-put]] +=== Update Space + +experimental[This API is *experimental* and may be changed or removed completely in a future release. The underlying Spaces concepts are stable, but the APIs for managing Spaces are currently experimental.] + +Updates an existing {kib} space. To create a new space, use the POST command. + +==== Request + +To update a space, issue a PUT request to the +`/api/spaces/space/` endpoint. + +[source,js] +-------------------------------------------------- +PUT /api/spaces/space/ +-------------------------------------------------- + +==== Request Body + +The following parameters can be specified in the body of a PUT request to update a space: + +`id`:: (string) Required identifier for the space. This identifier becomes part of Kibana's URL when inside the space. This cannot be changed by the update operation. + +`name`:: (string) Required display name for the space. + +`description`:: (string) Optional description for the space. + +`initials`:: (string) Optionally specify the initials shown in the Space Avatar for this space. By default, the initials will be automatically generated from the space name. +If specified, initials should be either 1 or 2 characters. + +`color`:: (string) Optioanlly specify the hex color code used in the Space Avatar for this space. By default, the color will be automatically generated from the space name. + +===== Example + +[source,js] +-------------------------------------------------- +PUT /api/spaces/space/marketing +{ + "id": "marketing", + "name": "Marketing", + "description" : "This is the Marketing Space", + "color": "#aabbcc", + "initials": "MK" +} +-------------------------------------------------- +// KIBANA + +==== Response + +A successful call returns a response code of `200` with the updated Space. diff --git a/docs/apm/using-the-apm-ui.asciidoc b/docs/apm/using-the-apm-ui.asciidoc index 0fc8008d4cf23..012f778c3a311 100644 --- a/docs/apm/using-the-apm-ui.asciidoc +++ b/docs/apm/using-the-apm-ui.asciidoc @@ -65,12 +65,7 @@ Watches are managed separately in the dedicated Watcher UI available in Advanced image::apm/images/apm-errors-watcher-assistant.png[Example view of the Watcher assistant for errors in APM UI in Kibana] [[machine-learning-integration]] -=== Machine Learning integration (beta) - -[NOTE] -============ -Please note this feature is in beta. We kindly ask that you https://discuss.elastic.co/c/apm[provide feedback] if you experience any issues. -============ +=== Machine Learning integration The Machine Learning integration will initiate a new job predefined to calculate anomaly scores on transaction response times. The response time graph will show the expected bounds and annotate the graph when the anomaly score is 75 or above. @@ -80,12 +75,7 @@ image::apm/images/apm-ml-integration.png[Example view of anomaly scores on respo Jobs can be created per transaction type and based on the average response time. You can manage jobs in the Machine Learning jobs management page. It might take some time for results to appear on the graph. [[query-bar]] -=== Query bar (beta) - -[NOTE] -============ -Please note this feature is in beta. We kindly ask that you https://discuss.elastic.co/c/apm[provide feedback] if you experience any issues. -============ +=== Query bar The query bar is a powerful data query feature. Similar to the query bar in {kibana-ref}/discover.html[Discover] it enables you to pass advanced queries on your data to filter on particular pieces of information that you're interested in. It comes with a handy autocomplete that helps find the fields and even provides suggestions to the data they include. The query bar is available on Services, Transaction and Errors views, and any input will persist as you move between them. diff --git a/docs/canvas.asciidoc b/docs/canvas.asciidoc new file mode 100644 index 0000000000000..0a883831dbee5 --- /dev/null +++ b/docs/canvas.asciidoc @@ -0,0 +1,27 @@ +[[canvas]] += Canvas + +[partintro] +-- + +beta[] + +Congratulations on finding the Canvas application in {kib}. You are in for a treat. +Canvas is a whole new way of making data look amazing. Canvas combines data with +colors, shapes, text, and your own imagination to bring dynamic, multi-page, +pixel-perfect, data displays to screens large and small. + +We made Canvas for people like us. We figure, you are probably people like us: +you make neat stuff and you want to show that neat stuff to others. Canvas is +for makers who are a little bit creative, a little bit technical, and whole lot +of curious. + +We've put together <> to teach you +how to get the most out of Canvas. + +-- + +include::canvas/canvas-getting-started.asciidoc[] + +include::canvas/canvas-workpad.asciidoc[] + diff --git a/docs/canvas/canvas-getting-started.asciidoc b/docs/canvas/canvas-getting-started.asciidoc new file mode 100644 index 0000000000000..1b25f65320d49 --- /dev/null +++ b/docs/canvas/canvas-getting-started.asciidoc @@ -0,0 +1,31 @@ +[[canvas-getting-started]] +== Getting started with Canvas + +beta[]Your best bet to getting started with Canvas is to check out one +(or all) of the sample data sets that ship with {kib}. + +. Click the {kib} logo in the upper left hand corner of your browser to navigate +to the {kib} home page. +. Click *Load a data set and a Kibana dashboard*. This also loads a +Canvas workpad to go with the data set. +. Pick a data set. Let’s go with the eCommerce one for this example, but while you're +here, feel free to click *Add* on all of the available sample data sets. +. Click the Canvas icon in the left hand navigation menu. +. Find the *[eCommerce] Revenue Tracking* workpad and click on its name to open it. + +[role="screenshot"] +image::images/canvas-ecommerce.png[] + +You’re in! The first thing to do is to make a copy of this +workpad so you can come back to it later if needed. We’ll be making a mess +of it in this tutorial. + +. Click the name of the workpad in the lower left hand corner. ++ +You’ll notice this is similar to the first screen. You could switch to a new +workpad from here, but let's not for now. + +. Click the *Clone* icon in the *[eCommerce] Revenue Tracking* row. ++ +You now have a new workpad called *[eCommerce] Revenue Tracking - Copy*. + diff --git a/docs/canvas/canvas-workpad.asciidoc b/docs/canvas/canvas-workpad.asciidoc new file mode 100644 index 0000000000000..dc53ea099d5c2 --- /dev/null +++ b/docs/canvas/canvas-workpad.asciidoc @@ -0,0 +1,48 @@ +[[canvas-workpad]] +== Using the workpad + +beta[]Now that you have a workpad with sample data that you can mess with, let’s mess with it. +We’ll start out by making a few stylistic changes. + +. Click the gauge chart in the top left of the workpad (fun fact, these are actually pie charts). +Try clicking on the small red slice. If you click the number, you'll notice that +you’ve actually selected a number element, not the gauge itself. ++ +This element is now selected. Off to the right, you'll see that the side bar has changed. +This is where you can make changes to the element. ++ +[role="screenshot"] +image::images/canvas_workpad_edit_style.png[] + +. Try changing the color palette. Easy right? Click the Back button in your +browser to undo your change. + +. Try dragging the chart around the page. Grab the resize handles to make +the chart bigger and smaller. + +. Now click somewhere off of the element, but not on another element, +to deselect it. ++ +You will notice the sidebar changing again. You now have +access to the page and workpad-level settings. Feel free to change the page +background color or rename your workpad. + +Speaking of pages, Canvas workpads can have multiple pages. + +. Click the arrow to the right of the *Page 1 of 2* text in the toolbar at the bottom +of the page. You'll see a whole new view of the the eCommerce data. +. Click the *Page 2 of 2* text to see a live preview of all of the pages in your +workpad. +. Click the (+) button to create a new, blank page. +. Click the *Add element* button in the top right hand corner of the page. +. Add an *Area Chart.* ++ +[role="screenshot"] +image::images/canvas_workpad_3_page.png[] + +You now have a three-page workpad, and a new element connected +to some demo data. Your next step is to wire your new element +up to some real data; you can click on the *Data* tab in the right sidebar menu +and click "Change your data source" to start working with your Elasticsearch data. + + diff --git a/docs/dev-tools/grokdebugger/getting-started.asciidoc b/docs/dev-tools/grokdebugger/getting-started.asciidoc index 65aa43a7e1afd..88f2271110c92 100644 --- a/docs/dev-tools/grokdebugger/getting-started.asciidoc +++ b/docs/dev-tools/grokdebugger/getting-started.asciidoc @@ -16,6 +16,9 @@ endif::gs-mini[] TIP: See the documentation about the ingest node {ref}/grok-processor.html[grok processor] and the Logstash {logstash-ref}/plugins-filters-grok.html[grok filter] more info about grok. +NOTE: If you're using {security}, you must have the `manage_pipeline` +permission in order to use the Grok Debugger. + The Grok Debugger is automatically enabled in {kib}. It is located under the *DevTools* tab in {kib}. To start debugging grok patterns: diff --git a/docs/development/core/development-basepath.asciidoc b/docs/development/core/development-basepath.asciidoc index b7e0dec88bf50..c86ab6c5e797d 100644 --- a/docs/development/core/development-basepath.asciidoc +++ b/docs/development/core/development-basepath.asciidoc @@ -48,15 +48,15 @@ $http.get(chrome.addBasePath('/api/plugin/things')); [float] ==== Server side -Append `config.get('server.basePath')` to any absolute URL path. +Append `request.getBasePath()` to any absolute URL path. ["source","shell"] ----------- const basePath = server.config().get('server.basePath'); server.route({ path: '/redirect', - handler(req, reply) { - reply.redirect(`${basePath}/otherLocation`); + handler(request, h) { + return h.redirect(`${request.getBasePath()}/otherLocation`); } }); ----------- @@ -84,4 +84,4 @@ or `yarn start`. ["source","shell"] ----------- yarn start --no-base-path ------------ \ No newline at end of file +----------- diff --git a/docs/development/visualize/development-create-visualization.asciidoc b/docs/development/visualize/development-create-visualization.asciidoc index 24b5b44b9603f..56ed620e148c5 100644 --- a/docs/development/visualize/development-create-visualization.asciidoc +++ b/docs/development/visualize/development-create-visualization.asciidoc @@ -422,7 +422,6 @@ The `vis` object holds the visualization state and is the window into kibana: - *vis.isEditorMode()*: returns true if in editor mode - *vis.API.timeFilter*: allows you to access time picker - *vis.API.queryFilter*: gives you access to queryFilter -- *vis.API.queryManager*: gives you access to add filters to the filter bar - *vis.API.events.click*: default click handler - *vis.API.events.brush*: default brush handler diff --git a/docs/getting-started/tutorial-sample-data.asciidoc b/docs/getting-started/tutorial-sample-data.asciidoc index 7eb46bd26b900..d064f41c65073 100644 --- a/docs/getting-started/tutorial-sample-data.asciidoc +++ b/docs/getting-started/tutorial-sample-data.asciidoc @@ -25,8 +25,7 @@ In this tutorial, you’ll learn to: * Edit a visualization * Inspect the data behind the scenes -NOTE: If security is enabled, you must have the `all` Kibana privilege. -You must also have access to the `kibana_sample_data_flights` index with -the `read`, `write,` and `manage` privileges. See {xpack-ref}/security-privileges.html[Security Privileges] +NOTE: If security is enabled, you must have `read`, `write`, and `manage` privileges +on the `kibana_sample_data_*` indices. See {xpack-ref}/security-privileges.html[Security Privileges] for more information. diff --git a/docs/images/canvas-ecommerce.png b/docs/images/canvas-ecommerce.png new file mode 100644 index 0000000000000..58c0612881341 Binary files /dev/null and b/docs/images/canvas-ecommerce.png differ diff --git a/docs/images/canvas_workpad_3_page.png b/docs/images/canvas_workpad_3_page.png new file mode 100644 index 0000000000000..9a60ed3d00f60 Binary files /dev/null and b/docs/images/canvas_workpad_3_page.png differ diff --git a/docs/images/canvas_workpad_edit_style.png b/docs/images/canvas_workpad_edit_style.png new file mode 100644 index 0000000000000..d12ae2cd81b8f Binary files /dev/null and b/docs/images/canvas_workpad_edit_style.png differ diff --git a/docs/images/management_create_rollup_job.png b/docs/images/management_create_rollup_job.png new file mode 100644 index 0000000000000..398105e7af491 Binary files /dev/null and b/docs/images/management_create_rollup_job.png differ diff --git a/docs/images/management_create_rollup_menu.png b/docs/images/management_create_rollup_menu.png new file mode 100644 index 0000000000000..21e19af0c90fc Binary files /dev/null and b/docs/images/management_create_rollup_menu.png differ diff --git a/docs/images/management_rolled_dashboard.png b/docs/images/management_rolled_dashboard.png new file mode 100644 index 0000000000000..b6f797147781c Binary files /dev/null and b/docs/images/management_rolled_dashboard.png differ diff --git a/docs/images/management_rollup_job_details.png b/docs/images/management_rollup_job_details.png new file mode 100644 index 0000000000000..03983977239d7 Binary files /dev/null and b/docs/images/management_rollup_job_details.png differ diff --git a/docs/images/management_rollup_list.png b/docs/images/management_rollup_list.png new file mode 100644 index 0000000000000..0ca3ce9940fe3 Binary files /dev/null and b/docs/images/management_rollup_list.png differ diff --git a/docs/images/management_rollups_visualization.png b/docs/images/management_rollups_visualization.png new file mode 100644 index 0000000000000..d2c1adb67b942 Binary files /dev/null and b/docs/images/management_rollups_visualization.png differ diff --git a/docs/images/monitoring-dashboard.png b/docs/images/monitoring-dashboard.png index ef72d171e54d5..0ad5192df7678 100644 Binary files a/docs/images/monitoring-dashboard.png and b/docs/images/monitoring-dashboard.png differ diff --git a/docs/index.asciidoc b/docs/index.asciidoc index 47c3f16dc500b..8b2a8e2eee561 100644 --- a/docs/index.asciidoc +++ b/docs/index.asciidoc @@ -24,7 +24,7 @@ include::introduction.asciidoc[] include::setup.asciidoc[] -include::monitoring/monitoring-xkib.asciidoc[] +include::monitoring/configuring-monitoring.asciidoc[] include::security/securing-kibana.asciidoc[] @@ -40,6 +40,8 @@ include::dashboard.asciidoc[] include::timelion.asciidoc[] +include::canvas.asciidoc[] + include::ml/index.asciidoc[] include::apm/index.asciidoc[] @@ -52,6 +54,8 @@ include::monitoring/index.asciidoc[] include::management.asciidoc[] +include::spaces/index.asciidoc[] + include::security/index.asciidoc[] include::management/watcher-ui/index.asciidoc[] @@ -74,4 +78,6 @@ include::release-notes/highlights.asciidoc[] include::migration.asciidoc[] -include::CHANGELOG.asciidoc[] \ No newline at end of file +include::CHANGELOG.asciidoc[] + +include::redirects.asciidoc[] \ No newline at end of file diff --git a/docs/limitations.asciidoc b/docs/limitations.asciidoc index 04bf5a72a24dc..bcf124d5acddd 100644 --- a/docs/limitations.asciidoc +++ b/docs/limitations.asciidoc @@ -6,7 +6,10 @@ Kibana currently has the following limitations. * <> +* <> -- include::limitations/nested-objects.asciidoc[] + +include::limitations/export-data.asciidoc[] diff --git a/docs/limitations/export-data.asciidoc b/docs/limitations/export-data.asciidoc new file mode 100644 index 0000000000000..442460c67017c --- /dev/null +++ b/docs/limitations/export-data.asciidoc @@ -0,0 +1,5 @@ +[[export-data]] +== Exporting data + +Exporting a data table or saved search from a dashboard or visualization report +has known limitations. The PDF report only includes the data visible on the screen. \ No newline at end of file diff --git a/docs/management.asciidoc b/docs/management.asciidoc index 909c5d3312548..2579779ef3889 100644 --- a/docs/management.asciidoc +++ b/docs/management.asciidoc @@ -17,6 +17,10 @@ include::management/managing-licenses.asciidoc[] include::management/index-patterns.asciidoc[] +include::management/rollups/create_and_manage_rollups.asciidoc[] + +include::management/rollups/visualize_rollup_data.asciidoc[] + include::management/managing-fields.asciidoc[] include::management/managing-indices.asciidoc[] diff --git a/docs/management/managing-fields.asciidoc b/docs/management/managing-fields.asciidoc index dbb4a30835c89..2926ddd895206 100644 --- a/docs/management/managing-fields.asciidoc +++ b/docs/management/managing-fields.asciidoc @@ -64,9 +64,9 @@ the https://adamwdraper.github.io/Numeral-js/[numeral.js] standard format defini Scripted fields compute data on the fly from the data in your Elasticsearch indices. Scripted field data is shown on the Discover tab as part of the document data, and you can use scripted fields in your visualizations. -Scripted field values are computed at query time so they aren't indexed and cannot be searched. - -NOTE: Kibana cannot query scripted fields. +Scripted field values are computed at query time so they aren't indexed and cannot be searched using Kibana's default +query language. However they can be queried using Kibana's new <>. Scripted +fields are also supported in the filter bar. WARNING: Computing data on the fly with scripted fields can be very resource intensive and can have a direct impact on Kibana's performance. Keep in mind that there's no built-in validation of a scripted field. If your scripts are diff --git a/docs/management/managing-licenses.asciidoc b/docs/management/managing-licenses.asciidoc index a55019030dfa5..aba61dbf1be79 100644 --- a/docs/management/managing-licenses.asciidoc +++ b/docs/management/managing-licenses.asciidoc @@ -26,4 +26,8 @@ At the end of the trial period, the Platinum features operate in a license, extend the trial, or purchase a subscription. For a comparison of the Elastic license levels, -see https://www.elastic.co/subscriptions[the subscription page]. +see https://www.elastic.co/subscriptions[the subscription page]. + +TIP: If {security} is enabled, before you can install a gold or platinum +license, you must configure Transport Layer Security (TLS) in {es}. See +{stack-ov}/encrypting-communications.html[Encrypting communications]. \ No newline at end of file diff --git a/docs/management/rollups/create_and_manage_rollups.asciidoc b/docs/management/rollups/create_and_manage_rollups.asciidoc new file mode 100644 index 0000000000000..aafdc9ffba78a --- /dev/null +++ b/docs/management/rollups/create_and_manage_rollups.asciidoc @@ -0,0 +1,80 @@ +[[data-rollups]] +== Working with rollup indices + +The {ref}/xpack-rollup.html[rollup feature in {es}] +enables you to summarize historical data and store it compactly for future analysis, +so you can query, aggregate, and visualize the data using a fraction of the storage. +This is a good way to keep costs down when you need to store months or years of +historical data for use in visualizations and reports. + +{kib} supports rolled up data in two ways: + +* You can create and manage a rollup job in Management +* You can create a visualization using rolled up data in +Visualize and view it in a dashboard + + + +[[create-and-manage-rollup-job]] +=== Create and manage rollup jobs + +In Management, you'll find a UI for viewing, creating, starting, stopping, and +deleting rollup jobs. A rollup job is a periodic task that summarizes data from +indices specified by an index pattern and rolls it into a new index. To navigate +to the UI, go to *Management*, and under *Elasticsearch*, click *Rollup Jobs*. + +[role="screenshot"] +image::images/management_rollup_list.png[][List of currently active rollup jobs] + +[float] +[[create-rollup-job]] +==== Creating a rollup job + +{kib} makes it easy for you to create a rollup job by walking you through the +process step by step. The first step is to define the job logistics. These include +the name of the rollup job, the index or indices to summarize, and the output rollup index. + +The index pattern cannot match the name of the output rollup index. For example, +if your index pattern is `metricbeat-*`, you cannot name your rollup index +`metricbeat-rollup`. Otherwise, the job will attempt to capture the data in the +rollup index. + +[role="screenshot"] +image::images/management_create_rollup_job.png[][Wizard that walks you through creation of a rollup job] + +You must set a schedule for the rollup job: how often to collect the data, +the number of documents to roll up at a time, and the duration of its latency. +The latency buffer field is provided to protect against the late arrival of data +from Beats or other sources. By delaying the rollup for the specified amount of +time from when the job starts, you allow for the inclusion of late-arriving data +in the rollup. + +In the subsequent phases, you define the Date Histogram aggregation for the job +and optionally the Terms and Histogram aggregations. + +* The Date Histogram aggregation defines the time intervals for summarizing the data. +This value is important because you cannot search the data with a smaller value +than this interval. However, you can aggregate buckets in a larger time interval. + +* The Terms histogram enables you to split the time buckets into sub buckets for +term field values. + +* The Histogram aggregation enables you to split the time buckets into sub buckets +for numeric field values. + +The final step is to specify the fields for calculating metrics. For each selected +field, you can collect any or all of the following: value count, average, sum, min, and max. + +Before you save the rollup job, {kib} displays a summary of the rollup job for +validation. + +[float] +[[manage-rollup-job]] +==== Managing rollup jobs + +Selecting a job on the *Rollup jobs* page shows its details. The Manage menu in +the lower right enables you to start, stop, and delete the rollup job. +You must first stop a rollup job before deleting it. + +[role="screenshot"] +image::images/management_rollup_job_details.png[][Rollup job details] diff --git a/docs/management/rollups/visualize_rollup_data.asciidoc b/docs/management/rollups/visualize_rollup_data.asciidoc new file mode 100644 index 0000000000000..1a8315f904c62 --- /dev/null +++ b/docs/management/rollups/visualize_rollup_data.asciidoc @@ -0,0 +1,48 @@ +[[visualize-rollup-data]] +=== Create a visualization using rolled up data + +beta[] + +You can visualize your rolled up data in a variety of charts, tables, maps, and +more. Most visualizations support rolled up data, with the exception of +Timelion, Visual Builder, and Vega visualizations. + +You create an index pattern for rolled up data the same way you do for any data, +in *Management > Kibana > Index patterns*. Clicking *Create index pattern* includes +an item for creating a rollup index pattern, if a rollup index is detected in the cluster. + +[role="screenshot"] +image::images/management_create_rollup_menu.png[Create index pattern menu] + +You can match an index pattern to only rolled up data, or mix both rolled up +and raw data to visualize all data together. An index +pattern can match only one rolled up index, not multiple. There is no restriction +on the number of standard indices that an index pattern can match. To match multiple indices, use a comma +to separate the names, with no space after the comma. + +When creating an index pattern, you’re asked to set a time field for filtering. +With a rollup index, the time filter field is the same field used for +the rolled up date histogram aggregation. + +Keep the following in mind when creating a visualization from rolled up data: + +* The data in a rollup index only has summarized metrics for specific fields. +You can’t search any other field from the original raw data. +* Data is summarized into time buckets that might be split into sub buckets for +numeric field values or terms. You can ask for a time aggregation that takes +several time buckets and combines them to lower granularity. For example, +if the rollup job was aggregated by hours, you can ask for buckets of days. + +The data represented in this visualization comes from a rollup index and +standard indices. + +[role="screenshot"] +image::images/management_rollups_visualization.png[][Rollups in visualizations] + +You can mix rollup visualizations and regular visualizations in a dashboard. +The following dashboard shows this mix, along with a field filter. Note +that not all queries and filters are supported by rollups. + +[role="screenshot"] +image::images/management_rolled_dashboard.png[][Rollups in dashboards] + diff --git a/docs/ml/creating-jobs.asciidoc b/docs/ml/creating-jobs.asciidoc index 4d9715736b891..3ad18bc475e1e 100644 --- a/docs/ml/creating-jobs.asciidoc +++ b/docs/ml/creating-jobs.asciidoc @@ -20,7 +20,7 @@ than running multiple jobs against the same data. A _population job_ detects activity that is unusual compared to the behavior of the population. For more information, see -{xpack-ref}/ml-configuring-pop.html[Performing Population Analysis]. +{stack-ov}/ml-configuring-pop.html[Performing Population Analysis]. An _advanced job_ can contain multiple detectors and enables you to configure all job settings. @@ -36,19 +36,20 @@ image::ml/images/ml-data-recognizer.jpg[A screenshot of the Apache and NGINX job If you are not certain which type of job to create, you can use the *Data Visualizer* to learn more about your data and to identify possible fields -for {ml} analysis. +for {ml} analysis. -[role="screenshot"] -image::ml/images/ml-data-visualizer.jpg[A screenshot of the Data Visualizer option when creating new jobs] - -NOTE: If your data is located outside of {es}, you cannot use {kib} to create +[NOTE] +=============================== +* If your index pattern does not contain a time field, you cannot use the *Data Visualizer*. +* If your data is located outside of {es}, you cannot use {kib} to create your jobs and you cannot use {dfeeds} to retrieve your data in real time. Machine learning analysis is still possible, however, by using APIs to create and manage jobs and post data to them. For more information, see {ref}/ml-apis.html[Machine Learning APIs]. +=============================== Ready to get some hands-on experience? See -{xpack-ref}/ml-getting-started.html[Getting Started with Machine Learning]. +{stack-ov}/ml-getting-started.html[Getting Started with Machine Learning]. The following video tutorials also demonstrate single metric, multi-metric, and advanced jobs: diff --git a/docs/ml/images/ml-calendar-management.jpg b/docs/ml/images/ml-calendar-management.jpg index 060877c1c1617..a1f22afc6c77f 100644 Binary files a/docs/ml/images/ml-calendar-management.jpg and b/docs/ml/images/ml-calendar-management.jpg differ diff --git a/docs/ml/images/ml-create-job.jpg b/docs/ml/images/ml-create-job.jpg index 506f3d8ea3c2e..ac4bece8dee4a 100644 Binary files a/docs/ml/images/ml-create-job.jpg and b/docs/ml/images/ml-create-job.jpg differ diff --git a/docs/ml/images/ml-data-visualizer-sample.jpg b/docs/ml/images/ml-data-visualizer-sample.jpg new file mode 100644 index 0000000000000..d3dfe8623c32f Binary files /dev/null and b/docs/ml/images/ml-data-visualizer-sample.jpg differ diff --git a/docs/ml/images/ml-data-visualizer.jpg b/docs/ml/images/ml-data-visualizer.jpg deleted file mode 100644 index 11758bab17b02..0000000000000 Binary files a/docs/ml/images/ml-data-visualizer.jpg and /dev/null differ diff --git a/docs/ml/images/ml-job-management.jpg b/docs/ml/images/ml-job-management.jpg index c459a1ac78d5a..9334665921a91 100644 Binary files a/docs/ml/images/ml-job-management.jpg and b/docs/ml/images/ml-job-management.jpg differ diff --git a/docs/ml/images/ml-settings.jpg b/docs/ml/images/ml-settings.jpg new file mode 100644 index 0000000000000..3c8d6153998e2 Binary files /dev/null and b/docs/ml/images/ml-settings.jpg differ diff --git a/docs/ml/images/ml-single-metric-viewer.jpg b/docs/ml/images/ml-single-metric-viewer.jpg index 7500e5a656af2..b943e6c78ddf3 100644 Binary files a/docs/ml/images/ml-single-metric-viewer.jpg and b/docs/ml/images/ml-single-metric-viewer.jpg differ diff --git a/docs/ml/index.asciidoc b/docs/ml/index.asciidoc index bafdfcaa2bd41..3832020436fab 100644 --- a/docs/ml/index.asciidoc +++ b/docs/ml/index.asciidoc @@ -7,42 +7,54 @@ As datasets increase in size and complexity, the human effort required to inspect dashboards or maintain rules for spotting infrastructure problems, -cyber attacks, or business issues becomes impractical. The {xpackml} features +cyber attacks, or business issues becomes impractical. The Elastic {ml-features} automatically model the normal behavior of your time series data — learning trends, periodicity, and more — in real time to identify anomalies, streamline root cause analysis, and reduce false positives. -{xpackml} runs in and scales with {es}, and includes an +The {ml-features} run in and scale with {es}, and include an intuitive UI on the {kib} *Machine Learning* page for creating anomaly detection jobs and understanding results. -You can use the *Job Management* pane to create and manage jobs and their -associated {dfeeds}: +If you have a basic license, you can use the *Data Visualizer* to learn more +about the data that you've stored in {es} and to identify possible fields for +{ml} analysis: + +[role="screenshot"] +image::ml/images/ml-data-visualizer-sample.jpg[Data Visualizer for sample flight data] + +experimental[] You can also upload a CSV, NDJSON, or log file (up to 100 MB in size). +The {ml-features} identify the file format and field mappings. You can then +optionally import that data into an {es} index. + +If you have a trial or platinum license, you can <> +and manage jobs and {dfeeds} from the *Job Management* pane: [role="screenshot"] image::ml/images/ml-job-management.jpg[Job Management] -You can use the *Settings* pane to add scheduled events to calendars and to -associate these calendars with your jobs: +You can use the *Settings* pane to create and edit +{stack-ov}/ml-calendars.html[calendars] and the filters that are used in +{stack-ov}/ml-rules.html[custom rules]: [role="screenshot"] -image::ml/images/ml-calendar-management.jpg[Calendar Management] +image::ml/images/ml-settings.jpg[Calendar Management] The *Anomaly Explorer* and *Single Metric Viewer* display the results of your -{ml} jobs. For example: +{ml} jobs. For example: [role="screenshot"] image::ml/images/ml-single-metric-viewer.jpg[Single Metric Viewer] -NOTE: The {xpack} {ml} features in {kib} use pop-ups. You must configure your +NOTE: The {kib} {ml-features} use pop-ups. You must configure your web browser so that it does not block pop-up windows or create an exception for -your Kibana URL. +your {kib} URL. For more information about {ml}, see -{xpack-ref}/xpack-ml.html[Machine Learning in the Elastic Stack]. +{stack-ov}/xpack-ml.html[Machine learning in the {stack}]. -- include::creating-jobs.asciidoc[] include::job-tips.asciidoc[] -//TO-DO: Add info about creating watch + diff --git a/docs/monitoring/beats-details.asciidoc b/docs/monitoring/beats-details.asciidoc index 4c9bc5aa31494..bc0cbfe6aaf06 100644 --- a/docs/monitoring/beats-details.asciidoc +++ b/docs/monitoring/beats-details.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[beats-page]] -=== Beats Monitoring Metrics +== Beats Monitoring Metrics ++++ Beats Metrics ++++ diff --git a/docs/monitoring/cluster-alerts.asciidoc b/docs/monitoring/cluster-alerts.asciidoc index fce76965dd9ae..fb7d0c31c5189 100644 --- a/docs/monitoring/cluster-alerts.asciidoc +++ b/docs/monitoring/cluster-alerts.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[cluster-alerts]] -=== Cluster Alerts +== Cluster Alerts The *Monitoring > Clusters* page in {kib} summarizes the status of your Elastic stack. You can drill down into the metrics to view more information about your diff --git a/docs/monitoring/configuring-monitoring.asciidoc b/docs/monitoring/configuring-monitoring.asciidoc index 82ef1bbd77f0b..9c35affc24ce6 100644 --- a/docs/monitoring/configuring-monitoring.asciidoc +++ b/docs/monitoring/configuring-monitoring.asciidoc @@ -1,4 +1,26 @@ +[role="xpack"] [[configuring-monitoring]] -== Configuring Monitoring +== Configuring monitoring in {kib} +++++ +Configuring monitoring +++++ -See {ref}/configuring-monitoring.html[Configuring Monitoring in {es}]. +If you enable the Elastic {monitor-features} in your cluster, you can +optionally collect metrics about {kib}: + +* <> +* <> + + +You can also use {kib} to visualize +monitoring data from across the {stack}: + +* <> + +To learn about monitoring in general, see +{stack-ov}/xpack-monitoring.html[Monitoring the {stack}]. + +include::monitoring-kibana.asciidoc[] +include::monitoring-metricbeat.asciidoc[] +include::viewing-metrics.asciidoc[] +include::{kib-repo-dir}/settings/monitoring-settings.asciidoc[] \ No newline at end of file diff --git a/docs/monitoring/elasticsearch-details.asciidoc b/docs/monitoring/elasticsearch-details.asciidoc index 751e20aa8dd2d..025fc8f2887cb 100644 --- a/docs/monitoring/elasticsearch-details.asciidoc +++ b/docs/monitoring/elasticsearch-details.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[elasticsearch-metrics]] -=== {es} Monitoring Metrics +== {es} Monitoring Metrics ++++ {es} Metrics ++++ @@ -28,7 +28,7 @@ The panel at the top shows the current cluster statistics, the charts show the search and indexing performance over time, and the table at the bottom shows information about any shards that are being recovered. -image::monitoring/images/monitoring-overview.jpg["Elasticsearch Cluster Overview",link="images/monitoring-overview.jpg"] +image::monitoring/images/monitoring-overview.png["Elasticsearch Cluster Overview",link="images/monitoring-overview.png"] TIP: Not sure what a chart is showing? Click the info button for a description of the metrics. @@ -42,7 +42,7 @@ From there, you can dive into detailed metrics for particular nodes and indices. To view node metrics, click **Nodes**. The Nodes section shows the status of each node in your cluster. -image::monitoring/images/monitoring-nodes.jpg["Elasticsearch Nodes",link="images/monitoring-nodes.jpg"] +image::monitoring/images/monitoring-nodes.png["Elasticsearch Nodes",link="images/monitoring-nodes.png"] [float] [[nodes-page-overview]] @@ -51,7 +51,7 @@ image::monitoring/images/monitoring-nodes.jpg["Elasticsearch Nodes",link="images Click the name of a node to view its node statistics over time. These represent high-level statistics collected from {es} that provide a good overview of health. -image::monitoring/images/monitoring-node.jpg["Elasticsearch Node Overview",link="images/monitoring-node.jpg"] +image::monitoring/images/monitoring-node.png["Elasticsearch Node Overview",link="images/monitoring-node.png"] [float] [[nodes-page-advanced]] @@ -74,7 +74,7 @@ more advanced knowledge of {es}, such as poor garbage collection performance. To view index metrics, click **Indices**. The Indices section shows the same overall index and search metrics as the Overview and a table of your indices. -image::monitoring/images/monitoring-indices.jpg["Elasticsearch Indices",link="images/monitoring-indices.jpg"] +image::monitoring/images/monitoring-indices.png["Elasticsearch Indices",link="images/monitoring-indices.png"] [float] [[indices-page-overview]] @@ -83,7 +83,7 @@ image::monitoring/images/monitoring-indices.jpg["Elasticsearch Indices",link="im From the Indices listing, you can view data for a particular index. To drill down into the data for a particular index, click its name in the Indices table. -image::monitoring/images/monitoring-index.jpg["Elasticsearch Index Overview",link="images/monitoring-index.jpg"] +image::monitoring/images/monitoring-index.png["Elasticsearch Index Overview",link="images/monitoring-index.png"] [float] [[indices-page-advanced]] diff --git a/docs/monitoring/getting-started.asciidoc b/docs/monitoring/getting-started.asciidoc deleted file mode 100644 index 1782661d5f0c8..0000000000000 --- a/docs/monitoring/getting-started.asciidoc +++ /dev/null @@ -1,4 +0,0 @@ -[[monitoring-getting-started]] -== Getting Started - -See {kibana-ref}/monitoring-data.html[Viewing Monitoring Data in {kib}]. diff --git a/docs/monitoring/images/metricbeat.png b/docs/monitoring/images/metricbeat.png new file mode 100644 index 0000000000000..17b9516e91b8e Binary files /dev/null and b/docs/monitoring/images/metricbeat.png differ diff --git a/docs/monitoring/images/monitoring-index-advanced.jpg b/docs/monitoring/images/monitoring-index-advanced.jpg deleted file mode 100644 index 19523cbbc63e9..0000000000000 Binary files a/docs/monitoring/images/monitoring-index-advanced.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-index-advanced.png b/docs/monitoring/images/monitoring-index-advanced.png index 832b6f631847d..833ae3a0d7638 100644 Binary files a/docs/monitoring/images/monitoring-index-advanced.png and b/docs/monitoring/images/monitoring-index-advanced.png differ diff --git a/docs/monitoring/images/monitoring-index.jpg b/docs/monitoring/images/monitoring-index.jpg deleted file mode 100644 index fdbb0ab8dafe6..0000000000000 Binary files a/docs/monitoring/images/monitoring-index.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-index.png b/docs/monitoring/images/monitoring-index.png new file mode 100644 index 0000000000000..d510e2fb7ff25 Binary files /dev/null and b/docs/monitoring/images/monitoring-index.png differ diff --git a/docs/monitoring/images/monitoring-indices.jpg b/docs/monitoring/images/monitoring-indices.jpg deleted file mode 100644 index de69527ef1efd..0000000000000 Binary files a/docs/monitoring/images/monitoring-indices.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-indices.png b/docs/monitoring/images/monitoring-indices.png new file mode 100644 index 0000000000000..41904fa1f5941 Binary files /dev/null and b/docs/monitoring/images/monitoring-indices.png differ diff --git a/docs/monitoring/images/monitoring-kibana-instance.jpg b/docs/monitoring/images/monitoring-kibana-instance.jpg deleted file mode 100644 index 975b679cb0939..0000000000000 Binary files a/docs/monitoring/images/monitoring-kibana-instance.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-kibana-instance.png b/docs/monitoring/images/monitoring-kibana-instance.png new file mode 100644 index 0000000000000..ee2fdc7fa070c Binary files /dev/null and b/docs/monitoring/images/monitoring-kibana-instance.png differ diff --git a/docs/monitoring/images/monitoring-kibana-instances.jpg b/docs/monitoring/images/monitoring-kibana-instances.jpg deleted file mode 100644 index 42fed9f501d97..0000000000000 Binary files a/docs/monitoring/images/monitoring-kibana-instances.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-kibana-instances.png b/docs/monitoring/images/monitoring-kibana-instances.png new file mode 100644 index 0000000000000..3c1605b2582cf Binary files /dev/null and b/docs/monitoring/images/monitoring-kibana-instances.png differ diff --git a/docs/monitoring/images/monitoring-kibana-overview.jpg b/docs/monitoring/images/monitoring-kibana-overview.jpg deleted file mode 100644 index 86908d7aea2d6..0000000000000 Binary files a/docs/monitoring/images/monitoring-kibana-overview.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-kibana-overview.png b/docs/monitoring/images/monitoring-kibana-overview.png new file mode 100644 index 0000000000000..8eb161a039187 Binary files /dev/null and b/docs/monitoring/images/monitoring-kibana-overview.png differ diff --git a/docs/monitoring/images/monitoring-node-advanced.jpg b/docs/monitoring/images/monitoring-node-advanced.jpg deleted file mode 100644 index ccef74821241f..0000000000000 Binary files a/docs/monitoring/images/monitoring-node-advanced.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-node-advanced.png b/docs/monitoring/images/monitoring-node-advanced.png index e8838b57779c7..74aa967ab1ae8 100644 Binary files a/docs/monitoring/images/monitoring-node-advanced.png and b/docs/monitoring/images/monitoring-node-advanced.png differ diff --git a/docs/monitoring/images/monitoring-node.jpg b/docs/monitoring/images/monitoring-node.jpg deleted file mode 100644 index 9424054f5b7f7..0000000000000 Binary files a/docs/monitoring/images/monitoring-node.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-node.png b/docs/monitoring/images/monitoring-node.png new file mode 100644 index 0000000000000..dd798fb19ea6b Binary files /dev/null and b/docs/monitoring/images/monitoring-node.png differ diff --git a/docs/monitoring/images/monitoring-nodes.jpg b/docs/monitoring/images/monitoring-nodes.jpg deleted file mode 100644 index 7658087ce374e..0000000000000 Binary files a/docs/monitoring/images/monitoring-nodes.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-nodes.png b/docs/monitoring/images/monitoring-nodes.png new file mode 100644 index 0000000000000..ea0ca24b273df Binary files /dev/null and b/docs/monitoring/images/monitoring-nodes.png differ diff --git a/docs/monitoring/images/monitoring-overview.jpg b/docs/monitoring/images/monitoring-overview.jpg deleted file mode 100644 index 7790fdecc6961..0000000000000 Binary files a/docs/monitoring/images/monitoring-overview.jpg and /dev/null differ diff --git a/docs/monitoring/images/monitoring-overview.png b/docs/monitoring/images/monitoring-overview.png new file mode 100644 index 0000000000000..f58b10a2e0488 Binary files /dev/null and b/docs/monitoring/images/monitoring-overview.png differ diff --git a/docs/monitoring/index.asciidoc b/docs/monitoring/index.asciidoc index fa57d13ed9623..f60bb5c36f028 100644 --- a/docs/monitoring/index.asciidoc +++ b/docs/monitoring/index.asciidoc @@ -5,24 +5,28 @@ [partintro] -- -{monitoring} in {kib} serves two separate purposes: +The {kib} {monitor-features} serve two separate purposes: -. To visualize monitoring data from across the Elastic Stack. You can view -health and performance data for {es}, Logstash, and Beats in real time, as well -as analyze past performance. For more information, see {xpack-ref}/xpack-monitoring.html[Monitoring the Elastic Stack]. +. To visualize monitoring data from across the {stack}. You can view health and +performance data for {es}, {ls}, and Beats in real time, as well as analyze past +performance. For more information, see +{stack-ov}/xpack-monitoring.html[Monitoring the {stack}]. . To monitor {kib} itself and route that data to the monitoring cluster. -If you enable {monitoring} across the Elastic Stack, a monitoring agent runs on -each {es} node, Logstash node, {kib} instance, and Beat to collect and index -metrics. Each node and instance is considered unique based on its persistent +If you enable monitoring across the {stack}, each {es} node, {ls} node, {kib} +instance, and Beat is considered unique based on its persistent UUID, which is written to the <> directory when the node -or instance starts. +or instance starts. -* <> -* <> +NOTE: Watcher must be enabled to view cluster alerts. If you have a Basic +license, Top Cluster Alerts are not displayed. -- -include::viewing-metrics.asciidoc[] +include::beats-details.asciidoc[] +include::cluster-alerts.asciidoc[] +include::elasticsearch-details.asciidoc[] +include::kibana-details.asciidoc[] +include::logstash-details.asciidoc[] include::monitoring-troubleshooting.asciidoc[] diff --git a/docs/monitoring/kibana-details.asciidoc b/docs/monitoring/kibana-details.asciidoc index 58f2ee25a94b4..ac5daec87d92e 100644 --- a/docs/monitoring/kibana-details.asciidoc +++ b/docs/monitoring/kibana-details.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[kibana-page]] -=== {kib} Monitoring Metrics +== {kib} Monitoring Metrics ++++ {kib} Metrics ++++ @@ -8,13 +8,13 @@ To view the key metrics that indicate the overall health of {kib} itself, click **Overview** in the {kib} section of the *Monitoring* page. -image::monitoring/images/monitoring-kibana-overview.jpg["Kibana Overview",link="images/monitoring-kibana-overview.jpg"] +image::monitoring/images/monitoring-kibana-overview.png["Kibana Overview",link="images/monitoring-kibana-overview.png"] To view {kib} instance metrics, click **Instances**. The Instances section shows the status of each {kib} instance. -image::monitoring/images/monitoring-kibana-instances.jpg["Kibana Instances",link="images/monitoring-kibana-instances.jpg"] +image::monitoring/images/monitoring-kibana-instances.png["Kibana Instances",link="images/monitoring-kibana-instances.png"] Click the name of an instance to view its instance statistics over time. -image::monitoring/images/monitoring-kibana-instance.jpg["Kibana Instance View",link="images/monitoring-kibana-instance.jpg"] +image::monitoring/images/monitoring-kibana-instance.png["Kibana Instance View",link="images/monitoring-kibana-instance.png"] diff --git a/docs/monitoring/logstash-details.asciidoc b/docs/monitoring/logstash-details.asciidoc index 42453e627f19e..65f7407e0575e 100644 --- a/docs/monitoring/logstash-details.asciidoc +++ b/docs/monitoring/logstash-details.asciidoc @@ -1,6 +1,6 @@ [role="xpack"] [[logstash-page]] -=== Logstash Monitoring Metrics +== Logstash Monitoring Metrics ++++ Logstash Metrics ++++ diff --git a/docs/monitoring/monitoring-elasticsearch.asciidoc b/docs/monitoring/monitoring-elasticsearch.asciidoc deleted file mode 100644 index e22285419a40e..0000000000000 --- a/docs/monitoring/monitoring-elasticsearch.asciidoc +++ /dev/null @@ -1,4 +0,0 @@ -[[monitoring-cluster]] -== Monitoring Elasticsearch - -See {ref}/es-monitoring.html[Monitoring {es}]. diff --git a/docs/monitoring/monitoring-kibana.asciidoc b/docs/monitoring/monitoring-kibana.asciidoc index 31ff8bc6b341e..4f2cfc92f874f 100644 --- a/docs/monitoring/monitoring-kibana.asciidoc +++ b/docs/monitoring/monitoring-kibana.asciidoc @@ -1,5 +1,121 @@ +[role="xpack"] [[monitoring-kibana]] -== Monitoring Kibana +=== Collecting {kib} monitoring data +++++ +Collecting monitoring data +++++ -See -{kibana-ref}/monitoring-xpack-kibana.html[Monitoring {kib}]. +If you enable the Elastic {monitor-features} in your cluster, you can +optionally collect metrics about {kib}. + +The following method involves sending the metrics to the production cluster, +which ultimately routes them to the monitoring cluster. For an alternative +method, see <>. + +To learn about monitoring in general, see +{stack-ov}/xpack-monitoring.html[Monitoring the {stack}]. + +. Set the `xpack.monitoring.collection.enabled` setting to `true` on each +node in the production cluster. By default, it is is disabled (`false`). ++ +-- +NOTE: You can specify this setting in either the `elasticsearch.yml` on each +node or across the cluster as a dynamic cluster setting. If {es} +{security-features} are enabled, you must have `monitor` cluster privileges to +view the cluster settings and `manage` cluster privileges to change them. + +-- + +** To update the cluster settings in {kib}: + +... Open {kib} in your web browser. ++ +-- +By default, if you are running {kib} locally, go to `http://localhost:5601/`. + +If {es} {security-features} are enabled, log in. +-- + +... In the side navigation, click *Monitoring*. If data collection is disabled, +you are prompted to turn it on. + +** From the Console or command line, set `xpack.monitoring.collection.enabled` +to `true` on the production cluster. + ++ +-- +For example, you can use the following APIs to review and change this setting: + +[source,js] +---------------------------------- +GET _cluster/settings + +PUT _cluster/settings +{ + "persistent": { + "xpack.monitoring.collection.enabled": true + } +} +---------------------------------- + +For more information, see {ref}/monitoring-settings.html[Monitoring settings in {es}] +and {ref}/cluster-update-settings.html[Cluster update settings]. +-- + +. Verify that `xpack.monitoring.enabled` and +`xpack.monitoring.kibana.collection.enabled` are set to `true` in the +`kibana.yml` file. These are the default values. For +more information, see <>. + +. Identify where to send monitoring data. {kib} automatically +sends metrics to the {es} cluster specified in the `elasticsearch.url` setting +in the `kibana.yml` file. This property has a default value of +`http://localhost:9200`. + ++ +-- +[TIP] +=============================== +In production environments, we strongly recommend using a separate cluster +(referred to as the _monitoring cluster_) to store the data. Using a separate +monitoring cluster prevents production cluster outages from impacting your +ability to access your monitoring data. It also prevents monitoring activities +from impacting the performance of your production cluster. + +If {security} is enabled on the production cluster, use an HTTPS URL such +as `https://:9200` in this setting. +=============================== + +-- + +. If the Elastic {security-features} are enabled on the production cluster: + +.. Verify that there is a +valid user ID and password in the `elasticsearch.username` and +`elasticsearch.password` settings in the `kibana.yml` file. These values are +used when {kib} sends monitoring data to the production cluster. + +.. Configure {kib} to encrypt communications between the {kib} server and the +production cluster. This set up involves generating a server certificate and +setting `server.ssl.*` and `elasticsearch.ssl.certificateAuthorities` settings +in the `kibana.yml` file on the {kib} server. For example: ++ +-- +[source,yaml] +-------------------------------------------------------------------------------- +server.ssl.key: /path/to/your/server.key +server.ssl.certificate: /path/to/your/server.crt +-------------------------------------------------------------------------------- + +If you are using your own certificate authority to sign certificates, specify +the location of the PEM file in the `kibana.yml` file: + +[source,yaml] +-------------------------------------------------------------------------------- +elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem +-------------------------------------------------------------------------------- + +For more information, see <>. +-- + +. <>. + +. <>. diff --git a/docs/monitoring/monitoring-logstash.asciidoc b/docs/monitoring/monitoring-logstash.asciidoc deleted file mode 100644 index 27a35303e3057..0000000000000 --- a/docs/monitoring/monitoring-logstash.asciidoc +++ /dev/null @@ -1,5 +0,0 @@ -[[monitoring-logstash]] -== Monitoring Logstash - -See -{logstash-ref}/monitoring-logstash.html[Monitoring Logstash]. diff --git a/docs/monitoring/monitoring-metricbeat.asciidoc b/docs/monitoring/monitoring-metricbeat.asciidoc new file mode 100644 index 0000000000000..5bd581d5d0718 --- /dev/null +++ b/docs/monitoring/monitoring-metricbeat.asciidoc @@ -0,0 +1,203 @@ +[role="xpack"] +[[monitoring-metricbeat]] +=== Collecting {kib} monitoring data with {metricbeat} +++++ +Collecting monitoring data with {metricbeat} +++++ + +beta[] + +In 6.4 and later, you can use {metricbeat} to collect data about {kib} +and ship it to the monitoring cluster, rather than routing it through the +production cluster as described in <>. + +image::monitoring/images/metricbeat.png[Example monitoring architecture] + +To learn about monitoring in general, see +{stack-ov}/xpack-monitoring.html[Monitoring the {stack}]. + +. Disable the default collection of {kib} monitoring metrics. + ++ +-- +Add the following setting in the {kib} configuration file (`kibana.yml`): + +[source,yaml] +---------------------------------- +xpack.monitoring.kibana.collection.enabled: false +---------------------------------- + +Leave the `xpack.monitoring.enabled` set to its default value (`true`). + +For more information, see +<>. +-- + +. <>. + +. Set the `xpack.monitoring.collection.enabled` setting to `true` on +each node in the production cluster. By default, it is disabled (`false`). ++ +-- +NOTE: You can specify this setting in either the `elasticsearch.yml` on each +node or across the cluster as a dynamic cluster setting. If {es} +{security-features} are enabled, you must have `monitor` cluster privileges to +view the cluster settings and `manage` cluster privileges to change them. + +-- + +** In {kib}: + +... Open {kib} in your web browser. ++ +-- +If you are running {kib} locally, go to `http://localhost:5601/`. + +If the Elastic {security-features} are enabled, log in. +-- + +... In the side navigation, click *Monitoring*. If data collection is disabled, +you are prompted to turn it on. + +** From the Console or command line, set `xpack.monitoring.collection.enabled` +to `true` on the production cluster. + ++ +-- +For example, you can use the following APIs to review and change this setting: + +[source,js] +---------------------------------- +GET _cluster/settings + +PUT _cluster/settings +{ + "persistent": { + "xpack.monitoring.collection.enabled": true + } +} +---------------------------------- + +For more information, see {ref}/monitoring-settings.html[Monitoring settings in {es}] +and {ref}/cluster-update-settings.html[Cluster update settings]. +-- + +. {metricbeat-ref}/metricbeat-installation.html[Install {metricbeat}] on the +same server as {kib}. + +. Enable the {kib} module in {metricbeat}. + ++ +-- +For example, to enable the default configuration in the `modules.d` directory, +run the following command: + +["source","sh",subs="attributes,callouts"] +---------------------------------------------------------------------- +metricbeat modules enable kibana +---------------------------------------------------------------------- + +For more information, see +{metricbeat-ref}/configuration-metricbeat.html[Specify which modules to run] and +{metricbeat-ref}/metricbeat-module-kibana.html[{kib} module]. +-- + +. Configure the {kib} module in {metricbeat}. + ++ +-- +You must specify the following settings in the `modules.d/kibana.yml` file: + +[source,yaml] +---------------------------------- +- module: kibana + metricsets: + - stats + period: 10s + hosts: ["http://localhost:5601"] <1> + xpack.enabled: true <2> +---------------------------------- +<1> This setting identifies the host and port number that are used to access {kib}. +<2> This setting ensures that {kib} can read the monitoring data successfully. +That is to say, it's stored in the same location and format as monitoring data +that is sent by {ref}/es-monitoring-exporters.html[exporters]. +-- + +. If the Elastic {security-features} are enabled, you must also provide a user +ID and password so that {metricbeat} can collect metrics successfully. + +... Create a user on the production cluster that has the +`remote_monitoring_collector` {stack-ov}/built-in-roles.html[built-in role]. +Alternatively, use the `remote_monitoring_user` +{stack-ov}/built-in-users.html[built-in user]. + +.. Add the `username` and `password` settings to the {kib} module configuration +file. ++ +-- +For example, add the following settings in the `modules.d/kibana.yml` file: + +[source,yaml] +---------------------------------- +- module: kibana + ... + username: remote_monitoring_user + password: YOUR_PASSWORD +---------------------------------- +-- + +. If you configured {kib} to use <>, +you must access it via HTTPS. For example, use a `hosts` setting like +`https://localhost:5601` in the `modules.d/kibana.yml` file. + +. Identify where to send the monitoring data. + ++ +-- +TIP: In production environments, we strongly recommend using a separate cluster +(referred to as the _monitoring cluster_) to store the data. Using a separate +monitoring cluster prevents production cluster outages from impacting your +ability to access your monitoring data. It also prevents monitoring activities +from impacting the performance of your production cluster. + +For example, specify the {es} output information in the {metricbeat} +configuration file (`metricbeat.yml`): + +[source,yaml] +---------------------------------- +output.elasticsearch: + hosts: ["http://es-mon-1:9200", "http://es-mon2:9200"] <1> +---------------------------------- +<1> In this example, the data is stored on a monitoring cluster with nodes +`es-mon-1` and `es-mon-2`. + +For more information about these configuration options, see +{metricbeat-ref}/elasticsearch-output.html[Configure the {es} output]. + +-- + +. If the {es} {security-features} are enabled on the monitoring cluster, you +must provide a valid user ID and password so that {metricbeat} can send metrics +successfully. + +... Create a user on the monitoring cluster that has the +`remote_monitoring_agent` {stack-ov}/built-in-roles.html[built-in role]. +Alternatively, use the `remote_monitoring_user` +{stack-ov}/built-in-users.html[built-in user]. + +.. Add the `username` and `password` settings to the {es} output information in +the {metricbeat} configuration file (`metricbeat.yml`): ++ +-- +[source,yaml] +---------------------------------- +output.elasticsearch: + ... + username: remote_monitoring_user + password: YOUR_PASSWORD +---------------------------------- +-- + +. If you configured the monitoring cluster to use +{ref}/configuring-tls.html[encrypted communications], you must access it via +HTTPS. For example, use a `hosts` setting like `https://es-mon-1:9200` in the +`metricbeat.yml` file. + +. {metricbeat-ref}/metricbeat-starting.html[Start {metricbeat}]. + +. <>. diff --git a/docs/monitoring/monitoring-xkib.asciidoc b/docs/monitoring/monitoring-xkib.asciidoc deleted file mode 100644 index 6a451308860fd..0000000000000 --- a/docs/monitoring/monitoring-xkib.asciidoc +++ /dev/null @@ -1,134 +0,0 @@ -[role="xpack"] -[[monitoring-xpack-kibana]] -== Configuring Monitoring in {kib} -++++ -Configuring Monitoring -++++ - -{monitoring} gives you insight into the operation of your {stack}. For more -information, see <> and -{stack-ov}/xpack-monitoring.html[Monitoring the {stack}]. - -. To monitor {kib}: - -.. Verify that the `xpack.monitoring.collection.enabled` setting is `true` on -the production cluster. If that setting is `false`, which is the default value, -the collection of monitoring data is disabled in {es} and data is ignored from -all other sources. For more information, see -{ref}/monitoring-settings.html[Monitoring Settings in {es}]. - -.. Verify that `xpack.monitoring.enabled` and -`xpack.monitoring.kibana.collection.enabled` are set to `true`, which are the -default values. For more information, see <>. - -.. Identify where to send monitoring data. {kib} automatically -sends metrics to the {es} cluster specified in the `elasticsearch.url` setting -in the `kibana.yml` file. This property has a default value of -`http://localhost:9200`. This cluster is often referred to as the -_production cluster_. -+ --- -TIP: If {security} is enabled on the production cluster, use an HTTPS URL such -as `https://:9200` in this setting. - --- - -. To visualize monitoring data: - -.. Verify that `xpack.monitoring.ui.enabled` is set to `true`, which is the -default value. For more information, see <>. - -.. Identify where to retrieve monitoring data from. If you want to use a -separate _monitoring cluster_, set `xpack.monitoring.elasticsearch.url` in the -`kibana.yml` file. Otherwise, the monitoring data is stored in the production -cluster. -+ --- -TIP: If {security} is enabled on the monitoring cluster, use an HTTPS URL such -as `https://:9200` in this setting. - -To learn more about typical monitoring architectures with separate -production and monitoring clusters, see -{xpack-ref}/how-monitoring-works.html[How Monitoring Works]. --- - -. If {security} is enabled on the production cluster: - -.. Verify that there is a -valid user ID and password in the `elasticsearch.username` and -`elasticsearch.password` settings in the `kibana.yml` file. These values are -used when {kib} sends monitoring data to the production cluster. - -.. Configure {kib} to encrypt communications between the {kib} server and the -production cluster. This set up involves generating a server certificate and -setting `server.ssl.*` and `elasticsearch.ssl.certificateAuthorities` settings -in the `kibana.yml` file on the {kib} server. For example: -+ --- -[source,yaml] --------------------------------------------------------------------------------- -server.ssl.key: /path/to/your/server.key -server.ssl.certificate: /path/to/your/server.crt --------------------------------------------------------------------------------- - -If you are using your own certificate authority to sign certificates, specify -the location of the PEM file in the `kibana.yml` file: - -[source,yaml] --------------------------------------------------------------------------------- -elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem --------------------------------------------------------------------------------- - -For more information, see <>. --- - -. If {security} is enabled on the monitoring cluster: - -.. Identify a user ID and password that {kib} can use to retrieve monitoring -data. Specify these values in the `xpack.monitoring.elasticsearch.username` and -`xpack.monitoring.elasticsearch.password` settings in the `kibana.yml` file. -If these settings are omitted, {kib} uses the `elasticsearch.username` and -`elasticsearch.password` setting values. - -.. Configure {kib} to encrypt communications between the {kib} server and the -monitoring cluster. Specify the `xpack.monitoring.elasticsearch.ssl.*` settings -in the `kibana.yml` file on the {kib} server. -+ --- -For example, if you are using your own certificate authority to sign -certificates, specify the location of the PEM file in the `kibana.yml` file: - -[source,yaml] --------------------------------------------------------------------------------- -xpack.monitoring.elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem --------------------------------------------------------------------------------- - --- - -. Restart {kib}. - -. If {security} is enabled on your {kib} server: - -.. Log in to {kib} as a user who has both the `kibana_user` and -`monitoring_user` roles. These roles have the necessary privileges to view the -monitoring dashboards. For example: -+ --- -[source,js] --------------------------------------------------- -POST /_xpack/security/user/stack-monitor -{ - "password" : "changeme", - "roles" : [ "kibana_user", "monitoring_user" ] -} --------------------------------------------------- -// CONSOLE --- - -.. If you are accessing a remote monitoring cluster, you must log in to {kib} -with username and password credentials that are valid on both the {kib} server -and the monitoring cluster. - -See also <>. - -include::{kib-repo-dir}/settings/monitoring-settings.asciidoc[] diff --git a/docs/monitoring/viewing-metrics.asciidoc b/docs/monitoring/viewing-metrics.asciidoc index 82ec152fdefa9..f2f1b7b971711 100644 --- a/docs/monitoring/viewing-metrics.asciidoc +++ b/docs/monitoring/viewing-metrics.asciidoc @@ -1,71 +1,105 @@ [role="xpack"] [[monitoring-data]] -== Viewing Monitoring Data in {kib} +=== Viewing monitoring data in {kib} ++++ -Viewing Monitoring Data +Viewing monitoring data ++++ -You can enable {monitoring} in {es}, Logstash, {kib}, and Beats. By default, the -monitoring agents on {es} index data within the same cluster. +After you collect monitoring data for one or more products in the {stack}, you +can configure {kib} to retrieve that information and display it in on the +*Monitoring* page. -TIP: If you have a dedicated monitoring cluster, the information is accessible -even if the {es} cluster you're monitoring is not. You can send data from -multiple clusters to the same monitoring cluster and view them all through the -same instance of {kib}. For more information, see +. Identify where to retrieve monitoring data from. ++ +-- +The cluster that contains the monitoring data is referred to +as the _monitoring cluster_. + +TIP: If the monitoring data is stored on a *dedicated* monitoring cluster, it is +accessible even when the cluster you're monitoring is not. If you have at least +a gold license, you can send data from multiple clusters to the same monitoring +cluster and view them all through the same instance of {kib}. + +By default, data is retrieved from the cluster specified in the +`elasticsearch.url` value in the `kibana.yml` file. If you want to retrieve it +from a different cluster, set `xpack.monitoring.elasticsearch.url`. + +To learn more about typical monitoring architectures, +see {stack-ov}/how-monitoring-works.html[How monitoring works] and +{stack-ov}/monitoring-production.html[Monitoring in a production environment]. +-- -To view and analyze the health and performance of {es}, Logstash, {kib}, and -Beats: +. Verify that `xpack.monitoring.ui.enabled` is set to `true`, which is the +default value, in the `kibana.yml` file. For more information, see +<>. -. {ref}/configuring-monitoring.html[Configure monitoring in {es}]. If you want -to use a separate monitoring cluster, see -{xpack-ref}/monitoring-production.html[Monitoring in a Production Environment]. +. If the Elastic {security-features} are enabled on the monitoring cluster, you +must provide a user ID and password so {kib} can retrieve the data. -. <>. +.. Create a user that has the `monitoring_user` +{stack-ov}/built-in-roles.html[built-in role] on the monitoring cluster. -. {logstash-ref}/configuring-logstash.html[Configure monitoring in Logstash]. +.. Add the `xpack.monitoring.elasticsearch.username` and +`xpack.monitoring.elasticsearch.password` settings in the `kibana.yml` file. +If these settings are omitted, {kib} uses the `elasticsearch.username` and +`elasticsearch.password` setting values. For more +information, see {kibana-ref}/using-kibana-with-security.html[Configuring security in {kib}]. + +. (Optional) Configure {kib} to encrypt communications between the {kib} server +and the monitoring cluster. See <>. + +. If the Elastic {security-features} are enabled on the {kib} server, only users +that have the authority to access {kib} indices and to read the monitoring indices +can use the monitoring dashboards. ++ +-- +NOTE: These users must exist on the monitoring cluster. If you are accessing a +remote monitoring cluster, you must use credentials that are valid on both the +{kib} server and the monitoring cluster. -. Configure monitoring in {auditbeat-ref}/monitoring.html[Auditbeat], -{filebeat-ref}/monitoring.html[Filebeat], -{heartbeat-ref}/monitoring.html[Heartbeat], -{metricbeat-ref}/monitoring.html[Metricbeat], -{packetbeat-ref}/monitoring.html[Packetbeat], and -{winlogbeat-ref}/monitoring.html[Winlogbeat]. +-- -. Open {kib} in your web browser and log in. If you are running {kib} -locally, go to `http://localhost:5601/`. To access {kib} and view the -monitoring dashboards, you must log in as a user who has the `kibana_user` -and `monitoring_user` roles. +.. Create users that have the `monitoring_user` and `kibana_user` +{stack-ov}/built-in-roles.html[built-in roles]. -. In the side navigation, click *Monitoring*. The first time you open {kib} -monitoring, data collection is -disabled. You will be prompted to turn on data collection. +. Open {kib} in your web browser. + -If you have permission to turn on data collection and there is data in the cluster, -{kib} displays the monitoring dashboards. You'll see cluster alerts +-- +By default, if you are running {kib} locally, go to `http://localhost:5601/`. + +If the Elastic {security-features} are enabled, log in. +-- + +. In the side navigation, click *Monitoring*. ++ +-- +If data collection is disabled, you are prompted to turn on data collection. +If {es} {security-features} are enabled, you must have `manage` cluster +privileges to turn on data collection. + +NOTE: If you are using a separate monitoring cluster, you do not need to turn on +data collection. The dashboards appear when there is data in the monitoring +cluster. + +-- + +You'll see cluster alerts that require your attention and a summary of the available monitoring metrics for {es}, Logstash, {kib}, and Beats. To view additional information, click the -Overview, Nodes, Indices, or Instances links. -+ +Overview, Nodes, Indices, or Instances links. See <>. + [role="screenshot"] image::images/monitoring-dashboard.png[Monitoring dashboard] -+ + If {kib} can't activate monitoring, here are some things to do: -+ + * If you don't have permission to activate monitoring, contact your system administrator. -+ + * If {kib} can't find monitoring data, set the time filter to “Last 1 hour”. When monitoring data appears in your cluster, the page automatically refreshes with the monitoring summary. -+ + * Check your `xpack.monitoring.elasticsearch.url` setting. See <>. - - -include::cluster-alerts-license.asciidoc[] -include::beats-details.asciidoc[] -include::cluster-alerts.asciidoc[] -include::elasticsearch-details.asciidoc[] -include::kibana-details.asciidoc[] -include::logstash-details.asciidoc[] diff --git a/docs/plugins/known-plugins.asciidoc b/docs/plugins/known-plugins.asciidoc index 45b5ae16758c5..384f44a0adf25 100644 --- a/docs/plugins/known-plugins.asciidoc +++ b/docs/plugins/known-plugins.asciidoc @@ -18,6 +18,7 @@ This list of plugins is not guaranteed to work on your version of Kibana. Instea * https://github.com/TrumanDu/indices_view[Indices View] - View indices related information. * https://github.com/johtani/analyze-api-ui-plugin[Analyze UI] (johtani) - UI for elasticsearch _analyze API * https://github.com/TrumanDu/cleaner[Cleaner] (TrumanDu)- Setting index ttl. +* https://github.com/bitsensor/elastalert-kibana-plugin[ElastAlert Kibana Plugin] (BitSensor) - UI to create, test and edit ElastAlert rules [float] === Timelion Extensions diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc new file mode 100644 index 0000000000000..152e9a84717f6 --- /dev/null +++ b/docs/redirects.asciidoc @@ -0,0 +1,14 @@ +[role="exclude",id="redirects"] += Deleted pages + +[partintro] +-- + +The following pages have moved or been deleted. + +-- +[role="exclude",id="monitoring-xpack-kibana"] +== Configuring monitoring in {kib} + +See <>. + diff --git a/docs/reporting/reporting-troubleshooting.asciidoc b/docs/reporting/reporting-troubleshooting.asciidoc index 5576033421b63..b30fe28bd7072 100644 --- a/docs/reporting/reporting-troubleshooting.asciidoc +++ b/docs/reporting/reporting-troubleshooting.asciidoc @@ -16,6 +16,10 @@ those characters is installed. You might see "There was an error generating your report" or one of the following errors when you download your report. See below for an explanation of why the failure occurred and what you can do to fix it. +[float] +=== Data Table Visualization does not show all data in PDF reports +There is currently a known limitation with the Data Table visualization that only the first page of data rows, which are the only data visible on the screen, are shown in PDF reports. + [float] ==== `You must install fontconfig and freetype for Reporting to work'` Reporting using PhantomJS, the default browser, relies on system packages. Install the appropriate fontconfig and freetype diff --git a/docs/security/authorization/index.asciidoc b/docs/security/authorization/index.asciidoc index ddc5bca0cb042..3320843bc7a81 100644 --- a/docs/security/authorization/index.asciidoc +++ b/docs/security/authorization/index.asciidoc @@ -2,10 +2,13 @@ [[xpack-security-authorization]] === Authorization -Authorizing users to use {kib} in most configurations is as simple as assigning the user +Authorizing users to use {kib} in simple configurations is as easy as assigning the user either the `kibana_user` or `kibana_dashboard_only_user` reserved role. If you're running -a single tenant of {kib} against your {es} cluster, this is sufficient and no other -action is required. +a single tenant of {kib} against your {es} cluster, and you're not controlling access to individual spaces, then this is sufficient and no other action is required. + +==== Spaces + +If you want to control individual spaces in {kib}, do **not** use the `kibana_user` or `kibana_dashboard_only_user` roles. Users with these roles are able to access all spaces in Kibana. Instead, create your own roles that grant access to specific spaces. ==== Multi-tenant {kib} @@ -15,6 +18,8 @@ either the *Management / Security / Roles* page in {kib} or the <> at that tenant. After creating the custom role, you should assign this role to the user(s) that you wish to have access. +While multi-tenant installations are supported, the recommended approach to securing access to segments of {kib} is to grant users access to specific spaces. + ==== Legacy roles Prior to {kib} 6.4, {kib} users required index privileges to the `kibana.index` diff --git a/docs/security/securing-communications/index.asciidoc b/docs/security/securing-communications/index.asciidoc index e6b3987b36014..9e52c42b3c3c9 100644 --- a/docs/security/securing-communications/index.asciidoc +++ b/docs/security/securing-communications/index.asciidoc @@ -58,7 +58,7 @@ For more information, see <>. + -- NOTE: To perform this step, you must -{ref}/configuring-security.html[enable the {security} feature in {es}] or you +{ref}/configuring-security.html[enable the {es} {security-features}] or you must have a proxy that provides an HTTPS endpoint for {es}. -- @@ -89,3 +89,36 @@ Setting the `certificateAuthorities` property lets you use the default For more information, see <>. -- + +. (Optional) If the Elastic {monitor-features} are enabled, configure {kib} to +connect to the {es} monitoring cluster via HTTPS: ++ +-- +NOTE: To perform this step, you must +{ref}/configuring-security.html[enable the {es} {security-features}] or you +must have a proxy that provides an HTTPS endpoint for {es}. + +-- + +.. Specify the HTTPS URL in the `xpack.monitoring.elasticsearch.url` setting in +the {kib} configuration file, `kibana.yml` ++ +-- +[source,yaml] +-------------------------------------------------------------------------------- +xpack.monitoring.elasticsearch.url: "https://:9200" +-------------------------------------------------------------------------------- +-- + +.. Specify the `xpack.monitoring.elasticsearch.ssl.*` settings in the +`kibana.yml` file. ++ +-- +For example, if you are using your own certificate authority to sign +certificates, specify the location of the PEM file in the `kibana.yml` file: + +[source,yaml] +-------------------------------------------------------------------------------- +xpack.monitoring.elasticsearch.ssl.certificateAuthorities: /path/to/your/cacert.pem +-------------------------------------------------------------------------------- +-- diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc index 9be86f53852f2..6aafeedf9cba4 100644 --- a/docs/settings/reporting-settings.asciidoc +++ b/docs/settings/reporting-settings.asciidoc @@ -51,8 +51,22 @@ reports, you might need to change the following settings. How often the index that stores reporting jobs rolls over to a new index. Valid values are `year`, `month`, `week`, `day`, and `hour`. Defaults to `week`. +`xpack.reporting.queue.pollEnabled`:: +Set to `true` (default) to enable the Kibana instance to to poll the index for +pending jobs and claim them for execution. Setting this to `false` allows the +Kibana instance to only add new jobs to the reporting queue, list jobs, and +provide the downloads to completed report through the UI. + +[NOTE] +============ +Running multiple instances of Kibana in a cluster for load balancing of +reporting requires identical values for `xpack.reporting.encryptionKey` and, if +security is enabled, `xpack.security.encryptionKey`. +============ + `xpack.reporting.queue.pollInterval`:: -How often idle workers poll the index for pending jobs. Defaults to `3000` (3 seconds). +Specifies the number of milliseconds that idle workers wait between polling the +index for pending jobs. Defaults to `3000` (3 seconds). [[xpack-reporting-q-timeout]]`xpack.reporting.queue.timeout`:: How long each worker has to produce a report. If your machine is slow or under @@ -122,5 +136,10 @@ content. The index is automatically created if it does not already exist. Defaults to `.reporting` `xpack.reporting.roles.allow`:: -Specifies the roles in addition to superusers that are allowed to access reporting. +Specifies the roles in addition to superusers that can use reporting. Defaults to `[ "reporting_user" ]` ++ +-- +NOTE: Each user has access to only their own reports. + +-- diff --git a/docs/settings/settings-xkb.asciidoc b/docs/settings/settings-xkb.asciidoc index 034bc43a4f109..979882e31701c 100644 --- a/docs/settings/settings-xkb.asciidoc +++ b/docs/settings/settings-xkb.asciidoc @@ -14,3 +14,4 @@ include::dev-settings.asciidoc[] include::graph-settings.asciidoc[] include::ml-settings.asciidoc[] include::reporting-settings.asciidoc[] +include::spaces-settings.asciidoc[] diff --git a/docs/settings/spaces-settings.asciidoc b/docs/settings/spaces-settings.asciidoc new file mode 100644 index 0000000000000..bb0a15b29a087 --- /dev/null +++ b/docs/settings/spaces-settings.asciidoc @@ -0,0 +1,22 @@ +[role="xpack"] +[[spaces-settings-kb]] +=== Spaces settings in {kib} +++++ +Spaces settings +++++ + +By default, Spaces is enabled in Kibana, and you can secure Spaces using +roles when Security is enabled. + +[float] +[[spaces-settings]] +==== Spaces settings + +`xpack.spaces.enabled`:: +Set to `true` (default) to enable Spaces in {kib}. + +`xpack.spaces.maxSpaces`:: +The maximum amount of Spaces that can be used with this instance of Kibana. Some operations +in Kibana return all spaces using a single `_search` from Elasticsearch, so this must be +set lower than the `index.max_result_window` in Elasticsearch. +Defaults to `1000`. \ No newline at end of file diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc index 55128f213f356..4303e739d73fa 100644 --- a/docs/setup/settings.asciidoc +++ b/docs/setup/settings.asciidoc @@ -49,6 +49,11 @@ certificate and key files. These files are used to verify the identity of Kibana `elasticsearch.ssl.verificationMode:`:: *Default: full* Controls the verification of certificates presented by Elasticsearch. Valid values are `none`, `certificate`, and `full`. `full` performs hostname verification, and `certificate` does not. +`elasticsearch.ssl.alwaysPresentCertificate:`:: *Default: false* Controls whether to always present the certificate specified +by `elasticsearch.ssl.certificate` when requested. This applies to all requests to Elasticsearch, including requests that are +proxied for end-users. Setting this to `true` when Elasticsearch is using certificates to authenticate users can lead to proxied +requests for end-users being executed as the identity tied to the configured certificate. + `elasticsearch.startupTimeout:`:: *Default: 5000* Time in milliseconds to wait for Elasticsearch at Kibana startup before retrying. diff --git a/docs/setup/upgrade.asciidoc b/docs/setup/upgrade.asciidoc index 548120541b5c9..9531831efd7de 100644 --- a/docs/setup/upgrade.asciidoc +++ b/docs/setup/upgrade.asciidoc @@ -41,3 +41,5 @@ include::upgrade/upgrade-standard.asciidoc[] include::upgrade/upgrade-standard-reindex.asciidoc[] include::upgrade/upgrade-new-install.asciidoc[] + +include::upgrade/upgrade-migrations.asciidoc[] diff --git a/docs/setup/upgrade/upgrade-migrations.asciidoc b/docs/setup/upgrade/upgrade-migrations.asciidoc new file mode 100644 index 0000000000000..6d140d7743ab8 --- /dev/null +++ b/docs/setup/upgrade/upgrade-migrations.asciidoc @@ -0,0 +1,48 @@ +[[upgrade-migrations]] +=== Saved object migrations + +Every time Kibana is upgraded it checks to see if all saved objects, such as dashboards, visualizations, and index patterns, are compatible with the new version. If any objects need to be updated, then the automatic saved object migration process is kicked off. + +[float] +[[upgrade-migrations-process]] +==== How the process works + +Saved objects are stored in an index named `.kibana_N`, where `N` is a number that increments over time as Kibana is upgraded. The index alias `.kibana` points to the latest up-to-date index for a given install. + +NOTE: Prior to 6.5.0, saved objects were stored directly in an index named `.kibana`, so the first time you upgrade to Kibana version 6.5+, Kibana will migrate into `.kibana_1` and set `.kibana` up as an index alias. + +While Kibana is starting up and before serving any HTTP traffic, it checks to see if any internal mapping changes or data transformations for existing saved objects are required. + +When changes are necessary, a new incremental `.kibana_N` index is created with updated mappings, then the saved objects are loaded in batches from the existing index, transformed to whatever extent necessary, and added to this new index. + +Once the objects are migrated, the `.kibana` index alias is updated to point to the new index, and Kibana finishes starting up and serving HTTP traffic. + +[float] +[[upgrade-migrations-old-indices]] +==== Handling old `.kibana` indices + +After migrations have run, there will be multiple Kibana indices in Elasticsearch: (`.kibana_1`, `.kibana_2`, etc). Kibana only uses the index that the `.kibana` alias points to. The other Kibana indices can be safely deleted, but are left around as a matter of historical record, and to facilitate rolling Kibana back to a previous version. + +[float] +[[upgrade-migrations-errors]] +==== Handling errors during saved object migrations + +If Kibana terminates unexpectedly while migrating a saved object index, some additional work may be required in order to get Kibana to re-attempt the migration. + +For example, if the `.kibana` alias is pointing to `.kibana_4`, and there is a `.kibana_5` index in Elasticsearch, the `.kibana_5` index will need to be deleted. Kibana will never attempt to overwrite an existing index. + +[float] +[[upgrade-migrations-multiple-instances]] +==== Support for multiple kibana instances + +If you're running multiple Kibana instances for a single index behind a load balancer, it's important that you stop all instances before upgrading, so you do not have multiple different versions of Kibana trying to perform saved object migrations. + +The first instance that triggers saved object migrations will run the entire process. Any other instances started up while a migration is running will log a message and then wait until saved object migration has completed before they start serving HTTP traffic. + +[float] +[[upgrade-migrations-rolling-back]] +==== Rolling back to a previous version of Kibana + +When rolling Kibana back to a previous version, point the `.kibana` alias to the appropriate Kibana index. When you have the previous version running again, delete the more recent `.kibana_N` index or indices so that future upgrades are based on the current Kibana index. + +WARNING: Rolling back to a previous Kibana version can result in saved object data loss if you had successfully upgraded and made changes to saved objects before rolling back. diff --git a/docs/spaces/getting-started.asciidoc b/docs/spaces/getting-started.asciidoc new file mode 100644 index 0000000000000..e6a96553873b7 --- /dev/null +++ b/docs/spaces/getting-started.asciidoc @@ -0,0 +1,8 @@ +[role="xpack"] +[[spaces-getting-started]] +=== Getting Started + +Spaces are automatically enabled in {kib}. If you don't wish to use this feature, you can disable it +by setting `xpack.spaces.enabled` to `false` in your `kibana.yml` configuration file. + +{kib} automatically creates a default space for you. If you are upgrading from another version of {kib}, then the default space will contain all of your existing saved objects. Although you can't delete the default space, you can customize it to your liking. \ No newline at end of file diff --git a/docs/spaces/images/delete-space.png b/docs/spaces/images/delete-space.png new file mode 100644 index 0000000000000..8237df1136a9e Binary files /dev/null and b/docs/spaces/images/delete-space.png differ diff --git a/docs/spaces/images/edit-space.png b/docs/spaces/images/edit-space.png new file mode 100644 index 0000000000000..dae7d01f665c0 Binary files /dev/null and b/docs/spaces/images/edit-space.png differ diff --git a/docs/spaces/images/securing-spaces.png b/docs/spaces/images/securing-spaces.png new file mode 100644 index 0000000000000..a94d2c36d4f5d Binary files /dev/null and b/docs/spaces/images/securing-spaces.png differ diff --git a/docs/spaces/images/space-management.png b/docs/spaces/images/space-management.png new file mode 100644 index 0000000000000..bd58605362024 Binary files /dev/null and b/docs/spaces/images/space-management.png differ diff --git a/docs/spaces/images/space-selector.png b/docs/spaces/images/space-selector.png new file mode 100644 index 0000000000000..a1977b01d1fa0 Binary files /dev/null and b/docs/spaces/images/space-selector.png differ diff --git a/docs/spaces/index.asciidoc b/docs/spaces/index.asciidoc new file mode 100644 index 0000000000000..b40c4267c2b49 --- /dev/null +++ b/docs/spaces/index.asciidoc @@ -0,0 +1,17 @@ +[role="xpack"] +[[xpack-spaces]] +== Spaces + +With spaces, you can organize your dashboards and other saved objects into meaningful categories. +After creating your own spaces, you will be asked to choose a space when you enter {kib}. Once inside a space, +you will only see the dashboards and other saved objects that belong to that space. You can change your active space at any time. + +With security enabled, you can control which users have access to individual spaces. + +[role="screenshot"] +image::spaces/images/space-selector.png["Space selector screen"] + +include::getting-started.asciidoc[] +include::managing-spaces.asciidoc[] +include::securing-spaces.asciidoc[] +include::moving-saved-objects.asciidoc[] diff --git a/docs/spaces/managing-spaces.asciidoc b/docs/spaces/managing-spaces.asciidoc new file mode 100644 index 0000000000000..73a21ff049b36 --- /dev/null +++ b/docs/spaces/managing-spaces.asciidoc @@ -0,0 +1,25 @@ +[role="xpack"] +[[spaces-managing]] +=== Managing spaces +You can manage spaces from the **Management > Spaces** page. Here you can create, edit, and delete your spaces. + +[NOTE] +{kib} has an <> if you want to create your spaces programatically. + +[role="screenshot"] +image::spaces/images/space-management.png["Space Management"] + +==== Creating and updating spaces +You can create as many spaces as you like, but each space must have a unique space identifier. The space identifier is a short string of text that is part of the {kib} URL when you are inside that space. {kib} automatically suggests a space identifier based on the name of your space, but you are free to customize this to your liking. + +[NOTE] +You cannot change the space identifier once the space is created. + +[role="screenshot"] +image::spaces/images/edit-space.png["Updating a space"] + +==== Deleting spaces +Deleting a space is a destructive operation, which cannot be undone. When you delete a space, all of the saved objects that belong to that space are also deleted. + +[role="screenshot"] +image::spaces/images/delete-space.png["Deleting a space"] \ No newline at end of file diff --git a/docs/spaces/moving-saved-objects.asciidoc b/docs/spaces/moving-saved-objects.asciidoc new file mode 100644 index 0000000000000..e6a116f54a252 --- /dev/null +++ b/docs/spaces/moving-saved-objects.asciidoc @@ -0,0 +1,14 @@ +[role="xpack"] +[[spaces-moving-objects]] +=== Moving saved objects between spaces +You can use {kib}'s <> interface to copy objects from one space to another: + +1. Navigate to the space that contains your saved objects. +2. Export your saved objects via the <> interface. +3. Navigate to the space you are importing to. +4. Import your saved objects via the <> interface. +5. (optional) Delete the saved objects from the space you exported from, if you don't want to keep a copy there. + + +[NOTE] +{kib} also has experimental <> and <> dashboard APIs if you are looking for a dashboard-centric way to automate this process. \ No newline at end of file diff --git a/docs/spaces/securing-spaces.asciidoc b/docs/spaces/securing-spaces.asciidoc new file mode 100644 index 0000000000000..1fd6e915bc4f8 --- /dev/null +++ b/docs/spaces/securing-spaces.asciidoc @@ -0,0 +1,7 @@ +[role="xpack"] +[[spaces-securing]] +=== Securing spaces + +With security enabled, you can control who has access to specific spaces. You can manage access in **Management > Roles**. + +image::spaces/images/securing-spaces.png["Securing spaces"] \ No newline at end of file diff --git a/docs/visualize/vega.asciidoc b/docs/visualize/vega.asciidoc index 9f88eeefbbb21..7351cd65ef090 100644 --- a/docs/visualize/vega.asciidoc +++ b/docs/visualize/vega.asciidoc @@ -215,7 +215,8 @@ the graph must specify `type=map` in the host configuration: // defaults to true, shows +/- buttons to zoom in/out "zoomControl": false, - // defaults to true, disables mouse wheel zoom + // Defaults to 'false', disables mouse wheel zoom. If set to + // 'true', map may zoom unexpectedly while scrolling dashboard "scrollWheelZoom": false, // When false, repaints on each move frame. diff --git a/package.json b/package.json index 9b97b52b54735..c029d8dbc15eb 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,9 @@ "dashboarding" ], "private": true, - "version": "7.0.0-alpha1", + "version": "7.0.0", "branch": "master", + "types": "./target/types/type_exports.d.ts", "build": { "number": 8467, "sha": "6cb7fec4e154faa0a4a3fee4b33dfef91b9870d9" @@ -37,7 +38,7 @@ "test:server": "grunt test:server", "test:coverage": "grunt test:coverage", "checkLicenses": "grunt licenses --dev", - "build": "node scripts/build", + "build": "node scripts/build --all-platforms", "start": "node scripts/kibana --dev", "debug": "node --nolazy --inspect scripts/kibana --dev", "debug-break": "node --nolazy --inspect-brk scripts/kibana --dev", @@ -52,23 +53,46 @@ "uiFramework:build": "cd packages/kbn-ui-framework && yarn docSiteBuild", "uiFramework:createComponent": "cd packages/kbn-ui-framework && yarn createComponent", "uiFramework:documentComponent": "cd packages/kbn-ui-framework && yarn documentComponent", - "kbn:watch": "node scripts/kibana --dev --logging.json=false" + "kbn:watch": "node scripts/kibana --dev --logging.json=false", + "build:types": "tsc --p tsconfig.types.json", + "kbn:bootstrap": "yarn build:types" }, "repository": { "type": "git", "url": "https://github.com/elastic/kibana.git" }, + "resolutions": { + "**/@types/node": "8.10.21", + "@types/react": "16.3.14" + }, + "workspaces": { + "packages": [ + "packages/*", + "x-pack", + "x-pack/plugins/*" + ], + "nohoist": [ + "**/@types/*", + "**/@types/*/**", + "**/grunt-*", + "**/grunt-*/**", + "x-pack/typescript" + ] + }, "dependencies": { - "@elastic/eui": "4.0.1", + "@elastic/eui": "5.0.0", "@elastic/filesaver": "1.1.2", + "@elastic/good": "8.1.1-kibana1", "@elastic/numeral": "2.3.2", "@elastic/ui-ace": "0.2.3", - "@kbn/babel-preset": "link:packages/kbn-babel-preset", - "@kbn/datemath": "link:packages/kbn-datemath", - "@kbn/i18n": "link:packages/kbn-i18n", - "@kbn/pm": "link:packages/kbn-pm", - "@kbn/test-subj-selector": "link:packages/kbn-test-subj-selector", - "@kbn/ui-framework": "link:packages/kbn-ui-framework", + "@kbn/babel-preset": "1.0.0", + "@kbn/config-schema": "1.0.0", + "@kbn/datemath": "5.0.0", + "@kbn/i18n": "1.0.0", + "@kbn/pm": "1.0.0", + "@kbn/test-subj-selector": "0.2.1", + "@kbn/ui-framework": "1.0.0", + "JSONStream": "1.1.1", "abortcontroller-polyfill": "^1.1.9", "angular": "1.6.9", "angular-aria": "1.6.6", @@ -83,7 +107,7 @@ "babel-polyfill": "6.20.0", "babel-register": "6.18.0", "bluebird": "2.9.34", - "boom": "5.2.0", + "boom": "^7.2.0", "brace": "0.11.1", "cache-loader": "1.0.3", "chalk": "^2.4.1", @@ -96,28 +120,27 @@ "d3-cloud": "1.2.1", "del": "^3.0.0", "dragula": "3.7.0", - "elasticsearch": "^15.1.1", - "elasticsearch-browser": "^15.1.1", + "elasticsearch": "^15.2.0", + "elasticsearch-browser": "^15.2.0", "encode-uri-query": "1.0.0", - "even-better": "7.0.2", "execa": "^0.10.0", "expiry-js": "0.1.7", "extract-text-webpack-plugin": "3.0.1", "file-loader": "1.1.4", "font-awesome": "4.4.0", + "getos": "^3.1.0", "glob": "^7.1.2", "glob-all": "^3.1.0", "good-squeeze": "2.1.0", - "h2o2": "5.1.1", - "h2o2-latest": "npm:h2o2@8.1.2", + "h2o2": "^8.1.2", "handlebars": "4.0.5", - "hapi": "14.2.0", - "hapi-latest": "npm:hapi@17.5.0", + "hapi": "^17.5.3", "hjson": "3.1.0", + "hoek": "^5.0.4", "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.1", - "inert": "4.0.2", - "joi": "10.4.1", + "inert": "^5.1.0", + "joi": "^13.5.2", "jquery": "^3.3.1", "js-yaml": "3.4.1", "json-stringify-pretty-compact": "1.0.4", @@ -130,7 +153,7 @@ "leaflet.heat": "0.2.0", "less": "2.7.1", "less-loader": "4.0.5", - "lodash": "3.10.1", + "lodash": "npm:@elastic/lodash@3.10.1-kibana1", "lru-cache": "4.1.1", "markdown-it": "^8.4.1", "minimatch": "^3.0.4", @@ -141,6 +164,8 @@ "ngreact": "0.5.1", "no-ui-slider": "1.2.0", "node-fetch": "1.3.2", + "opn": "^5.4.0", + "oppsy": "^2.0.0", "pegjs": "0.9.0", "postcss-loader": "2.0.6", "prop-types": "15.5.8", @@ -157,7 +182,7 @@ "react-input-range": "^1.3.0", "react-markdown": "^3.1.4", "react-redux": "^5.0.7", - "react-router-dom": "4.2.2", + "react-router-dom": "^4.3.1", "react-sizeme": "^2.3.6", "react-toggle": "4.0.2", "reactcss": "1.2.3", @@ -165,7 +190,7 @@ "redux-actions": "2.2.1", "redux-thunk": "2.3.0", "regression": "2.0.0", - "request": "^2.85.0", + "request": "^2.88.0", "reselect": "^3.0.1", "resize-observer-polyfill": "1.2.1", "rimraf": "2.4.3", @@ -176,10 +201,11 @@ "style-loader": "0.19.0", "tar": "2.2.0", "tinygradient": "0.3.0", - "tinymath": "0.2.1", + "tinymath": "1.1.0", "topojson-client": "3.0.0", "trunc-html": "1.0.2", "trunc-text": "1.0.2", + "ts-optchain": "^0.1.1", "tslib": "^1.9.3", "type-detect": "^4.0.8", "uglifyjs-webpack-plugin": "^1.2.7", @@ -192,63 +218,77 @@ "vega-lite": "^2.4.0", "vega-schema-url-parser": "1.0.0", "vega-tooltip": "^0.9.14", - "vision": "4.1.0", + "vision": "^5.3.3", "webpack": "3.6.0", "webpack-merge": "4.1.0", "whatwg-fetch": "^2.0.3", - "wreck": "12.4.0", - "x-pack": "link:x-pack", + "wreck": "^14.0.2", + "x-pack": "7.0.0", "yauzl": "2.7.0" }, "devDependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0", - "@elastic/eslint-config-kibana": "link:packages/eslint-config-kibana", - "@elastic/eslint-plugin-kibana-custom": "link:packages/eslint-plugin-kibana-custom", - "@kbn/es": "link:packages/kbn-es", - "@kbn/eslint-import-resolver-kibana": "link:packages/kbn-eslint-import-resolver-kibana", - "@kbn/eslint-plugin-license-header": "link:packages/kbn-eslint-plugin-license-header", - "@kbn/plugin-generator": "link:packages/kbn-plugin-generator", - "@kbn/test": "link:packages/kbn-test", + "@elastic/eslint-config-kibana": "0.15.0", + "@elastic/eslint-plugin-kibana-custom": "1.1.0", + "@kbn/es": "1.0.0", + "@kbn/eslint-import-resolver-kibana": "2.0.0", + "@kbn/eslint-plugin-license-header": "1.0.0", + "@kbn/plugin-generator": "1.0.0", + "@kbn/test": "1.0.0", "@octokit/rest": "^15.10.0", - "@types/angular": "^1.6.45", + "@types/angular": "^1.6.50", + "@types/angular-mocks": "^1.7.0", "@types/babel-core": "^6.25.5", "@types/bluebird": "^3.1.1", "@types/boom": "^7.2.0", "@types/chance": "^1.0.0", "@types/classnames": "^2.2.3", + "@types/d3": "^5.0.0", "@types/dedent": "^0.7.0", + "@types/del": "^3.0.1", + "@types/elasticsearch": "^5.0.26", "@types/enzyme": "^3.1.12", "@types/eslint": "^4.16.2", "@types/execa": "^0.9.0", "@types/fetch-mock": "^5.12.2", "@types/getopts": "^2.0.0", "@types/glob": "^5.0.35", - "@types/hapi-latest": "npm:@types/hapi@17.0.12", + "@types/graphql": "^0.13.1", + "@types/hapi": "^17.0.18", "@types/has-ansi": "^3.0.0", + "@types/hoek": "^4.1.3", "@types/jest": "^23.3.1", - "@types/joi": "^10.4.4", + "@types/joi": "^13.4.2", "@types/jquery": "^3.3.6", "@types/js-yaml": "^3.11.1", "@types/listr": "^0.13.0", "@types/lodash": "^3.10.1", "@types/minimatch": "^2.0.29", + "@types/moment-timezone": "^0.5.8", + "@types/mustache": "^0.8.31", "@types/node": "^8.10.20", + "@types/opn": "^5.1.0", + "@types/podium": "^1.0.0", "@types/prop-types": "^15.5.3", "@types/puppeteer": "^1.6.2", - "@types/react": "^16.3.14", + "@types/react": "16.3.14", "@types/react-dom": "^16.0.5", "@types/react-redux": "^6.0.6", + "@types/react-router-dom": "^4.3.1", "@types/react-virtualized": "^9.18.7", "@types/redux": "^3.6.31", "@types/redux-actions": "^2.2.1", "@types/semver": "^5.5.0", "@types/sinon": "^5.0.1", "@types/strip-ansi": "^3.0.0", + "@types/styled-components": "^3.0.1", "@types/supertest": "^2.0.5", "@types/type-detect": "^4.0.1", "@types/uuid": "^3.4.4", + "@types/zen-observable": "^0.8.0", "angular-mocks": "1.4.7", + "archiver": "^3.0.0", "babel-eslint": "^9.0.0", "babel-jest": "^23.4.2", "backport": "4.4.1", @@ -256,22 +296,23 @@ "chance": "1.0.10", "cheerio": "0.22.0", "chokidar": "1.6.0", - "chromedriver": "^2.41.0", + "chromedriver": "2.42.1", "classnames": "2.2.5", "dedent": "^0.7.0", "enzyme": "3.2.0", "enzyme-adapter-react-16": "^1.1.1", "enzyme-to-json": "3.3.1", "eslint": "^5.6.0", - "eslint-config-prettier": "^2.9.0", - "eslint-plugin-babel": "4.1.2", - "eslint-plugin-import": "2.8.0", - "eslint-plugin-jest": "^21.22.0", - "eslint-plugin-mocha": "4.11.0", + "eslint-config-prettier": "^3.1.0", + "eslint-plugin-babel": "^5.2.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-jest": "^21.22.1", + "eslint-plugin-jsx-a11y": "^6.1.2", + "eslint-plugin-mocha": "^5.2.0", "eslint-plugin-no-unsanitized": "^3.0.2", - "eslint-plugin-prefer-object-spread": "1.2.1", - "eslint-plugin-prettier": "^2.6.0", - "eslint-plugin-react": "7.5.1", + "eslint-plugin-prefer-object-spread": "^1.2.1", + "eslint-plugin-prettier": "^2.6.2", + "eslint-plugin-react": "^7.11.1", "event-stream": "3.3.2", "expect.js": "0.3.1", "faker": "1.1.0", @@ -281,15 +322,16 @@ "globby": "^8.0.1", "grunt": "1.0.1", "grunt-cli": "^1.2.0", - "grunt-contrib-watch": "^1.0.0", + "grunt-contrib-watch": "^1.1.0", "grunt-karma": "2.0.0", "grunt-peg": "^2.0.1", "grunt-run": "0.7.0", "gulp-babel": "^7.0.1", "gulp-sourcemaps": "1.7.3", "has-ansi": "^3.0.0", - "husky": "0.8.1", + "husky": "^0.14.3", "image-diff": "1.6.0", + "intl-messageformat-parser": "^1.4.0", "istanbul-instrumenter-loader": "3.0.0", "jest": "^23.5.0", "jest-cli": "^23.5.0", @@ -308,7 +350,7 @@ "license-checker": "^16.0.0", "listr": "^0.14.1", "load-grunt-config": "0.19.2", - "makelogs": "^4.1.0", + "makelogs": "^4.3.0", "mocha": "3.3.0", "mock-fs": "^4.4.2", "murmurhash3js": "3.0.1", @@ -318,7 +360,7 @@ "normalize-path": "^3.0.0", "pixelmatch": "4.0.2", "postcss": "^7.0.2", - "prettier": "^1.14.0", + "prettier": "^1.14.3", "proxyquire": "1.7.11", "regenerate": "^1.4.0", "selenium-webdriver": "^4.0.0-alpha.1", @@ -333,7 +375,7 @@ "ts-node": "^7.0.1", "tslint": "^5.11.0", "tslint-config-prettier": "^1.15.0", - "tslint-plugin-prettier": "^1.3.0", + "tslint-plugin-prettier": "^2.0.0", "typescript": "^3.0.3", "vinyl-fs": "^3.0.2", "xml2js": "^0.4.19", @@ -342,6 +384,6 @@ }, "engines": { "node": "8.11.4", - "yarn": "^1.6.0" + "yarn": "^1.10.1" } -} +} \ No newline at end of file diff --git a/packages/eslint-config-kibana/.eslintrc.js b/packages/eslint-config-kibana/.eslintrc.js index c14d0268e1578..d2d1efa9180fa 100644 --- a/packages/eslint-config-kibana/.eslintrc.js +++ b/packages/eslint-config-kibana/.eslintrc.js @@ -10,8 +10,9 @@ module.exports = { 'import', 'no-unsanitized', 'prefer-object-spread', + 'jsx-a11y', ], - + env: { es6: true, node: true, @@ -116,6 +117,30 @@ module.exports = { arrow: true, }], 'react/jsx-first-prop-new-line': ['error', 'multiline-multiprop'], + 'jsx-a11y/accessible-emoji': 'error', + 'jsx-a11y/alt-text': 'error', + 'jsx-a11y/anchor-has-content': 'error', + 'jsx-a11y/aria-activedescendant-has-tabindex': 'error', + 'jsx-a11y/aria-props': 'error', + 'jsx-a11y/aria-proptypes': 'error', + 'jsx-a11y/aria-role': 'error', + 'jsx-a11y/aria-unsupported-elements': 'error', + 'jsx-a11y/heading-has-content': 'error', + 'jsx-a11y/html-has-lang': 'error', + 'jsx-a11y/iframe-has-title': 'error', + 'jsx-a11y/interactive-supports-focus': 'error', + 'jsx-a11y/media-has-caption': 'error', + 'jsx-a11y/mouse-events-have-key-events': 'error', + 'jsx-a11y/no-access-key': 'error', + 'jsx-a11y/no-distracting-elements': 'error', + 'jsx-a11y/no-interactive-element-to-noninteractive-role': 'error', + 'jsx-a11y/no-noninteractive-element-interactions': 'error', + 'jsx-a11y/no-noninteractive-element-to-interactive-role': 'error', + 'jsx-a11y/no-redundant-roles': 'error', + 'jsx-a11y/role-has-required-aria-props': 'error', + 'jsx-a11y/role-supports-aria-props': 'error', + 'jsx-a11y/scope': 'error', + 'jsx-a11y/tabindex-no-positive': 'error', 'react/jsx-equals-spacing': ['error', 'never'], 'react/jsx-indent': ['error', 2], 'react/no-will-update-set-state': 'error', diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json index 6c02d7579de76..d2e639eebbbe3 100644 --- a/packages/eslint-config-kibana/package.json +++ b/packages/eslint-config-kibana/package.json @@ -17,12 +17,13 @@ "peerDependencies": { "babel-eslint": "^9.0.0", "eslint": "^5.6.0", - "eslint-plugin-babel": "^4.1.1", - "eslint-plugin-import": "^2.6.0", - "eslint-plugin-jest": "^21.22.0", - "eslint-plugin-mocha": "^4.9.0", + "eslint-plugin-babel": "^5.2.0", + "eslint-plugin-jsx-a11y": "^6.1.2", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-jest": "^21.22.1", + "eslint-plugin-mocha": "^5.2.0", "eslint-plugin-no-unsanitized": "^3.0.2", "eslint-plugin-prefer-object-spread": "^1.2.1", - "eslint-plugin-react": "^7.1.0" + "eslint-plugin-react": "^7.11.1" } } diff --git a/packages/kbn-babel-preset/yarn.lock b/packages/kbn-babel-preset/yarn.lock deleted file mode 100644 index 797fb16861133..0000000000000 --- a/packages/kbn-babel-preset/yarn.lock +++ /dev/null @@ -1,664 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-class-properties@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-flow@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - -babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-class-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" - dependencies: - babel-helper-function-name "^6.24.1" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-define@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.0.tgz#94c5f9459c810c738cc7c50cbd44a31829d6f319" - dependencies: - lodash "4.17.4" - traverse "0.6.6" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.23.0: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-preset-env@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^1.4.0" - invariant "^2.2.2" - -babel-preset-flow@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" - dependencies: - babel-plugin-transform-flow-strip-types "^6.22.0" - -babel-preset-react@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" - dependencies: - babel-plugin-syntax-jsx "^6.3.13" - babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.24.1" - babel-plugin-transform-react-jsx-self "^6.22.0" - babel-plugin-transform-react-jsx-source "^6.22.0" - babel-preset-flow "^6.23.0" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -browserslist@^1.4.0: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - -caniuse-db@^1.0.30000639: - version "1.0.30000800" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000800.tgz#a86e6bc23bd9a707d5df42f33e64d0495cfda218" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -core-js@^2.4.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" - -debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -electron-to-chromium@^1.2.7: - version "1.3.32" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6" - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -invariant@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" - dependencies: - loose-envify "^1.0.0" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -lodash@4.17.4, lodash@^4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -private@^0.1.6: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -traverse@0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json new file mode 100644 index 0000000000000..4d8a017716ac4 --- /dev/null +++ b/packages/kbn-config-schema/package.json @@ -0,0 +1,20 @@ +{ + "name": "@kbn/config-schema", + "main": "./target/out/index.js", + "types": "./target/types/index.d.ts", + "version": "1.0.0", + "license": "Apache-2.0", + "private": true, + "scripts": { + "build": "tsc", + "kbn:bootstrap": "yarn build" + }, + "devDependencies": { + "typescript": "^3.0.3" + }, + "peerDependencies": { + "joi": "10.4.1", + "moment": "^2.20.1", + "type-detect": "^4.0.8" + } +} diff --git a/src/core/server/config/schema/byte_size_value/__snapshots__/index.test.ts.snap b/packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap similarity index 100% rename from src/core/server/config/schema/byte_size_value/__snapshots__/index.test.ts.snap rename to packages/kbn-config-schema/src/byte_size_value/__snapshots__/index.test.ts.snap diff --git a/src/core/server/config/schema/byte_size_value/index.test.ts b/packages/kbn-config-schema/src/byte_size_value/index.test.ts similarity index 100% rename from src/core/server/config/schema/byte_size_value/index.test.ts rename to packages/kbn-config-schema/src/byte_size_value/index.test.ts diff --git a/src/core/server/config/schema/byte_size_value/index.ts b/packages/kbn-config-schema/src/byte_size_value/index.ts similarity index 100% rename from src/core/server/config/schema/byte_size_value/index.ts rename to packages/kbn-config-schema/src/byte_size_value/index.ts diff --git a/src/core/server/config/schema/duration/index.ts b/packages/kbn-config-schema/src/duration/index.ts similarity index 100% rename from src/core/server/config/schema/duration/index.ts rename to packages/kbn-config-schema/src/duration/index.ts diff --git a/src/core/server/config/schema/errors/index.ts b/packages/kbn-config-schema/src/errors/index.ts similarity index 100% rename from src/core/server/config/schema/errors/index.ts rename to packages/kbn-config-schema/src/errors/index.ts diff --git a/src/core/server/config/schema/errors/schema_error.test.ts b/packages/kbn-config-schema/src/errors/schema_error.test.ts similarity index 100% rename from src/core/server/config/schema/errors/schema_error.test.ts rename to packages/kbn-config-schema/src/errors/schema_error.test.ts diff --git a/src/core/server/config/schema/errors/schema_error.ts b/packages/kbn-config-schema/src/errors/schema_error.ts similarity index 100% rename from src/core/server/config/schema/errors/schema_error.ts rename to packages/kbn-config-schema/src/errors/schema_error.ts diff --git a/src/core/server/config/schema/errors/schema_type_error.ts b/packages/kbn-config-schema/src/errors/schema_type_error.ts similarity index 100% rename from src/core/server/config/schema/errors/schema_type_error.ts rename to packages/kbn-config-schema/src/errors/schema_type_error.ts diff --git a/src/core/server/config/schema/errors/schema_types_error.ts b/packages/kbn-config-schema/src/errors/schema_types_error.ts similarity index 100% rename from src/core/server/config/schema/errors/schema_types_error.ts rename to packages/kbn-config-schema/src/errors/schema_types_error.ts diff --git a/src/core/server/config/schema/errors/validation_error.ts b/packages/kbn-config-schema/src/errors/validation_error.ts similarity index 100% rename from src/core/server/config/schema/errors/validation_error.ts rename to packages/kbn-config-schema/src/errors/validation_error.ts diff --git a/src/core/server/config/schema/index.ts b/packages/kbn-config-schema/src/index.ts similarity index 100% rename from src/core/server/config/schema/index.ts rename to packages/kbn-config-schema/src/index.ts diff --git a/packages/kbn-config-schema/src/internals/index.ts b/packages/kbn-config-schema/src/internals/index.ts new file mode 100644 index 0000000000000..78216e18555b3 --- /dev/null +++ b/packages/kbn-config-schema/src/internals/index.ts @@ -0,0 +1,291 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import Joi from 'joi'; +import { + AnySchema, + JoiRoot, + Reference, + Rules, + SchemaLike, + State, + ValidationErrorItem, + ValidationOptions, +} from 'joi'; +import { isPlainObject } from 'lodash'; +import { isDuration } from 'moment'; +import { ByteSizeValue, ensureByteSizeValue } from '../byte_size_value'; +import { ensureDuration } from '../duration'; + +export { AnySchema, Reference, SchemaLike, ValidationErrorItem }; + +function isMap(o: any): o is Map { + return o instanceof Map; +} + +const anyCustomRule: Rules = { + name: 'custom', + params: { + validator: Joi.func() + .maxArity(1) + .required(), + }, + validate(params, value, state, options) { + let validationResultMessage; + try { + validationResultMessage = params.validator(value); + } catch (e) { + validationResultMessage = e.message || e; + } + + if (typeof validationResultMessage === 'string') { + return this.createError( + 'any.custom', + { value, message: validationResultMessage }, + state, + options + ); + } + + return value; + }, +}; + +/** + * @internal + */ +export const internals = Joi.extend([ + { + name: 'any', + + rules: [anyCustomRule], + }, + { + name: 'boolean', + + base: Joi.boolean(), + coerce(value: any, state: State, options: ValidationOptions) { + // If value isn't defined, let Joi handle default value if it's defined. + if (value !== undefined && typeof value !== 'boolean') { + return this.createError('boolean.base', { value }, state, options); + } + + return value; + }, + rules: [anyCustomRule], + }, + { + name: 'string', + + base: Joi.string(), + rules: [anyCustomRule], + }, + { + name: 'bytes', + + coerce(value: any, state: State, options: ValidationOptions) { + try { + if (typeof value === 'string') { + return ByteSizeValue.parse(value); + } + + if (typeof value === 'number') { + return new ByteSizeValue(value); + } + } catch (e) { + return this.createError('bytes.parse', { value, message: e.message }, state, options); + } + + return value; + }, + pre(value: any, state: State, options: ValidationOptions) { + // If value isn't defined, let Joi handle default value if it's defined. + if (value instanceof ByteSizeValue) { + return value as any; + } + + return this.createError('bytes.base', { value }, state, options); + }, + rules: [ + anyCustomRule, + { + name: 'min', + params: { + limit: Joi.alternatives([Joi.number(), Joi.string()]).required(), + }, + validate(params, value, state, options) { + const limit = ensureByteSizeValue(params.limit); + if (value.isLessThan(limit)) { + return this.createError('bytes.min', { value, limit }, state, options); + } + + return value; + }, + }, + { + name: 'max', + params: { + limit: Joi.alternatives([Joi.number(), Joi.string()]).required(), + }, + validate(params, value, state, options) { + const limit = ensureByteSizeValue(params.limit); + if (value.isGreaterThan(limit)) { + return this.createError('bytes.max', { value, limit }, state, options); + } + + return value; + }, + }, + ], + }, + { + name: 'duration', + + coerce(value: any, state: State, options: ValidationOptions) { + try { + if (typeof value === 'string' || typeof value === 'number') { + return ensureDuration(value); + } + } catch (e) { + return this.createError('duration.parse', { value, message: e.message }, state, options); + } + + return value; + }, + pre(value: any, state: State, options: ValidationOptions) { + if (!isDuration(value)) { + return this.createError('duration.base', { value }, state, options); + } + + return value; + }, + rules: [anyCustomRule], + }, + { + name: 'number', + + base: Joi.number(), + coerce(value: any, state: State, options: ValidationOptions) { + // If value isn't defined, let Joi handle default value if it's defined. + if (value === undefined) { + return value; + } + + // Do we want to allow strings that can be converted, e.g. "2"? (Joi does) + // (this can for example be nice in http endpoints with query params) + // + // From Joi docs on `Joi.number`: + // > Generates a schema object that matches a number data type (as well as + // > strings that can be converted to numbers) + const coercedValue: any = typeof value === 'string' ? Number(value) : value; + if (typeof coercedValue !== 'number' || isNaN(coercedValue)) { + return this.createError('number.base', { value }, state, options); + } + + return value; + }, + rules: [anyCustomRule], + }, + { + name: 'object', + + base: Joi.object(), + coerce(value: any, state: State, options: ValidationOptions) { + // If value isn't defined, let Joi handle default value if it's defined. + if (value !== undefined && !isPlainObject(value)) { + return this.createError('object.base', { value }, state, options); + } + + return value; + }, + rules: [anyCustomRule], + }, + { + name: 'map', + + coerce(value: any, state: State, options: ValidationOptions) { + if (isPlainObject(value)) { + return new Map(Object.entries(value)); + } + + return value; + }, + pre(value: any, state: State, options: ValidationOptions) { + if (!isMap(value)) { + return this.createError('map.base', { value }, state, options); + } + + return value as any; + }, + rules: [ + anyCustomRule, + { + name: 'entries', + params: { + key: Joi.object().schema(), + value: Joi.object().schema(), + }, + validate(params, value, state, options) { + const result = new Map(); + for (const [entryKey, entryValue] of value) { + const { value: validatedEntryKey, error: keyError } = Joi.validate( + entryKey, + params.key + ); + + if (keyError) { + return this.createError('map.key', { entryKey, reason: keyError }, state, options); + } + + const { value: validatedEntryValue, error: valueError } = Joi.validate( + entryValue, + params.value + ); + + if (valueError) { + return this.createError( + 'map.value', + { entryKey, reason: valueError }, + state, + options + ); + } + + result.set(validatedEntryKey, validatedEntryValue); + } + + return result as any; + }, + }, + ], + }, + { + name: 'array', + + base: Joi.array(), + coerce(value: any, state: State, options: ValidationOptions) { + // If value isn't defined, let Joi handle default value if it's defined. + if (value !== undefined && !Array.isArray(value)) { + return this.createError('array.base', { value }, state, options); + } + + return value; + }, + rules: [anyCustomRule], + }, +]) as JoiRoot; diff --git a/src/core/server/config/schema/references/context_reference.ts b/packages/kbn-config-schema/src/references/context_reference.ts similarity index 100% rename from src/core/server/config/schema/references/context_reference.ts rename to packages/kbn-config-schema/src/references/context_reference.ts diff --git a/src/core/server/config/schema/references/index.ts b/packages/kbn-config-schema/src/references/index.ts similarity index 100% rename from src/core/server/config/schema/references/index.ts rename to packages/kbn-config-schema/src/references/index.ts diff --git a/src/core/server/config/schema/references/reference.ts b/packages/kbn-config-schema/src/references/reference.ts similarity index 100% rename from src/core/server/config/schema/references/reference.ts rename to packages/kbn-config-schema/src/references/reference.ts diff --git a/src/core/server/config/schema/references/sibling_reference.ts b/packages/kbn-config-schema/src/references/sibling_reference.ts similarity index 100% rename from src/core/server/config/schema/references/sibling_reference.ts rename to packages/kbn-config-schema/src/references/sibling_reference.ts diff --git a/src/core/server/config/schema/types/__snapshots__/any_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/any_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/any_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/any_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/array_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/array_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/array_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/array_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/boolean_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/boolean_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/boolean_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/byte_size_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/byte_size_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/byte_size_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/conditional_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/conditional_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/conditional_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/conditional_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/duration_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/duration_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/duration_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/literal_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/literal_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/literal_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/literal_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/map_of_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/map_of_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/map_of_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/map_of_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/maybe_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/maybe_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/maybe_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/maybe_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/number_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/number_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/number_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/number_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/object_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/object_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/object_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/object_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/one_of_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/one_of_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/one_of_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/one_of_type.test.ts.snap diff --git a/src/core/server/config/schema/types/__snapshots__/string_type.test.ts.snap b/packages/kbn-config-schema/src/types/__snapshots__/string_type.test.ts.snap similarity index 100% rename from src/core/server/config/schema/types/__snapshots__/string_type.test.ts.snap rename to packages/kbn-config-schema/src/types/__snapshots__/string_type.test.ts.snap diff --git a/src/core/server/config/schema/types/any_type.test.ts b/packages/kbn-config-schema/src/types/any_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/any_type.test.ts rename to packages/kbn-config-schema/src/types/any_type.test.ts diff --git a/src/core/server/config/schema/types/any_type.ts b/packages/kbn-config-schema/src/types/any_type.ts similarity index 100% rename from src/core/server/config/schema/types/any_type.ts rename to packages/kbn-config-schema/src/types/any_type.ts diff --git a/src/core/server/config/schema/types/array_type.test.ts b/packages/kbn-config-schema/src/types/array_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/array_type.test.ts rename to packages/kbn-config-schema/src/types/array_type.test.ts diff --git a/src/core/server/config/schema/types/array_type.ts b/packages/kbn-config-schema/src/types/array_type.ts similarity index 100% rename from src/core/server/config/schema/types/array_type.ts rename to packages/kbn-config-schema/src/types/array_type.ts diff --git a/src/core/server/config/schema/types/boolean_type.test.ts b/packages/kbn-config-schema/src/types/boolean_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/boolean_type.test.ts rename to packages/kbn-config-schema/src/types/boolean_type.test.ts diff --git a/src/core/server/config/schema/types/boolean_type.ts b/packages/kbn-config-schema/src/types/boolean_type.ts similarity index 100% rename from src/core/server/config/schema/types/boolean_type.ts rename to packages/kbn-config-schema/src/types/boolean_type.ts diff --git a/src/core/server/config/schema/types/byte_size_type.test.ts b/packages/kbn-config-schema/src/types/byte_size_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/byte_size_type.test.ts rename to packages/kbn-config-schema/src/types/byte_size_type.test.ts diff --git a/src/core/server/config/schema/types/byte_size_type.ts b/packages/kbn-config-schema/src/types/byte_size_type.ts similarity index 100% rename from src/core/server/config/schema/types/byte_size_type.ts rename to packages/kbn-config-schema/src/types/byte_size_type.ts diff --git a/src/core/server/config/schema/types/conditional_type.test.ts b/packages/kbn-config-schema/src/types/conditional_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/conditional_type.test.ts rename to packages/kbn-config-schema/src/types/conditional_type.test.ts diff --git a/src/core/server/config/schema/types/conditional_type.ts b/packages/kbn-config-schema/src/types/conditional_type.ts similarity index 100% rename from src/core/server/config/schema/types/conditional_type.ts rename to packages/kbn-config-schema/src/types/conditional_type.ts diff --git a/src/core/server/config/schema/types/duration_type.test.ts b/packages/kbn-config-schema/src/types/duration_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/duration_type.test.ts rename to packages/kbn-config-schema/src/types/duration_type.test.ts diff --git a/src/core/server/config/schema/types/duration_type.ts b/packages/kbn-config-schema/src/types/duration_type.ts similarity index 100% rename from src/core/server/config/schema/types/duration_type.ts rename to packages/kbn-config-schema/src/types/duration_type.ts diff --git a/src/core/server/config/schema/types/index.ts b/packages/kbn-config-schema/src/types/index.ts similarity index 100% rename from src/core/server/config/schema/types/index.ts rename to packages/kbn-config-schema/src/types/index.ts diff --git a/src/core/server/config/schema/types/literal_type.test.ts b/packages/kbn-config-schema/src/types/literal_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/literal_type.test.ts rename to packages/kbn-config-schema/src/types/literal_type.test.ts diff --git a/src/core/server/config/schema/types/literal_type.ts b/packages/kbn-config-schema/src/types/literal_type.ts similarity index 100% rename from src/core/server/config/schema/types/literal_type.ts rename to packages/kbn-config-schema/src/types/literal_type.ts diff --git a/src/core/server/config/schema/types/map_of_type.test.ts b/packages/kbn-config-schema/src/types/map_of_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/map_of_type.test.ts rename to packages/kbn-config-schema/src/types/map_of_type.test.ts diff --git a/src/core/server/config/schema/types/map_type.ts b/packages/kbn-config-schema/src/types/map_type.ts similarity index 100% rename from src/core/server/config/schema/types/map_type.ts rename to packages/kbn-config-schema/src/types/map_type.ts diff --git a/src/core/server/config/schema/types/maybe_type.test.ts b/packages/kbn-config-schema/src/types/maybe_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/maybe_type.test.ts rename to packages/kbn-config-schema/src/types/maybe_type.test.ts diff --git a/src/core/server/config/schema/types/maybe_type.ts b/packages/kbn-config-schema/src/types/maybe_type.ts similarity index 100% rename from src/core/server/config/schema/types/maybe_type.ts rename to packages/kbn-config-schema/src/types/maybe_type.ts diff --git a/src/core/server/config/schema/types/number_type.test.ts b/packages/kbn-config-schema/src/types/number_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/number_type.test.ts rename to packages/kbn-config-schema/src/types/number_type.test.ts diff --git a/src/core/server/config/schema/types/number_type.ts b/packages/kbn-config-schema/src/types/number_type.ts similarity index 100% rename from src/core/server/config/schema/types/number_type.ts rename to packages/kbn-config-schema/src/types/number_type.ts diff --git a/src/core/server/config/schema/types/object_type.test.ts b/packages/kbn-config-schema/src/types/object_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/object_type.test.ts rename to packages/kbn-config-schema/src/types/object_type.test.ts diff --git a/src/core/server/config/schema/types/object_type.ts b/packages/kbn-config-schema/src/types/object_type.ts similarity index 100% rename from src/core/server/config/schema/types/object_type.ts rename to packages/kbn-config-schema/src/types/object_type.ts diff --git a/src/core/server/config/schema/types/one_of_type.test.ts b/packages/kbn-config-schema/src/types/one_of_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/one_of_type.test.ts rename to packages/kbn-config-schema/src/types/one_of_type.test.ts diff --git a/src/core/server/config/schema/types/string_type.test.ts b/packages/kbn-config-schema/src/types/string_type.test.ts similarity index 100% rename from src/core/server/config/schema/types/string_type.test.ts rename to packages/kbn-config-schema/src/types/string_type.test.ts diff --git a/src/core/server/config/schema/types/string_type.ts b/packages/kbn-config-schema/src/types/string_type.ts similarity index 100% rename from src/core/server/config/schema/types/string_type.ts rename to packages/kbn-config-schema/src/types/string_type.ts diff --git a/src/core/server/config/schema/types/type.ts b/packages/kbn-config-schema/src/types/type.ts similarity index 91% rename from src/core/server/config/schema/types/type.ts rename to packages/kbn-config-schema/src/types/type.ts index b7db6d71668ae..e8d0370a443dc 100644 --- a/src/core/server/config/schema/types/type.ts +++ b/packages/kbn-config-schema/src/types/type.ts @@ -81,6 +81,9 @@ export abstract class Type { return validatedValue; } + /** + * @internal + */ public getSchema() { return this.internalSchema; } @@ -98,12 +101,7 @@ export abstract class Type { return error; } - const { context = {}, type, path: rawPath, message } = error; - - // Before v11.0.0 Joi reported paths as `.`-delimited strings, but more - // recent version use arrays instead. Once we upgrade Joi, we should just - // remove this split logic and use `path` provided by Joi directly. - const path = rawPath ? rawPath.split('.') : []; + const { context = {}, type, path, message } = error; const errorHandleResult = this.handleError(type, context, path); if (errorHandleResult instanceof SchemaTypeError) { diff --git a/src/core/server/config/schema/types/union_type.ts b/packages/kbn-config-schema/src/types/union_type.ts similarity index 100% rename from src/core/server/config/schema/types/union_type.ts rename to packages/kbn-config-schema/src/types/union_type.ts diff --git a/packages/kbn-config-schema/tsconfig.json b/packages/kbn-config-schema/tsconfig.json new file mode 100644 index 0000000000000..7a250509cf435 --- /dev/null +++ b/packages/kbn-config-schema/tsconfig.json @@ -0,0 +1,17 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "declaration": true, + "declarationDir": "./target/types", + "outDir": "./target/out", + "stripInternal": true, + "declarationMap": true + }, + "include": [ + "./types/joi.d.ts", + "./src/**/*.ts" + ], + "exclude": [ + "target" + ] +} diff --git a/packages/kbn-config-schema/types/joi.d.ts b/packages/kbn-config-schema/types/joi.d.ts new file mode 100644 index 0000000000000..8f3082e342043 --- /dev/null +++ b/packages/kbn-config-schema/types/joi.d.ts @@ -0,0 +1,51 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import * as Joi from 'joi'; +import { ByteSizeValue } from '../src/byte_size_value'; + +declare module 'joi' { + interface BytesSchema extends AnySchema { + min(limit: number | string | ByteSizeValue): this; + max(limit: number | string | ByteSizeValue): this; + } + + interface MapSchema extends AnySchema { + entries(key: AnySchema, value: AnySchema): this; + } + + // In more recent Joi types we can use `Root` type instead of `typeof Joi`. + export type JoiRoot = typeof Joi & { + bytes: () => BytesSchema; + duration: () => AnySchema; + map: () => MapSchema; + }; + + interface AnySchema { + custom(validator: (value: any) => string | void): this; + } + + // Joi types don't include `schema` function even though it's supported. + interface ObjectSchema { + schema(): this; + } + + // Joi types define only signature with single extension, but Joi supports + // an array form as well. It's fixed in more recent Joi types. + function extend(extension: Joi.Extension | Joi.Extension[]): any; +} diff --git a/packages/kbn-datemath/src/index.d.ts b/packages/kbn-datemath/src/index.d.ts index e3389fb255700..a53494641b920 100644 --- a/packages/kbn-datemath/src/index.d.ts +++ b/packages/kbn-datemath/src/index.d.ts @@ -17,13 +17,29 @@ * under the License. */ -declare module '@kbn/datemath' { - const dateMath: { - parse: any; - unitsMap: any; - units: string[]; - unitsAsc: string[]; - unitsDesc: string[]; +import moment from 'moment'; +export type Unit = 'ms' | 's' | 'm' | 'h' | 'd' | 'w' | 'M' | 'y'; + +declare const datemath: { + unitsMap: { + [k in Unit]: { + weight: number; + type: 'calendar' | 'fixed' | 'mixed'; + base: number; + } }; - export default dateMath; -} + units: Unit[]; + unitsAsc: Unit[]; + unitsDesc: Unit[]; + + parse( + input: string, + options?: { + roundUp?: boolean; + forceNow?: boolean; + momentInstance?: typeof moment; + } + ): moment.Moment | undefined; +}; + +export default datemath; diff --git a/packages/kbn-datemath/src/index.js b/packages/kbn-datemath/src/index.js index 6576a458fe77b..afedad3ef6f72 100644 --- a/packages/kbn-datemath/src/index.js +++ b/packages/kbn-datemath/src/index.js @@ -25,10 +25,10 @@ const unitsMap = { m: { weight: 3, type: 'mixed', base: 1000 * 60 }, h: { weight: 4, type: 'mixed', base: 1000 * 60 * 60 }, d: { weight: 5, type: 'mixed', base: 1000 * 60 * 60 * 24 }, - w: { weight: 6, type: 'calendar' }, - M: { weight: 7, type: 'calendar' }, + w: { weight: 6, type: 'calendar', base: NaN }, + M: { weight: 7, type: 'calendar', base: NaN }, // q: { weight: 8, type: 'calendar' }, // TODO: moment duration does not support quarter - y: { weight: 9, type: 'calendar' }, + y: { weight: 9, type: 'calendar', base: NaN }, }; const units = Object.keys(unitsMap).sort((a, b) => unitsMap[b].weight - unitsMap[a].weight); const unitsDesc = [...units]; diff --git a/packages/kbn-datemath/yarn.lock b/packages/kbn-datemath/yarn.lock deleted file mode 100644 index cf6ea88561976..0000000000000 --- a/packages/kbn-datemath/yarn.lock +++ /dev/null @@ -1,1612 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws4@^1.2.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" - -babel-cli@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" - dependencies: - babel-core "^6.26.0" - babel-polyfill "^6.26.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - commander "^2.11.0" - convert-source-map "^1.5.0" - fs-readdir-recursive "^1.0.0" - glob "^7.1.2" - lodash "^4.17.4" - output-file-sync "^1.1.2" - path-is-absolute "^1.0.1" - slash "^1.0.0" - source-map "^0.5.6" - v8flags "^2.1.1" - optionalDependencies: - chokidar "^1.6.1" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.0" - debug "^2.6.8" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.7" - slash "^1.0.0" - source-map "^0.5.6" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-env@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^2.1.2" - invariant "^2.2.2" - semver "^5.3.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -browserslist@^2.1.2: - version "2.11.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" - dependencies: - caniuse-lite "^1.0.30000792" - electron-to-chromium "^1.3.30" - -caniuse-lite@^1.0.30000792: - version "1.0.30000803" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000803.tgz#9939c37149d38d5f4540430490d240c03106a0f5" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" - dependencies: - delayed-stream "~1.0.0" - -commander@^2.11.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.0.tgz#7b25325963e6aace20d3a9285b09379b0c2208b5" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -convert-source-map@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -core-js@^2.4.0, core-js@^2.5.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -debug@^2.2.0, debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - -electron-to-chromium@^1.3.30: - version "1.3.32" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.32.tgz#11d0684c0840e003c4be8928f8ac5f35dbc2b4e6" - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -extend@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -fs-readdir-recursive@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" - dependencies: - nan "^2.3.0" - node-pre-gyp "^0.6.39" - -fstream-ignore@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" - dependencies: - fstream "^1.0.0" - inherits "2" - minimatch "^3.0.0" - -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob@^7.0.5, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -graceful-fs@^4.1.2, graceful-fs@^4.1.4: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -hawk@3.1.3, hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -invariant@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360" - dependencies: - loose-envify "^1.0.0" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -lodash@^4.17.4: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -mime-db@~1.30.0: - version "1.30.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01" - -mime-types@^2.1.12, mime-types@~2.1.7: - version "2.1.17" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.17.tgz#09d7a393f03e995a79f8af857b70a9e0ab16557a" - dependencies: - mime-db "~1.30.0" - -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -"mkdirp@>=0.5 0", mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@^2.13.0: - version "2.20.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -nan@^2.3.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" - -node-pre-gyp@^0.6.39: - version "0.6.39" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" - dependencies: - detect-libc "^1.0.2" - hawk "3.1.3" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.0.2" - rc "^1.1.7" - request "2.81.0" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -once@^1.3.0, once@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -output-file-sync@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" - dependencies: - graceful-fs "^4.1.4" - mkdirp "^0.5.1" - object-assign "^4.1.0" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -private@^0.1.6, private@^0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -rc@^1.1.7: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -request@2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -semver@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - dependencies: - source-map "^0.5.6" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -sshpk@^1.7.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -tar-pack@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -tough-cookie@~2.3.0: - version "2.3.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" - dependencies: - punycode "^1.4.1" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -uid-number@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -uuid@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -v8flags@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - dependencies: - user-home "^1.1.1" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json index 9ce518746009f..02f4b90512689 100644 --- a/packages/kbn-dev-utils/package.json +++ b/packages/kbn-dev-utils/package.json @@ -18,7 +18,7 @@ "tslib": "^1.9.3" }, "devDependencies": { - "@kbn/babel-preset": "link:../kbn-babel-preset", + "@kbn/babel-preset": "1.0.0", "babel-cli": "^6.26.0", "chance": "1.0.6", "expect.js": "0.3.1" diff --git a/packages/kbn-dev-utils/src/proc_runner/proc.js b/packages/kbn-dev-utils/src/proc_runner/proc.js index f473026418109..c2548bccfac7c 100644 --- a/packages/kbn-dev-utils/src/proc_runner/proc.js +++ b/packages/kbn-dev-utils/src/proc_runner/proc.js @@ -91,6 +91,9 @@ export function createProc(name, { cmd, args, cwd, env, stdin, log }) { const exit$ = Rx.fromEvent(childProcess, 'exit').pipe( take(1), map(([code]) => { + if (this._stopCalled) { + return null; + } // JVM exits with 143 on SIGTERM and 130 on SIGINT, dont' treat then as errors if (code > 0 && !(code === 143 || code === 130)) { throw createCliError(`[${name}] exited with code ${code}`); @@ -115,9 +118,16 @@ export function createProc(name, { cmd, args, cwd, env, stdin, log }) { return this._outcomePromise; } + _stopCalled = false; + async stop(signal) { + if (this._stopCalled) { + return; + } + this._stopCalled = true; await withTimeout( async () => { + log.debug(`Sending "${signal}" to proc "${name}"`); await treeKillAsync(childProcess.pid, signal); await this.getOutcomePromise(); }, diff --git a/packages/kbn-dev-utils/yarn.lock b/packages/kbn-dev-utils/yarn.lock deleted file mode 100644 index 49960242a058d..0000000000000 --- a/packages/kbn-dev-utils/yarn.lock +++ /dev/null @@ -1,1858 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@kbn/babel-preset@link:../kbn-babel-preset": - version "0.0.0" - uid "" - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws4@^1.2.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" - -babel-cli@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" - dependencies: - babel-core "^6.26.0" - babel-polyfill "^6.26.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - commander "^2.11.0" - convert-source-map "^1.5.0" - fs-readdir-recursive "^1.0.0" - glob "^7.1.2" - lodash "^4.17.4" - output-file-sync "^1.1.2" - path-is-absolute "^1.0.1" - slash "^1.0.0" - source-map "^0.5.6" - v8flags "^2.1.1" - optionalDependencies: - chokidar "^1.6.1" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.0" - debug "^2.6.8" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.7" - slash "^1.0.0" - source-map "^0.5.6" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-class-properties@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-flow@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - -babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-class-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" - dependencies: - babel-helper-function-name "^6.24.1" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-define@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.0.tgz#94c5f9459c810c738cc7c50cbd44a31829d6f319" - dependencies: - lodash "4.17.4" - traverse "0.6.6" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.23.0: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-env@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^1.4.0" - invariant "^2.2.2" - -babel-preset-flow@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" - dependencies: - babel-plugin-transform-flow-strip-types "^6.22.0" - -babel-preset-react@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" - dependencies: - babel-plugin-syntax-jsx "^6.3.13" - babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.24.1" - babel-plugin-transform-react-jsx-self "^6.22.0" - babel-plugin-transform-react-jsx-source "^6.22.0" - babel-preset-flow "^6.23.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -browserslist@^1.4.0: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - -caniuse-db@^1.0.30000639: - version "1.0.30000814" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000814.tgz#2c9eed7fbc2724066474cb7e1a924f0ea12fe4a2" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chance@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/chance/-/chance-1.0.6.tgz#4734f62d02b738cdc2882d8b5d41f89af49e7bfd" - -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" - dependencies: - delayed-stream "~1.0.0" - -commander@^2.11.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -convert-source-map@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -core-js@^2.4.0, core-js@^2.5.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -debug@^2.2.0, debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - -electron-to-chromium@^1.2.7: - version "1.3.37" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.37.tgz#4a92734e0044c8cf0b1553be57eae21a4c6e5fab" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -expect.js@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/expect.js/-/expect.js-0.3.1.tgz#b0a59a0d2eff5437544ebf0ceaa6015841d09b5b" - -extend@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -fs-readdir-recursive@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" - dependencies: - nan "^2.3.0" - node-pre-gyp "^0.6.39" - -fstream-ignore@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" - dependencies: - fstream "^1.0.0" - inherits "2" - minimatch "^3.0.0" - -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob@^7.0.5, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -graceful-fs@^4.1.2, graceful-fs@^4.1.4: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -hawk@3.1.3, hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - dependencies: - loose-envify "^1.0.0" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -lodash@4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - -lodash@^4.17.4: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - -mime-types@^2.1.12, mime-types@~2.1.7: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - dependencies: - mime-db "~1.33.0" - -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -"mkdirp@>=0.5 0", mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@^2.20.1: - version "2.21.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -nan@^2.3.0: - version "2.9.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" - -nice-try@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" - -node-pre-gyp@^0.6.39: - version "0.6.39" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" - dependencies: - detect-libc "^1.0.2" - hawk "3.1.3" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.0.2" - rc "^1.1.7" - request "2.81.0" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -once@^1.3.0, once@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -output-file-sync@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" - dependencies: - graceful-fs "^4.1.4" - mkdirp "^0.5.1" - object-assign "^4.1.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -private@^0.1.6, private@^0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -rc@^1.1.7: - version "1.2.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4: - version "2.3.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -request@2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -rxjs@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1" - dependencies: - tslib "^1.9.0" - -safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -semver@^5.3.0, semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - dependencies: - source-map "^0.5.6" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -sshpk@^1.7.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" - dependencies: - has-flag "^3.0.0" - -tar-pack@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -tough-cookie@~2.3.0: - version "2.3.4" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" - dependencies: - punycode "^1.4.1" - -traverse@0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" - -tree-kill@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -tslib@^1.9.0, tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -uid-number@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -uuid@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -v8flags@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - dependencies: - user-home "^1.1.1" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json index 9e798ebbe7e0b..8a59bff9cea58 100644 --- a/packages/kbn-es/package.json +++ b/packages/kbn-es/package.json @@ -5,10 +5,10 @@ "license": "Apache-2.0", "private": true, "dependencies": { - "@kbn/dev-utils": "link:../kbn-dev-utils", + "@kbn/dev-utils": "1.0.0", "chalk": "^2.4.1", "dedent": "^0.7.0", - "elasticsearch": "^14.1.0", + "del": "^3.0.0", "execa": "^0.10.0", "getopts": "^2.0.6", "glob": "^7.1.2", @@ -17,6 +17,7 @@ "node-fetch": "^2.0.0", "simple-git": "^1.91.0", "tar-fs": "^1.16.0", + "tree-kill": "^1.1.0", "yauzl": "^2.10.0", "zlib": "^1.0.5" } diff --git a/packages/kbn-es/src/cluster.js b/packages/kbn-es/src/cluster.js index bd744a0e977b0..f14be3582f71a 100644 --- a/packages/kbn-es/src/cluster.js +++ b/packages/kbn-es/src/cluster.js @@ -23,6 +23,8 @@ const { installSnapshot, installSource, installArchive } = require('./install'); const { ES_BIN } = require('./paths'); const { log: defaultLog, parseEsLog, extractConfigFiles } = require('./utils'); const { createCliError } = require('./errors'); +const { promisify } = require('util'); +const treeKillAsync = promisify(require('tree-kill')); exports.Cluster = class Cluster { constructor(log = defaultLog) { @@ -141,11 +143,17 @@ exports.Cluster = class Cluster { * @returns {Promise} */ async stop() { + if (this._stopCalled) { + return; + } + this._stopCalled = true; + if (!this._process || !this._outcome) { throw new Error('ES has not been started'); } - this._process.kill(); + await treeKillAsync(this._process.pid); + await this._outcome; } @@ -190,6 +198,10 @@ exports.Cluster = class Cluster { this._outcome = new Promise((resolve, reject) => { this._process.once('exit', code => { + if (this._stopCalled) { + resolve(); + return; + } // JVM exits with 143 on SIGTERM and 130 on SIGINT, dont' treat them as errors if (code > 0 && !(code === 143 || code === 130)) { reject(createCliError(`ES exited with code ${code}`)); diff --git a/packages/kbn-es/src/install/archive.js b/packages/kbn-es/src/install/archive.js index bc2fbe995be88..5e59fccb01608 100644 --- a/packages/kbn-es/src/install/archive.js +++ b/packages/kbn-es/src/install/archive.js @@ -21,6 +21,7 @@ const fs = require('fs'); const path = require('path'); const chalk = require('chalk'); const execa = require('execa'); +const del = require('del'); const { log: defaultLog, decompress } = require('../utils'); const { BASE_PATH, ES_CONFIG, ES_KEYSTORE_BIN } = require('../paths'); @@ -45,7 +46,7 @@ exports.installArchive = async function installArchive(archive, options = {}) { if (fs.existsSync(installPath)) { log.info('install directory already exists, removing'); - rmrfSync(installPath); + await del(installPath, { force: true }); } log.info('extracting %s', chalk.bold(archive)); @@ -66,26 +67,6 @@ exports.installArchive = async function installArchive(archive, options = {}) { return { installPath }; }; -/** - * Recursive deletion for a directory - * - * @param {String} path - */ -function rmrfSync(path) { - if (fs.existsSync(path)) { - fs.readdirSync(path).forEach(file => { - const curPath = path + '/' + file; - - if (fs.lstatSync(curPath).isDirectory()) { - rmrfSync(curPath); - } else { - fs.unlinkSync(curPath); - } - }); - fs.rmdirSync(path); - } -} - /** * Appends single line to elasticsearch.yml config file * diff --git a/packages/kbn-es/src/install/snapshot.js b/packages/kbn-es/src/install/snapshot.js index d61f6e58ba20d..de1a635b7f9f6 100644 --- a/packages/kbn-es/src/install/snapshot.js +++ b/packages/kbn-es/src/install/snapshot.js @@ -46,7 +46,8 @@ exports.installSnapshot = async function installSnapshot({ installPath = path.resolve(basePath, version), log = defaultLog, }) { - const fileName = getFilename(license, version); + // TODO: remove -alpha1 once elastic/elasticsearch#35172 has been merged + const fileName = getFilename(license, version + '-alpha1'); const url = `https://snapshots.elastic.co/downloads/elasticsearch/${fileName}`; const dest = path.resolve(basePath, 'cache', fileName); @@ -89,7 +90,7 @@ function downloadFile(url, dest, log) { } if (!res.ok) { - return reject(new Error(res.statusText)); + return reject(new Error(`Unable to download elasticsearch snapshot: ${res.statusText}`)); } const stream = fs.createWriteStream(downloadPath); diff --git a/packages/kbn-es/yarn.lock b/packages/kbn-es/yarn.lock deleted file mode 100644 index 16c1f54ad5dc9..0000000000000 --- a/packages/kbn-es/yarn.lock +++ /dev/null @@ -1,435 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@kbn/dev-utils@link:../kbn-dev-utils": - version "0.0.0" - uid "" - -agentkeepalive@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.4.1.tgz#aa95aebc3a749bca5ed53e3880a09f5235b48f0c" - dependencies: - humanize-ms "^1.2.1" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -bl@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e" - dependencies: - readable-stream "^2.0.5" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - -chalk@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - -color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -debug@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - dependencies: - ms "2.0.0" - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - -elasticsearch@^14.1.0: - version "14.2.0" - resolved "https://registry.yarnpkg.com/elasticsearch/-/elasticsearch-14.2.0.tgz#ef7c6e505cb41525a0751b5156e8c0fbd1f02d62" - dependencies: - agentkeepalive "^3.4.1" - chalk "^1.0.0" - lodash "2.4.2" - lodash.get "^4.4.2" - lodash.isempty "^4.4.0" - lodash.trimend "^4.5.1" - -end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - dependencies: - once "^1.4.0" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - dependencies: - pend "~1.2.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -getopts@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.0.6.tgz#4788d533a977527e79efd57b5e742ffa0dd33105" - -glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - dependencies: - ms "^2.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - -lodash.isempty@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - -lodash.trimend@^4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.trimend/-/lodash.trimend-4.5.1.tgz#12804437286b98cad8996b79414e11300114082f" - -lodash@2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e" - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -mock-fs@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/mock-fs/-/mock-fs-4.5.0.tgz#75245b966f7e3defe197b03454af9c5b355594b7" - -moment@^2.20.1: - version "2.21.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -ms@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - -nice-try@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" - -node-fetch@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.1.tgz#369ca70b82f50c86496104a6c776d274f4e4a2d4" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -pump@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -readable-stream@^2.0.0, readable-stream@^2.0.5: - version "2.3.4" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -rxjs@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1" - dependencies: - tslib "^1.9.0" - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -simple-git@^1.91.0: - version "1.92.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.92.0.tgz#6061468eb7d19f0141078fc742e62457e910f547" - dependencies: - debug "^3.1.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" - dependencies: - has-flag "^3.0.0" - -tar-fs@^1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.0.tgz#e877a25acbcc51d8c790da1c57c9cf439817b896" - dependencies: - chownr "^1.0.1" - mkdirp "^0.5.1" - pump "^1.0.0" - tar-stream "^1.1.2" - -tar-stream@^1.1.2: - version "1.5.5" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55" - dependencies: - bl "^1.0.0" - end-of-stream "^1.0.0" - readable-stream "^2.0.0" - xtend "^4.0.0" - -tree-kill@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" - -tslib@^1.9.0: - version "1.9.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e" - -tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -zlib@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" diff --git a/packages/kbn-eslint-import-resolver-kibana/package.json b/packages/kbn-eslint-import-resolver-kibana/package.json index a0439beb04e61..9a6f506c022a6 100755 --- a/packages/kbn-eslint-import-resolver-kibana/package.json +++ b/packages/kbn-eslint-import-resolver-kibana/package.json @@ -11,8 +11,8 @@ }, "dependencies": { "debug": "^2.6.6", - "eslint-import-resolver-node": "^0.3.0", - "eslint-import-resolver-webpack": "^0.8.1", + "eslint-import-resolver-node": "^0.3.2", + "eslint-import-resolver-webpack": "^0.10.1", "glob-all": "^3.1.0", "lru-cache": "^4.1.2", "resolve": "^1.7.1", diff --git a/packages/kbn-eslint-import-resolver-kibana/yarn.lock b/packages/kbn-eslint-import-resolver-kibana/yarn.lock deleted file mode 100644 index 88a2b84696c19..0000000000000 --- a/packages/kbn-eslint-import-resolver-kibana/yarn.lock +++ /dev/null @@ -1,2531 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -acorn-dynamic-import@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" - dependencies: - acorn "^4.0.3" - -acorn@^4.0.3: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - -acorn@^5.0.0: - version "5.5.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" - -ajv-keywords@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" - -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -ajv@^5.1.5: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - -array-find@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8" - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - -asn1.js@^4.0.0: - version "4.10.1" - resolved "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -assert@^1.1.1: - version "1.4.1" - resolved "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" - dependencies: - util "0.10.3" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -async@^2.1.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" - dependencies: - lodash "^4.14.0" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -atob@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws4@^1.2.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base64-js@^1.0.2: - version "1.2.3" - resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801" - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - -big.js@^3.1.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^2.3.0, braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -brorand@^1.0.1: - version "1.1.0" - resolved "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.2.0" - resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" - dependencies: - buffer-xor "^1.0.3" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.3" - inherits "^2.0.1" - safe-buffer "^5.0.1" - -browserify-cipher@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c" - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - -browserify-rsa@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" - dependencies: - bn.js "^4.1.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - dependencies: - pako "~1.0.5" - -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - -buffer@^4.3.0: - version "4.9.1" - resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chokidar@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176" - dependencies: - anymatch "^2.0.0" - async-each "^1.0.0" - braces "^2.3.0" - glob-parent "^3.1.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^2.1.1" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - upath "^1.0.0" - optionalDependencies: - fsevents "^1.1.2" - -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" - dependencies: - delayed-stream "~1.0.0" - -component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -console-browserify@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - dependencies: - date-now "^0.1.4" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -create-ecdh@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz#44223dfed533193ba5ba54e0df5709b89acf1f82" - dependencies: - bn.js "^4.1.0" - elliptic "^6.0.0" - -create-hash@^1.1.0, create-hash@^1.1.2: - version "1.2.0" - resolved "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - md5.js "^1.3.4" - ripemd160 "^2.0.1" - sha.js "^2.4.0" - -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: - version "1.1.7" - resolved "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" - dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" - -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" - dependencies: - es5-ext "^0.10.9" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -date-now@^0.1.4: - version "0.1.4" - resolved "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" - -debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -decamelize@^1.0.0, decamelize@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -des.js@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -diffie-hellman@^5.0.0: - version "5.0.3" - resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - -elliptic@^6.0.0: - version "6.4.0" - resolved "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" - dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" - hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - -enhanced-resolve@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - object-assign "^4.0.1" - tapable "^0.2.7" - -enhanced-resolve@~0.9.0: - version "0.9.1" - resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.2.0" - tapable "^0.1.8" - -errno@^0.1.3: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - dependencies: - prr "~1.0.1" - -error-ex@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" - dependencies: - is-arrayish "^0.2.1" - -es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.42" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d" - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.1" - next-tick "1" - -es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-map@^0.1.3: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-set "~0.1.5" - es6-symbol "~3.1.1" - event-emitter "~0.3.5" - -es6-set@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-symbol "3.1.1" - event-emitter "~0.3.5" - -es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" - dependencies: - d "1" - es5-ext "~0.10.14" - -es6-weak-map@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" - dependencies: - d "1" - es5-ext "^0.10.14" - es6-iterator "^2.0.1" - es6-symbol "^3.1.1" - -escope@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" - dependencies: - es6-map "^0.1.3" - es6-weak-map "^2.0.1" - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-import-resolver-node@^0.3.0: - version "0.3.2" - resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - dependencies: - debug "^2.6.9" - resolve "^1.5.0" - -eslint-import-resolver-webpack@^0.8.1: - version "0.8.4" - resolved "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.8.4.tgz#0f7cd74bc9d7fc1773e8d5fc25baf864b2f87a42" - dependencies: - array-find "^1.0.0" - debug "^2.6.8" - enhanced-resolve "~0.9.0" - find-root "^0.1.1" - has "^1.0.1" - interpret "^1.0.0" - is-absolute "^0.2.3" - lodash.get "^3.7.0" - node-libs-browser "^1.0.0 || ^2.0.0" - resolve "^1.2.0" - semver "^5.3.0" - -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - dependencies: - estraverse "^4.1.0" - -estraverse@^4.1.0, estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - -event-emitter@~0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - dependencies: - d "1" - es5-ext "~0.10.14" - -events@^1.0.0: - version "1.1.1" - resolved "https://registry.npmjs.org/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -find-root@^0.1.1: - version "0.1.2" - resolved "https://registry.npmjs.org/find-root/-/find-root-0.1.2.tgz#98d2267cff1916ccaf2743b3a0eea81d79d7dcd1" - -find-up@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - dependencies: - locate-path "^2.0.0" - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - dependencies: - map-cache "^0.2.2" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" - dependencies: - nan "^2.3.0" - node-pre-gyp "^0.6.39" - -fstream-ignore@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" - dependencies: - fstream "^1.0.0" - inherits "2" - minimatch "^3.0.0" - -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -function-bind@^1.0.2: - version "1.1.1" - resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-all@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-all/-/glob-all-3.1.0.tgz#8913ddfb5ee1ac7812656241b03d5217c64b02ab" - dependencies: - glob "^7.0.5" - yargs "~1.2.6" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob@^7.0.5: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -graceful-fs@^4.1.2: - version "4.1.11" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" - dependencies: - function-bind "^1.0.2" - -hash-base@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" - dependencies: - inherits "^2.0.1" - -hash-base@^3.0.0: - version "3.0.4" - resolved "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.3" - resolved "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.0" - -hawk@3.1.3, hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hmac-drbg@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -hosted-git-info@^2.1.4: - version "2.6.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - -ieee754@^1.1.4: - version "1.1.11" - resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455" - -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -interpret@^1.0.0: - version "1.1.0" - resolved "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - -is-absolute@^0.2.3: - version "0.2.6" - resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb" - dependencies: - is-relative "^0.2.1" - is-windows "^0.2.0" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - dependencies: - kind-of "^6.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - dependencies: - is-extglob "^2.1.1" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - -is-odd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" - dependencies: - is-number "^4.0.0" - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - dependencies: - isobject "^3.0.1" - -is-relative@^0.2.1: - version "0.2.1" - resolved "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" - dependencies: - is-unc-path "^0.1.1" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-unc-path@^0.1.1: - version "0.1.2" - resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9" - dependencies: - unc-path-regex "^0.1.0" - -is-windows@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -json-loader@^0.5.4: - version "0.5.7" - resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" - -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -json5@^0.5.0, json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - dependencies: - invert-kv "^1.0.0" - -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -loader-runner@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" - -loader-utils@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -lodash._baseget@^3.0.0: - version "3.7.2" - resolved "https://registry.npmjs.org/lodash._baseget/-/lodash._baseget-3.7.2.tgz#1b6ae1d5facf3c25532350a13c1197cb8bb674f4" - -lodash._topath@^3.0.0: - version "3.8.1" - resolved "https://registry.npmjs.org/lodash._topath/-/lodash._topath-3.8.1.tgz#3ec5e2606014f4cb97f755fe6914edd8bfc00eac" - dependencies: - lodash.isarray "^3.0.0" - -lodash.get@^3.7.0: - version "3.7.0" - resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-3.7.0.tgz#3ce68ae2c91683b281cc5394128303cbf75e691f" - dependencies: - lodash._baseget "^3.0.0" - lodash._topath "^3.0.0" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash@^4.14.0: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - -lru-cache@^4.0.1, lru-cache@^4.1.2: - version "4.1.2" - resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - dependencies: - object-visit "^1.0.0" - -md5.js@^1.3.4: - version "1.3.4" - resolved "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - dependencies: - mimic-fn "^1.0.0" - -memory-fs@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" - -memory-fs@^0.4.0, memory-fs@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" - -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - -mime-types@^2.1.12, mime-types@~2.1.7: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - dependencies: - mime-db "~1.33.0" - -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -nan@^2.3.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - -nanomatch@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-odd "^2.0.0" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -neo-async@^2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee" - -next-tick@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" - -"node-libs-browser@^1.0.0 || ^2.0.0", node-libs-browser@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.0" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - -node-pre-gyp@^0.6.39: - version "0.6.39" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" - dependencies: - detect-libc "^1.0.2" - hawk "3.1.3" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.0.2" - rc "^1.1.7" - request "2.81.0" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - dependencies: - isobject "^3.0.0" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - dependencies: - isobject "^3.0.1" - -once@^1.3.0, once@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - -os-tmpdir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" - dependencies: - p-try "^1.0.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - dependencies: - p-limit "^1.1.0" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - -pako@~1.0.5: - version "1.0.6" - resolved "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" - -parse-asn1@^5.0.0: - version "5.1.1" - resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" - dependencies: - asn1.js "^4.0.0" - browserify-aes "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - dependencies: - error-ex "^1.2.0" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - -path-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" - -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - dependencies: - pify "^2.0.0" - -pbkdf2@^3.0.3: - version "3.0.14" - resolved "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade" - dependencies: - create-hash "^1.1.2" - create-hmac "^1.1.4" - ripemd160 "^2.0.1" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -public-encrypt@^4.0.0: - version "4.0.2" - resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - -punycode@^1.2.4, punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: - version "2.0.6" - resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" - dependencies: - safe-buffer "^5.1.0" - -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - -rc@^1.1.7: - version "1.2.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.3.3: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -request@2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - -resolve@^1.2.0, resolve@^1.5.0, resolve@^1.7.1: - version "1.7.1" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" - dependencies: - path-parse "^1.0.5" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - -rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" - dependencies: - hash-base "^2.0.0" - inherits "^2.0.1" - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - dependencies: - ret "~0.1.10" - -"semver@2 || 3 || 4 || 5", semver@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.4: - version "1.0.5" - resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.11" - resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" - -source-map-resolve@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" - dependencies: - atob "^2.0.0" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - -source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - -spdx-correct@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - dependencies: - extend-shallow "^3.0.0" - -sshpk@^1.7.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -stream-browserify@^2.0.1: - version "2.0.1" - resolved "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-http@^2.7.2: - version "2.8.1" - resolved "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.3" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@^1.0.0, string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - -tapable@^0.1.8: - version "0.1.10" - resolved "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" - -tapable@^0.2.7: - version "0.2.8" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" - -tar-pack@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -timers-browserify@^2.0.4: - version "2.0.7" - resolved "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.7.tgz#e74093629cb62c20332af587ddc0c86b4ba97a05" - dependencies: - setimmediate "^1.0.4" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -tough-cookie@~2.3.0: - version "2.3.4" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" - dependencies: - punycode "^1.4.1" - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -uglify-js@^2.8.29: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - -uglifyjs-webpack-plugin@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" - dependencies: - source-map "^0.5.6" - uglify-js "^2.8.29" - webpack-sources "^1.0.1" - -uid-number@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - -unc-path-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -upath@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.npmjs.org/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -use@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544" - dependencies: - kind-of "^6.0.2" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -util@0.10.3, util@^0.10.3: - version "0.10.3" - resolved "https://registry.npmjs.org/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - dependencies: - inherits "2.0.1" - -uuid@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -validate-npm-package-license@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vm-browserify@0.0.4: - version "0.0.4" - resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" - dependencies: - indexof "0.0.1" - -watchpack@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" - dependencies: - chokidar "^2.0.2" - graceful-fs "^4.1.2" - neo-async "^2.5.0" - -webpack-sources@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc" - dependencies: - acorn "^5.0.0" - acorn-dynamic-import "^2.0.0" - ajv "^5.1.5" - ajv-keywords "^2.0.0" - async "^2.1.2" - enhanced-resolve "^3.4.0" - escope "^3.6.0" - interpret "^1.0.0" - json-loader "^0.5.4" - json5 "^0.5.1" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - mkdirp "~0.5.0" - node-libs-browser "^2.0.0" - source-map "^0.5.3" - supports-color "^4.2.1" - tapable "^0.2.7" - uglifyjs-webpack-plugin "^0.4.6" - watchpack "^1.4.0" - webpack-sources "^1.0.1" - yargs "^8.0.2" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - -which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - dependencies: - camelcase "^4.1.0" - -yargs@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" - -yargs@~1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b" - dependencies: - minimist "^0.1.0" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" diff --git a/packages/kbn-eslint-plugin-license-header/yarn.lock b/packages/kbn-eslint-plugin-license-header/yarn.lock deleted file mode 100644 index ff19c550def63..0000000000000 --- a/packages/kbn-eslint-plugin-license-header/yarn.lock +++ /dev/null @@ -1,7 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" diff --git a/packages/kbn-i18n/.babelrc b/packages/kbn-i18n/.babelrc deleted file mode 100644 index 4216ef3ceccd9..0000000000000 --- a/packages/kbn-i18n/.babelrc +++ /dev/null @@ -1,10 +0,0 @@ -{ - "env": { - "web": { - "presets": ["@kbn/babel-preset/webpack_preset"] - }, - "node": { - "presets": ["@kbn/babel-preset/node_preset"] - } - } -} diff --git a/packages/kbn-i18n/GUIDELINE.md b/packages/kbn-i18n/GUIDELINE.md index 77e54fc1240f4..188a88316b131 100644 --- a/packages/kbn-i18n/GUIDELINE.md +++ b/packages/kbn-i18n/GUIDELINE.md @@ -18,7 +18,7 @@ The following types are supported: - ToggleSwitch - LinkLabel and etc. -There is one more complex case, when we have to divide a single expression into different labels. +There is one more complex case, when we have to divide a single expression into different labels. For example the message before translation looks like: @@ -221,8 +221,8 @@ For example: ```js ``` @@ -333,4 +333,3 @@ it('should render normally', async () => { }); // ... ``` - diff --git a/packages/kbn-i18n/README.md b/packages/kbn-i18n/README.md index 54eadbd46ca9e..cff7fbe98ad44 100644 --- a/packages/kbn-i18n/README.md +++ b/packages/kbn-i18n/README.md @@ -107,8 +107,8 @@ when missing translations For the detailed explanation, see the section below - `getFormats()` - returns current formats - `getRegisteredLocales()` - returns array of locales having translations -- `translate(id: string, [{values: object, defaultMessage: string, context: string}])` – -translate message by id. `context` is optional context comment that will be extracted +- `translate(id: string, [{values: object, defaultMessage: string, description: string}])` – +translate message by id. `description` is optional context comment that will be extracted by i18n tools and added as a comment next to translation message at `defaultMessages.json`. - `init(messages: Map)` - initializes the engine @@ -171,6 +171,37 @@ import memoizeIntlConstructor from 'intl-format-cache'; const getMessageFormat = memoizeIntlConstructor(IntlMessageFormat); ``` +## Vanilla JS + +`Intl-messageformat` package assumes that the +[Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl) +global object exists in the runtime. `Intl` is present in all modern +browsers and Node.js 0.10+. In order to load i18n engine +in Node.js we should simply `import` this module (in Node.js, the +[data](https://github.com/yahoo/intl-messageformat/tree/master/dist/locale-data) +for all 200+ languages is loaded along with the library) and pass the translation +messages into `init` method: + +```js +import { i18n } from '@kbn/i18n'; + +i18n.init(messages); +``` + +One common use-case is that of internationalizing a string constant. Here's an +example of how we'd do that: + +```js +import { i18n } from '@kbn/i18n'; + +export const HELLO_WORLD = i18n.translate('hello.wonderful.world', { + defaultMessage: 'Greetings, planet Earth!', +}), +``` + +We're also able to use all methods exposed by the i18n engine +(see [I18n engine](#i18n-engine) section above for more details). + ## React [React-intl](https://github.com/yahoo/react-intl) library is used for internalization @@ -238,7 +269,7 @@ class RootComponent extends Component { } ``` -Optionally we can pass `context` prop into `FormattedMessage` component. +Optionally we can pass `description` prop into `FormattedMessage` component. This prop is optional context comment that will be extracted by i18n tools and added as a comment next to translation message at `defaultMessages.json` @@ -256,10 +287,15 @@ import { injectI18n, intlShape } from '@kbn/i18n/react'; const MyComponentContent = ({ intl }) => ( ); @@ -321,13 +357,13 @@ when missing translations - `init(messages: Map)` - initializes the engine The translation `service` provides only one method: -- `i18n(id: string, [{values: object, defaultMessage: string, context: string }])`– +- `i18n(id: string, [{values: object, defaultMessage: string, description: string }])`– translate message by id The translation `filter` is used for attributes translation and has the following syntax: ``` -{{'translationId' | i18n[:{ values: object, defaultMessage: string, context: string }]}} +{{'translationId' | i18n[:{ values: object, defaultMessage: string, description: string }]}} ``` Where: @@ -335,7 +371,7 @@ Where: - `values` - values to pass into translation - `defaultMessage` - will be used unless translation was successful (the final fallback in english, will be used for generating `en.json`) -- `context` - optional context comment that will be extracted by i18n tools +- `description` - optional context comment that will be extracted by i18n tools and added as a comment next to translation message at `defaultMessages.json` The translation `directive` has the following syntax: @@ -344,7 +380,7 @@ The translation `directive` has the following syntax: i18n-id="{string}" [i18n-values="{object}"] [i18n-default-message="{string}"] - [i18n-context="{string}"] + [i18n-description="{string}"] > ``` @@ -352,7 +388,7 @@ Where: - `i18n-id` - translation id to be translated - `i18n-values` - values to pass into translation - `i18n-default-message` - will be used unless translation was successful -- `i18n-context` - optional context comment that will be extracted by i18n tools +- `i18n-description` - optional context comment that will be extracted by i18n tools and added as a comment next to translation message at `defaultMessages.json` Angular `I18n` module is placed into `autoload` module, so it will be @@ -368,32 +404,12 @@ In order to translate attributes in Angular we should use `i18nFilter`: ```html ``` -## Node.JS - -`Intl-messageformat` package assumes that the -[Intl](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl) -global object exists in the runtime. `Intl` is present in all modern -browsers and Node.js 0.10+. In order to load i18n engine -in Node.js we should simply `import` this module (in Node.js, the -[data](https://github.com/yahoo/intl-messageformat/tree/master/dist/locale-data) -for all 200+ languages is loaded along with the library) and pass the translation -messages into `init` method: - -```js -import { i18n } from '@kbn/i18n'; - -i18n.init(messages); -``` - -After that we are able to use all methods exposed by the i18n engine -(see [I18n engine](#i18n-engine) section above for more details). - ## Build tools In order to simplify localization process, some build tools will be added: diff --git a/packages/kbn-i18n/angular/package.json b/packages/kbn-i18n/angular/package.json index 1359539d4a867..1979e988fa7ce 100644 --- a/packages/kbn-i18n/angular/package.json +++ b/packages/kbn-i18n/angular/package.json @@ -1,4 +1,5 @@ { "browser": "../target/web/angular", - "main": "../target/node/angular" + "main": "../target/node/angular", + "types": "../target/types/angular/index.d.ts" } diff --git a/packages/kbn-i18n/babel.config.js b/packages/kbn-i18n/babel.config.js new file mode 100644 index 0000000000000..3530b4daf6792 --- /dev/null +++ b/packages/kbn-i18n/babel.config.js @@ -0,0 +1,51 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +// We can't use common Kibana presets here because of babel versions incompatibility +module.exports = { + plugins: ['@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-object-rest-spread'], + presets: ['@babel/preset-react', '@babel/typescript'], + env: { + web: { + presets: [ + [ + '@babel/preset-env', + { + targets: { + browsers: ['last 2 versions', '> 5%', 'Safari 7'], + }, + }, + ], + ], + }, + node: { + presets: [ + [ + '@babel/preset-env', + { + targets: { + node: 'current', + }, + }, + ], + ], + }, + }, + ignore: ['**/*.test.ts', '**/*.test.tsx'], +}; diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json index e760bcd51e8fc..7ef8d10c3a916 100644 --- a/packages/kbn-i18n/package.json +++ b/packages/kbn-i18n/package.json @@ -2,30 +2,39 @@ "name": "@kbn/i18n", "browser": "./target/web/browser.js", "main": "./target/node/index.js", - "module": "./src/index.js", + "types": "./target/types/index.d.ts", "version": "1.0.0", "license": "Apache-2.0", "private": true, "scripts": { - "build": "yarn build:web && yarn build:node", - "build:web": "cross-env BABEL_ENV=web babel src --out-dir target/web", - "build:node": "cross-env BABEL_ENV=node babel src --out-dir target/node", + "build": "yarn build:web && yarn build:node && yarn build:types", + "build:types": "tsc --emitDeclarationOnly", + "build:web": "cross-env BABEL_ENV=web babel src --config-file ./babel.config.js --out-dir target/web --extensions \".ts,.js,.tsx\"", + "build:node": "cross-env BABEL_ENV=node babel src --config-file ./babel.config.js --out-dir target/node --extensions \".ts,.js,.tsx\"", "kbn:bootstrap": "yarn build", "kbn:watch": "yarn build --watch" }, "devDependencies": { - "@kbn/babel-preset": "link:../kbn-babel-preset", - "@kbn/dev-utils": "link:../kbn-dev-utils", - "babel-cli": "^6.26.0", - "cross-env": "^5.2.0" + "@babel/cli": "^7.1.0", + "@babel/core": "^7.1.0", + "@babel/plugin-proposal-class-properties": "^7.1.0", + "@babel/plugin-proposal-object-rest-spread": "^7.0.0", + "@babel/preset-env": "^7.1.0", + "@babel/preset-react": "^7.0.0", + "@babel/preset-typescript": "^7.1.0", + "@types/intl-relativeformat": "^2.1.0", + "@types/json5": "^0.0.30", + "@types/react-intl": "^2.3.11", + "cross-env": "^5.2.0", + "typescript": "^3.0.3" }, "dependencies": { "intl-format-cache": "^2.1.0", "intl-messageformat": "^2.2.0", "intl-relativeformat": "^2.1.0", - "json5": "^1.0.1", - "prop-types": "^15.5.8", + "json5": "^2.0.1", + "prop-types": "^15.6.2", "react": "^16.3.0", - "react-intl": "^2.4.0" + "react-intl": "^2.7.0" } } diff --git a/packages/kbn-i18n/react/package.json b/packages/kbn-i18n/react/package.json index 73e591f8b1fc3..a22994acb3d83 100644 --- a/packages/kbn-i18n/react/package.json +++ b/packages/kbn-i18n/react/package.json @@ -1,4 +1,5 @@ { "browser": "../target/web/react", - "main": "../target/node/react" + "main": "../target/node/react", + "types": "../target/types/react/index.d.ts" } diff --git a/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en-US.json b/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en-US.json index a25da0165b407..5cd8dd88e36a2 100644 --- a/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en-US.json +++ b/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en-US.json @@ -1,4 +1,6 @@ { - "a.b.c": "bar", - "d.e.f": "foo" + "messages": { + "a.b.c": "bar", + "d.e.f": "foo" + } } diff --git a/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en.json b/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en.json index eaec1a6d8a096..36aa3aa450c8f 100644 --- a/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en.json +++ b/packages/kbn-i18n/src/__fixtures__/test_plugin_1/translations/en.json @@ -1,4 +1,6 @@ { - "a.b.c": "foo", - "d.e.f": "bar" + "messages": { + "a.b.c": "foo", + "d.e.f": "bar" + } } diff --git a/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/en.json b/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/en.json index 85a62e3df1a48..9530a5967eb99 100644 --- a/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/en.json +++ b/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/en.json @@ -1,4 +1,6 @@ { - "a.b.c.custom": "foo.custom", - "d.e.f.custom": "bar.custom" + "messages": { + "a.b.c.custom": "foo.custom", + "d.e.f.custom": "bar.custom" + } } diff --git a/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/fr.json b/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/fr.json index 04e20542e75e3..88d3f27d9126c 100644 --- a/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/fr.json +++ b/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/fr.json @@ -1,3 +1,5 @@ { - test: 'test' // JSON5 test + messages: { + test: 'test' // JSON5 test + } } diff --git a/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/ru.json b/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/ru.json index d0ae716dbe4c3..e6207873f600a 100644 --- a/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/ru.json +++ b/packages/kbn-i18n/src/__fixtures__/test_plugin_2/translations/ru.json @@ -1,3 +1,5 @@ { - "test": "test" + "messages": { + "test": "test" + } } diff --git a/packages/kbn-i18n/src/__snapshots__/loader.test.js.snap b/packages/kbn-i18n/src/__snapshots__/loader.test.ts.snap similarity index 100% rename from packages/kbn-i18n/src/__snapshots__/loader.test.js.snap rename to packages/kbn-i18n/src/__snapshots__/loader.test.ts.snap diff --git a/packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap b/packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap new file mode 100644 index 0000000000000..9e783305a5a38 --- /dev/null +++ b/packages/kbn-i18n/src/angular/__snapshots__/directive.test.ts.snap @@ -0,0 +1,47 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`i18nDirective inserts correct translation html content with values 1`] = `"default-message word"`; + +exports[`i18nDirective inserts correct translation html content with values 2`] = `"default-message anotherWord"`; + +exports[`i18nDirective sanitizes message before inserting it to DOM 1`] = ` +
' }" +> + Default message, +
+
+`; + +exports[`i18nDirective sanitizes onclick attribute 1`] = ` +
+ Default + + Press + + message +
+`; + +exports[`i18nDirective sanitizes onmouseover attribute 1`] = ` +
Press' }" +> + Default + + Press + + message +
+`; diff --git a/packages/kbn-i18n/src/angular/directive.js b/packages/kbn-i18n/src/angular/directive.js deleted file mode 100644 index f9421814d9817..0000000000000 --- a/packages/kbn-i18n/src/angular/directive.js +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export function i18nDirective(i18n) { - return { - restrict: 'A', - scope: { - id: '@i18nId', - defaultMessage: '@i18nDefaultMessage', - values: '=i18nValues', - }, - link: function($scope, $element) { - $scope.$watchGroup(['id', 'defaultMessage', 'values'], function([ - id, - defaultMessage = '', - values = {}, - ]) { - $element.html( - i18n(id, { - values, - defaultMessage, - }) - ); - }); - }, - }; -} diff --git a/packages/kbn-i18n/src/angular/directive.test.js b/packages/kbn-i18n/src/angular/directive.test.js deleted file mode 100644 index 6f28c0b453236..0000000000000 --- a/packages/kbn-i18n/src/angular/directive.test.js +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import angular from 'angular'; -import 'angular-mocks'; -import { i18nDirective } from './directive'; -import { i18nProvider } from './provider'; - -angular - .module('app', []) - .provider('i18n', i18nProvider) - .directive('i18nId', i18nDirective); - -describe('i18nDirective', () => { - let compile; - let scope; - - beforeEach(angular.mock.module('app')); - beforeEach( - angular.mock.inject(($compile, $rootScope) => { - compile = $compile; - scope = $rootScope.$new(); - }) - ); - - it('inserts correct translation html content', () => { - const id = 'id'; - const defaultMessage = 'default-message'; - - const element = angular.element( - `
` - ); - - compile(element)(scope); - scope.$digest(); - - expect(element.html()).toEqual(defaultMessage); - }); - - it('inserts correct translation html content with values', () => { - const id = 'id'; - const defaultMessage = 'default-message {word}'; - const compiledContent = 'default-message word'; - - const element = angular.element( - `
` - ); - - compile(element)(scope); - scope.$digest(); - - expect(element.html()).toEqual(compiledContent); - }); -}); diff --git a/packages/kbn-i18n/src/angular/directive.test.ts b/packages/kbn-i18n/src/angular/directive.test.ts new file mode 100644 index 0000000000000..bd454192a9b2d --- /dev/null +++ b/packages/kbn-i18n/src/angular/directive.test.ts @@ -0,0 +1,131 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import angular from 'angular'; +import 'angular-mocks'; +import 'angular-sanitize'; + +import { i18nDirective } from './directive'; +import { I18nProvider } from './provider'; + +angular + .module('app', ['ngSanitize']) + .provider('i18n', I18nProvider) + .directive('i18nId', i18nDirective); + +describe('i18nDirective', () => { + let compile: angular.ICompileService; + let scope: angular.IRootScopeService & { word?: string }; + + beforeEach(angular.mock.module('app')); + beforeEach( + angular.mock.inject( + ($compile: angular.ICompileService, $rootScope: angular.IRootScopeService) => { + compile = $compile; + scope = $rootScope.$new(); + scope.word = 'word'; + } + ) + ); + + test('inserts correct translation html content', () => { + const id = 'id'; + const defaultMessage = 'default-message'; + + const element = angular.element( + `
` + ); + + compile(element)(scope); + scope.$digest(); + + expect(element.html()).toEqual(defaultMessage); + }); + + test('inserts correct translation html content with values', () => { + const id = 'id'; + const defaultMessage = 'default-message {word}'; + + const element = angular.element( + `
` + ); + + compile(element)(scope); + scope.$digest(); + + expect(element.html()).toMatchSnapshot(); + + scope.word = 'anotherWord'; + scope.$digest(); + + expect(element.html()).toMatchSnapshot(); + }); + + test('sanitizes message before inserting it to DOM', () => { + const element = angular.element( + `
` + ); + + compile(element)(scope); + scope.$digest(); + + expect(element[0]).toMatchSnapshot(); + }); + + test('sanitizes onclick attribute', () => { + const element = angular.element( + `
` + ); + + compile(element)(scope); + scope.$digest(); + + expect(element[0]).toMatchSnapshot(); + }); + + test('sanitizes onmouseover attribute', () => { + const element = angular.element( + `
` + ); + + compile(element)(scope); + scope.$digest(); + + expect(element[0]).toMatchSnapshot(); + }); +}); diff --git a/packages/kbn-i18n/src/angular/directive.ts b/packages/kbn-i18n/src/angular/directive.ts new file mode 100644 index 0000000000000..0b111c3daad68 --- /dev/null +++ b/packages/kbn-i18n/src/angular/directive.ts @@ -0,0 +1,67 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { IDirective, IRootElementService, IScope } from 'angular'; + +import { I18nServiceType } from './provider'; + +interface I18nScope extends IScope { + values?: Record; + defaultMessage: string; + id: string; +} + +export function i18nDirective( + i18n: I18nServiceType, + $sanitize: (html: string) => string +): IDirective { + return { + restrict: 'A', + scope: { + id: '@i18nId', + defaultMessage: '@i18nDefaultMessage', + values: ' { + setHtmlContent($element, $scope, $sanitize, i18n); + }); + } else { + setHtmlContent($element, $scope, $sanitize, i18n); + } + }, + }; +} + +function setHtmlContent( + $element: IRootElementService, + $scope: I18nScope, + $sanitize: (html: string) => string, + i18n: I18nServiceType +) { + $element.html( + $sanitize( + i18n($scope.id, { + values: $scope.values, + defaultMessage: $scope.defaultMessage, + }) + ) + ); +} diff --git a/packages/kbn-i18n/src/angular/filter.js b/packages/kbn-i18n/src/angular/filter.js deleted file mode 100644 index cdbe869237b1a..0000000000000 --- a/packages/kbn-i18n/src/angular/filter.js +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export function i18nFilter(i18n) { - return function(id, { defaultMessage = '', values = {} } = {}) { - return i18n(id, { - values, - defaultMessage, - }); - }; -} diff --git a/packages/kbn-i18n/src/angular/filter.test.js b/packages/kbn-i18n/src/angular/filter.test.js deleted file mode 100644 index b1ec5b8c3ad4c..0000000000000 --- a/packages/kbn-i18n/src/angular/filter.test.js +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import angular from 'angular'; -import 'angular-mocks'; -import { i18nProvider } from './provider'; -import { i18nFilter } from './filter'; -import * as i18n from '../core/i18n'; - -jest.mock('../core/i18n', () => ({ - translate: jest.fn().mockImplementation(() => 'translation'), -})); - -angular - .module('app', []) - .provider('i18n', i18nProvider) - .filter('i18n', i18nFilter); - -describe('i18nFilter', () => { - let filter; - - beforeEach(angular.mock.module('app')); - beforeEach( - angular.mock.inject(i18nFilter => { - filter = i18nFilter; - }) - ); - afterEach(() => { - jest.resetAllMocks(); - }); - - it('provides wrapper around i18n engine', () => { - const id = 'id'; - const defaultMessage = 'default-message'; - const values = {}; - - const result = filter(id, { defaultMessage, values }); - - expect(i18n.translate).toHaveBeenCalledTimes(1); - expect(i18n.translate).toHaveBeenCalledWith(id, { defaultMessage, values }); - expect(result).toEqual('translation'); - }); -}); diff --git a/packages/kbn-i18n/src/angular/filter.test.ts b/packages/kbn-i18n/src/angular/filter.test.ts new file mode 100644 index 0000000000000..78bc279689357 --- /dev/null +++ b/packages/kbn-i18n/src/angular/filter.test.ts @@ -0,0 +1,60 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +jest.mock('../core/i18n', () => ({ + translate: jest.fn().mockImplementation(() => 'translation'), +})); + +import angular from 'angular'; +import 'angular-mocks'; + +import * as i18n from '../core/i18n'; +import { i18nFilter as angularI18nFilter } from './filter'; +import { I18nProvider, I18nServiceType } from './provider'; + +angular + .module('app', []) + .provider('i18n', I18nProvider) + .filter('i18n', angularI18nFilter); + +describe('i18nFilter', () => { + let filter: I18nServiceType; + + beforeEach(angular.mock.module('app')); + beforeEach( + angular.mock.inject(i18nFilter => { + filter = i18nFilter; + }) + ); + afterEach(() => { + jest.resetAllMocks(); + }); + + test('provides wrapper around i18n engine', () => { + const id = 'id'; + const defaultMessage = 'default-message'; + const values = {}; + + const result = filter(id, { defaultMessage, values }); + + expect(result).toEqual('translation'); + expect(i18n.translate).toHaveBeenCalledTimes(1); + expect(i18n.translate).toHaveBeenCalledWith(id, { defaultMessage, values }); + }); +}); diff --git a/packages/kbn-i18n/src/angular/filter.ts b/packages/kbn-i18n/src/angular/filter.ts new file mode 100644 index 0000000000000..2f7425a9dd8e0 --- /dev/null +++ b/packages/kbn-i18n/src/angular/filter.ts @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { I18nServiceType } from './provider'; + +export function i18nFilter(i18n: I18nServiceType) { + return (id: string, { defaultMessage = '', values = {} } = {}) => { + return i18n(id, { + values, + defaultMessage, + }); + }; +} diff --git a/packages/kbn-i18n/src/angular/index.js b/packages/kbn-i18n/src/angular/index.js deleted file mode 100644 index a7af6fbeffc35..0000000000000 --- a/packages/kbn-i18n/src/angular/index.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { i18nProvider } from './provider'; -export { i18nFilter } from './filter'; -export { i18nDirective } from './directive'; diff --git a/packages/kbn-i18n/src/angular/index.ts b/packages/kbn-i18n/src/angular/index.ts new file mode 100644 index 0000000000000..8f1e315cab389 --- /dev/null +++ b/packages/kbn-i18n/src/angular/index.ts @@ -0,0 +1,22 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { I18nProvider, I18nServiceType } from './provider'; +export { i18nFilter } from './filter'; +export { i18nDirective } from './directive'; diff --git a/packages/kbn-i18n/src/angular/provider.js b/packages/kbn-i18n/src/angular/provider.js deleted file mode 100644 index e4f73b7de0db3..0000000000000 --- a/packages/kbn-i18n/src/angular/provider.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import * as i18n from '../core'; - -export function i18nProvider() { - this.addMessages = i18n.addMessages; - this.getMessages = i18n.getMessages; - this.setLocale = i18n.setLocale; - this.getLocale = i18n.getLocale; - this.setDefaultLocale = i18n.setDefaultLocale; - this.getDefaultLocale = i18n.getDefaultLocale; - this.setFormats = i18n.setFormats; - this.getFormats = i18n.getFormats; - this.getRegisteredLocales = i18n.getRegisteredLocales; - this.init = i18n.init; - this.$get = () => i18n.translate; -} diff --git a/packages/kbn-i18n/src/angular/provider.test.js b/packages/kbn-i18n/src/angular/provider.test.js deleted file mode 100644 index 3246a6f1964d6..0000000000000 --- a/packages/kbn-i18n/src/angular/provider.test.js +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import angular from 'angular'; -import 'angular-mocks'; -import { i18nProvider } from './provider'; -import * as i18n from '../core/i18n'; - -angular.module('app', []).provider('i18n', i18nProvider); - -describe('i18nProvider', () => { - let provider; - let service; - - beforeEach( - angular.mock.module('app', [ - 'i18nProvider', - i18n => { - service = i18n; - }, - ]) - ); - beforeEach( - angular.mock.inject(i18n => { - provider = i18n; - }) - ); - - it('provides wrapper around i18n engine', () => { - expect(provider).toEqual(i18n.translate); - }); - - it('provides service wrapper around i18n engine', () => { - const serviceMethodNames = Object.keys(service); - const pluginMethodNames = Object.keys(i18n); - - expect([...serviceMethodNames, 'translate'].sort()).toEqual( - [...pluginMethodNames, '$get'].sort() - ); - }); -}); diff --git a/packages/kbn-i18n/src/angular/provider.test.ts b/packages/kbn-i18n/src/angular/provider.test.ts new file mode 100644 index 0000000000000..dfa1894c82c7a --- /dev/null +++ b/packages/kbn-i18n/src/angular/provider.test.ts @@ -0,0 +1,58 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import angular from 'angular'; +import 'angular-mocks'; + +import * as i18nCore from '../core/i18n'; +import { I18nProvider, I18nServiceType } from './provider'; + +angular.module('app', []).provider('i18n', I18nProvider); + +describe('i18nProvider', () => { + let provider: I18nProvider; + let service: I18nServiceType; + + beforeEach( + angular.mock.module('app', [ + 'i18nProvider', + (i18n: I18nProvider) => { + provider = i18n; + }, + ]) + ); + beforeEach( + angular.mock.inject((i18n: I18nServiceType) => { + service = i18n; + }) + ); + + test('provides wrapper around i18n engine', () => { + expect(service).toEqual(i18nCore.translate); + }); + + test('provides service wrapper around i18n engine', () => { + const serviceMethodNames = Object.keys(provider); + const pluginMethodNames = Object.keys(i18nCore); + + expect([...serviceMethodNames, 'translate'].sort()).toEqual( + [...pluginMethodNames, '$get'].sort() + ); + }); +}); diff --git a/packages/kbn-i18n/src/angular/provider.ts b/packages/kbn-i18n/src/angular/provider.ts new file mode 100644 index 0000000000000..44f0974ac8143 --- /dev/null +++ b/packages/kbn-i18n/src/angular/provider.ts @@ -0,0 +1,36 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import * as i18n from '../core'; + +export type I18nServiceType = ReturnType; + +export class I18nProvider implements angular.IServiceProvider { + public addTranslation = i18n.addTranslation; + public getTranslation = i18n.getTranslation; + public setLocale = i18n.setLocale; + public getLocale = i18n.getLocale; + public setDefaultLocale = i18n.setDefaultLocale; + public getDefaultLocale = i18n.getDefaultLocale; + public setFormats = i18n.setFormats; + public getFormats = i18n.getFormats; + public getRegisteredLocales = i18n.getRegisteredLocales; + public init = i18n.init; + public $get = () => i18n.translate; +} diff --git a/packages/kbn-i18n/src/browser.js b/packages/kbn-i18n/src/browser.ts similarity index 100% rename from packages/kbn-i18n/src/browser.js rename to packages/kbn-i18n/src/browser.ts diff --git a/packages/kbn-i18n/src/core/__snapshots__/i18n.test.js.snap b/packages/kbn-i18n/src/core/__snapshots__/i18n.test.js.snap deleted file mode 100644 index e28975a7c1e9e..0000000000000 --- a/packages/kbn-i18n/src/core/__snapshots__/i18n.test.js.snap +++ /dev/null @@ -1,49 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`I18n engine addMessages should throw error if locale is not specified or empty 1`] = `"[I18n] A \`locale\` must be a non-empty string to add messages."`; - -exports[`I18n engine addMessages should throw error if locale is not specified or empty 2`] = `"[I18n] A \`locale\` must be a non-empty string to add messages."`; - -exports[`I18n engine addMessages should throw error if locale specified in messages is different from one provided as second argument 1`] = `"[I18n] A \`locale\` in the messages object is different from the one provided as a second argument."`; - -exports[`I18n engine translate should throw error if id is not a non-empty string 1`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; - -exports[`I18n engine translate should throw error if id is not a non-empty string 2`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; - -exports[`I18n engine translate should throw error if id is not a non-empty string 3`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; - -exports[`I18n engine translate should throw error if id is not a non-empty string 4`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; - -exports[`I18n engine translate should throw error if id is not a non-empty string 5`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; - -exports[`I18n engine translate should throw error if id is not a non-empty string 6`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; - -exports[`I18n engine translate should throw error if translation message and defaultMessage are not provided 1`] = `"[I18n] Cannot format message: \\"foo\\". Default message must be provided."`; - -exports[`I18n engine translate should throw error if used format is not specified 1`] = ` -"[I18n] Error formatting message: \\"a.b.c\\" for locale: \\"en\\". -SyntaxError: Expected \\"date\\", \\"number\\", \\"plural\\", \\"select\\", \\"selectordinal\\" or \\"time\\" but \\"f\\" found." -`; - -exports[`I18n engine translate should throw error if used format is not specified 2`] = ` -"[I18n] Error formatting the default message for: \\"d.e.f\\". -SyntaxError: Expected \\"date\\", \\"number\\", \\"plural\\", \\"select\\", \\"selectordinal\\" or \\"time\\" but \\"b\\" found." -`; - -exports[`I18n engine translate should throw error if wrong context is provided to the translation string 1`] = ` -"[I18n] Error formatting message: \\"a.b.c\\" for locale: \\"en\\". -Error: The intl string context variable 'numPhotos' was not provided to the string 'You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }'" -`; - -exports[`I18n engine translate should throw error if wrong context is provided to the translation string 2`] = ` -"[I18n] Error formatting the default message for: \\"d.e.f\\". -Error: The intl string context variable 'numPhotos' was not provided to the string 'You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }'" -`; diff --git a/packages/kbn-i18n/src/core/__snapshots__/i18n.test.ts.snap b/packages/kbn-i18n/src/core/__snapshots__/i18n.test.ts.snap new file mode 100644 index 0000000000000..30d4f3f885053 --- /dev/null +++ b/packages/kbn-i18n/src/core/__snapshots__/i18n.test.ts.snap @@ -0,0 +1,51 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`I18n engine addMessages should throw error if locale is not specified or empty 1`] = `"[I18n] A \`locale\` must be a non-empty string to add messages."`; + +exports[`I18n engine addMessages should throw error if locale is not specified or empty 2`] = `"[I18n] A \`locale\` must be a non-empty string to add messages."`; + +exports[`I18n engine addMessages should throw error if locale specified in messages is different from one provided as second argument 1`] = `"[I18n] A \`locale\` in the translation object is different from the one provided as a second argument."`; + +exports[`I18n engine translate should throw error if id is not a non-empty string 1`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; + +exports[`I18n engine translate should throw error if id is not a non-empty string 2`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; + +exports[`I18n engine translate should throw error if id is not a non-empty string 3`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; + +exports[`I18n engine translate should throw error if id is not a non-empty string 4`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; + +exports[`I18n engine translate should throw error if id is not a non-empty string 5`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; + +exports[`I18n engine translate should throw error if id is not a non-empty string 6`] = `"[I18n] An \`id\` must be a non-empty string to translate a message."`; + +exports[`I18n engine translate should throw error if translation message and defaultMessage are not provided 1`] = `"[I18n] Cannot format message: \\"foo\\". Default message must be provided."`; + +exports[`I18n engine translate should throw error if used format is not specified 1`] = ` +"[I18n] Error formatting message: \\"a.b.c\\" for locale: \\"en\\". +SyntaxError: Expected \\"date\\", \\"number\\", \\"plural\\", \\"select\\", \\"selectordinal\\" or \\"time\\" but \\"f\\" found." +`; + +exports[`I18n engine translate should throw error if used format is not specified 2`] = ` +"[I18n] Error formatting the default message for: \\"d.e.f\\". +SyntaxError: Expected \\"date\\", \\"number\\", \\"plural\\", \\"select\\", \\"selectordinal\\" or \\"time\\" but \\"b\\" found." +`; + +exports[`I18n engine translate should throw error if wrong context is provided to the translation string 1`] = ` +"[I18n] Error formatting message: \\"a.b.c\\" for locale: \\"en\\". +Error: The intl string context variable 'numPhotos' was not provided to the string 'You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }'" +`; + +exports[`I18n engine translate should throw error if wrong context is provided to the translation string 2`] = ` +"[I18n] Error formatting the default message for: \\"d.e.f\\". +Error: The intl string context variable 'numPhotos' was not provided to the string 'You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }'" +`; + +exports[`I18n engine translateUsingPseudoLocale should translate message using pseudo-locale 1`] = `"Ṁéšššàĝĝé ŵîîţĥ àà [ɱàŕŕķðôôŵñ ļļîñķķ](http://localhost:5601/url) àñðð àñ ĥĥţɱļļ éļééɱéññţ"`; diff --git a/packages/kbn-i18n/src/core/formats.js b/packages/kbn-i18n/src/core/formats.js deleted file mode 100644 index 6a74040a7e1b7..0000000000000 --- a/packages/kbn-i18n/src/core/formats.js +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * Default format options used for "en" locale. - * These are used when constructing the internal Intl.NumberFormat - * (`number` formatter) and Intl.DateTimeFormat (`date` and `time` formatters) instances. - * The value of each parameter of `number` formatter is options object which is - * described in `options` section of [NumberFormat constructor]. - * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat} - * The value of each parameter of `date` and `time` formatters is options object which is - * described in `options` section of [DateTimeFormat constructor]. - * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat} - */ -export const formats = { - number: { - currency: { - style: 'currency', - }, - percent: { - style: 'percent', - }, - }, - date: { - short: { - month: 'numeric', - day: 'numeric', - year: '2-digit', - }, - medium: { - month: 'short', - day: 'numeric', - year: 'numeric', - }, - long: { - month: 'long', - day: 'numeric', - year: 'numeric', - }, - full: { - weekday: 'long', - month: 'long', - day: 'numeric', - year: 'numeric', - }, - }, - time: { - short: { - hour: 'numeric', - minute: 'numeric', - }, - medium: { - hour: 'numeric', - minute: 'numeric', - second: 'numeric', - }, - long: { - hour: 'numeric', - minute: 'numeric', - second: 'numeric', - timeZoneName: 'short', - }, - full: { - hour: 'numeric', - minute: 'numeric', - second: 'numeric', - timeZoneName: 'short', - }, - }, -}; diff --git a/packages/kbn-i18n/src/core/formats.ts b/packages/kbn-i18n/src/core/formats.ts new file mode 100644 index 0000000000000..69cd61d9921dc --- /dev/null +++ b/packages/kbn-i18n/src/core/formats.ts @@ -0,0 +1,126 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Default format options used for "en" locale. + * These are used when constructing the internal Intl.NumberFormat + * (`number` formatter) and Intl.DateTimeFormat (`date` and `time` formatters) instances. + * The value of each parameter of `number` formatter is options object which is + * described in `options` section of [NumberFormat constructor]. + * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/NumberFormat} + * The value of each parameter of `date` and `time` formatters is options object which is + * described in `options` section of [DateTimeFormat constructor]. + * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DateTimeFormat} + */ +export const formats: Formats = { + number: { + currency: { + style: 'currency', + }, + percent: { + style: 'percent', + }, + }, + date: { + short: { + month: 'numeric', + day: 'numeric', + year: '2-digit', + }, + medium: { + month: 'short', + day: 'numeric', + year: 'numeric', + }, + long: { + month: 'long', + day: 'numeric', + year: 'numeric', + }, + full: { + weekday: 'long', + month: 'long', + day: 'numeric', + year: 'numeric', + }, + }, + time: { + short: { + hour: 'numeric', + minute: 'numeric', + }, + medium: { + hour: 'numeric', + minute: 'numeric', + second: 'numeric', + }, + long: { + hour: 'numeric', + minute: 'numeric', + second: 'numeric', + timeZoneName: 'short', + }, + full: { + hour: 'numeric', + minute: 'numeric', + second: 'numeric', + timeZoneName: 'short', + }, + }, +}; + +interface NumberFormatOptions extends Intl.NumberFormatOptions { + style?: TStyle; + localeMatcher?: 'lookup' | 'best fit'; + currencyDisplay?: 'symbol' | 'code' | 'name'; +} + +export interface Formats { + number?: Partial<{ + [key: string]: NumberFormatOptions<'currency' | 'percent' | 'decimal'>; + currency: NumberFormatOptions<'currency'>; + percent: NumberFormatOptions<'percent'>; + }>; + date?: Partial<{ + [key: string]: DateTimeFormatOptions; + short: DateTimeFormatOptions; + medium: DateTimeFormatOptions; + long: DateTimeFormatOptions; + full: DateTimeFormatOptions; + }>; + time?: Partial<{ + [key: string]: DateTimeFormatOptions; + short: DateTimeFormatOptions; + medium: DateTimeFormatOptions; + long: DateTimeFormatOptions; + full: DateTimeFormatOptions; + }>; +} + +interface DateTimeFormatOptions extends Intl.DateTimeFormatOptions { + weekday?: 'narrow' | 'short' | 'long'; + era?: 'narrow' | 'short' | 'long'; + year?: 'numeric' | '2-digit'; + month?: 'numeric' | '2-digit' | 'narrow' | 'short' | 'long'; + day?: 'numeric' | '2-digit'; + hour?: 'numeric' | '2-digit'; + minute?: 'numeric' | '2-digit'; + second?: 'numeric' | '2-digit'; + timeZoneName?: 'short' | 'long'; +} diff --git a/packages/kbn-i18n/src/core/helper.js b/packages/kbn-i18n/src/core/helper.js deleted file mode 100644 index c13b1b3a303e9..0000000000000 --- a/packages/kbn-i18n/src/core/helper.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export const isString = value => typeof value === 'string'; - -export const isObject = value => typeof value === 'object' && value !== null; - -export const hasValues = values => Object.keys(values).length > 0; - -export const unique = (arr = []) => [...new Set(arr)]; - -const merge = (a, b) => - unique([...Object.keys(a), ...Object.keys(b)]).reduce((acc, key) => { - if (isObject(a[key]) && isObject(b[key]) && !Array.isArray(a[key]) && !Array.isArray(b[key])) { - return { - ...acc, - [key]: merge(a[key], b[key]), - }; - } - - return { - ...acc, - [key]: b[key] === undefined ? a[key] : b[key], - }; - }, {}); - -export const mergeAll = (...sources) => - sources.filter(isObject).reduce((acc, source) => merge(acc, source)); diff --git a/packages/kbn-i18n/src/core/helper.test.js b/packages/kbn-i18n/src/core/helper.test.js deleted file mode 100644 index cb54be97ca9e7..0000000000000 --- a/packages/kbn-i18n/src/core/helper.test.js +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { isString, isObject, hasValues, unique, mergeAll } from './helper'; - -describe('I18n helper', () => { - describe('isString', () => { - test('should return true for string literal', () => { - expect(isString('test')).toBe(true); - }); - - test('should return false for string object', () => { - expect(isString(new String('test'))).toBe(false); - }); - - test('should return false for non-string values', () => { - expect(isString(undefined)).toBe(false); - expect(isString(null)).toBe(false); - expect(isString(0)).toBe(false); - expect(isString(true)).toBe(false); - expect(isString({})).toBe(false); - }); - }); - - describe('isObject', () => { - test('should return true for object literal', () => { - expect(isObject({})).toBe(true); - }); - - test('should return true for array literal', () => { - expect(isObject([])).toBe(true); - }); - - test('should return false for primitives', () => { - expect(isObject(undefined)).toBe(false); - expect(isObject(null)).toBe(false); - expect(isObject(0)).toBe(false); - expect(isObject(true)).toBe(false); - expect(isObject('test')).toBe(false); - }); - }); - - describe('hasValues', () => { - test('should return false for empty object', () => { - expect(hasValues({})).toBe(false); - }); - - test('should return true for non-empty object', () => { - expect(hasValues({ foo: 'bar' })).toBe(true); - }); - - test('should throw error for null and undefined', () => { - expect(() => hasValues(undefined)).toThrow(); - expect(() => hasValues(null)).toThrow(); - }); - - test('should return false for number and boolean', () => { - expect(hasValues(true)).toBe(false); - expect(hasValues(0)).toBe(false); - }); - - test('should return false for empty string', () => { - expect(hasValues('')).toBe(false); - }); - - test('should return true for non-empty string', () => { - expect(hasValues('test')).toBe(true); - }); - - test('should return false for empty array', () => { - expect(hasValues([])).toBe(false); - }); - - test('should return true for non-empty array', () => { - expect(hasValues([1, 2, 3])).toBe(true); - }); - }); - - describe('unique', () => { - test('should return an array with unique values', () => { - expect(unique([1, 2, 7, 2, 6, 7, 1])).toEqual([1, 2, 7, 6]); - }); - - test('should create a new array', () => { - const value = [1, 2, 3]; - - expect(unique(value)).toEqual(value); - expect(unique(value)).not.toBe(value); - }); - - test('should filter unique values only by reference', () => { - expect(unique([{ foo: 'bar' }, { foo: 'bar' }])).toEqual([{ foo: 'bar' }, { foo: 'bar' }]); - - const value = { foo: 'bar' }; - - expect(unique([value, value])).toEqual([value]); - }); - }); - - describe('mergeAll', () => { - test('should throw error for empty arguments', () => { - expect(() => mergeAll()).toThrow(); - }); - - test('should merge only objects', () => { - expect(mergeAll(undefined, null, true, 5, '5', { foo: 'bar' })).toEqual({ - foo: 'bar', - }); - }); - - test('should return the only argument as is', () => { - const value = { foo: 'bar' }; - - expect(mergeAll(value)).toBe(value); - }); - - test('should return a deep merge of 2 objects nested objects', () => { - expect( - mergeAll( - { - foo: { bar: 3 }, - array: [ - { - does: 'work', - too: [1, 2, 3], - }, - ], - }, - { - foo: { baz: 4 }, - quux: 5, - array: [ - { - does: 'work', - too: [4, 5, 6], - }, - { - really: 'yes', - }, - ], - } - ) - ).toEqual({ - foo: { - bar: 3, - baz: 4, - }, - array: [ - { - does: 'work', - too: [4, 5, 6], - }, - { - really: 'yes', - }, - ], - quux: 5, - }); - }); - - test('should override arrays', () => { - expect(mergeAll({ foo: [1, 2] }, { foo: [3, 4] })).toEqual({ - foo: [3, 4], - }); - }); - - test('should merge any number of objects', () => { - expect(mergeAll({ a: 1 }, { b: 2 }, { c: 3 })).toEqual({ - a: 1, - b: 2, - c: 3, - }); - expect(mergeAll({ a: 1 }, { b: 2 }, { c: 3 }, { d: 4 })).toEqual({ - a: 1, - b: 2, - c: 3, - d: 4, - }); - }); - }); -}); diff --git a/packages/kbn-i18n/src/core/helper.test.ts b/packages/kbn-i18n/src/core/helper.test.ts new file mode 100644 index 0000000000000..ee2202dca7f0c --- /dev/null +++ b/packages/kbn-i18n/src/core/helper.test.ts @@ -0,0 +1,198 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { hasValues, isObject, isString, mergeAll, unique } from './helper'; + +describe('I18n helper', () => { + describe('isString', () => { + test('should return true for string literal', () => { + expect(isString('test')).toBe(true); + }); + + test('should return false for string object', () => { + // tslint:disable-next-line:no-construct + expect(isString(new String('test'))).toBe(false); + }); + + test('should return false for non-string values', () => { + expect(isString(undefined)).toBe(false); + expect(isString(null)).toBe(false); + expect(isString(0)).toBe(false); + expect(isString(true)).toBe(false); + expect(isString({})).toBe(false); + }); + }); + + describe('isObject', () => { + test('should return true for object literal', () => { + expect(isObject({})).toBe(true); + }); + + test('should return true for array literal', () => { + expect(isObject([])).toBe(true); + }); + + test('should return false for primitives', () => { + expect(isObject(undefined)).toBe(false); + expect(isObject(null)).toBe(false); + expect(isObject(0)).toBe(false); + expect(isObject(true)).toBe(false); + expect(isObject('test')).toBe(false); + }); + }); + + describe('hasValues', () => { + test('should return false for empty object', () => { + expect(hasValues({})).toBe(false); + }); + + test('should return true for non-empty object', () => { + expect(hasValues({ foo: 'bar' })).toBe(true); + }); + + test('should throw error for null and undefined', () => { + expect(() => hasValues(undefined)).toThrow(); + expect(() => hasValues(null)).toThrow(); + }); + + test('should return false for number and boolean', () => { + expect(hasValues(true)).toBe(false); + expect(hasValues(0)).toBe(false); + }); + + test('should return false for empty string', () => { + expect(hasValues('')).toBe(false); + }); + + test('should return true for non-empty string', () => { + expect(hasValues('test')).toBe(true); + }); + + test('should return false for empty array', () => { + expect(hasValues([])).toBe(false); + }); + + test('should return true for non-empty array', () => { + expect(hasValues([1, 2, 3])).toBe(true); + }); + }); + + describe('unique', () => { + test('should return an array with unique values', () => { + expect(unique([1, 2, 7, 2, 6, 7, 1])).toEqual([1, 2, 7, 6]); + }); + + test('should create a new array', () => { + const value = [1, 2, 3]; + + expect(unique(value)).toEqual(value); + expect(unique(value)).not.toBe(value); + }); + + test('should filter unique values only by reference', () => { + expect(unique([{ foo: 'bar' }, { foo: 'bar' }])).toEqual([{ foo: 'bar' }, { foo: 'bar' }]); + + const value = { foo: 'bar' }; + + expect(unique([value, value])).toEqual([value]); + }); + }); + + describe('mergeAll', () => { + test('should throw error for empty arguments', () => { + expect(() => mergeAll()).toThrow(); + }); + + test('should merge only objects', () => { + expect(mergeAll(undefined, null, true, 5, '5', { foo: 'bar' })).toEqual({ + foo: 'bar', + }); + }); + + test('should return the only argument as is', () => { + const value = { foo: 'bar' }; + + expect(mergeAll(value)).toBe(value); + }); + + test('should return a deep merge of 2 objects nested objects', () => { + expect( + mergeAll( + { + foo: { bar: 3 }, + array: [ + { + does: 'work', + too: [1, 2, 3], + }, + ], + }, + { + foo: { baz: 4 }, + quux: 5, + array: [ + { + does: 'work', + too: [4, 5, 6], + }, + { + really: 'yes', + }, + ], + } + ) + ).toEqual({ + foo: { + bar: 3, + baz: 4, + }, + array: [ + { + does: 'work', + too: [4, 5, 6], + }, + { + really: 'yes', + }, + ], + quux: 5, + }); + }); + + test('should override arrays', () => { + expect(mergeAll({ foo: [1, 2] }, { foo: [3, 4] })).toEqual({ + foo: [3, 4], + }); + }); + + test('should merge any number of objects', () => { + expect(mergeAll({ a: 1 }, { b: 2 }, { c: 3 })).toEqual({ + a: 1, + b: 2, + c: 3, + }); + expect(mergeAll({ a: 1 }, { b: 2 }, { c: 3 }, { d: 4 })).toEqual({ + a: 1, + b: 2, + c: 3, + d: 4, + }); + }); + }); +}); diff --git a/packages/kbn-i18n/src/core/helper.ts b/packages/kbn-i18n/src/core/helper.ts new file mode 100644 index 0000000000000..34d7261a0c9aa --- /dev/null +++ b/packages/kbn-i18n/src/core/helper.ts @@ -0,0 +1,45 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export const isString = (value: any): value is string => typeof value === 'string'; + +export const isObject = (value: any): value is object => + typeof value === 'object' && value !== null; + +export const hasValues = (values: any) => Object.keys(values).length > 0; + +export const unique = (arr: T[] = []): T[] => [...new Set(arr)]; + +const merge = (a: any, b: any): { [k: string]: any } => + unique([...Object.keys(a), ...Object.keys(b)]).reduce((acc, key) => { + if (isObject(a[key]) && isObject(b[key]) && !Array.isArray(a[key]) && !Array.isArray(b[key])) { + return { + ...acc, + [key]: merge(a[key], b[key]), + }; + } + + return { + ...acc, + [key]: b[key] === undefined ? a[key] : b[key], + }; + }, {}); + +export const mergeAll = (...sources: any[]) => + sources.filter(isObject).reduce((acc, source) => merge(acc, source)); diff --git a/packages/kbn-i18n/src/core/i18n.js b/packages/kbn-i18n/src/core/i18n.js deleted file mode 100644 index 3d76d13a72d63..0000000000000 --- a/packages/kbn-i18n/src/core/i18n.js +++ /dev/null @@ -1,237 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - @typedef Messages - messages tree, where leafs are translated strings - @type {object} - @property {string} [locale] - locale of the messages - @property {object} [formats] - set of options to the underlying formatter - */ - -import IntlMessageFormat from 'intl-messageformat'; -import IntlRelativeFormat from 'intl-relativeformat'; -import memoizeIntlConstructor from 'intl-format-cache'; -import { isString, isObject, hasValues, mergeAll } from './helper'; -import { formats as EN_FORMATS } from './formats'; - -// Add all locale data to `IntlMessageFormat`. -import './locales'; - -const EN_LOCALE = 'en'; -const LOCALE_DELIMITER = '-'; -const messages = {}; -const getMessageFormat = memoizeIntlConstructor(IntlMessageFormat); - -let defaultLocale = EN_LOCALE; -let currentLocale = EN_LOCALE; -let formats = EN_FORMATS; - -IntlMessageFormat.defaultLocale = defaultLocale; -IntlRelativeFormat.defaultLocale = defaultLocale; - -/** - * Returns message by the given message id. - * @param {string} id - path to the message - * @returns {string} message - translated message from messages tree - */ -function getMessageById(id) { - return getMessages()[id]; -} - -/** - * Normalizes locale to make it consistent with IntlMessageFormat locales - * @param {string} locale - * @returns {string} normalizedLocale - */ -function normalizeLocale(locale) { - return locale.toLowerCase().replace('_', LOCALE_DELIMITER); -} - -/** - * Provides a way to register translations with the engine - * @param {Messages} newMessages - * @param {string} [locale = messages.locale] - */ -export function addMessages(newMessages = {}, locale = newMessages.locale) { - if (!locale || !isString(locale)) { - throw new Error('[I18n] A `locale` must be a non-empty string to add messages.'); - } - - if (newMessages.locale && newMessages.locale !== locale) { - throw new Error( - '[I18n] A `locale` in the messages object is different from the one provided as a second argument.' - ); - } - - const normalizedLocale = normalizeLocale(locale); - - messages[normalizedLocale] = { - ...messages[normalizedLocale], - ...newMessages, - }; -} - -/** - * Returns messages for the current language - * @returns {Messages} messages - */ -export function getMessages() { - return messages[currentLocale] || {}; -} - -/** - * Tells the engine which language to use by given language key - * @param {string} locale - */ -export function setLocale(locale) { - if (!locale || !isString(locale)) { - throw new Error('[I18n] A `locale` must be a non-empty string.'); - } - - currentLocale = normalizeLocale(locale); -} - -/** - * Returns the current locale - * @returns {string} locale - */ -export function getLocale() { - return currentLocale; -} - -/** - * Tells the library which language to fallback when missing translations - * @param {string} locale - */ -export function setDefaultLocale(locale) { - if (!locale || !isString(locale)) { - throw new Error('[I18n] A `locale` must be a non-empty string.'); - } - - defaultLocale = normalizeLocale(locale); - IntlMessageFormat.defaultLocale = defaultLocale; - IntlRelativeFormat.defaultLocale = defaultLocale; -} - -/** - * Returns the default locale - * @returns {string} defaultLocale - */ -export function getDefaultLocale() { - return defaultLocale; -} - -/** - * Supplies a set of options to the underlying formatter - * [Default format options used as the prototype of the formats] - * {@link https://github.com/yahoo/intl-messageformat/blob/master/src/core.js#L62} - * These are used when constructing the internal Intl.NumberFormat - * and Intl.DateTimeFormat instances. - * @param {object} newFormats - * @param {object} [newFormats.number] - * @param {object} [newFormats.date] - * @param {object} [newFormats.time] - */ -export function setFormats(newFormats) { - if (!isObject(newFormats) || !hasValues(newFormats)) { - throw new Error('[I18n] A `formats` must be a non-empty object.'); - } - - formats = mergeAll(formats, newFormats); -} - -/** - * Returns current formats - * @returns {object} formats - */ -export function getFormats() { - return formats; -} - -/** - * Returns array of locales having translations - * @returns {string[]} locales - */ -export function getRegisteredLocales() { - return Object.keys(messages); -} - -/** - * Translate message by id - * @param {string} id - translation id to be translated - * @param {object} [options] - * @param {object} [options.values] - values to pass into translation - * @param {string} [options.defaultMessage] - will be used unless translation was successful - * @returns {string} - */ -export function translate(id, { values = {}, defaultMessage = '' } = {}) { - if (!id || !isString(id)) { - throw new Error('[I18n] An `id` must be a non-empty string to translate a message.'); - } - - const message = getMessageById(id); - - if (!message && !defaultMessage) { - throw new Error(`[I18n] Cannot format message: "${id}". Default message must be provided.`); - } - - if (!hasValues(values)) { - return message || defaultMessage; - } - - if (message) { - try { - const msg = getMessageFormat(message, getLocale(), getFormats()); - - return msg.format(values); - } catch (e) { - throw new Error( - `[I18n] Error formatting message: "${id}" for locale: "${getLocale()}".\n${e}` - ); - } - } - - try { - const msg = getMessageFormat(defaultMessage, getDefaultLocale(), getFormats()); - - return msg.format(values); - } catch (e) { - throw new Error(`[I18n] Error formatting the default message for: "${id}".\n${e}`); - } -} - -/** - * Initializes the engine - * @param {Messages} newMessages - */ -export function init(newMessages) { - if (!newMessages) { - return; - } - - addMessages(newMessages); - - if (newMessages.locale) { - setLocale(newMessages.locale); - } - - if (newMessages.formats) { - setFormats(newMessages.formats); - } -} diff --git a/packages/kbn-i18n/src/core/i18n.test.js b/packages/kbn-i18n/src/core/i18n.test.js deleted file mode 100644 index 695b65a3e2d3e..0000000000000 --- a/packages/kbn-i18n/src/core/i18n.test.js +++ /dev/null @@ -1,774 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -describe('I18n engine', () => { - let i18n; - - beforeEach(() => { - i18n = require('./i18n'); - }); - - afterEach(() => { - // isolate modules for every test so that local module state doesn't conflict between tests - jest.resetModules(); - }); - - describe('addMessages', () => { - test('should throw error if locale is not specified or empty', () => { - expect(() => i18n.addMessages({ foo: 'bar' })).toThrowErrorMatchingSnapshot(); - expect(() => i18n.addMessages({ locale: '' })).toThrowErrorMatchingSnapshot(); - }); - - test('should throw error if locale specified in messages is different from one provided as second argument', () => { - expect(() => - i18n.addMessages({ foo: 'bar', locale: 'en' }, 'ru') - ).toThrowErrorMatchingSnapshot(); - }); - - test('should add messages if locale prop is passed as second argument', () => { - const locale = 'ru'; - - expect(i18n.getMessages()).toEqual({}); - - i18n.addMessages({ foo: 'bar' }, locale); - - expect(i18n.getMessages()).toEqual({}); - - i18n.setLocale(locale); - - expect(i18n.getMessages()).toEqual({ foo: 'bar' }); - }); - - test('should add messages if locale prop is passed as messages property', () => { - const locale = 'ru'; - - expect(i18n.getMessages()).toEqual({}); - - i18n.addMessages({ - locale, - foo: 'bar', - }); - - expect(i18n.getMessages()).toEqual({}); - - i18n.setLocale(locale); - - expect(i18n.getMessages()).toEqual({ - foo: 'bar', - locale: 'ru', - }); - }); - - test('should merge messages with the same locale', () => { - const locale = 'ru'; - - i18n.setLocale(locale); - i18n.addMessages({ - locale, - ['a.b.c']: 'foo', - }); - - expect(i18n.getMessages()).toEqual({ - locale: 'ru', - ['a.b.c']: 'foo', - }); - - i18n.addMessages({ - locale, - ['d.e.f']: 'bar', - }); - - expect(i18n.getMessages()).toEqual({ - locale: 'ru', - ['a.b.c']: 'foo', - ['d.e.f']: 'bar', - }); - }); - - test('should override messages with the same locale and id', () => { - const locale = 'ru'; - - i18n.setLocale(locale); - i18n.addMessages({ - locale, - ['a.b.c']: 'foo', - }); - - expect(i18n.getMessages()).toEqual({ - locale: 'ru', - ['a.b.c']: 'foo', - }); - - i18n.addMessages({ - locale, - ['a.b.c']: 'bar', - }); - - expect(i18n.getMessages()).toEqual({ - locale: 'ru', - ['a.b.c']: 'bar', - }); - }); - - test('should add messages with normalized passed locale', () => { - const locale = 'en-us'; - i18n.setLocale(locale); - - i18n.addMessages( - { - ['a.b.c']: 'bar', - }, - 'en_US' - ); - - expect(i18n.getLocale()).toBe(locale); - expect(i18n.getMessages()).toEqual({ - ['a.b.c']: 'bar', - }); - }); - }); - - describe('getMessages', () => { - test('should return messages for the current language', () => { - i18n.addMessages({ - locale: 'ru', - foo: 'bar', - }); - i18n.addMessages({ - locale: 'en', - bar: 'foo', - }); - - i18n.setLocale('ru'); - expect(i18n.getMessages()).toEqual({ - locale: 'ru', - foo: 'bar', - }); - - i18n.setLocale('en'); - expect(i18n.getMessages()).toEqual({ - locale: 'en', - bar: 'foo', - }); - }); - - test('should return an empty object if messages for current locale are not specified', () => { - expect(i18n.getMessages()).toEqual({}); - - i18n.setLocale('fr'); - expect(i18n.getMessages()).toEqual({}); - - i18n.setLocale('en'); - expect(i18n.getMessages()).toEqual({}); - }); - }); - - describe('setLocale', () => { - test('should throw error if locale is not a non-empty string', () => { - expect(() => i18n.setLocale(undefined)).toThrow(); - expect(() => i18n.setLocale(null)).toThrow(); - expect(() => i18n.setLocale(true)).toThrow(); - expect(() => i18n.setLocale(5)).toThrow(); - expect(() => i18n.setLocale({})).toThrow(); - expect(() => i18n.setLocale('')).toThrow(); - }); - - test('should update current locale', () => { - expect(i18n.getLocale()).not.toBe('foo'); - i18n.setLocale('foo'); - expect(i18n.getLocale()).toBe('foo'); - }); - - test('should normalize passed locale', () => { - i18n.setLocale('en_US'); - expect(i18n.getLocale()).toBe('en-us'); - }); - }); - - describe('getLocale', () => { - test('should return "en" locale by default', () => { - expect(i18n.getLocale()).toBe('en'); - }); - - test('should return updated locale', () => { - i18n.setLocale('foo'); - expect(i18n.getLocale()).toBe('foo'); - }); - }); - - describe('setDefaultLocale', () => { - test('should throw error if locale is not a non-empty string', () => { - expect(() => i18n.setDefaultLocale(undefined)).toThrow(); - expect(() => i18n.setDefaultLocale(null)).toThrow(); - expect(() => i18n.setDefaultLocale(true)).toThrow(); - expect(() => i18n.setDefaultLocale(5)).toThrow(); - expect(() => i18n.setDefaultLocale({})).toThrow(); - expect(() => i18n.setDefaultLocale('')).toThrow(); - }); - - test('should update the default locale', () => { - expect(i18n.getDefaultLocale()).not.toBe('foo'); - i18n.setDefaultLocale('foo'); - expect(i18n.getDefaultLocale()).toBe('foo'); - }); - - test('should normalize passed locale', () => { - i18n.setDefaultLocale('en_US'); - expect(i18n.getDefaultLocale()).toBe('en-us'); - }); - - test('should set "en" locale as default for IntlMessageFormat and IntlRelativeFormat', () => { - const IntlMessageFormat = require('intl-messageformat'); - const IntlRelativeFormat = require('intl-relativeformat'); - - expect(IntlMessageFormat.defaultLocale).toBe('en'); - expect(IntlRelativeFormat.defaultLocale).toBe('en'); - }); - - test('should update defaultLocale for IntlMessageFormat and IntlRelativeFormat', () => { - const IntlMessageFormat = require('intl-messageformat'); - const IntlRelativeFormat = require('intl-relativeformat'); - - i18n.setDefaultLocale('foo'); - - expect(IntlMessageFormat.defaultLocale).toBe('foo'); - expect(IntlRelativeFormat.defaultLocale).toBe('foo'); - }); - }); - - describe('getDefaultLocale', () => { - test('should return "en" locale by default', () => { - expect(i18n.getDefaultLocale()).toBe('en'); - }); - - test('should return updated locale', () => { - i18n.setDefaultLocale('foo'); - expect(i18n.getDefaultLocale()).toBe('foo'); - }); - }); - - describe('setFormats', () => { - test('should throw error if formats parameter is not a non-empty object', () => { - expect(() => i18n.setFormats(undefined)).toThrow(); - expect(() => i18n.setFormats(null)).toThrow(); - expect(() => i18n.setFormats(true)).toThrow(); - expect(() => i18n.setFormats(5)).toThrow(); - expect(() => i18n.setFormats('foo')).toThrow(); - expect(() => i18n.setFormats({})).toThrow(); - }); - - test('should merge current formats with a passed formats', () => { - expect(i18n.getFormats().date.short).not.toEqual({ - month: 'short', - day: 'numeric', - year: 'numeric', - }); - - i18n.setFormats({ - date: { - short: { - month: 'short', - day: 'numeric', - year: 'numeric', - }, - }, - }); - - expect(i18n.getFormats().date.short).toEqual({ - month: 'short', - day: 'numeric', - year: 'numeric', - }); - - i18n.setFormats({ - date: { - short: { - month: 'long', - }, - }, - }); - - expect(i18n.getFormats().date.short).toEqual({ - month: 'long', - day: 'numeric', - year: 'numeric', - }); - }); - }); - - describe('getFormats', () => { - test('should return "en" formats by default', () => { - const { formats } = require('./formats'); - - expect(i18n.getFormats()).toEqual(formats); - }); - - test('should return updated formats', () => { - const { formats } = require('./formats'); - - i18n.setFormats({ - foo: 'bar', - }); - - expect(i18n.getFormats()).toEqual({ - ...formats, - foo: 'bar', - }); - }); - }); - - describe('getRegisteredLocales', () => { - test('should return empty array by default', () => { - expect(i18n.getRegisteredLocales()).toEqual([]); - }); - - test('should return array of registered locales', () => { - i18n.addMessages({ - locale: 'en', - }); - - expect(i18n.getRegisteredLocales()).toEqual(['en']); - - i18n.addMessages({ - locale: 'ru', - }); - - expect(i18n.getRegisteredLocales()).toContain('en', 'ru'); - expect(i18n.getRegisteredLocales().length).toBe(2); - - i18n.addMessages({ - locale: 'fr', - }); - - expect(i18n.getRegisteredLocales()).toContain('en', 'ru', 'fr'); - expect(i18n.getRegisteredLocales().length).toBe(3); - }); - }); - - describe('translate', () => { - test('should throw error if id is not a non-empty string', () => { - expect(() => i18n.translate(undefined)).toThrowErrorMatchingSnapshot(); - expect(() => i18n.translate(null)).toThrowErrorMatchingSnapshot(); - expect(() => i18n.translate(true)).toThrowErrorMatchingSnapshot(); - expect(() => i18n.translate(5)).toThrowErrorMatchingSnapshot(); - expect(() => i18n.translate({})).toThrowErrorMatchingSnapshot(); - expect(() => i18n.translate('')).toThrowErrorMatchingSnapshot(); - }); - - test('should throw error if translation message and defaultMessage are not provided', () => { - expect(() => i18n.translate('foo')).toThrowErrorMatchingSnapshot(); - }); - - test('should return message as is if values are not provided', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: 'foo', - }); - - expect(i18n.translate('a.b.c')).toBe('foo'); - }); - - test('should return default message as is if values are not provided', () => { - expect(i18n.translate('a.b.c', { defaultMessage: 'foo' })).toBe('foo'); - }); - - test('should not return defaultMessage as is if values are provided', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: 'foo', - }); - expect(i18n.translate('a.b.c', { defaultMessage: 'bar' })).toBe('foo'); - }); - - test('should interpolate variables', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: 'foo {a}, {b}, {c} bar', - ['d.e.f']: '{foo}', - }); - - expect( - i18n.translate('a.b.c', { - values: { a: 1, b: 2, c: 3 }, - }) - ).toBe('foo 1, 2, 3 bar'); - - expect(i18n.translate('d.e.f', { values: { foo: 'bar' } })).toBe('bar'); - }); - - test('should interpolate variables for default messages', () => { - expect( - i18n.translate('a.b.c', { - defaultMessage: 'foo {a}, {b}, {c} bar', - values: { a: 1, b: 2, c: 3 }, - }) - ).toBe('foo 1, 2, 3 bar'); - }); - - test('should format pluralized messages', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: `You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }`, - }); - - expect(i18n.translate('a.b.c', { values: { numPhotos: 0 } })).toBe('You have no photos.'); - expect(i18n.translate('a.b.c', { values: { numPhotos: 1 } })).toBe('You have one photo.'); - expect(i18n.translate('a.b.c', { values: { numPhotos: 1000 } })).toBe( - 'You have 1,000 photos.' - ); - }); - - test('should format pluralized default messages', () => { - i18n.setDefaultLocale('en'); - - expect( - i18n.translate('a.b.c', { - values: { numPhotos: 0 }, - defaultMessage: `You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }`, - }) - ).toBe('You have no photos.'); - - expect( - i18n.translate('a.b.c', { - values: { numPhotos: 1 }, - defaultMessage: `You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }`, - }) - ).toBe('You have one photo.'); - - expect( - i18n.translate('a.b.c', { - values: { numPhotos: 1000 }, - defaultMessage: `You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }`, - }) - ).toBe('You have 1,000 photos.'); - }); - - test('should throw error if wrong context is provided to the translation string', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: `You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }`, - }); - i18n.setDefaultLocale('en'); - - expect(() => i18n.translate('a.b.c', { values: { foo: 0 } })).toThrowErrorMatchingSnapshot(); - - expect(() => - i18n.translate('d.e.f', { - values: { bar: 1000 }, - defaultMessage: `You have {numPhotos, plural, - =0 {no photos.} - =1 {one photo.} - other {# photos.} - }`, - }) - ).toThrowErrorMatchingSnapshot(); - }); - - test('should format messages with percent formatter', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: 'Result: {result, number, percent}', - }); - i18n.setDefaultLocale('en'); - - expect(i18n.translate('a.b.c', { values: { result: 0.15 } })).toBe('Result: 15%'); - - expect( - i18n.translate('d.e.f', { - values: { result: 0.15 }, - defaultMessage: 'Result: {result, number, percent}', - }) - ).toBe('Result: 15%'); - }); - - test('should format messages with date formatter', () => { - i18n.init({ - locale: 'en', - ['a.short']: 'Sale begins {start, date, short}', - ['a.medium']: 'Sale begins {start, date, medium}', - ['a.long']: 'Sale begins {start, date, long}', - ['a.full']: 'Sale begins {start, date, full}', - }); - - expect( - i18n.translate('a.short', { - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins 6/20/18'); - - expect( - i18n.translate('a.medium', { - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins Jun 20, 2018'); - - expect( - i18n.translate('a.long', { - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins June 20, 2018'); - - expect( - i18n.translate('a.full', { - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins Wednesday, June 20, 2018'); - }); - - test('should format default messages with date formatter', () => { - i18n.setDefaultLocale('en'); - - expect( - i18n.translate('foo', { - defaultMessage: 'Sale begins {start, date, short}', - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins 6/20/18'); - - expect( - i18n.translate('foo', { - defaultMessage: 'Sale begins {start, date, medium}', - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins Jun 20, 2018'); - - expect( - i18n.translate('foo', { - defaultMessage: 'Sale begins {start, date, long}', - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins June 20, 2018'); - - expect( - i18n.translate('foo', { - defaultMessage: 'Sale begins {start, date, full}', - values: { start: new Date(2018, 5, 20) }, - }) - ).toBe('Sale begins Wednesday, June 20, 2018'); - }); - - test('should format messages with time formatter', () => { - i18n.init({ - locale: 'en', - ['a.short']: 'Coupon expires at {expires, time, short}', - ['a.medium']: 'Coupon expires at {expires, time, medium}', - }); - - expect( - i18n.translate('a.short', { - values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, - }) - ).toBe('Coupon expires at 6:40 PM'); - - expect( - i18n.translate('a.medium', { - values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, - }) - ).toBe('Coupon expires at 6:40:30 PM'); - }); - - test('should format default messages with time formatter', () => { - i18n.setDefaultLocale('en'); - - expect( - i18n.translate('foo', { - defaultMessage: 'Coupon expires at {expires, time, short}', - values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, - }) - ).toBe('Coupon expires at 6:40 PM'); - - expect( - i18n.translate('foo', { - defaultMessage: 'Coupon expires at {expires, time, medium}', - values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, - }) - ).toBe('Coupon expires at 6:40:30 PM'); - }); - - test('should format message with a custom format', () => { - i18n.init({ - locale: 'en', - formats: { - number: { - usd: { style: 'currency', currency: 'USD' }, - }, - }, - ['a.b.c']: 'Your total is {total, number, usd}', - ['d.e.f']: 'Your total is {total, number, eur}', - }); - - expect(i18n.translate('a.b.c', { values: { total: 1000 } })).toBe('Your total is $1,000.00'); - - i18n.setFormats({ - number: { - eur: { style: 'currency', currency: 'EUR' }, - }, - }); - - expect(i18n.translate('a.b.c', { values: { total: 1000 } })).toBe('Your total is $1,000.00'); - - expect(i18n.translate('d.e.f', { values: { total: 1000 } })).toBe('Your total is €1,000.00'); - }); - - test('should format default message with a custom format', () => { - i18n.init({ - locale: 'en', - formats: { - number: { - usd: { style: 'currency', currency: 'USD' }, - }, - }, - }); - i18n.setDefaultLocale('en'); - - expect( - i18n.translate('a.b.c', { - values: { total: 1000 }, - defaultMessage: 'Your total is {total, number, usd}', - }) - ).toBe('Your total is $1,000.00'); - - i18n.setFormats({ - number: { - eur: { style: 'currency', currency: 'EUR' }, - }, - }); - - expect( - i18n.translate('a.b.c', { - values: { total: 1000 }, - defaultMessage: 'Your total is {total, number, usd}', - }) - ).toBe('Your total is $1,000.00'); - - expect( - i18n.translate('d.e.f', { - values: { total: 1000 }, - defaultMessage: 'Your total is {total, number, eur}', - }) - ).toBe('Your total is €1,000.00'); - }); - - test('should use default format if passed format option is not specified', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: 'Your total is {total, number, usd}', - }); - i18n.setDefaultLocale('en'); - - expect(i18n.translate('a.b.c', { values: { total: 1000 } })).toBe('Your total is 1,000'); - - expect( - i18n.translate('d.e.f', { - values: { total: 1000 }, - defaultMessage: 'Your total is {total, number, foo}', - }) - ).toBe('Your total is 1,000'); - }); - - test('should throw error if used format is not specified', () => { - i18n.init({ - locale: 'en', - ['a.b.c']: 'Your total is {total, foo}', - }); - i18n.setDefaultLocale('en'); - - expect(() => - i18n.translate('a.b.c', { values: { total: 1 } }) - ).toThrowErrorMatchingSnapshot(); - - expect(() => - i18n.translate('d.e.f', { - values: { total: 1000 }, - defaultMessage: 'Your total is {total, bar}', - }) - ).toThrowErrorMatchingSnapshot(); - }); - }); - - describe('init', () => { - test('should not initialize the engine if messages are not specified', () => { - i18n.init(); - expect(i18n.getMessages()).toEqual({}); - }); - - test('should throw error if messages are empty', () => { - expect(() => i18n.init({})).toThrow(); - expect(i18n.getMessages()).toEqual({}); - }); - - test('should add messages if locale is specified', () => { - i18n.init({ - locale: 'en', - foo: 'bar', - }); - - expect(i18n.getMessages()).toEqual({ - locale: 'en', - foo: 'bar', - }); - }); - - test('should set the current locale', () => { - i18n.init({ locale: 'ru' }); - expect(i18n.getLocale()).toBe('ru'); - }); - - test('should add custom formats', () => { - i18n.init({ - locale: 'ru', - formats: { - date: { - custom: { - month: 'short', - day: 'numeric', - year: 'numeric', - }, - }, - }, - }); - - expect(i18n.getFormats().date.custom).toEqual({ - month: 'short', - day: 'numeric', - year: 'numeric', - }); - }); - }); -}); diff --git a/packages/kbn-i18n/src/core/i18n.test.ts b/packages/kbn-i18n/src/core/i18n.test.ts new file mode 100644 index 0000000000000..c6c41c9325992 --- /dev/null +++ b/packages/kbn-i18n/src/core/i18n.test.ts @@ -0,0 +1,872 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import * as i18nModule from './i18n'; + +describe('I18n engine', () => { + let i18n: typeof i18nModule; + + beforeEach(() => { + i18n = require.requireActual('./i18n'); + }); + + afterEach(() => { + // isolate modules for every test so that local module state doesn't conflict between tests + jest.resetModules(); + }); + + describe('addMessages', () => { + test('should throw error if locale is not specified or empty', () => { + expect(() => + i18n.addTranslation({ messages: { foo: 'bar' } }) + ).toThrowErrorMatchingSnapshot(); + expect(() => + i18n.addTranslation({ locale: '', messages: {} }) + ).toThrowErrorMatchingSnapshot(); + }); + + test('should throw error if locale specified in messages is different from one provided as second argument', () => { + expect(() => + i18n.addTranslation({ messages: { foo: 'bar' }, locale: 'en' }, 'ru') + ).toThrowErrorMatchingSnapshot(); + }); + + test('should add messages if locale prop is passed as second argument', () => { + const locale = 'ru'; + + expect(i18n.getTranslation()).toEqual({ messages: {} }); + + i18n.addTranslation({ messages: { foo: 'bar' } }, locale); + + expect(i18n.getTranslation()).toEqual({ messages: {} }); + + i18n.setLocale(locale); + + expect(i18n.getTranslation()).toEqual({ messages: { foo: 'bar' } }); + }); + + test('should add messages if locale prop is passed as messages property', () => { + const locale = 'ru'; + + expect(i18n.getTranslation()).toEqual({ messages: {} }); + + i18n.addTranslation({ + locale, + messages: { + foo: 'bar', + }, + }); + + expect(i18n.getTranslation()).toEqual({ messages: {} }); + + i18n.setLocale(locale); + + expect(i18n.getTranslation()).toEqual({ + messages: { + foo: 'bar', + }, + locale: 'ru', + }); + }); + + test('should merge messages with the same locale', () => { + const locale = 'ru'; + + i18n.setLocale(locale); + i18n.addTranslation({ + locale, + messages: { + ['a.b.c']: 'foo', + }, + }); + + expect(i18n.getTranslation()).toEqual({ + locale: 'ru', + messages: { + ['a.b.c']: 'foo', + }, + }); + + i18n.addTranslation({ + locale, + messages: { + ['d.e.f']: 'bar', + }, + }); + + expect(i18n.getTranslation()).toEqual({ + locale: 'ru', + messages: { + ['a.b.c']: 'foo', + ['d.e.f']: 'bar', + }, + }); + }); + + test('should override messages with the same locale and id', () => { + const locale = 'ru'; + + i18n.setLocale(locale); + i18n.addTranslation({ + locale, + messages: { + ['a.b.c']: 'foo', + }, + }); + + expect(i18n.getTranslation()).toEqual({ + locale: 'ru', + messages: { + ['a.b.c']: 'foo', + }, + }); + + i18n.addTranslation({ + locale, + messages: { + ['a.b.c']: 'bar', + }, + }); + + expect(i18n.getTranslation()).toEqual({ + locale: 'ru', + messages: { + ['a.b.c']: 'bar', + }, + }); + }); + + test('should add messages with normalized passed locale', () => { + const locale = 'en-us'; + i18n.setLocale(locale); + + i18n.addTranslation( + { + messages: { + ['a.b.c']: 'bar', + }, + }, + 'en_US' + ); + + expect(i18n.getLocale()).toBe(locale); + expect(i18n.getTranslation()).toEqual({ + messages: { + ['a.b.c']: 'bar', + }, + }); + }); + }); + + describe('getTranslation', () => { + test('should return messages for the current language', () => { + i18n.addTranslation({ + locale: 'ru', + messages: { + foo: 'bar', + }, + }); + i18n.addTranslation({ + locale: 'en', + messages: { + bar: 'foo', + }, + }); + + i18n.setLocale('ru'); + expect(i18n.getTranslation()).toEqual({ + locale: 'ru', + messages: { + foo: 'bar', + }, + }); + + i18n.setLocale('en'); + expect(i18n.getTranslation()).toEqual({ + locale: 'en', + messages: { + bar: 'foo', + }, + }); + }); + + test('should return an empty object if messages for current locale are not specified', () => { + expect(i18n.getTranslation()).toEqual({ messages: {} }); + + i18n.setLocale('fr'); + expect(i18n.getTranslation()).toEqual({ messages: {} }); + + i18n.setLocale('en'); + expect(i18n.getTranslation()).toEqual({ messages: {} }); + }); + }); + + describe('setLocale', () => { + test('should throw error if locale is not a non-empty string', () => { + expect(() => i18n.setLocale(undefined as any)).toThrow(); + expect(() => i18n.setLocale(null as any)).toThrow(); + expect(() => i18n.setLocale(true as any)).toThrow(); + expect(() => i18n.setLocale(5 as any)).toThrow(); + expect(() => i18n.setLocale({} as any)).toThrow(); + expect(() => i18n.setLocale('')).toThrow(); + }); + + test('should update current locale', () => { + expect(i18n.getLocale()).not.toBe('foo'); + i18n.setLocale('foo'); + expect(i18n.getLocale()).toBe('foo'); + }); + + test('should normalize passed locale', () => { + i18n.setLocale('en_US'); + expect(i18n.getLocale()).toBe('en-us'); + }); + }); + + describe('getLocale', () => { + test('should return "en" locale by default', () => { + expect(i18n.getLocale()).toBe('en'); + }); + + test('should return updated locale', () => { + i18n.setLocale('foo'); + expect(i18n.getLocale()).toBe('foo'); + }); + }); + + describe('setDefaultLocale', () => { + test('should throw error if locale is not a non-empty string', () => { + expect(() => i18n.setDefaultLocale(undefined as any)).toThrow(); + expect(() => i18n.setDefaultLocale(null as any)).toThrow(); + expect(() => i18n.setDefaultLocale(true as any)).toThrow(); + expect(() => i18n.setDefaultLocale(5 as any)).toThrow(); + expect(() => i18n.setDefaultLocale({} as any)).toThrow(); + expect(() => i18n.setDefaultLocale('')).toThrow(); + }); + + test('should update the default locale', () => { + expect(i18n.getDefaultLocale()).not.toBe('foo'); + i18n.setDefaultLocale('foo'); + expect(i18n.getDefaultLocale()).toBe('foo'); + }); + + test('should normalize passed locale', () => { + i18n.setDefaultLocale('en_US'); + expect(i18n.getDefaultLocale()).toBe('en-us'); + }); + + test('should set "en" locale as default for IntlMessageFormat and IntlRelativeFormat', () => { + const IntlMessageFormat = require('intl-messageformat'); + const IntlRelativeFormat = require('intl-relativeformat'); + + expect(IntlMessageFormat.defaultLocale).toBe('en'); + expect(IntlRelativeFormat.defaultLocale).toBe('en'); + }); + + test('should update defaultLocale for IntlMessageFormat and IntlRelativeFormat', () => { + const IntlMessageFormat = require('intl-messageformat'); + const IntlRelativeFormat = require('intl-relativeformat'); + + i18n.setDefaultLocale('foo'); + + expect(IntlMessageFormat.defaultLocale).toBe('foo'); + expect(IntlRelativeFormat.defaultLocale).toBe('foo'); + }); + }); + + describe('getDefaultLocale', () => { + test('should return "en" locale by default', () => { + expect(i18n.getDefaultLocale()).toBe('en'); + }); + + test('should return updated locale', () => { + i18n.setDefaultLocale('foo'); + expect(i18n.getDefaultLocale()).toBe('foo'); + }); + }); + + describe('setFormats', () => { + test('should throw error if formats parameter is not a non-empty object', () => { + expect(() => i18n.setFormats(undefined as any)).toThrow(); + expect(() => i18n.setFormats(null as any)).toThrow(); + expect(() => i18n.setFormats(true as any)).toThrow(); + expect(() => i18n.setFormats(5 as any)).toThrow(); + expect(() => i18n.setFormats('foo' as any)).toThrow(); + expect(() => i18n.setFormats({} as any)).toThrow(); + }); + + test('should merge current formats with a passed formats', () => { + expect(i18n.getFormats().date!.short).not.toEqual({ + month: 'short', + day: 'numeric', + year: 'numeric', + }); + + i18n.setFormats({ + date: { + short: { + month: 'short', + day: 'numeric', + year: 'numeric', + }, + }, + }); + + expect(i18n.getFormats().date!.short).toEqual({ + month: 'short', + day: 'numeric', + year: 'numeric', + }); + + i18n.setFormats({ + date: { + short: { + month: 'long', + }, + }, + }); + + expect(i18n.getFormats().date!.short).toEqual({ + month: 'long', + day: 'numeric', + year: 'numeric', + }); + }); + }); + + describe('getFormats', () => { + test('should return "en" formats by default', () => { + const { formats } = require('./formats'); + + expect(i18n.getFormats()).toEqual(formats); + }); + + test('should return updated formats', () => { + const { formats } = require('./formats'); + + i18n.setFormats({ + number: { + currency: { + style: 'currency', + currency: 'EUR', + }, + }, + }); + + expect(i18n.getFormats()).toEqual({ + ...formats, + number: { + ...formats.number, + currency: { + style: 'currency', + currency: 'EUR', + }, + }, + }); + }); + }); + + describe('getRegisteredLocales', () => { + test('should return empty array by default', () => { + expect(i18n.getRegisteredLocales()).toEqual([]); + }); + + test('should return array of registered locales', () => { + i18n.addTranslation({ + locale: 'en', + messages: {}, + }); + + expect(i18n.getRegisteredLocales()).toEqual(['en']); + + i18n.addTranslation({ + locale: 'ru', + messages: {}, + }); + + expect(i18n.getRegisteredLocales()).toContain('en'); + expect(i18n.getRegisteredLocales()).toContain('ru'); + expect(i18n.getRegisteredLocales().length).toBe(2); + + i18n.addTranslation({ + locale: 'fr', + messages: {}, + }); + + expect(i18n.getRegisteredLocales()).toContain('en'); + expect(i18n.getRegisteredLocales()).toContain('fr'); + expect(i18n.getRegisteredLocales()).toContain('ru'); + expect(i18n.getRegisteredLocales().length).toBe(3); + }); + }); + + describe('translate', () => { + test('should throw error if id is not a non-empty string', () => { + expect(() => i18n.translate(undefined as any)).toThrowErrorMatchingSnapshot(); + expect(() => i18n.translate(null as any)).toThrowErrorMatchingSnapshot(); + expect(() => i18n.translate(true as any)).toThrowErrorMatchingSnapshot(); + expect(() => i18n.translate(5 as any)).toThrowErrorMatchingSnapshot(); + expect(() => i18n.translate({} as any)).toThrowErrorMatchingSnapshot(); + expect(() => i18n.translate('')).toThrowErrorMatchingSnapshot(); + }); + + test('should throw error if translation message and defaultMessage are not provided', () => { + expect(() => i18n.translate('foo')).toThrowErrorMatchingSnapshot(); + }); + + test('should return message as is if values are not provided', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: 'foo', + }, + }); + + expect(i18n.translate('a.b.c')).toBe('foo'); + }); + + test('should return default message as is if values are not provided', () => { + expect(i18n.translate('a.b.c', { defaultMessage: 'foo' })).toBe('foo'); + }); + + test('should not return defaultMessage as is if values are provided', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: 'foo', + }, + }); + expect(i18n.translate('a.b.c', { defaultMessage: 'bar' })).toBe('foo'); + }); + + test('should interpolate variables', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: 'foo {a}, {b}, {c} bar', + ['d.e.f']: '{foo}', + }, + }); + + expect( + i18n.translate('a.b.c', { + values: { a: 1, b: 2, c: 3 }, + }) + ).toBe('foo 1, 2, 3 bar'); + + expect(i18n.translate('d.e.f', { values: { foo: 'bar' } })).toBe('bar'); + }); + + test('should interpolate variables for default messages', () => { + expect( + i18n.translate('a.b.c', { + defaultMessage: 'foo {a}, {b}, {c} bar', + values: { a: 1, b: 2, c: 3 }, + }) + ).toBe('foo 1, 2, 3 bar'); + }); + + test('should format pluralized messages', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: `You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }`, + }, + }); + + expect(i18n.translate('a.b.c', { values: { numPhotos: 0 } })).toBe('You have no photos.'); + expect(i18n.translate('a.b.c', { values: { numPhotos: 1 } })).toBe('You have one photo.'); + expect(i18n.translate('a.b.c', { values: { numPhotos: 1000 } })).toBe( + 'You have 1,000 photos.' + ); + }); + + test('should format pluralized default messages', () => { + i18n.setDefaultLocale('en'); + + expect( + i18n.translate('a.b.c', { + values: { numPhotos: 0 }, + defaultMessage: `You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }`, + }) + ).toBe('You have no photos.'); + + expect( + i18n.translate('a.b.c', { + values: { numPhotos: 1 }, + defaultMessage: `You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }`, + }) + ).toBe('You have one photo.'); + + expect( + i18n.translate('a.b.c', { + values: { numPhotos: 1000 }, + defaultMessage: `You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }`, + }) + ).toBe('You have 1,000 photos.'); + }); + + test('should throw error if wrong context is provided to the translation string', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: `You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }`, + }, + }); + i18n.setDefaultLocale('en'); + + expect(() => i18n.translate('a.b.c', { values: { foo: 0 } })).toThrowErrorMatchingSnapshot(); + + expect(() => + i18n.translate('d.e.f', { + values: { bar: 1000 }, + defaultMessage: `You have {numPhotos, plural, + =0 {no photos.} + =1 {one photo.} + other {# photos.} + }`, + }) + ).toThrowErrorMatchingSnapshot(); + }); + + test('should format messages with percent formatter', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: 'Result: {result, number, percent}', + }, + }); + i18n.setDefaultLocale('en'); + + expect(i18n.translate('a.b.c', { values: { result: 0.15 } })).toBe('Result: 15%'); + + expect( + i18n.translate('d.e.f', { + values: { result: 0.15 }, + defaultMessage: 'Result: {result, number, percent}', + }) + ).toBe('Result: 15%'); + }); + + test('should format messages with date formatter', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.short']: 'Sale begins {start, date, short}', + ['a.medium']: 'Sale begins {start, date, medium}', + ['a.long']: 'Sale begins {start, date, long}', + ['a.full']: 'Sale begins {start, date, full}', + }, + }); + + expect( + i18n.translate('a.short', { + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins 6/20/18'); + + expect( + i18n.translate('a.medium', { + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins Jun 20, 2018'); + + expect( + i18n.translate('a.long', { + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins June 20, 2018'); + + expect( + i18n.translate('a.full', { + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins Wednesday, June 20, 2018'); + }); + + test('should format default messages with date formatter', () => { + i18n.setDefaultLocale('en'); + + expect( + i18n.translate('foo', { + defaultMessage: 'Sale begins {start, date, short}', + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins 6/20/18'); + + expect( + i18n.translate('foo', { + defaultMessage: 'Sale begins {start, date, medium}', + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins Jun 20, 2018'); + + expect( + i18n.translate('foo', { + defaultMessage: 'Sale begins {start, date, long}', + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins June 20, 2018'); + + expect( + i18n.translate('foo', { + defaultMessage: 'Sale begins {start, date, full}', + values: { start: new Date(2018, 5, 20) }, + }) + ).toBe('Sale begins Wednesday, June 20, 2018'); + }); + + test('should format messages with time formatter', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.short']: 'Coupon expires at {expires, time, short}', + ['a.medium']: 'Coupon expires at {expires, time, medium}', + }, + }); + + expect( + i18n.translate('a.short', { + values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, + }) + ).toBe('Coupon expires at 6:40 PM'); + + expect( + i18n.translate('a.medium', { + values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, + }) + ).toBe('Coupon expires at 6:40:30 PM'); + }); + + test('should format default messages with time formatter', () => { + i18n.setDefaultLocale('en'); + + expect( + i18n.translate('foo', { + defaultMessage: 'Coupon expires at {expires, time, short}', + values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, + }) + ).toBe('Coupon expires at 6:40 PM'); + + expect( + i18n.translate('foo', { + defaultMessage: 'Coupon expires at {expires, time, medium}', + values: { expires: new Date(2018, 5, 20, 18, 40, 30, 50) }, + }) + ).toBe('Coupon expires at 6:40:30 PM'); + }); + + test('should format message with a custom format', () => { + i18n.init({ + locale: 'en', + formats: { + number: { + usd: { style: 'currency', currency: 'USD' }, + }, + }, + messages: { + ['a.b.c']: 'Your total is {total, number, usd}', + ['d.e.f']: 'Your total is {total, number, eur}', + }, + }); + + expect(i18n.translate('a.b.c', { values: { total: 1000 } })).toBe('Your total is $1,000.00'); + + i18n.setFormats({ + number: { + eur: { style: 'currency', currency: 'EUR' }, + }, + }); + + expect(i18n.translate('a.b.c', { values: { total: 1000 } })).toBe('Your total is $1,000.00'); + + expect(i18n.translate('d.e.f', { values: { total: 1000 } })).toBe('Your total is €1,000.00'); + }); + + test('should format default message with a custom format', () => { + i18n.init({ + locale: 'en', + formats: { + number: { + usd: { style: 'currency', currency: 'USD' }, + }, + }, + messages: {}, + }); + i18n.setDefaultLocale('en'); + + expect( + i18n.translate('a.b.c', { + values: { total: 1000 }, + defaultMessage: 'Your total is {total, number, usd}', + }) + ).toBe('Your total is $1,000.00'); + + i18n.setFormats({ + number: { + eur: { style: 'currency', currency: 'EUR' }, + }, + }); + + expect( + i18n.translate('a.b.c', { + values: { total: 1000 }, + defaultMessage: 'Your total is {total, number, usd}', + }) + ).toBe('Your total is $1,000.00'); + + expect( + i18n.translate('d.e.f', { + values: { total: 1000 }, + defaultMessage: 'Your total is {total, number, eur}', + }) + ).toBe('Your total is €1,000.00'); + }); + + test('should use default format if passed format option is not specified', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: 'Your total is {total, number, usd}', + }, + }); + i18n.setDefaultLocale('en'); + + expect(i18n.translate('a.b.c', { values: { total: 1000 } })).toBe('Your total is 1,000'); + + expect( + i18n.translate('d.e.f', { + values: { total: 1000 }, + defaultMessage: 'Your total is {total, number, foo}', + }) + ).toBe('Your total is 1,000'); + }); + + test('should throw error if used format is not specified', () => { + i18n.init({ + locale: 'en', + messages: { + ['a.b.c']: 'Your total is {total, foo}', + }, + }); + i18n.setDefaultLocale('en'); + + expect(() => + i18n.translate('a.b.c', { values: { total: 1 } }) + ).toThrowErrorMatchingSnapshot(); + + expect(() => + i18n.translate('d.e.f', { + values: { total: 1000 }, + defaultMessage: 'Your total is {total, bar}', + }) + ).toThrowErrorMatchingSnapshot(); + }); + }); + + describe('init', () => { + test('should not initialize the engine if messages are not specified', () => { + i18n.init(); + expect(i18n.getTranslation()).toEqual({ messages: {} }); + }); + + test('should throw error if messages are empty', () => { + expect(() => i18n.init({ messages: {} })).toThrow(); + expect(i18n.getTranslation()).toEqual({ messages: {} }); + }); + + test('should add messages if locale is specified', () => { + i18n.init({ + locale: 'en', + messages: { + foo: 'bar', + }, + }); + + expect(i18n.getTranslation()).toEqual({ + locale: 'en', + messages: { + foo: 'bar', + }, + }); + }); + + test('should set the current locale', () => { + i18n.init({ locale: 'ru', messages: {} }); + expect(i18n.getLocale()).toBe('ru'); + }); + + test('should add custom formats', () => { + i18n.init({ + locale: 'ru', + formats: { + date: { + custom: { + month: 'short', + day: 'numeric', + year: 'numeric', + }, + }, + }, + messages: {}, + }); + + expect((i18n.getFormats().date as any).custom).toEqual({ + month: 'short', + day: 'numeric', + year: 'numeric', + }); + }); + }); + + describe('translateUsingPseudoLocale', () => { + test('should translate message using pseudo-locale', () => { + i18n.setLocale('en-xa'); + const message = i18n.translate('namespace.id', { + defaultMessage: + 'Message with a [markdown link](http://localhost:5601/url) and an {htmlElement}', + values: { + htmlElement: 'html element', + }, + }); + + expect(message).toMatchSnapshot(); + }); + }); +}); diff --git a/packages/kbn-i18n/src/core/i18n.ts b/packages/kbn-i18n/src/core/i18n.ts new file mode 100644 index 0000000000000..70348ba051fbf --- /dev/null +++ b/packages/kbn-i18n/src/core/i18n.ts @@ -0,0 +1,243 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import memoizeIntlConstructor from 'intl-format-cache'; +import IntlMessageFormat from 'intl-messageformat'; +import IntlRelativeFormat from 'intl-relativeformat'; + +import { Translation } from '../translation'; +import { Formats, formats as EN_FORMATS } from './formats'; +import { hasValues, isObject, isString, mergeAll } from './helper'; +import { isPseudoLocale, translateUsingPseudoLocale } from './pseudo_locale'; + +// Add all locale data to `IntlMessageFormat`. +import './locales.js'; + +const EN_LOCALE = 'en'; +const LOCALE_DELIMITER = '-'; +const translationsForLocale: Record = {}; +const getMessageFormat = memoizeIntlConstructor(IntlMessageFormat); + +let defaultLocale = EN_LOCALE; +let currentLocale = EN_LOCALE; +let formats = EN_FORMATS; + +IntlMessageFormat.defaultLocale = defaultLocale; +IntlRelativeFormat.defaultLocale = defaultLocale; + +/** + * Returns message by the given message id. + * @param id - path to the message + */ +function getMessageById(id: string): string | undefined { + const translation = getTranslation(); + return translation.messages ? translation.messages[id] : undefined; +} + +/** + * Normalizes locale to make it consistent with IntlMessageFormat locales + * @param locale + */ +function normalizeLocale(locale: string) { + return locale.toLowerCase().replace('_', LOCALE_DELIMITER); +} + +/** + * Provides a way to register translations with the engine + * @param newTranslation + * @param [locale = messages.locale] + */ +export function addTranslation(newTranslation: Translation, locale = newTranslation.locale) { + if (!locale || !isString(locale)) { + throw new Error('[I18n] A `locale` must be a non-empty string to add messages.'); + } + + if (newTranslation.locale && newTranslation.locale !== locale) { + throw new Error( + '[I18n] A `locale` in the translation object is different from the one provided as a second argument.' + ); + } + + const normalizedLocale = normalizeLocale(locale); + const existingTranslation = translationsForLocale[normalizedLocale] || { messages: {} }; + + translationsForLocale[normalizedLocale] = { + formats: newTranslation.formats || existingTranslation.formats, + locale: newTranslation.locale || existingTranslation.locale, + messages: { + ...existingTranslation.messages, + ...newTranslation.messages, + }, + }; +} + +/** + * Returns messages for the current language + */ +export function getTranslation(): Translation { + return translationsForLocale[currentLocale] || { messages: {} }; +} + +/** + * Tells the engine which language to use by given language key + * @param locale + */ +export function setLocale(locale: string) { + if (!locale || !isString(locale)) { + throw new Error('[I18n] A `locale` must be a non-empty string.'); + } + + currentLocale = normalizeLocale(locale); +} + +/** + * Returns the current locale + */ +export function getLocale() { + return currentLocale; +} + +/** + * Tells the library which language to fallback when missing translations + * @param locale + */ +export function setDefaultLocale(locale: string) { + if (!locale || !isString(locale)) { + throw new Error('[I18n] A `locale` must be a non-empty string.'); + } + + defaultLocale = normalizeLocale(locale); + IntlMessageFormat.defaultLocale = defaultLocale; + IntlRelativeFormat.defaultLocale = defaultLocale; +} + +export function getDefaultLocale() { + return defaultLocale; +} + +/** + * Supplies a set of options to the underlying formatter + * [Default format options used as the prototype of the formats] + * {@link https://github.com/yahoo/intl-messageformat/blob/master/src/core.js#L62} + * These are used when constructing the internal Intl.NumberFormat + * and Intl.DateTimeFormat instances. + * @param newFormats + * @param [newFormats.number] + * @param [newFormats.date] + * @param [newFormats.time] + */ +export function setFormats(newFormats: Formats) { + if (!isObject(newFormats) || !hasValues(newFormats)) { + throw new Error('[I18n] A `formats` must be a non-empty object.'); + } + + formats = mergeAll(formats, newFormats); +} + +/** + * Returns current formats + */ +export function getFormats() { + return formats; +} + +/** + * Returns array of locales having translations + */ +export function getRegisteredLocales() { + return Object.keys(translationsForLocale); +} + +interface TranslateArguments { + values?: { [key: string]: string | number | Date }; + defaultMessage?: string; + description?: string; +} + +/** + * Translate message by id + * @param id - translation id to be translated + * @param [options] + * @param [options.values] - values to pass into translation + * @param [options.defaultMessage] - will be used unless translation was successful + */ +export function translate( + id: string, + { values = {}, defaultMessage = '' }: TranslateArguments = { + values: {}, + defaultMessage: '', + } +) { + const shouldUsePseudoLocale = isPseudoLocale(currentLocale); + + if (!id || !isString(id)) { + throw new Error('[I18n] An `id` must be a non-empty string to translate a message.'); + } + + const message = shouldUsePseudoLocale ? defaultMessage : getMessageById(id); + + if (!message && !defaultMessage) { + throw new Error(`[I18n] Cannot format message: "${id}". Default message must be provided.`); + } + + if (message) { + try { + // We should call `format` even for messages without any value references + // to let it handle escaped curly braces `\\{` that are the part of the text itself + // and not value reference boundaries. + const formattedMessage = getMessageFormat(message, getLocale(), getFormats()).format(values); + + return shouldUsePseudoLocale + ? translateUsingPseudoLocale(formattedMessage) + : formattedMessage; + } catch (e) { + throw new Error( + `[I18n] Error formatting message: "${id}" for locale: "${getLocale()}".\n${e}` + ); + } + } + + try { + const msg = getMessageFormat(defaultMessage, getDefaultLocale(), getFormats()); + + return msg.format(values); + } catch (e) { + throw new Error(`[I18n] Error formatting the default message for: "${id}".\n${e}`); + } +} + +/** + * Initializes the engine + * @param newTranslation + */ +export function init(newTranslation?: Translation) { + if (!newTranslation) { + return; + } + + addTranslation(newTranslation); + + if (newTranslation.locale) { + setLocale(newTranslation.locale); + } + + if (newTranslation.formats) { + setFormats(newTranslation.formats); + } +} diff --git a/packages/kbn-i18n/src/core/index.js b/packages/kbn-i18n/src/core/index.ts similarity index 100% rename from packages/kbn-i18n/src/core/index.js rename to packages/kbn-i18n/src/core/index.ts diff --git a/packages/kbn-i18n/src/core/pseudo_locale.ts b/packages/kbn-i18n/src/core/pseudo_locale.ts new file mode 100644 index 0000000000000..f881655ea014f --- /dev/null +++ b/packages/kbn-i18n/src/core/pseudo_locale.ts @@ -0,0 +1,104 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Matches every single [A-Za-z] character, `` and `](markdown-link-address)` + */ +const CHARS_FOR_PSEUDO_LOCALIZATION_REGEX = /[A-Za-z]|(\]\([\s\S]*?\))|(<([^"<>]|("[^"]*?"))*?>)/g; +const PSEUDO_ACCENTS_LOCALE = 'en-xa'; + +export function isPseudoLocale(locale: string) { + return locale.toLowerCase() === PSEUDO_ACCENTS_LOCALE; +} + +/** + * Replaces every latin char by pseudo char and repeats every third char twice. + */ +function replacer() { + let count = 0; + + return (match: string) => { + // if `match.length !== 1`, then `match` is html tag or markdown link address, so it should be ignored + if (match.length !== 1) { + return match; + } + + const pseudoChar = pseudoAccentCharMap[match] || match; + return ++count % 3 === 0 ? pseudoChar.repeat(2) : pseudoChar; + }; +} + +export function translateUsingPseudoLocale(message: string) { + return message.replace(CHARS_FOR_PSEUDO_LOCALIZATION_REGEX, replacer()); +} + +const pseudoAccentCharMap: Record = { + a: 'à', + b: 'ƀ', + c: 'ç', + d: 'ð', + e: 'é', + f: 'ƒ', + g: 'ĝ', + h: 'ĥ', + i: 'î', + l: 'ļ', + k: 'ķ', + j: 'ĵ', + m: 'ɱ', + n: 'ñ', + o: 'ô', + p: 'þ', + q: 'ǫ', + r: 'ŕ', + s: 'š', + t: 'ţ', + u: 'û', + v: 'ṽ', + w: 'ŵ', + x: 'ẋ', + y: 'ý', + z: 'ž', + A: 'À', + B: 'Ɓ', + C: 'Ç', + D: 'Ð', + E: 'É', + F: 'Ƒ', + G: 'Ĝ', + H: 'Ĥ', + I: 'Î', + L: 'Ļ', + K: 'Ķ', + J: 'Ĵ', + M: 'Ṁ', + N: 'Ñ', + O: 'Ô', + P: 'Þ', + Q: 'Ǫ', + R: 'Ŕ', + S: 'Š', + T: 'Ţ', + U: 'Û', + V: 'Ṽ', + W: 'Ŵ', + X: 'Ẋ', + Y: 'Ý', + Z: 'Ž', +}; diff --git a/packages/kbn-i18n/src/index.js b/packages/kbn-i18n/src/index.ts similarity index 100% rename from packages/kbn-i18n/src/index.js rename to packages/kbn-i18n/src/index.ts diff --git a/packages/kbn-i18n/src/loader.js b/packages/kbn-i18n/src/loader.js deleted file mode 100644 index 009d866725846..0000000000000 --- a/packages/kbn-i18n/src/loader.js +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - @typedef Messages - messages tree, where leafs are translated strings - @type {object} - @property {string} [locale] - locale of the messages - @property {object} [formats] - set of options to the underlying formatter - */ - -import path from 'path'; -import { readFile } from 'fs'; -import { promisify } from 'util'; -import JSON5 from 'json5'; -import { unique } from './core/helper'; - -const asyncReadFile = promisify(readFile); - -const TRANSLATION_FILE_EXTENSION = '.json'; - -/** - * Internal property for storing registered translations paths - * @type {Map|{}} - Key is locale, value is array of registered paths - */ -const translationsRegistry = {}; - -/** - * Internal property for caching loaded translations files - * @type {Map|{}} - Key is path to translation file, value is - * object with translation messages - */ -const loadedFiles = {}; - -/** - * Returns locale by the given translation file name - * @param {string} fullFileName - * @returns {string} locale - * @example - * getLocaleFromFileName('./path/to/translation/ru.json') // => 'ru' - */ -function getLocaleFromFileName(fullFileName) { - if (!fullFileName) { - throw new Error('Filename is empty'); - } - - const fileExt = path.extname(fullFileName); - - if (fileExt !== TRANSLATION_FILE_EXTENSION) { - throw new Error( - `Translations must have 'json' extension. File being registered is ${fullFileName}` - ); - } - - return path.basename(fullFileName, TRANSLATION_FILE_EXTENSION); -} - -/** - * Loads file and parses it as JSON5 - * @param {string} pathToFile - * @returns {Promise} - */ -async function loadFile(pathToFile) { - return JSON5.parse(await asyncReadFile(pathToFile, 'utf8')); -} - -/** - * Loads translations files and adds them into "loadedFiles" cache - * @param {string[]} files - * @returns {Promise} - */ -async function loadAndCacheFiles(files) { - const translations = await Promise.all(files.map(loadFile)); - - files.forEach((file, index) => { - loadedFiles[file] = translations[index]; - }); -} - -/** - * Registers translation file with i18n loader - * @param {string} translationFilePath - Absolute path to the translation file to register. - */ -export function registerTranslationFile(translationFilePath) { - if (!path.isAbsolute(translationFilePath)) { - throw new TypeError( - 'Paths to translation files must be absolute. ' + - `Got relative path: "${translationFilePath}"` - ); - } - - const locale = getLocaleFromFileName(translationFilePath); - - translationsRegistry[locale] = unique([ - ...(translationsRegistry[locale] || []), - translationFilePath, - ]); -} - -/** - * Registers array of translation files with i18n loader - * @param {string[]} arrayOfPaths - Array of absolute paths to the translation files to register. - */ -export function registerTranslationFiles(arrayOfPaths = []) { - arrayOfPaths.forEach(registerTranslationFile); -} - -/** - * Returns an array of locales that have been registered with i18n loader - * @returns {string[]} registeredTranslations - */ -export function getRegisteredLocales() { - return Object.keys(translationsRegistry); -} - -/** - * Returns translation messages by specified locale - * @param {string} locale - * @returns {Promise} translations - translation messages - */ -export async function getTranslationsByLocale(locale) { - const files = translationsRegistry[locale] || []; - const notLoadedFiles = files.filter(file => !loadedFiles[file]); - - if (notLoadedFiles.length) { - await loadAndCacheFiles(notLoadedFiles); - } - - return files.length - ? files.reduce( - (messages, file) => ({ - ...messages, - ...loadedFiles[file], - }), - { locale } - ) - : {}; -} - -/** - * Returns all translations for registered locales - * @return {Promise>} translations - A Promise object - * where keys are the locale and values are objects of translation messages - */ -export async function getAllTranslations() { - const locales = getRegisteredLocales(); - const translations = await Promise.all(locales.map(getTranslationsByLocale)); - - return locales.reduce( - (acc, locale, index) => ({ - ...acc, - [locale]: translations[index], - }), - {} - ); -} - -/** - * Registers passed translations files, loads them and returns promise with - * all translation messages - * @param {string[]} paths - Array of absolute paths to the translation files - * @returns {Promise>} translations - A Promise object - * where keys are the locale and values are objects of translation messages - */ -export async function getAllTranslationsFromPaths(paths) { - registerTranslationFiles(paths); - - return await getAllTranslations(); -} diff --git a/packages/kbn-i18n/src/loader.test.js b/packages/kbn-i18n/src/loader.test.js deleted file mode 100644 index c2d494a9f1095..0000000000000 --- a/packages/kbn-i18n/src/loader.test.js +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { join } from 'path'; - -describe('I18n loader', () => { - let i18nLoader; - - beforeEach(() => { - i18nLoader = require('./loader'); - }); - - afterEach(() => { - // isolate modules for every test so that local module state doesn't conflict between tests - jest.resetModules(); - }); - - describe('registerTranslationFile', () => { - test('should throw error if path to translation file is not specified', () => { - expect(() => i18nLoader.registerTranslationFile()).toThrowErrorMatchingSnapshot(); - }); - - test('should throw error if path to translation file is not an absolute', () => { - expect(() => i18nLoader.registerTranslationFile('./en.json')).toThrowErrorMatchingSnapshot(); - }); - - test('should throw error if path to translation file does not have an extension', () => { - expect(() => - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_1/translations/en') - ) - ).toThrow(); - }); - - test('should throw error if translation file is not a json', () => { - expect(() => - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_1/translations/en.txt') - ) - ).toThrow(); - }); - - test('should register a translation file', () => { - expect(i18nLoader.getRegisteredLocales()).toEqual([]); - - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json') - ); - - expect(i18nLoader.getRegisteredLocales()).toEqual(['en']); - - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json') - ); - - expect(i18nLoader.getRegisteredLocales()).toContain('en', 'en-US'); - expect(i18nLoader.getRegisteredLocales().length).toBe(2); - }); - }); - - describe('registerTranslationFiles', () => { - test('should register array of translation files', () => { - expect(i18nLoader.getRegisteredLocales()).toEqual([]); - - i18nLoader.registerTranslationFiles([ - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), - ]); - - expect(i18nLoader.getRegisteredLocales()).toContain('en', 'en-US'); - expect(i18nLoader.getRegisteredLocales().length).toBe(2); - }); - }); - - describe('getTranslationsByLocale', () => { - test('should return translation messages by specified locale', async () => { - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json') - ); - - expect(await i18nLoader.getTranslationsByLocale('en')).toEqual({ - locale: 'en', - ['a.b.c']: 'foo', - ['d.e.f']: 'bar', - }); - }); - - test('should return empty object if passed locale is not registered', async () => { - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json') - ); - - expect(await i18nLoader.getTranslationsByLocale('ru')).toEqual({}); - }); - - test('should return translation messages from a couple of files by specified locale', async () => { - i18nLoader.registerTranslationFiles([ - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), - ]); - - expect(await i18nLoader.getTranslationsByLocale('en')).toEqual({ - locale: 'en', - ['a.b.c']: 'foo', - ['d.e.f']: 'bar', - ['a.b.c.custom']: 'foo.custom', - ['d.e.f.custom']: 'bar.custom', - }); - }); - - test('should return translation messages for different locales', async () => { - i18nLoader.registerTranslationFiles([ - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/ru.json'), - ]); - - expect(await i18nLoader.getTranslationsByLocale('en')).toEqual({ - locale: 'en', - ['a.b.c']: 'foo', - ['d.e.f']: 'bar', - ['a.b.c.custom']: 'foo.custom', - ['d.e.f.custom']: 'bar.custom', - }); - - expect(await i18nLoader.getTranslationsByLocale('en-US')).toEqual({ - locale: 'en-US', - ['a.b.c']: 'bar', - ['d.e.f']: 'foo', - }); - - expect(await i18nLoader.getTranslationsByLocale('ru')).toEqual({ - locale: 'ru', - test: 'test', - }); - }); - - test('should return translation messages from JSON5 file', async () => { - i18nLoader.registerTranslationFile( - join(__dirname, './__fixtures__/test_plugin_2/translations/fr.json') - ); - - expect(await i18nLoader.getTranslationsByLocale('fr')).toEqual({ - locale: 'fr', - test: 'test', - }); - }); - }); - - describe('getAllTranslations', () => { - test('should return translation messages for all registered locales', async () => { - i18nLoader.registerTranslationFiles([ - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/ru.json'), - ]); - - expect(await i18nLoader.getAllTranslations()).toEqual({ - en: { - locale: 'en', - ['a.b.c']: 'foo', - ['d.e.f']: 'bar', - ['a.b.c.custom']: 'foo.custom', - ['d.e.f.custom']: 'bar.custom', - }, - ['en-US']: { - locale: 'en-US', - ['a.b.c']: 'bar', - ['d.e.f']: 'foo', - }, - ru: { - locale: 'ru', - test: 'test', - }, - }); - }); - - test('should return empty object if there are no registered locales', async () => { - expect(await i18nLoader.getAllTranslations()).toEqual({}); - }); - }); - - describe('getAllTranslationsFromPaths', () => { - test('should return translation messages for all passed paths to translation files', async () => { - expect( - await i18nLoader.getAllTranslationsFromPaths([ - join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), - join(__dirname, './__fixtures__/test_plugin_2/translations/ru.json'), - ]) - ).toEqual({ - en: { - locale: 'en', - ['a.b.c']: 'foo', - ['d.e.f']: 'bar', - ['a.b.c.custom']: 'foo.custom', - ['d.e.f.custom']: 'bar.custom', - }, - ['en-US']: { - locale: 'en-US', - ['a.b.c']: 'bar', - ['d.e.f']: 'foo', - }, - ru: { - locale: 'ru', - test: 'test', - }, - }); - }); - - test('should return empty object if there are no translation files', async () => { - expect(await i18nLoader.getAllTranslationsFromPaths()).toEqual({}); - }); - }); -}); diff --git a/packages/kbn-i18n/src/loader.test.ts b/packages/kbn-i18n/src/loader.test.ts new file mode 100644 index 0000000000000..72cfeb09974ac --- /dev/null +++ b/packages/kbn-i18n/src/loader.test.ts @@ -0,0 +1,262 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { join } from 'path'; + +describe('I18n loader', () => { + let i18nLoader: typeof import('./loader'); + + beforeEach(() => { + i18nLoader = require('./loader'); + }); + + afterEach(() => { + // isolate modules for every test so that local module state doesn't conflict between tests + jest.resetModules(); + }); + + describe('registerTranslationFile', () => { + test('should throw error if path to translation file is not specified', () => { + expect(() => + i18nLoader.registerTranslationFile(undefined as any) + ).toThrowErrorMatchingSnapshot(); + }); + + test('should throw error if path to translation file is not an absolute', () => { + expect(() => i18nLoader.registerTranslationFile('./en.json')).toThrowErrorMatchingSnapshot(); + }); + + test('should throw error if path to translation file does not have an extension', () => { + expect(() => + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_1/translations/en') + ) + ).toThrow(); + }); + + test('should throw error if translation file is not a json', () => { + expect(() => + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_1/translations/en.txt') + ) + ).toThrow(); + }); + + test('should register a translation file', () => { + expect(i18nLoader.getRegisteredLocales()).toEqual([]); + + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json') + ); + + expect(i18nLoader.getRegisteredLocales()).toEqual(['en']); + + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json') + ); + + expect(i18nLoader.getRegisteredLocales()).toContain('en'); + expect(i18nLoader.getRegisteredLocales()).toContain('en-US'); + expect(i18nLoader.getRegisteredLocales().length).toBe(2); + }); + }); + + describe('registerTranslationFiles', () => { + test('should register array of translation files', () => { + expect(i18nLoader.getRegisteredLocales()).toEqual([]); + + i18nLoader.registerTranslationFiles([ + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), + ]); + + expect(i18nLoader.getRegisteredLocales()).toContain('en'); + expect(i18nLoader.getRegisteredLocales()).toContain('en-US'); + expect(i18nLoader.getRegisteredLocales().length).toBe(2); + }); + }); + + describe('getTranslationsByLocale', () => { + test('should return translation messages by specified locale', async () => { + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json') + ); + + expect(await i18nLoader.getTranslationsByLocale('en')).toEqual({ + locale: 'en', + messages: { + ['a.b.c']: 'foo', + ['d.e.f']: 'bar', + }, + }); + }); + + test('should return empty object if passed locale is not registered', async () => { + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json') + ); + + expect(await i18nLoader.getTranslationsByLocale('ru')).toEqual({ messages: {} }); + }); + + test('should return translation messages from a couple of files by specified locale', async () => { + i18nLoader.registerTranslationFiles([ + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), + ]); + + expect(await i18nLoader.getTranslationsByLocale('en')).toEqual({ + locale: 'en', + messages: { + ['a.b.c']: 'foo', + ['d.e.f']: 'bar', + ['a.b.c.custom']: 'foo.custom', + ['d.e.f.custom']: 'bar.custom', + }, + }); + }); + + test('should return translation messages for different locales', async () => { + i18nLoader.registerTranslationFiles([ + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/ru.json'), + ]); + + expect(await i18nLoader.getTranslationsByLocale('en')).toEqual({ + locale: 'en', + messages: { + ['a.b.c']: 'foo', + ['d.e.f']: 'bar', + ['a.b.c.custom']: 'foo.custom', + ['d.e.f.custom']: 'bar.custom', + }, + }); + + expect(await i18nLoader.getTranslationsByLocale('en-US')).toEqual({ + locale: 'en-US', + messages: { + ['a.b.c']: 'bar', + ['d.e.f']: 'foo', + }, + }); + + expect(await i18nLoader.getTranslationsByLocale('ru')).toEqual({ + locale: 'ru', + messages: { + test: 'test', + }, + }); + }); + + test('should return translation messages from JSON5 file', async () => { + i18nLoader.registerTranslationFile( + join(__dirname, './__fixtures__/test_plugin_2/translations/fr.json') + ); + + expect(await i18nLoader.getTranslationsByLocale('fr')).toEqual({ + locale: 'fr', + messages: { + test: 'test', + }, + }); + }); + }); + + describe('getAllTranslations', () => { + test('should return translation messages for all registered locales', async () => { + i18nLoader.registerTranslationFiles([ + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/ru.json'), + ]); + + expect(await i18nLoader.getAllTranslations()).toEqual({ + en: { + locale: 'en', + messages: { + ['a.b.c']: 'foo', + ['d.e.f']: 'bar', + ['a.b.c.custom']: 'foo.custom', + ['d.e.f.custom']: 'bar.custom', + }, + }, + ['en-US']: { + locale: 'en-US', + messages: { + ['a.b.c']: 'bar', + ['d.e.f']: 'foo', + }, + }, + ru: { + locale: 'ru', + messages: { + test: 'test', + }, + }, + }); + }); + + test('should return empty object if there are no registered locales', async () => { + expect(await i18nLoader.getAllTranslations()).toEqual({}); + }); + }); + + describe('getAllTranslationsFromPaths', () => { + test('should return translation messages for all passed paths to translation files', async () => { + expect( + await i18nLoader.getAllTranslationsFromPaths([ + join(__dirname, './__fixtures__/test_plugin_1/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_1/translations/en-US.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/en.json'), + join(__dirname, './__fixtures__/test_plugin_2/translations/ru.json'), + ]) + ).toEqual({ + en: { + locale: 'en', + messages: { + ['a.b.c']: 'foo', + ['d.e.f']: 'bar', + ['a.b.c.custom']: 'foo.custom', + ['d.e.f.custom']: 'bar.custom', + }, + }, + ['en-US']: { + locale: 'en-US', + messages: { + ['a.b.c']: 'bar', + ['d.e.f']: 'foo', + }, + }, + ru: { + locale: 'ru', + messages: { + test: 'test', + }, + }, + }); + }); + + test('should return empty object if there are no translation files', async () => { + expect(await i18nLoader.getAllTranslationsFromPaths(undefined as any)).toEqual({}); + }); + }); +}); diff --git a/packages/kbn-i18n/src/loader.ts b/packages/kbn-i18n/src/loader.ts new file mode 100644 index 0000000000000..6efafc18ae79b --- /dev/null +++ b/packages/kbn-i18n/src/loader.ts @@ -0,0 +1,184 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { readFile } from 'fs'; +import * as JSON5 from 'json5'; +import * as path from 'path'; +import { promisify } from 'util'; + +import { unique } from './core/helper'; +import { Translation } from './translation'; + +const asyncReadFile = promisify(readFile); + +const TRANSLATION_FILE_EXTENSION = '.json'; + +/** + * Internal property for storing registered translations paths. + * Key is locale, value is array of registered paths + */ +const translationsRegistry: { [key: string]: string[] } = {}; + +/** + * Internal property for caching loaded translations files. + * Key is path to translation file, value is object with translation messages + */ +const loadedFiles: { [key: string]: Translation } = {}; + +/** + * Returns locale by the given translation file name + * @param fullFileName + * @returns locale + * @example + * getLocaleFromFileName('./path/to/translation/ru.json') // => 'ru' + */ +function getLocaleFromFileName(fullFileName: string) { + if (!fullFileName) { + throw new Error('Filename is empty'); + } + + const fileExt = path.extname(fullFileName); + + if (fileExt !== TRANSLATION_FILE_EXTENSION) { + throw new Error( + `Translations must have 'json' extension. File being registered is ${fullFileName}` + ); + } + + return path.basename(fullFileName, TRANSLATION_FILE_EXTENSION); +} + +/** + * Loads file and parses it as JSON5 + * @param pathToFile + * @returns + */ +async function loadFile(pathToFile: string): Promise { + return JSON5.parse(await asyncReadFile(pathToFile, 'utf8')); +} + +/** + * Loads translations files and adds them into "loadedFiles" cache + * @param files + * @returns + */ +async function loadAndCacheFiles(files: string[]) { + const translations = await Promise.all(files.map(loadFile)); + + files.forEach((file, index) => { + loadedFiles[file] = translations[index]; + }); +} + +/** + * Registers translation file with i18n loader + * @param translationFilePath - Absolute path to the translation file to register. + */ +export function registerTranslationFile(translationFilePath: string) { + if (!path.isAbsolute(translationFilePath)) { + throw new TypeError( + 'Paths to translation files must be absolute. ' + + `Got relative path: "${translationFilePath}"` + ); + } + + const locale = getLocaleFromFileName(translationFilePath); + + translationsRegistry[locale] = unique([ + ...(translationsRegistry[locale] || []), + translationFilePath, + ]); +} + +/** + * Registers array of translation files with i18n loader + * @param arrayOfPaths - Array of absolute paths to the translation files to register. + */ +export function registerTranslationFiles(arrayOfPaths: string[] = []) { + arrayOfPaths.forEach(registerTranslationFile); +} + +/** + * Returns an array of locales that have been registered with i18n loader + * @returns registeredTranslations + */ +export function getRegisteredLocales() { + return Object.keys(translationsRegistry); +} + +/** + * Returns translation messages by specified locale + * @param locale + * @returns translation messages + */ +export async function getTranslationsByLocale(locale: string): Promise { + const files = translationsRegistry[locale] || []; + const notLoadedFiles = files.filter(file => !loadedFiles[file]); + + if (notLoadedFiles.length) { + await loadAndCacheFiles(notLoadedFiles); + } + + if (!files.length) { + return { messages: {} }; + } + + return files.reduce( + (translation: Translation, file) => ({ + locale: loadedFiles[file].locale || translation.locale, + formats: loadedFiles[file].formats || translation.formats, + messages: { + ...loadedFiles[file].messages, + ...translation.messages, + }, + }), + { locale, messages: {} } + ); +} + +/** + * Returns all translations for registered locales + * @returns A Promise object + * where keys are the locale and values are objects of translation messages + */ +export async function getAllTranslations(): Promise<{ [key: string]: Translation }> { + const locales = getRegisteredLocales(); + const translations = await Promise.all(locales.map(getTranslationsByLocale)); + + return locales.reduce( + (acc, locale, index) => ({ + ...acc, + [locale]: translations[index], + }), + {} + ); +} + +/** + * Registers passed translations files, loads them and returns promise with + * all translation messages + * @param paths - Array of absolute paths to the translation files + * @returns A Promise object where + * keys are the locale and values are objects of translation messages + */ +export async function getAllTranslationsFromPaths(paths: string[]) { + registerTranslationFiles(paths); + + return await getAllTranslations(); +} diff --git a/packages/kbn-i18n/src/react/__snapshots__/inject_i18n_provider.test.tsx.snap b/packages/kbn-i18n/src/react/__snapshots__/inject_i18n_provider.test.tsx.snap new file mode 100644 index 0000000000000..7ad7a6fbc1f00 --- /dev/null +++ b/packages/kbn-i18n/src/react/__snapshots__/inject_i18n_provider.test.tsx.snap @@ -0,0 +1,90 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`injectI18nProvider provides with context 1`] = ` +Object { + "defaultFormats": Object { + "date": Object { + "full": Object { + "day": "numeric", + "month": "long", + "weekday": "long", + "year": "numeric", + }, + "long": Object { + "day": "numeric", + "month": "long", + "year": "numeric", + }, + "medium": Object { + "day": "numeric", + "month": "short", + "year": "numeric", + }, + "short": Object { + "day": "numeric", + "month": "numeric", + "year": "2-digit", + }, + }, + "number": Object { + "currency": Object { + "style": "currency", + }, + "percent": Object { + "style": "percent", + }, + }, + "time": Object { + "full": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", + }, + "long": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", + }, + "medium": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + }, + "short": Object { + "hour": "numeric", + "minute": "numeric", + }, + }, + }, + "defaultLocale": "en", + "formatDate": [Function], + "formatHTMLMessage": [Function], + "formatMessage": [Function], + "formatNumber": [Function], + "formatPlural": [Function], + "formatRelative": [Function], + "formatTime": [Function], + "formats": Object {}, + "formatters": Object { + "getDateTimeFormat": [Function], + "getMessageFormat": [Function], + "getNumberFormat": [Function], + "getPluralFormat": [Function], + "getRelativeFormat": [Function], + }, + "locale": "en", + "messages": Object {}, + "now": [Function], + "onError": [Function], + "textComponent": Symbol(react.fragment), + "timeZone": null, +} +`; + +exports[`injectI18nProvider renders children 1`] = ` + + + +`; diff --git a/packages/kbn-i18n/src/react/__snapshots__/provider.test.js.snap b/packages/kbn-i18n/src/react/__snapshots__/provider.test.js.snap deleted file mode 100644 index 750d2d48b045a..0000000000000 --- a/packages/kbn-i18n/src/react/__snapshots__/provider.test.js.snap +++ /dev/null @@ -1,139 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`I18nProvider provides with context 1`] = ` -Object { - "defaultFormats": Object { - "date": Object { - "full": Object { - "day": "numeric", - "month": "long", - "weekday": "long", - "year": "numeric", - }, - "long": Object { - "day": "numeric", - "month": "long", - "year": "numeric", - }, - "medium": Object { - "day": "numeric", - "month": "short", - "year": "numeric", - }, - "short": Object { - "day": "numeric", - "month": "numeric", - "year": "2-digit", - }, - }, - "number": Object { - "currency": Object { - "style": "currency", - }, - "percent": Object { - "style": "percent", - }, - }, - "time": Object { - "full": Object { - "hour": "numeric", - "minute": "numeric", - "second": "numeric", - "timeZoneName": "short", - }, - "long": Object { - "hour": "numeric", - "minute": "numeric", - "second": "numeric", - "timeZoneName": "short", - }, - "medium": Object { - "hour": "numeric", - "minute": "numeric", - "second": "numeric", - }, - "short": Object { - "hour": "numeric", - "minute": "numeric", - }, - }, - }, - "defaultLocale": "en", - "formatDate": [Function], - "formatHTMLMessage": [Function], - "formatMessage": [Function], - "formatNumber": [Function], - "formatPlural": [Function], - "formatRelative": [Function], - "formatTime": [Function], - "formats": Object { - "date": Object { - "full": Object { - "day": "numeric", - "month": "long", - "weekday": "long", - "year": "numeric", - }, - "long": Object { - "day": "numeric", - "month": "long", - "year": "numeric", - }, - "medium": Object { - "day": "numeric", - "month": "short", - "year": "numeric", - }, - "short": Object { - "day": "numeric", - "month": "numeric", - "year": "2-digit", - }, - }, - "number": Object { - "currency": Object { - "style": "currency", - }, - "percent": Object { - "style": "percent", - }, - }, - "time": Object { - "full": Object { - "hour": "numeric", - "minute": "numeric", - "second": "numeric", - "timeZoneName": "short", - }, - "long": Object { - "hour": "numeric", - "minute": "numeric", - "second": "numeric", - "timeZoneName": "short", - }, - "medium": Object { - "hour": "numeric", - "minute": "numeric", - "second": "numeric", - }, - "short": Object { - "hour": "numeric", - "minute": "numeric", - }, - }, - }, - "formatters": Object { - "getDateTimeFormat": [Function], - "getMessageFormat": [Function], - "getNumberFormat": [Function], - "getPluralFormat": [Function], - "getRelativeFormat": [Function], - }, - "locale": "en", - "messages": Object {}, - "now": [Function], - "textComponent": "span", -} -`; - -exports[`I18nProvider renders children 1`] = ``; diff --git a/packages/kbn-i18n/src/react/__snapshots__/provider.test.tsx.snap b/packages/kbn-i18n/src/react/__snapshots__/provider.test.tsx.snap new file mode 100644 index 0000000000000..67701d6c14697 --- /dev/null +++ b/packages/kbn-i18n/src/react/__snapshots__/provider.test.tsx.snap @@ -0,0 +1,86 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`I18nProvider provides with context 1`] = ` +Object { + "defaultFormats": Object { + "date": Object { + "full": Object { + "day": "numeric", + "month": "long", + "weekday": "long", + "year": "numeric", + }, + "long": Object { + "day": "numeric", + "month": "long", + "year": "numeric", + }, + "medium": Object { + "day": "numeric", + "month": "short", + "year": "numeric", + }, + "short": Object { + "day": "numeric", + "month": "numeric", + "year": "2-digit", + }, + }, + "number": Object { + "currency": Object { + "style": "currency", + }, + "percent": Object { + "style": "percent", + }, + }, + "time": Object { + "full": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", + }, + "long": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", + }, + "medium": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + }, + "short": Object { + "hour": "numeric", + "minute": "numeric", + }, + }, + }, + "defaultLocale": "en", + "formatDate": [Function], + "formatHTMLMessage": [Function], + "formatMessage": [Function], + "formatNumber": [Function], + "formatPlural": [Function], + "formatRelative": [Function], + "formatTime": [Function], + "formats": Object {}, + "formatters": Object { + "getDateTimeFormat": [Function], + "getMessageFormat": [Function], + "getNumberFormat": [Function], + "getPluralFormat": [Function], + "getRelativeFormat": [Function], + }, + "locale": "en", + "messages": Object {}, + "now": [Function], + "onError": [Function], + "textComponent": Symbol(react.fragment), + "timeZone": null, +} +`; + +exports[`I18nProvider renders children 1`] = ``; diff --git a/packages/kbn-i18n/src/react/index.js b/packages/kbn-i18n/src/react/index.js deleted file mode 100644 index 9619d2c8d162e..0000000000000 --- a/packages/kbn-i18n/src/react/index.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { - intlShape, - FormattedDate, - FormattedTime, - FormattedRelative, - FormattedNumber, - FormattedPlural, - FormattedMessage, - FormattedHTMLMessage, -} from 'react-intl'; - -export { I18nProvider } from './provider'; -export { injectI18n } from './inject'; diff --git a/packages/kbn-i18n/src/react/index.tsx b/packages/kbn-i18n/src/react/index.tsx new file mode 100644 index 0000000000000..646c3608a7cd3 --- /dev/null +++ b/packages/kbn-i18n/src/react/index.tsx @@ -0,0 +1,34 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { + intlShape, + InjectedIntl, + FormattedDate, + FormattedTime, + FormattedRelative, + FormattedNumber, + FormattedPlural, + FormattedMessage, + FormattedHTMLMessage, +} from 'react-intl'; + +export { I18nProvider } from './provider'; +export { injectI18nProvider } from './inject_i18n_provider'; +export { injectI18n } from './inject'; diff --git a/packages/kbn-i18n/src/react/inject.js b/packages/kbn-i18n/src/react/inject.tsx similarity index 100% rename from packages/kbn-i18n/src/react/inject.js rename to packages/kbn-i18n/src/react/inject.tsx diff --git a/packages/kbn-i18n/src/react/inject_i18n_provider.test.tsx b/packages/kbn-i18n/src/react/inject_i18n_provider.test.tsx new file mode 100644 index 0000000000000..13080510f0b58 --- /dev/null +++ b/packages/kbn-i18n/src/react/inject_i18n_provider.test.tsx @@ -0,0 +1,47 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { mount, shallow } from 'enzyme'; +import * as React from 'react'; +import { intlShape } from 'react-intl'; + +import { injectI18n } from './inject'; +import { injectI18nProvider } from './inject_i18n_provider'; + +describe('injectI18nProvider', () => { + test('renders children', () => { + const ChildrenMock = () => null; + const Injected = injectI18nProvider(ChildrenMock); + + expect(shallow()).toMatchSnapshot(); + }); + + test('provides with context', () => { + const ChildrenMock = () =>
; + const WithIntl = injectI18n(ChildrenMock); + const Injected = injectI18nProvider(WithIntl); + + const wrapper = mount(, { + childContextTypes: { + intl: intlShape, + }, + }); + + expect(wrapper.find(ChildrenMock).prop('intl')).toMatchSnapshot(); + }); +}); diff --git a/packages/kbn-i18n/src/react/inject_i18n_provider.tsx b/packages/kbn-i18n/src/react/inject_i18n_provider.tsx new file mode 100644 index 0000000000000..e6301c5916a76 --- /dev/null +++ b/packages/kbn-i18n/src/react/inject_i18n_provider.tsx @@ -0,0 +1,38 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import React from 'react'; + +import { I18nProvider } from './provider'; + +export function injectI18nProvider

(WrappedComponent: React.ComponentType

) { + const I18nProviderWrapper: React.SFC

= props => { + return ( + + + + ); + }; + + // Original propTypes from the wrapped component should be re-exposed + // since it will be used by reactDirective Angular service + // that will rely on propTypes to watch attributes with these names + I18nProviderWrapper.propTypes = WrappedComponent.propTypes; + + return I18nProviderWrapper; +} diff --git a/packages/kbn-i18n/src/react/provider.js b/packages/kbn-i18n/src/react/provider.js deleted file mode 100644 index 46e94863a0ba1..0000000000000 --- a/packages/kbn-i18n/src/react/provider.js +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React, { PureComponent } from 'react'; -import PropTypes from 'prop-types'; -import { IntlProvider } from 'react-intl'; - -import * as i18n from '../core'; - -/** - * The library uses the provider pattern to scope an i18n context to a tree - * of components. This component is used to setup the i18n context for a tree. - * IntlProvider should wrap react app's root component (inside each react render method). - */ -export class I18nProvider extends PureComponent { - static propTypes = { - children: PropTypes.object, - }; - - render() { - const { children } = this.props; - - return ( - - {children} - - ); - } -} diff --git a/packages/kbn-i18n/src/react/provider.test.js b/packages/kbn-i18n/src/react/provider.test.js deleted file mode 100644 index 2bfdaedba9130..0000000000000 --- a/packages/kbn-i18n/src/react/provider.test.js +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from 'react'; -import { intlShape } from 'react-intl'; -import { shallow, mount } from 'enzyme'; -import { I18nProvider } from './provider'; -import { injectI18n } from './inject'; - -describe('I18nProvider', () => { - it('renders children', () => { - const ChildrenMock = () => {}; - - const wrapper = shallow( - - - - ); - - expect(wrapper.children()).toMatchSnapshot(); - }); - - it('provides with context', () => { - const childrenMock = () =>

; - const WithIntl = injectI18n(childrenMock); - - const wrapper = mount( - - - , - { - childContextTypes: { - intl: intlShape, - }, - } - ); - - expect(wrapper.find(childrenMock).prop('intl')).toMatchSnapshot(); - }); -}); diff --git a/packages/kbn-i18n/src/react/provider.test.tsx b/packages/kbn-i18n/src/react/provider.test.tsx new file mode 100644 index 0000000000000..6dabc806541cb --- /dev/null +++ b/packages/kbn-i18n/src/react/provider.test.tsx @@ -0,0 +1,56 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { mount, shallow } from 'enzyme'; +import * as React from 'react'; +import { intlShape } from 'react-intl'; +import { injectI18n } from './inject'; +import { I18nProvider } from './provider'; + +describe('I18nProvider', () => { + test('renders children', () => { + const ChildrenMock = () => null; + + const wrapper = shallow( + + + + ); + + expect(wrapper.children()).toMatchSnapshot(); + }); + + test('provides with context', () => { + const childrenMock = () =>
; + const WithIntl = injectI18n(childrenMock); + + const wrapper = mount( + + + , + { + childContextTypes: { + intl: intlShape, + }, + } + ); + + expect(wrapper.find(childrenMock).prop('intl')).toMatchSnapshot(); + }); +}); diff --git a/packages/kbn-i18n/src/react/provider.tsx b/packages/kbn-i18n/src/react/provider.tsx new file mode 100644 index 0000000000000..f359b10a5662a --- /dev/null +++ b/packages/kbn-i18n/src/react/provider.tsx @@ -0,0 +1,68 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import * as PropTypes from 'prop-types'; +import * as React from 'react'; +import { IntlProvider } from 'react-intl'; + +import * as i18n from '../core'; +import { isPseudoLocale, translateUsingPseudoLocale } from '../core/pseudo_locale'; +import { injectI18n } from './inject'; + +/** + * If pseudo locale is detected, default intl.formatMessage should be decorated + * with the pseudo localization function. + * @param child I18nProvider child component. + */ +function wrapIntlFormatMessage(child: React.ReactNode) { + return React.createElement( + injectI18n(({ intl }) => { + const formatMessage = intl.formatMessage; + intl.formatMessage = (...args) => translateUsingPseudoLocale(formatMessage(...args)); + + return React.Children.only(child); + }) + ); +} + +/** + * The library uses the provider pattern to scope an i18n context to a tree + * of components. This component is used to setup the i18n context for a tree. + * IntlProvider should wrap react app's root component (inside each react render method). + */ +export class I18nProvider extends React.PureComponent { + public static propTypes = { children: PropTypes.element.isRequired }; + + public render() { + return ( + + {isPseudoLocale(i18n.getLocale()) + ? wrapIntlFormatMessage(this.props.children) + : this.props.children} + + ); + } +} diff --git a/packages/kbn-i18n/src/translation.ts b/packages/kbn-i18n/src/translation.ts new file mode 100644 index 0000000000000..20a27ca72a72c --- /dev/null +++ b/packages/kbn-i18n/src/translation.ts @@ -0,0 +1,35 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Formats } from './core/formats'; + +export interface Translation { + /** + * Actual translated messages. + */ + messages: Record; + /** + * Locale of the translated messages. + */ + locale?: string; + /** + * Set of options to the underlying formatter. + */ + formats?: Formats; +} diff --git a/packages/kbn-i18n/tsconfig.json b/packages/kbn-i18n/tsconfig.json new file mode 100644 index 0000000000000..c6d1da43b893f --- /dev/null +++ b/packages/kbn-i18n/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.json", + "include": [ + "src/**/*.ts", + "src/**/*.tsx", + "types/intl_format_cache.d.ts", + "types/intl_relativeformat.d.ts" + ], + "exclude": [ + "target" + ], + "compilerOptions": { + "declaration": true, + "declarationDir": "./target/types", + } +} diff --git a/packages/kbn-i18n/tslint.yml b/packages/kbn-i18n/tslint.yml new file mode 100644 index 0000000000000..e470d241339a7 --- /dev/null +++ b/packages/kbn-i18n/tslint.yml @@ -0,0 +1,2 @@ +extends: + - ../../tslint.yaml diff --git a/packages/kbn-i18n/types/intl_format_cache.d.ts b/packages/kbn-i18n/types/intl_format_cache.d.ts new file mode 100644 index 0000000000000..cdc7e69b98603 --- /dev/null +++ b/packages/kbn-i18n/types/intl_format_cache.d.ts @@ -0,0 +1,32 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +declare module 'intl-format-cache' { + import IntlMessageFormat from 'intl-messageformat'; + + interface Message { + format: (values: { [key: string]: string | number | Date }) => string; + } + + function memoizeIntlConstructor( + IntlMessageFormatCtor: typeof IntlMessageFormat + ): (msg: string, locale: string, formats: any) => Message; + + export = memoizeIntlConstructor; +} diff --git a/packages/kbn-i18n/types/intl_relativeformat.d.ts b/packages/kbn-i18n/types/intl_relativeformat.d.ts new file mode 100644 index 0000000000000..784b975c78131 --- /dev/null +++ b/packages/kbn-i18n/types/intl_relativeformat.d.ts @@ -0,0 +1,22 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +declare module 'intl-relativeformat' { + export let defaultLocale: string; +} diff --git a/packages/kbn-i18n/yarn.lock b/packages/kbn-i18n/yarn.lock deleted file mode 100644 index b495c747149f4..0000000000000 --- a/packages/kbn-i18n/yarn.lock +++ /dev/null @@ -1,1745 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@kbn/babel-preset@link:../kbn-babel-preset": - version "0.0.0" - uid "" - -"@kbn/dev-utils@link:../kbn-dev-utils": - version "0.0.0" - uid "" - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -babel-cli@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" - dependencies: - babel-core "^6.26.0" - babel-polyfill "^6.26.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - commander "^2.11.0" - convert-source-map "^1.5.0" - fs-readdir-recursive "^1.0.0" - glob "^7.1.2" - lodash "^4.17.4" - output-file-sync "^1.1.2" - path-is-absolute "^1.0.1" - slash "^1.0.0" - source-map "^0.5.6" - v8flags "^2.1.1" - optionalDependencies: - chokidar "^1.6.1" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-class-properties@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-flow@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - -babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-class-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" - dependencies: - babel-helper-function-name "^6.24.1" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-define@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.0.tgz#94c5f9459c810c738cc7c50cbd44a31829d6f319" - dependencies: - lodash "4.17.4" - traverse "0.6.6" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.23.0: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-env@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^1.4.0" - invariant "^2.2.2" - -babel-preset-flow@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" - dependencies: - babel-plugin-transform-flow-strip-types "^6.22.0" - -babel-preset-react@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" - dependencies: - babel-plugin-syntax-jsx "^6.3.13" - babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.24.1" - babel-plugin-transform-react-jsx-self "^6.22.0" - babel-plugin-transform-react-jsx-source "^6.22.0" - babel-preset-flow "^6.23.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -browserslist@^1.4.0: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - -caniuse-db@^1.0.30000639: - version "1.0.30000850" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000850.tgz#965c816641576d08709bee12256a0550164b95d5" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -commander@^2.11.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -convert-source-map@^1.5.0, convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -core-js@^1.0.0: - version "1.2.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" - -core-js@^2.4.0, core-js@^2.5.0: - version "2.5.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cross-env@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.2.0.tgz#6ecd4c015d5773e614039ee529076669b9d126f2" - dependencies: - cross-spawn "^6.0.5" - is-windows "^1.0.0" - -cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -debug@^2.1.2, debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -electron-to-chromium@^1.2.7: - version "1.3.48" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900" - -encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - dependencies: - iconv-lite "~0.4.13" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -fbjs@^0.8.16: - version "0.8.16" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" - dependencies: - core-js "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.9" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" - dependencies: - minipass "^2.2.1" - -fs-readdir-recursive@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.0.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" - dependencies: - nan "^2.9.2" - node-pre-gyp "^0.10.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob@^7.0.5, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -graceful-fs@^4.1.2, graceful-fs@^4.1.4: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -iconv-lite@^0.4.4, iconv-lite@~0.4.13: - version "0.4.23" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" - dependencies: - minimatch "^3.0.4" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -intl-format-cache@^2.0.5, intl-format-cache@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/intl-format-cache/-/intl-format-cache-2.1.0.tgz#04a369fecbfad6da6005bae1f14333332dcf9316" - -intl-messageformat-parser@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075" - -intl-messageformat@^2.0.0, intl-messageformat@^2.1.0, intl-messageformat@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc" - dependencies: - intl-messageformat-parser "1.4.0" - -intl-relativeformat@^2.0.0, intl-relativeformat@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz#010f1105802251f40ac47d0e3e1a201348a255df" - dependencies: - intl-messageformat "^2.0.0" - -invariant@^2.1.1, invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - dependencies: - loose-envify "^1.0.0" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-stream@^1.0.1, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-windows@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isomorphic-fetch@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" - dependencies: - node-fetch "^1.0.1" - whatwg-fetch ">=0.10.0" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - dependencies: - minimist "^1.2.0" - -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -lodash@4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - -lodash@^4.17.4: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" - -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -math-random@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minipass@^2.2.1, minipass@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233" - dependencies: - safe-buffer "^5.1.2" - yallist "^3.0.0" - -minizlib@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" - dependencies: - minipass "^2.2.1" - -mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@^2.20.1: - version "2.22.2" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -nan@^2.9.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - -needle@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d" - dependencies: - debug "^2.1.2" - iconv-lite "^0.4.4" - sax "^1.2.4" - -nice-try@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" - -node-fetch@^1.0.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - -node-pre-gyp@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46" - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.0" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.1.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-bundled@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" - -npm-packlist@^1.1.6: - version "1.1.10" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a" - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -output-file-sync@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" - dependencies: - graceful-fs "^4.1.4" - mkdirp "^0.5.1" - object-assign "^4.1.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -private@^0.1.6, private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - dependencies: - asap "~2.0.3" - -prop-types@^15.5.8, prop-types@^15.6.0: - version "15.6.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.3.1" - object-assign "^4.1.1" - -randomatic@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923" - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - -rc@^1.1.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -react-intl@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-2.4.0.tgz#66c14dc9df9a73b2fbbfbd6021726e80a613eb15" - dependencies: - intl-format-cache "^2.0.5" - intl-messageformat "^2.1.0" - intl-relativeformat "^2.0.0" - invariant "^2.1.1" - -react@^16.3.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" - -readable-stream@^2.0.2, readable-stream@^2.0.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -regenerate@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -rxjs@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1" - dependencies: - tslib "^1.9.0" - -safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - -semver@^5.3.0, semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - dependencies: - source-map "^0.5.6" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - -tar@^4: - version "4.4.4" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd" - dependencies: - chownr "^1.0.1" - fs-minipass "^1.2.5" - minipass "^2.3.3" - minizlib "^1.1.0" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.2" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -traverse@0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" - -tree-kill@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -tslib@^1.9.0: - version "1.9.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e" - -tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -ua-parser-js@^0.7.9: - version "0.7.18" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -v8flags@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - dependencies: - user-home "^1.1.1" - -whatwg-fetch@>=0.10.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" - -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - dependencies: - string-width "^1.0.2 || 2" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" diff --git a/packages/kbn-plugin-generator/sao_template/template/gitignore b/packages/kbn-plugin-generator/sao_template/template/gitignore index a9f22092da63b..db28fed19376d 100755 --- a/packages/kbn-plugin-generator/sao_template/template/gitignore +++ b/packages/kbn-plugin-generator/sao_template/template/gitignore @@ -1,3 +1,6 @@ npm-debug.log* node_modules /build/ +<%_ if (generateScss) { -%> +/public/app.css +<%_ } -%> diff --git a/packages/kbn-plugin-generator/sao_template/template/index.js b/packages/kbn-plugin-generator/sao_template/template/index.js index b75eab070bfd6..65b949a309cbd 100755 --- a/packages/kbn-plugin-generator/sao_template/template/index.js +++ b/packages/kbn-plugin-generator/sao_template/template/index.js @@ -17,7 +17,7 @@ export default function (kibana) { <%_ if (generateHack) { -%> hacks: [ 'plugins/<%= snakeCase(name) %>/hack' - ] + ], <%_ } -%> <%_ if (generateScss) { -%> styleSheetPaths: require('path').resolve(__dirname, 'public/app.scss'), diff --git a/packages/kbn-plugin-generator/sao_template/template/package.json b/packages/kbn-plugin-generator/sao_template/template/package.json index 2e26cc70a8f9f..073571613ba4a 100755 --- a/packages/kbn-plugin-generator/sao_template/template/package.json +++ b/packages/kbn-plugin-generator/sao_template/template/package.json @@ -10,6 +10,7 @@ "scripts": { "preinstall": "node ../../kibana/preinstall_check", "kbn": "node ../../kibana/scripts/kbn", + "es": "node ../../kibana/scripts/es", "lint": "eslint .", "start": "plugin-helpers start", "test:server": "plugin-helpers test:server", @@ -22,13 +23,13 @@ "@kbn/plugin-helpers": "link:../../kibana/packages/kbn-plugin-helpers", "babel-eslint": "^9.0.0", "eslint": "^5.6.0", - "eslint-plugin-babel": "^4.1.1", - "eslint-plugin-import": "^2.3.0", - "eslint-plugin-jest": "^21.22.0", - "eslint-plugin-mocha": "^4.9.0", + "eslint-plugin-babel": "^5.2.0", + "eslint-plugin-import": "^2.14.0", + "eslint-plugin-jest": "^21.22.1", + "eslint-plugin-mocha": "^5.2.0", "eslint-plugin-no-unsanitized": "^3.0.2", "eslint-plugin-prefer-object-spread": "^1.2.1", - "eslint-plugin-react": "^7.0.1", + "eslint-plugin-react": "^7.11.1", "expect.js": "^0.3.1" } } diff --git a/packages/kbn-plugin-generator/sao_template/template/server/routes/example.js b/packages/kbn-plugin-generator/sao_template/template/server/routes/example.js index f4f67431b196b..5a612645f48fc 100755 --- a/packages/kbn-plugin-generator/sao_template/template/server/routes/example.js +++ b/packages/kbn-plugin-generator/sao_template/template/server/routes/example.js @@ -3,8 +3,8 @@ export default function (server) { server.route({ path: '/api/<%= name %>/example', method: 'GET', - handler(req, reply) { - reply({ time: (new Date()).toISOString() }); + handler() { + return { time: (new Date()).toISOString() }; } }); diff --git a/packages/kbn-plugin-generator/yarn.lock b/packages/kbn-plugin-generator/yarn.lock deleted file mode 100644 index b8110052c7761..0000000000000 --- a/packages/kbn-plugin-generator/yarn.lock +++ /dev/null @@ -1,1718 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - dependencies: - string-width "^2.0.0" - -ansi-escapes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" - dependencies: - color-convert "^1.9.0" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -arrify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base64-js@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -bl@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e" - dependencies: - readable-stream "^2.0.5" - -boxen@^1.2.1, boxen@^1.2.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - -buffer@^3.0.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-3.6.0.tgz#a72c936f77b96bf52f5f7e7b467180628551defb" - dependencies: - base64-js "0.0.8" - ieee754 "^1.1.4" - isarray "^1.0.0" - -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - -cac@^3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/cac/-/cac-3.0.4.tgz#6d24ceec372efe5c9b798808bc7f49b47242a4ef" - dependencies: - camelcase-keys "^3.0.0" - chalk "^1.1.3" - indent-string "^3.0.0" - minimist "^1.2.0" - read-pkg-up "^1.0.1" - suffix "^0.1.0" - text-table "^0.2.0" - -cac@^4.3.4: - version "4.4.1" - resolved "https://registry.yarnpkg.com/cac/-/cac-4.4.1.tgz#c6867f731c4be7b0c270689d1689400b914c7788" - dependencies: - chalk "^2.0.1" - minimost "^1.0.0" - read-pkg-up "^2.0.0" - redent "^2.0.0" - string-width "^2.1.1" - text-table "^0.2.0" - -camelcase-keys@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-3.0.0.tgz#fc0c6c360363f7377e3793b9a16bccf1070c1ca4" - dependencies: - camelcase "^3.0.0" - map-obj "^1.0.0" - -camelcase-keys@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" - dependencies: - camelcase "^4.1.0" - map-obj "^2.0.0" - quick-lru "^1.0.0" - -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - -camelcase@^4.0.0, camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - -capture-stack-trace@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" - -caw@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95" - dependencies: - get-proxy "^2.0.0" - isurl "^1.0.0-alpha5" - tunnel-agent "^0.6.0" - url-to-options "^1.0.1" - -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" - dependencies: - ansi-styles "^3.1.0" - escape-string-regexp "^1.0.5" - supports-color "^4.0.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chardet@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" - -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - dependencies: - restore-cursor "^2.0.0" - -cli-spinners@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - -co@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -commander@~2.8.1: - version "2.8.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4" - dependencies: - graceful-readlink ">= 1.0.0" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -conf@^1.1.2: - version "1.4.0" - resolved "https://registry.yarnpkg.com/conf/-/conf-1.4.0.tgz#1ea66c9d7a9b601674a5bb9d2b8dc3c726625e67" - dependencies: - dot-prop "^4.1.0" - env-paths "^1.0.0" - make-dir "^1.0.0" - pkg-up "^2.0.0" - write-file-atomic "^2.3.0" - -config-chain@^1.1.11: - version "1.1.11" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - -configstore@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90" - dependencies: - dot-prop "^4.1.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - unique-string "^1.0.0" - write-file-atomic "^2.0.0" - xdg-basedir "^3.0.0" - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -create-error-class@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - dependencies: - capture-stack-trace "^1.0.0" - -cross-spawn@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41" - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - -cross-spawn@^5.0.1, cross-spawn@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -crypto-random-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - -decamelize@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - -decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1" - dependencies: - file-type "^5.2.0" - is-stream "^1.1.0" - tar-stream "^1.5.2" - -decompress-tarbz2@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b" - dependencies: - decompress-tar "^4.1.0" - file-type "^6.1.0" - is-stream "^1.1.0" - seek-bzip "^1.0.5" - unbzip2-stream "^1.0.9" - -decompress-targz@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee" - dependencies: - decompress-tar "^4.1.1" - file-type "^5.2.0" - is-stream "^1.1.0" - -decompress-unzip@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69" - dependencies: - file-type "^3.8.0" - get-stream "^2.2.0" - pify "^2.3.0" - yauzl "^2.4.2" - -decompress@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.0.tgz#7aedd85427e5a92dacfe55674a7c505e96d01f9d" - dependencies: - decompress-tar "^4.0.0" - decompress-tarbz2 "^4.0.0" - decompress-targz "^4.0.0" - decompress-unzip "^4.0.1" - graceful-fs "^4.1.10" - make-dir "^1.0.0" - pify "^2.3.0" - strip-dirs "^2.0.0" - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - -dot-prop@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - dependencies: - is-obj "^1.0.0" - -download-git-repo@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/download-git-repo/-/download-git-repo-1.0.2.tgz#0b93a62057e41e2f21b1a06c95e7b26362b108ff" - dependencies: - download "^5.0.3" - git-clone "^0.1.0" - rimraf "^2.6.1" - -download@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/download/-/download-5.0.3.tgz#63537f977f99266a30eb8a2a2fbd1f20b8000f7a" - dependencies: - caw "^2.0.0" - decompress "^4.0.0" - filenamify "^2.0.0" - get-stream "^3.0.0" - got "^6.3.0" - mkdirp "^0.5.1" - pify "^2.3.0" - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - -ejs@^2.2.4: - version "2.5.7" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" - -end-of-stream@^1.0.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - dependencies: - once "^1.4.0" - -env-paths@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" - -error-ex@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" - dependencies: - is-arrayish "^0.2.1" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -external-editor@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48" - dependencies: - chardet "^0.4.0" - iconv-lite "^0.4.17" - tmp "^0.0.33" - -fd-slicer@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.0.1.tgz#8b5bcbd9ec327c5041bf9ab023fd6750f1177e65" - dependencies: - pend "~1.2.0" - -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - dependencies: - escape-string-regexp "^1.0.5" - -file-type@^3.8.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9" - -file-type@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6" - -file-type@^6.1.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919" - -filename-reserved-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" - -filenamify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.0.0.tgz#bd162262c0b6e94bfbcdcf19a3bbb3764f785695" - dependencies: - filename-reserved-regex "^2.0.0" - strip-outer "^1.0.0" - trim-repeated "^1.0.0" - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - dependencies: - locate-path "^2.0.0" - -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - -fs-extra@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^3.0.0" - universalify "^0.1.0" - -fs-extra@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -get-proxy@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93" - dependencies: - npm-conf "^1.1.0" - -get-stream@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de" - dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -getopts@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.0.0.tgz#e9119f3e79d22d0685b77fbe78d5cd6e19ca1af0" - -git-clone@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/git-clone/-/git-clone-0.1.0.tgz#0d76163778093aef7f1c30238f2a9ef3f07a2eb9" - -git-config-path@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/git-config-path/-/git-config-path-1.0.1.tgz#6d33f7ed63db0d0e118131503bab3aca47d54664" - dependencies: - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - homedir-polyfill "^1.0.0" - -glob@^7.0.3, glob@^7.0.5: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-dirs@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - dependencies: - ini "^1.3.4" - -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -got@^6.3.0, got@^6.7.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - dependencies: - create-error-class "^3.0.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" - -graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - -handlebars@^4.0.1: - version "4.0.11" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" - dependencies: - async "^1.4.0" - optimist "^0.6.1" - source-map "^0.4.4" - optionalDependencies: - uglify-js "^2.6" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-symbol-support-x@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.1.tgz#66ec2e377e0c7d7ccedb07a3a84d77510ff1bc4c" - -has-to-string-tag-x@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" - dependencies: - has-symbol-support-x "^1.4.1" - -homedir-polyfill@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" - dependencies: - parse-passwd "^1.0.0" - -hosted-git-info@^2.1.4: - version "2.5.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" - -iconv-lite@^0.4.17: - version "0.4.19" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" - -ieee754@^1.1.4: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" - -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - -indent-string@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -inquirer@^3.2.3: - version "3.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.0.4" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" - string-width "^2.1.0" - strip-ansi "^4.0.0" - through "^2.3.6" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - -is-binary-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.0.0.tgz#0e61cea6974b24dda8bcc8366ce58a69265d1a36" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" - -is-extendable@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-installed-globally@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - dependencies: - global-dirs "^0.1.0" - is-path-inside "^1.0.0" - -is-natural-number@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" - -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - -is-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - -is-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - dependencies: - path-is-inside "^1.0.1" - -is-promise@^2.0.0, is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - -is-retry-allowed@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" - -is-stream@^1.0.0, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - -isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isurl@^1.0.0-alpha5: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67" - dependencies: - has-to-string-tag-x "^1.2.0" - is-object "^1.0.1" - -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - optionalDependencies: - graceful-fs "^4.1.6" - -jstransformer-ejs@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/jstransformer-ejs/-/jstransformer-ejs-0.0.3.tgz#04d9201469274fcf260f1e7efd732d487fa234b6" - dependencies: - ejs "^2.2.4" - -jstransformer-handlebars@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/jstransformer-handlebars/-/jstransformer-handlebars-1.1.0.tgz#91ba56e0a28aee31bb56d4adbcbce508d8230468" - dependencies: - handlebars "^4.0.1" - -jstransformer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/jstransformer/-/jstransformer-1.0.0.tgz#ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3" - dependencies: - is-promise "^2.0.0" - promise "^7.0.1" - -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kopy@^8.2.0: - version "8.2.5" - resolved "https://registry.yarnpkg.com/kopy/-/kopy-8.2.5.tgz#6c95f312e981ab917680d7e5de3cdf29a1bf221f" - dependencies: - inquirer "^3.2.3" - is-binary-path "^2.0.0" - jstransformer "^1.0.0" - jstransformer-ejs "^0.0.3" - majo "^0.4.1" - minimatch "^3.0.4" - multimatch "^2.1.0" - path-exists "^3.0.0" - -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - dependencies: - package-json "^4.0.0" - -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - -load-json-file@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - -lodash.kebabcase@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" - -lodash.snakecase@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" - -lodash.startcase@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" - -lodash@^4.3.0: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -log-symbols@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - dependencies: - chalk "^2.0.1" - -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - -lowercase-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" - -lru-cache@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -majo@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/majo/-/majo-0.4.1.tgz#5e6eeb9b63bda77e59d396b9c9ce4189ce6100bc" - dependencies: - fs-extra "^3.0.1" - globby "^6.1.0" - ware "^1.3.0" - -make-dir@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51" - dependencies: - pify "^3.0.0" - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - -map-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" - -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - -minimatch@^3.0.0, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - -minimost@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/minimost/-/minimost-1.0.0.tgz#1d07954aa0268873408b95552fbffc5977dfc78b" - dependencies: - camelcase-keys "^4.0.0" - minimist "^1.2.0" - -mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -multimatch@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" - dependencies: - array-differ "^1.0.0" - array-union "^1.0.1" - arrify "^1.0.0" - minimatch "^3.0.0" - -mute-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - -normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -npm-conf@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -object-assign@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -once@^1.3.0, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - dependencies: - mimic-fn "^1.0.0" - -optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - -ora@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5" - dependencies: - chalk "^2.1.0" - cli-cursor "^2.1.0" - cli-spinners "^1.0.1" - log-symbols "^2.1.0" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" - dependencies: - p-try "^1.0.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - dependencies: - p-limit "^1.1.0" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - -parse-git-config@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-1.1.1.tgz#d3a9984317132f57398712bba438e129590ddf8c" - dependencies: - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - git-config-path "^1.0.1" - ini "^1.3.4" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - dependencies: - error-ex "^1.2.0" - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - dependencies: - pinkie-promise "^2.0.0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - dependencies: - pify "^2.0.0" - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - -pify@^2.0.0, pify@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - -pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" - dependencies: - find-up "^2.1.0" - -prepend-http@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - -process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -promise@^7.0.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - dependencies: - asap "~2.0.3" - -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -quick-lru@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" - -rc@^1.0.1, rc@^1.1.6: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -read-pkg-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -readable-stream@^2.0.0, readable-stream@^2.0.5: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -redent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" - dependencies: - indent-string "^3.0.0" - strip-indent "^2.0.0" - -registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - dependencies: - rc "^1.0.1" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - dependencies: - onetime "^2.0.0" - signal-exit "^3.0.2" - -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - -rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - dependencies: - is-promise "^2.1.0" - -rx-lite-aggregates@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" - dependencies: - rx-lite "*" - -rx-lite@*, rx-lite@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" - -safe-buffer@^5.0.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -sao@^0.22.12: - version "0.22.12" - resolved "https://registry.yarnpkg.com/sao/-/sao-0.22.12.tgz#fe13bb32bb0d32892c188024f77c5ac26c19eaf9" - dependencies: - boxen "^1.2.2" - cac "^4.3.4" - chalk "^2.0.1" - co "^4.6.0" - conf "^1.1.2" - cross-spawn "^5.1.0" - download-git-repo "^1.0.1" - filenamify "^2.0.0" - fs-extra "^4.0.1" - git-config-path "^1.0.1" - globby "^6.1.0" - jstransformer-handlebars "^1.0.0" - kopy "^8.2.0" - ora "^1.3.0" - parse-git-config "^1.1.1" - semver "^5.4.1" - text-table "^0.2.0" - tildify "^1.2.0" - update-notifier "^2.2.0" - user-home "^2.0.0" - yarn-install "^0.5.1" - -seek-bzip@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc" - dependencies: - commander "~2.8.1" - -semver-diff@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - dependencies: - semver "^5.0.3" - -"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.4.1: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -source-map@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -spdx-correct@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" - dependencies: - spdx-license-ids "^1.0.2" - -spdx-expression-parse@~1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" - -spdx-license-ids@^1.0.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" - -string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - dependencies: - is-utf8 "^0.2.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - -strip-dirs@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5" - dependencies: - is-natural-number "^4.0.1" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-indent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -strip-outer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.0.tgz#aac0ba60d2e90c5d4f275fd8869fd9a2d310ffb8" - dependencies: - escape-string-regexp "^1.0.2" - -suffix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/suffix/-/suffix-0.1.0.tgz#3e46966de56af17600385e58db8ec659dd797907" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - -supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - -tar-stream@^1.5.2: - version "1.5.5" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55" - dependencies: - bl "^1.0.0" - end-of-stream "^1.0.0" - readable-stream "^2.0.0" - xtend "^4.0.0" - -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - dependencies: - execa "^0.7.0" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -tildify@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" - dependencies: - os-homedir "^1.0.0" - -timed-out@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - dependencies: - os-tmpdir "~1.0.2" - -trim-repeated@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" - dependencies: - escape-string-regexp "^1.0.2" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -uglify-js@^2.6: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - -unbzip2-stream@^1.0.9: - version "1.2.5" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz#73a033a567bbbde59654b193c44d48a7e4f43c47" - dependencies: - buffer "^3.0.1" - through "^2.3.6" - -unique-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - dependencies: - crypto-random-string "^1.0.0" - -universalify@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" - -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - -update-notifier@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451" - dependencies: - boxen "^1.2.1" - chalk "^2.0.1" - configstore "^3.0.0" - import-lazy "^2.1.0" - is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" - semver-diff "^2.0.0" - xdg-basedir "^3.0.0" - -url-parse-lax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - dependencies: - prepend-http "^1.0.1" - -url-to-options@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9" - -user-home@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" - dependencies: - os-homedir "^1.0.0" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -validate-npm-package-license@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" - dependencies: - spdx-correct "~1.0.0" - spdx-expression-parse "~1.0.0" - -ware@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4" - dependencies: - wrap-fn "^0.1.0" - -which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -widest-line@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273" - dependencies: - string-width "^2.1.1" - -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - -wrap-fn@^0.1.0: - version "0.1.5" - resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845" - dependencies: - co "3.1.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write-file-atomic@^2.0.0, write-file-atomic@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -xdg-basedir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - -yarn-install@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/yarn-install/-/yarn-install-0.5.1.tgz#f3c55e8646b6ac8da360b2f8e31afe5c4a067340" - dependencies: - cac "^3.0.3" - chalk "^1.1.3" - cross-spawn "^4.0.2" - -yauzl@^2.4.2: - version "2.9.1" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.9.1.tgz#a81981ea70a57946133883f029c5821a89359a7f" - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.0.1" diff --git a/packages/kbn-plugin-helpers/yarn.lock b/packages/kbn-plugin-helpers/yarn.lock deleted file mode 100644 index d5e6b213bbd37..0000000000000 --- a/packages/kbn-plugin-helpers/yarn.lock +++ /dev/null @@ -1,1872 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - -ansi-cyan@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873" - dependencies: - ansi-wrap "0.1.0" - -ansi-escapes@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" - -ansi-red@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c" - dependencies: - ansi-wrap "0.1.0" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-wrap@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" - -append-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" - dependencies: - buffer-equal "^1.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argv-split@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argv-split/-/argv-split-2.0.1.tgz#be264117790dbd5ccd63ec3f449a1804814ac4c5" - -arr-diff@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a" - dependencies: - arr-flatten "^1.0.1" - array-slice "^0.2.3" - -arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d" - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - -array-slice@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -arrify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws4@^1.2.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -brace-expansion@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - -buffer-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - -camelcase-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" - dependencies: - camelcase "^2.0.0" - map-obj "^1.0.0" - -camelcase@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - -caseless@~0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -chalk@^1.0.0, chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -cli-cursor@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" - dependencies: - restore-cursor "^1.0.1" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - -clone@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" - -cloneable-readable@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" - dependencies: - inherits "^2.0.1" - process-nextick-args "^1.0.6" - through2 "^2.0.1" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" - dependencies: - delayed-stream "~1.0.0" - -commander@^2.9.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.0.tgz#7b25325963e6aace20d3a9285b09379b0c2208b5" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -concat-stream@^1.4.7: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" - dependencies: - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -convert-source-map@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -currently-unhandled@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - dependencies: - array-find-index "^1.0.1" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -decamelize@^1.1.1, decamelize@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - -define-properties@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" - dependencies: - foreach "^2.0.5" - object-keys "^1.0.8" - -del@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8" - dependencies: - globby "^5.0.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - rimraf "^2.2.8" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -duplexify@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e" - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - -end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - dependencies: - once "^1.4.0" - -error-ex@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" - dependencies: - is-arrayish "^0.2.1" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -exit-hook@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" - -extend-shallow@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071" - dependencies: - kind-of "^1.1.0" - -extend@^3.0.0, extend@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -external-editor@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b" - dependencies: - extend "^3.0.0" - spawn-sync "^1.0.15" - tmp "^0.0.29" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -figures@^1.3.5: - version "1.7.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" - dependencies: - escape-string-regexp "^1.0.5" - object-assign "^4.1.0" - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - -flush-write-stream@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.2.tgz#c81b90d8746766f1a609a46809946c45dd8ae417" - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.4" - -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -fs-mkdirp-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb" - dependencies: - graceful-fs "^4.1.11" - through2 "^2.0.3" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fstream@^1.0.0, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -gaze@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" - dependencies: - globule "^1.0.0" - -generate-function@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74" - -generate-object-property@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0" - dependencies: - is-property "^1.0.0" - -get-caller-file@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" - -get-stdin@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-stream@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4" - dependencies: - extend "^3.0.0" - glob "^7.1.1" - glob-parent "^3.1.0" - is-negated-glob "^1.0.0" - ordered-read-streams "^1.0.0" - pumpify "^1.3.5" - readable-stream "^2.1.5" - remove-trailing-separator "^1.0.1" - to-absolute-glob "^2.0.0" - unique-stream "^2.0.2" - -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globby@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d" - dependencies: - array-union "^1.0.1" - arrify "^1.0.0" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -globule@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" - dependencies: - glob "~7.1.1" - lodash "~4.17.10" - minimatch "~3.0.2" - -graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -gulp-rename@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.2.2.tgz#3ad4428763f05e2764dec1c67d868db275687817" - -gulp-zip@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-4.1.0.tgz#dab178bd99afa190923f1eb78abaf0db47817704" - dependencies: - get-stream "^3.0.0" - plugin-error "^0.1.2" - through2 "^2.0.1" - vinyl "^2.1.0" - yazl "^2.1.0" - -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - -har-validator@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d" - dependencies: - chalk "^1.1.1" - commander "^2.9.0" - is-my-json-valid "^2.12.4" - pinkie-promise "^2.0.0" - -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -hosted-git-info@^2.1.4: - version "2.6.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -in-publish@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" - -indent-string@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" - dependencies: - repeating "^2.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -inquirer@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" - dependencies: - ansi-escapes "^1.1.0" - chalk "^1.0.0" - cli-cursor "^1.0.1" - cli-width "^2.0.0" - external-editor "^1.1.0" - figures "^1.3.5" - lodash "^4.3.0" - mute-stream "0.0.6" - pinkie-promise "^2.0.0" - run-async "^2.2.0" - rx "^4.1.0" - string-width "^1.0.1" - strip-ansi "^3.0.0" - through "^2.3.6" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" - -is-extglob@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-my-ip-valid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" - -is-my-json-valid@^2.12.4: - version "2.17.2" - resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c" - dependencies: - generate-function "^2.0.0" - generate-object-property "^1.1.0" - is-my-ip-valid "^1.0.0" - jsonpointer "^4.0.0" - xtend "^4.0.0" - -is-negated-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" - -is-path-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" - -is-path-in-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" - dependencies: - is-path-inside "^1.0.0" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - dependencies: - path-is-inside "^1.0.1" - -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - -is-property@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" - -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - dependencies: - is-unc-path "^1.0.0" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - dependencies: - unc-path-regex "^0.1.2" - -is-utf8@^0.2.0, is-utf8@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - -is-valid-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" - -is-windows@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -js-base64@^2.1.8: - version "2.4.5" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsonpointer@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kind-of@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" - -lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - dependencies: - readable-stream "^2.0.5" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - dependencies: - invert-kv "^1.0.0" - -lead@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42" - dependencies: - flush-write-stream "^1.0.2" - -load-json-file@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - -lodash@^4.0.0, lodash@~4.17.10: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" - -lodash@^4.3.0: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -loud-rejection@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - dependencies: - currently-unhandled "^0.4.1" - signal-exit "^3.0.0" - -lru-cache@^4.0.1: - version "4.1.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -map-obj@^1.0.0, map-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - -meow@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" - dependencies: - camelcase-keys "^2.0.0" - decamelize "^1.1.2" - loud-rejection "^1.0.0" - map-obj "^1.0.1" - minimist "^1.1.3" - normalize-package-data "^2.3.4" - object-assign "^4.0.1" - read-pkg-up "^1.0.1" - redent "^1.0.0" - trim-newlines "^1.0.0" - -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - -mime-types@^2.1.12, mime-types@~2.1.7: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - dependencies: - mime-db "~1.33.0" - -"minimatch@2 || 3", minimatch@^3.0.4, minimatch@~3.0.2: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -mute-stream@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" - -nan@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - -nice-try@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" - -node-gyp@^3.3.1: - version "3.7.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.7.0.tgz#789478e8f6c45e277aa014f3e28f958f286f9203" - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request ">=2.9.0 <2.82.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -node-sass@^4.9.0: - version "4.9.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52" - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.10.0" - node-gyp "^3.3.1" - npmlog "^4.0.0" - request "~2.79.0" - sass-graph "^2.2.4" - stdout-stream "^1.4.0" - "true-case-path" "^1.0.2" - -"nopt@2 || 3": - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -now-and-later@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.0.tgz#bc61cbb456d79cb32207ce47ca05136ff2e7d6ee" - dependencies: - once "^1.3.2" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-keys@^1.0.11, object-keys@^1.0.8: - version "1.0.11" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" - -object.assign@^4.0.4: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" - -once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" - -ordered-read-streams@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e" - dependencies: - readable-stream "^2.0.1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - dependencies: - lcid "^1.0.0" - -os-shim@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - -os-tmpdir@^1.0.0, os-tmpdir@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@0: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - dependencies: - error-ex "^1.2.0" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - dependencies: - pinkie-promise "^2.0.0" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - -plugin-error@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace" - dependencies: - ansi-cyan "^0.1.1" - ansi-red "^0.1.1" - arr-diff "^1.0.1" - arr-union "^2.0.1" - extend-shallow "^1.1.2" - -process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -pumpify@^1.3.5: - version "1.4.0" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.4.0.tgz#80b7c5df7e24153d03f0e7ac8a05a5d068bd07fb" - dependencies: - duplexify "^3.5.3" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qs@~6.3.0: - version "6.3.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" - -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -read-pkg-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readable-stream@^2.0.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^2.3.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -redent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - dependencies: - indent-string "^2.1.0" - strip-indent "^1.0.1" - -remove-bom-buffer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53" - dependencies: - is-buffer "^1.1.5" - is-utf8 "^0.2.1" - -remove-bom-stream@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523" - dependencies: - remove-bom-buffer "^3.0.0" - safe-buffer "^5.1.0" - through2 "^2.0.3" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -replace-ext@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" - -"request@>=2.9.0 <2.82.0": - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -request@~2.79.0: - version "2.79.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.11.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~2.0.6" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - -resolve-options@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131" - dependencies: - value-or-function "^3.0.0" - -restore-cursor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" - dependencies: - exit-hook "^1.0.0" - onetime "^1.0.0" - -rimraf@2, rimraf@^2.2.8: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - dependencies: - is-promise "^2.1.0" - -rx@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" - -safe-buffer@^5.0.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - -safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -safer-buffer@^2.0.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -sass-graph@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^7.0.0" - -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - -"semver@2 || 3 || 4 || 5", semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -source-map@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -spawn-sync@^1.0.15: - version "1.0.15" - resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" - dependencies: - concat-stream "^1.4.7" - os-shim "^0.1.2" - -spdx-correct@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" - -sshpk@^1.7.0: - version "1.14.2" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - safer-buffer "^2.0.2" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -stdout-stream@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" - dependencies: - readable-stream "^2.0.1" - -stream-shift@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4: - version "0.0.6" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - dependencies: - is-utf8 "^0.2.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" - dependencies: - get-stdin "^4.0.1" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -through2-filter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec" - dependencies: - through2 "~2.0.0" - xtend "~4.0.0" - -through2-map@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/through2-map/-/through2-map-3.0.0.tgz#a6c3026ce63b4898a997d540506b66ffd970f271" - dependencies: - through2 "~2.0.0" - xtend "^4.0.0" - -through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" - dependencies: - readable-stream "^2.1.5" - xtend "~4.0.1" - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -tmp@^0.0.29: - version "0.0.29" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0" - dependencies: - os-tmpdir "~1.0.1" - -to-absolute-glob@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" - dependencies: - is-absolute "^1.0.0" - is-negated-glob "^1.0.0" - -to-through@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6" - dependencies: - through2 "^2.0.3" - -tough-cookie@~2.3.0: - version "2.3.4" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" - dependencies: - punycode "^1.4.1" - -trim-newlines@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - -"true-case-path@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62" - dependencies: - glob "^6.0.4" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - -unique-stream@^2.0.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369" - dependencies: - json-stable-stringify "^1.0.0" - through2-filter "^2.0.0" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -uuid@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -validate-npm-package-license@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -value-or-function@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vinyl-fs@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.2.tgz#1b86258844383f57581fcaac081fe09ef6d6d752" - dependencies: - fs-mkdirp-stream "^1.0.0" - glob-stream "^6.1.0" - graceful-fs "^4.0.0" - is-valid-glob "^1.0.0" - lazystream "^1.0.0" - lead "^1.0.0" - object.assign "^4.0.4" - pumpify "^1.3.5" - readable-stream "^2.3.3" - remove-bom-buffer "^3.0.0" - remove-bom-stream "^1.2.0" - resolve-options "^1.1.0" - through2 "^2.0.0" - to-through "^2.0.0" - value-or-function "^3.0.0" - vinyl "^2.0.0" - vinyl-sourcemap "^1.1.0" - -vinyl-sourcemap@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16" - dependencies: - append-buffer "^1.0.2" - convert-source-map "^1.5.0" - graceful-fs "^4.1.6" - normalize-path "^2.1.1" - now-and-later "^2.0.0" - remove-bom-buffer "^3.0.0" - vinyl "^2.0.0" - -vinyl@^2.0.0, vinyl@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - -which@1, which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - dependencies: - string-width "^1.0.2 || 2" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - dependencies: - camelcase "^3.0.0" - -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.0" - -yazl@^2.1.0: - version "2.4.3" - resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.4.3.tgz#ec26e5cc87d5601b9df8432dbdd3cd2e5173a071" - dependencies: - buffer-crc32 "~0.2.3" diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js index 4128527ef757f..93c0e111f0d38 100644 --- a/packages/kbn-pm/dist/index.js +++ b/packages/kbn-pm/dist/index.js @@ -61,12341 +61,3453 @@ module.exports = /******/ __webpack_require__.p = ""; /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 257); +/******/ return __webpack_require__(__webpack_require__.s = 136); /******/ }) /************************************************************************/ /******/ ([ /* 0 */ -/***/ (function(module, exports, __webpack_require__) { - -/* WEBPACK VAR INJECTION */(function(module) {var require;//! moment.js -//! version : 2.20.1 -//! authors : Tim Wood, Iskren Chernev, Moment.js contributors -//! license : MIT -//! momentjs.com - -;(function (global, factory) { - true ? module.exports = factory() : - typeof define === 'function' && define.amd ? define(factory) : - global.moment = factory() -}(this, (function () { 'use strict'; - -var hookCallback; +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function hooks () { - return hookCallback.apply(null, arguments); -} +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = __extends; +/* unused harmony export __assign */ +/* unused harmony export __rest */ +/* unused harmony export __decorate */ +/* unused harmony export __param */ +/* unused harmony export __metadata */ +/* unused harmony export __awaiter */ +/* unused harmony export __generator */ +/* unused harmony export __exportStar */ +/* unused harmony export __values */ +/* unused harmony export __read */ +/* unused harmony export __spread */ +/* unused harmony export __await */ +/* unused harmony export __asyncGenerator */ +/* unused harmony export __asyncDelegator */ +/* unused harmony export __asyncValues */ +/* unused harmony export __makeTemplateObject */ +/* unused harmony export __importStar */ +/* unused harmony export __importDefault */ +/*! ***************************************************************************** +Copyright (c) Microsoft Corporation. All rights reserved. +Licensed under the Apache License, Version 2.0 (the "License"); you may not use +this file except in compliance with the License. You may obtain a copy of the +License at http://www.apache.org/licenses/LICENSE-2.0 + +THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED +WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, +MERCHANTABLITY OR NON-INFRINGEMENT. + +See the Apache Version 2.0 License for specific language governing permissions +and limitations under the License. +***************************************************************************** */ +/* global Reflect, Promise */ + +var extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + +function __extends(d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); +} + +var __assign = Object.assign || function __assign(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]; + } + return t; +} + +function __rest(s, e) { + var t = {}; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) + t[p] = s[p]; + if (s != null && typeof Object.getOwnPropertySymbols === "function") + for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0) + t[p[i]] = s[p[i]]; + return t; +} + +function __decorate(decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +} + +function __param(paramIndex, decorator) { + return function (target, key) { decorator(target, key, paramIndex); } +} + +function __metadata(metadataKey, metadataValue) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue); +} + +function __awaiter(thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +} + +function __generator(thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [0, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +} + +function __exportStar(m, exports) { + for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; +} + +function __values(o) { + var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0; + if (m) return m.call(o); + return { + next: function () { + if (o && i >= o.length) o = void 0; + return { value: o && o[i++], done: !o }; + } + }; +} + +function __read(o, n) { + var m = typeof Symbol === "function" && o[Symbol.iterator]; + if (!m) return o; + var i = m.call(o), r, ar = [], e; + try { + while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value); + } + catch (error) { e = { error: error }; } + finally { + try { + if (r && !r.done && (m = i["return"])) m.call(i); + } + finally { if (e) throw e.error; } + } + return ar; +} + +function __spread() { + for (var ar = [], i = 0; i < arguments.length; i++) + ar = ar.concat(__read(arguments[i])); + return ar; +} + +function __await(v) { + return this instanceof __await ? (this.v = v, this) : new __await(v); +} + +function __asyncGenerator(thisArg, _arguments, generator) { + if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined."); + var g = generator.apply(thisArg, _arguments || []), i, q = []; + return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i; + function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; } + function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } } + function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); } + function fulfill(value) { resume("next", value); } + function reject(value) { resume("throw", value); } + function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); } +} + +function __asyncDelegator(o) { + var i, p; + return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i; + function verb(n, f) { if (o[n]) i[n] = function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; }; } +} + +function __asyncValues(o) { + if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined."); + var m = o[Symbol.asyncIterator]; + return m ? m.call(o) : typeof __values === "function" ? __values(o) : o[Symbol.iterator](); +} + +function __makeTemplateObject(cooked, raw) { + if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } + return cooked; +}; + +function __importStar(mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; + result.default = mod; + return result; +} + +function __importDefault(mod) { + return (mod && mod.__esModule) ? mod : { default: mod }; +} -// This is done to register the method called with moment() -// without creating circular dependencies. -function setHookCallback (callback) { - hookCallback = callback; -} -function isArray(input) { - return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]'; -} +/***/ }), +/* 1 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function isObject(input) { - // IE8 will treat undefined and null as object if it wasn't for - // input != null - return input != null && Object.prototype.toString.call(input) === '[object Object]'; -} +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscriber; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isFunction__ = __webpack_require__(29); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(102); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__ = __webpack_require__(62); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config__ = __webpack_require__(42); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_hostReportError__ = __webpack_require__(61); +/** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */ -function isObjectEmpty(obj) { - if (Object.getOwnPropertyNames) { - return (Object.getOwnPropertyNames(obj).length === 0); - } else { - var k; - for (k in obj) { - if (obj.hasOwnProperty(k)) { - return false; - } - } - return true; - } -} -function isUndefined(input) { - return input === void 0; -} -function isNumber(input) { - return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]'; -} -function isDate(input) { - return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]'; -} -function map(arr, fn) { - var res = [], i; - for (i = 0; i < arr.length; ++i) { - res.push(fn(arr[i], i)); - } - return res; -} -function hasOwnProp(a, b) { - return Object.prototype.hasOwnProperty.call(a, b); -} -function extend(a, b) { - for (var i in b) { - if (hasOwnProp(b, i)) { - a[i] = b[i]; +var Subscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subscriber, _super); + function Subscriber(destinationOrNext, error, complete) { + var _this = _super.call(this) || this; + _this.syncErrorValue = null; + _this.syncErrorThrown = false; + _this.syncErrorThrowable = false; + _this.isStopped = false; + switch (arguments.length) { + case 0: + _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]; + break; + case 1: + if (!destinationOrNext) { + _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]; + break; + } + if (typeof destinationOrNext === 'object') { + if (isTrustedSubscriber(destinationOrNext)) { + var trustedSubscriber = destinationOrNext[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]](); + _this.syncErrorThrowable = trustedSubscriber.syncErrorThrowable; + _this.destination = trustedSubscriber; + trustedSubscriber.add(_this); + } + else { + _this.syncErrorThrowable = true; + _this.destination = new SafeSubscriber(_this, destinationOrNext); + } + break; + } + default: + _this.syncErrorThrowable = true; + _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete); + break; } + return _this; } - - if (hasOwnProp(b, 'toString')) { - a.toString = b.toString; - } - - if (hasOwnProp(b, 'valueOf')) { - a.valueOf = b.valueOf; - } - - return a; -} - -function createUTC (input, format, locale, strict) { - return createLocalOrUTC(input, format, locale, strict, true).utc(); -} - -function defaultParsingFlags() { - // We need to deep clone this object. - return { - empty : false, - unusedTokens : [], - unusedInput : [], - overflow : -2, - charsLeftOver : 0, - nullInput : false, - invalidMonth : null, - invalidFormat : false, - userInvalidated : false, - iso : false, - parsedDateParts : [], - meridiem : null, - rfc2822 : false, - weekdayMismatch : false + Subscriber.prototype[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () { return this; }; + Subscriber.create = function (next, error, complete) { + var subscriber = new Subscriber(next, error, complete); + subscriber.syncErrorThrowable = false; + return subscriber; }; -} - -function getParsingFlags(m) { - if (m._pf == null) { - m._pf = defaultParsingFlags(); - } - return m._pf; -} - -var some; -if (Array.prototype.some) { - some = Array.prototype.some; -} else { - some = function (fun) { - var t = Object(this); - var len = t.length >>> 0; - - for (var i = 0; i < len; i++) { - if (i in t && fun.call(this, t[i], i, t)) { - return true; - } + Subscriber.prototype.next = function (value) { + if (!this.isStopped) { + this._next(value); } - - return false; }; -} - -function isValid(m) { - if (m._isValid == null) { - var flags = getParsingFlags(m); - var parsedParts = some.call(flags.parsedDateParts, function (i) { - return i != null; - }); - var isNowValid = !isNaN(m._d.getTime()) && - flags.overflow < 0 && - !flags.empty && - !flags.invalidMonth && - !flags.invalidWeekday && - !flags.weekdayMismatch && - !flags.nullInput && - !flags.invalidFormat && - !flags.userInvalidated && - (!flags.meridiem || (flags.meridiem && parsedParts)); - - if (m._strict) { - isNowValid = isNowValid && - flags.charsLeftOver === 0 && - flags.unusedTokens.length === 0 && - flags.bigHour === undefined; - } - - if (Object.isFrozen == null || !Object.isFrozen(m)) { - m._isValid = isNowValid; + Subscriber.prototype.error = function (err) { + if (!this.isStopped) { + this.isStopped = true; + this._error(err); } - else { - return isNowValid; + }; + Subscriber.prototype.complete = function () { + if (!this.isStopped) { + this.isStopped = true; + this._complete(); } - } - return m._isValid; -} - -function createInvalid (flags) { - var m = createUTC(NaN); - if (flags != null) { - extend(getParsingFlags(m), flags); - } - else { - getParsingFlags(m).userInvalidated = true; - } - - return m; -} - -// Plugins that add properties should also add the key here (null value), -// so we can properly clone ourselves. -var momentProperties = hooks.momentProperties = []; - -function copyConfig(to, from) { - var i, prop, val; - - if (!isUndefined(from._isAMomentObject)) { - to._isAMomentObject = from._isAMomentObject; - } - if (!isUndefined(from._i)) { - to._i = from._i; - } - if (!isUndefined(from._f)) { - to._f = from._f; - } - if (!isUndefined(from._l)) { - to._l = from._l; - } - if (!isUndefined(from._strict)) { - to._strict = from._strict; - } - if (!isUndefined(from._tzm)) { - to._tzm = from._tzm; - } - if (!isUndefined(from._isUTC)) { - to._isUTC = from._isUTC; - } - if (!isUndefined(from._offset)) { - to._offset = from._offset; - } - if (!isUndefined(from._pf)) { - to._pf = getParsingFlags(from); - } - if (!isUndefined(from._locale)) { - to._locale = from._locale; - } - - if (momentProperties.length > 0) { - for (i = 0; i < momentProperties.length; i++) { - prop = momentProperties[i]; - val = from[prop]; - if (!isUndefined(val)) { - to[prop] = val; - } + }; + Subscriber.prototype.unsubscribe = function () { + if (this.closed) { + return; } - } - - return to; -} - -var updateInProgress = false; - -// Moment prototype object -function Moment(config) { - copyConfig(this, config); - this._d = new Date(config._d != null ? config._d.getTime() : NaN); - if (!this.isValid()) { - this._d = new Date(NaN); - } - // Prevent infinite loop in case updateOffset creates new moment - // objects. - if (updateInProgress === false) { - updateInProgress = true; - hooks.updateOffset(this); - updateInProgress = false; - } -} - -function isMoment (obj) { - return obj instanceof Moment || (obj != null && obj._isAMomentObject != null); -} - -function absFloor (number) { - if (number < 0) { - // -0 -> 0 - return Math.ceil(number) || 0; - } else { - return Math.floor(number); - } -} - -function toInt(argumentForCoercion) { - var coercedNumber = +argumentForCoercion, - value = 0; - - if (coercedNumber !== 0 && isFinite(coercedNumber)) { - value = absFloor(coercedNumber); - } - - return value; -} + this.isStopped = true; + _super.prototype.unsubscribe.call(this); + }; + Subscriber.prototype._next = function (value) { + this.destination.next(value); + }; + Subscriber.prototype._error = function (err) { + this.destination.error(err); + this.unsubscribe(); + }; + Subscriber.prototype._complete = function () { + this.destination.complete(); + this.unsubscribe(); + }; + Subscriber.prototype._unsubscribeAndRecycle = function () { + var _a = this, _parent = _a._parent, _parents = _a._parents; + this._parent = null; + this._parents = null; + this.unsubscribe(); + this.closed = false; + this.isStopped = false; + this._parent = _parent; + this._parents = _parents; + return this; + }; + return Subscriber; +}(__WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */])); -// compare two arrays, return the number of differences -function compareArrays(array1, array2, dontConvert) { - var len = Math.min(array1.length, array2.length), - lengthDiff = Math.abs(array1.length - array2.length), - diffs = 0, - i; - for (i = 0; i < len; i++) { - if ((dontConvert && array1[i] !== array2[i]) || - (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) { - diffs++; +var SafeSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SafeSubscriber, _super); + function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) { + var _this = _super.call(this) || this; + _this._parentSubscriber = _parentSubscriber; + var next; + var context = _this; + if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(observerOrNext)) { + next = observerOrNext; } + else if (observerOrNext) { + next = observerOrNext.next; + error = observerOrNext.error; + complete = observerOrNext.complete; + if (observerOrNext !== __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]) { + context = Object.create(observerOrNext); + if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(context.unsubscribe)) { + _this.add(context.unsubscribe.bind(context)); + } + context.unsubscribe = _this.unsubscribe.bind(_this); + } + } + _this._context = context; + _this._next = next; + _this._error = error; + _this._complete = complete; + return _this; } - return diffs + lengthDiff; -} - -function warn(msg) { - if (hooks.suppressDeprecationWarnings === false && - (typeof console !== 'undefined') && console.warn) { - console.warn('Deprecation warning: ' + msg); - } -} - -function deprecate(msg, fn) { - var firstTime = true; - - return extend(function () { - if (hooks.deprecationHandler != null) { - hooks.deprecationHandler(null, msg); + SafeSubscriber.prototype.next = function (value) { + if (!this.isStopped && this._next) { + var _parentSubscriber = this._parentSubscriber; + if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) { + this.__tryOrUnsub(this._next, value); + } + else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) { + this.unsubscribe(); + } } - if (firstTime) { - var args = []; - var arg; - for (var i = 0; i < arguments.length; i++) { - arg = ''; - if (typeof arguments[i] === 'object') { - arg += '\n[' + i + '] '; - for (var key in arguments[0]) { - arg += key + ': ' + arguments[0][key] + ', '; - } - arg = arg.slice(0, -2); // Remove trailing comma and space - } else { - arg = arguments[i]; + }; + SafeSubscriber.prototype.error = function (err) { + if (!this.isStopped) { + var _parentSubscriber = this._parentSubscriber; + var useDeprecatedSynchronousErrorHandling = __WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling; + if (this._error) { + if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) { + this.__tryOrUnsub(this._error, err); + this.unsubscribe(); + } + else { + this.__tryOrSetError(_parentSubscriber, this._error, err); + this.unsubscribe(); + } + } + else if (!_parentSubscriber.syncErrorThrowable) { + this.unsubscribe(); + if (useDeprecatedSynchronousErrorHandling) { + throw err; + } + Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); + } + else { + if (useDeprecatedSynchronousErrorHandling) { + _parentSubscriber.syncErrorValue = err; + _parentSubscriber.syncErrorThrown = true; + } + else { + Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); } - args.push(arg); + this.unsubscribe(); } - warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack); - firstTime = false; } - return fn.apply(this, arguments); - }, fn); -} - -var deprecations = {}; - -function deprecateSimple(name, msg) { - if (hooks.deprecationHandler != null) { - hooks.deprecationHandler(name, msg); - } - if (!deprecations[name]) { - warn(msg); - deprecations[name] = true; - } -} - -hooks.suppressDeprecationWarnings = false; -hooks.deprecationHandler = null; - -function isFunction(input) { - return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]'; -} - -function set (config) { - var prop, i; - for (i in config) { - prop = config[i]; - if (isFunction(prop)) { - this[i] = prop; - } else { - this['_' + i] = prop; - } - } - this._config = config; - // Lenient ordinal parsing accepts just a number in addition to - // number + (possibly) stuff coming from _dayOfMonthOrdinalParse. - // TODO: Remove "ordinalParse" fallback in next major release. - this._dayOfMonthOrdinalParseLenient = new RegExp( - (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) + - '|' + (/\d{1,2}/).source); -} - -function mergeConfigs(parentConfig, childConfig) { - var res = extend({}, parentConfig), prop; - for (prop in childConfig) { - if (hasOwnProp(childConfig, prop)) { - if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) { - res[prop] = {}; - extend(res[prop], parentConfig[prop]); - extend(res[prop], childConfig[prop]); - } else if (childConfig[prop] != null) { - res[prop] = childConfig[prop]; - } else { - delete res[prop]; + }; + SafeSubscriber.prototype.complete = function () { + var _this = this; + if (!this.isStopped) { + var _parentSubscriber = this._parentSubscriber; + if (this._complete) { + var wrappedComplete = function () { return _this._complete.call(_this._context); }; + if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) { + this.__tryOrUnsub(wrappedComplete); + this.unsubscribe(); + } + else { + this.__tryOrSetError(_parentSubscriber, wrappedComplete); + this.unsubscribe(); + } + } + else { + this.unsubscribe(); } } - } - for (prop in parentConfig) { - if (hasOwnProp(parentConfig, prop) && - !hasOwnProp(childConfig, prop) && - isObject(parentConfig[prop])) { - // make sure changes to properties don't modify parent config - res[prop] = extend({}, res[prop]); + }; + SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) { + try { + fn.call(this._context, value); } - } - return res; -} - -function Locale(config) { - if (config != null) { - this.set(config); - } -} - -var keys; - -if (Object.keys) { - keys = Object.keys; -} else { - keys = function (obj) { - var i, res = []; - for (i in obj) { - if (hasOwnProp(obj, i)) { - res.push(i); + catch (err) { + this.unsubscribe(); + if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { + throw err; + } + else { + Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); } } - return res; }; -} - -var defaultCalendar = { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' -}; - -function calendar (key, mom, now) { - var output = this._calendar[key] || this._calendar['sameElse']; - return isFunction(output) ? output.call(mom, now) : output; -} - -var defaultLongDateFormat = { - LTS : 'h:mm:ss A', - LT : 'h:mm A', - L : 'MM/DD/YYYY', - LL : 'MMMM D, YYYY', - LLL : 'MMMM D, YYYY h:mm A', - LLLL : 'dddd, MMMM D, YYYY h:mm A' -}; - -function longDateFormat (key) { - var format = this._longDateFormat[key], - formatUpper = this._longDateFormat[key.toUpperCase()]; - - if (format || !formatUpper) { - return format; - } - - this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) { - return val.slice(1); - }); - - return this._longDateFormat[key]; -} - -var defaultInvalidDate = 'Invalid date'; - -function invalidDate () { - return this._invalidDate; -} - -var defaultOrdinal = '%d'; -var defaultDayOfMonthOrdinalParse = /\d{1,2}/; - -function ordinal (number) { - return this._ordinal.replace('%d', number); -} - -var defaultRelativeTime = { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - ss : '%d seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' -}; - -function relativeTime (number, withoutSuffix, string, isFuture) { - var output = this._relativeTime[string]; - return (isFunction(output)) ? - output(number, withoutSuffix, string, isFuture) : - output.replace(/%d/i, number); -} - -function pastFuture (diff, output) { - var format = this._relativeTime[diff > 0 ? 'future' : 'past']; - return isFunction(format) ? format(output) : format.replace(/%s/i, output); -} - -var aliases = {}; - -function addUnitAlias (unit, shorthand) { - var lowerCase = unit.toLowerCase(); - aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit; -} - -function normalizeUnits(units) { - return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined; -} - -function normalizeObjectUnits(inputObject) { - var normalizedInput = {}, - normalizedProp, - prop; - - for (prop in inputObject) { - if (hasOwnProp(inputObject, prop)) { - normalizedProp = normalizeUnits(prop); - if (normalizedProp) { - normalizedInput[normalizedProp] = inputObject[prop]; - } - } - } - - return normalizedInput; -} - -var priorities = {}; - -function addUnitPriority(unit, priority) { - priorities[unit] = priority; -} - -function getPrioritizedUnits(unitsObj) { - var units = []; - for (var u in unitsObj) { - units.push({unit: u, priority: priorities[u]}); - } - units.sort(function (a, b) { - return a.priority - b.priority; - }); - return units; -} - -function zeroFill(number, targetLength, forceSign) { - var absNumber = '' + Math.abs(number), - zerosToFill = targetLength - absNumber.length, - sign = number >= 0; - return (sign ? (forceSign ? '+' : '') : '-') + - Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber; -} - -var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g; - -var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g; - -var formatFunctions = {}; - -var formatTokenFunctions = {}; - -// token: 'M' -// padded: ['MM', 2] -// ordinal: 'Mo' -// callback: function () { this.month() + 1 } -function addFormatToken (token, padded, ordinal, callback) { - var func = callback; - if (typeof callback === 'string') { - func = function () { - return this[callback](); - }; - } - if (token) { - formatTokenFunctions[token] = func; - } - if (padded) { - formatTokenFunctions[padded[0]] = function () { - return zeroFill(func.apply(this, arguments), padded[1], padded[2]); - }; - } - if (ordinal) { - formatTokenFunctions[ordinal] = function () { - return this.localeData().ordinal(func.apply(this, arguments), token); - }; - } -} - -function removeFormattingTokens(input) { - if (input.match(/\[[\s\S]/)) { - return input.replace(/^\[|\]$/g, ''); - } - return input.replace(/\\/g, ''); -} - -function makeFormatFunction(format) { - var array = format.match(formattingTokens), i, length; - - for (i = 0, length = array.length; i < length; i++) { - if (formatTokenFunctions[array[i]]) { - array[i] = formatTokenFunctions[array[i]]; - } else { - array[i] = removeFormattingTokens(array[i]); - } - } - - return function (mom) { - var output = '', i; - for (i = 0; i < length; i++) { - output += isFunction(array[i]) ? array[i].call(mom, format) : array[i]; - } - return output; - }; -} - -// format date using native date object -function formatMoment(m, format) { - if (!m.isValid()) { - return m.localeData().invalidDate(); - } - - format = expandFormat(format, m.localeData()); - formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format); - - return formatFunctions[format](m); -} - -function expandFormat(format, locale) { - var i = 5; - - function replaceLongDateFormatTokens(input) { - return locale.longDateFormat(input) || input; - } - - localFormattingTokens.lastIndex = 0; - while (i >= 0 && localFormattingTokens.test(format)) { - format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); - localFormattingTokens.lastIndex = 0; - i -= 1; - } - - return format; -} - -var match1 = /\d/; // 0 - 9 -var match2 = /\d\d/; // 00 - 99 -var match3 = /\d{3}/; // 000 - 999 -var match4 = /\d{4}/; // 0000 - 9999 -var match6 = /[+-]?\d{6}/; // -999999 - 999999 -var match1to2 = /\d\d?/; // 0 - 99 -var match3to4 = /\d\d\d\d?/; // 999 - 9999 -var match5to6 = /\d\d\d\d\d\d?/; // 99999 - 999999 -var match1to3 = /\d{1,3}/; // 0 - 999 -var match1to4 = /\d{1,4}/; // 0 - 9999 -var match1to6 = /[+-]?\d{1,6}/; // -999999 - 999999 - -var matchUnsigned = /\d+/; // 0 - inf -var matchSigned = /[+-]?\d+/; // -inf - inf - -var matchOffset = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z -var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z - -var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123 - -// any word (or two) characters or numbers including two/three word month in arabic. -// includes scottish gaelic two word and hyphenated months -var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i; - - -var regexes = {}; - -function addRegexToken (token, regex, strictRegex) { - regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) { - return (isStrict && strictRegex) ? strictRegex : regex; - }; -} - -function getParseRegexForToken (token, config) { - if (!hasOwnProp(regexes, token)) { - return new RegExp(unescapeFormat(token)); - } - - return regexes[token](config._strict, config._locale); -} - -// Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript -function unescapeFormat(s) { - return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) { - return p1 || p2 || p3 || p4; - })); -} - -function regexEscape(s) { - return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'); -} - -var tokens = {}; - -function addParseToken (token, callback) { - var i, func = callback; - if (typeof token === 'string') { - token = [token]; - } - if (isNumber(callback)) { - func = function (input, array) { - array[callback] = toInt(input); - }; - } - for (i = 0; i < token.length; i++) { - tokens[token[i]] = func; - } -} - -function addWeekParseToken (token, callback) { - addParseToken(token, function (input, array, config, token) { - config._w = config._w || {}; - callback(input, config._w, config, token); - }); -} - -function addTimeToArrayFromToken(token, input, config) { - if (input != null && hasOwnProp(tokens, token)) { - tokens[token](input, config._a, config, token); - } -} - -var YEAR = 0; -var MONTH = 1; -var DATE = 2; -var HOUR = 3; -var MINUTE = 4; -var SECOND = 5; -var MILLISECOND = 6; -var WEEK = 7; -var WEEKDAY = 8; - -// FORMATTING - -addFormatToken('Y', 0, 0, function () { - var y = this.year(); - return y <= 9999 ? '' + y : '+' + y; -}); - -addFormatToken(0, ['YY', 2], 0, function () { - return this.year() % 100; -}); - -addFormatToken(0, ['YYYY', 4], 0, 'year'); -addFormatToken(0, ['YYYYY', 5], 0, 'year'); -addFormatToken(0, ['YYYYYY', 6, true], 0, 'year'); - -// ALIASES - -addUnitAlias('year', 'y'); - -// PRIORITIES - -addUnitPriority('year', 1); - -// PARSING - -addRegexToken('Y', matchSigned); -addRegexToken('YY', match1to2, match2); -addRegexToken('YYYY', match1to4, match4); -addRegexToken('YYYYY', match1to6, match6); -addRegexToken('YYYYYY', match1to6, match6); - -addParseToken(['YYYYY', 'YYYYYY'], YEAR); -addParseToken('YYYY', function (input, array) { - array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input); -}); -addParseToken('YY', function (input, array) { - array[YEAR] = hooks.parseTwoDigitYear(input); -}); -addParseToken('Y', function (input, array) { - array[YEAR] = parseInt(input, 10); -}); - -// HELPERS - -function daysInYear(year) { - return isLeapYear(year) ? 366 : 365; -} - -function isLeapYear(year) { - return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; -} - -// HOOKS - -hooks.parseTwoDigitYear = function (input) { - return toInt(input) + (toInt(input) > 68 ? 1900 : 2000); -}; - -// MOMENTS - -var getSetYear = makeGetSet('FullYear', true); - -function getIsLeapYear () { - return isLeapYear(this.year()); -} - -function makeGetSet (unit, keepTime) { - return function (value) { - if (value != null) { - set$1(this, unit, value); - hooks.updateOffset(this, keepTime); - return this; - } else { - return get(this, unit); - } - }; -} - -function get (mom, unit) { - return mom.isValid() ? - mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN; -} - -function set$1 (mom, unit, value) { - if (mom.isValid() && !isNaN(value)) { - if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) { - mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month())); - } - else { - mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value); - } - } -} - -// MOMENTS - -function stringGet (units) { - units = normalizeUnits(units); - if (isFunction(this[units])) { - return this[units](); - } - return this; -} - - -function stringSet (units, value) { - if (typeof units === 'object') { - units = normalizeObjectUnits(units); - var prioritized = getPrioritizedUnits(units); - for (var i = 0; i < prioritized.length; i++) { - this[prioritized[i].unit](units[prioritized[i].unit]); - } - } else { - units = normalizeUnits(units); - if (isFunction(this[units])) { - return this[units](value); - } - } - return this; -} - -function mod(n, x) { - return ((n % x) + x) % x; -} - -var indexOf; - -if (Array.prototype.indexOf) { - indexOf = Array.prototype.indexOf; -} else { - indexOf = function (o) { - // I know - var i; - for (i = 0; i < this.length; ++i) { - if (this[i] === o) { - return i; - } - } - return -1; - }; -} - -function daysInMonth(year, month) { - if (isNaN(year) || isNaN(month)) { - return NaN; - } - var modMonth = mod(month, 12); - year += (month - modMonth) / 12; - return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2); -} - -// FORMATTING - -addFormatToken('M', ['MM', 2], 'Mo', function () { - return this.month() + 1; -}); - -addFormatToken('MMM', 0, 0, function (format) { - return this.localeData().monthsShort(this, format); -}); - -addFormatToken('MMMM', 0, 0, function (format) { - return this.localeData().months(this, format); -}); - -// ALIASES - -addUnitAlias('month', 'M'); - -// PRIORITY - -addUnitPriority('month', 8); - -// PARSING - -addRegexToken('M', match1to2); -addRegexToken('MM', match1to2, match2); -addRegexToken('MMM', function (isStrict, locale) { - return locale.monthsShortRegex(isStrict); -}); -addRegexToken('MMMM', function (isStrict, locale) { - return locale.monthsRegex(isStrict); -}); - -addParseToken(['M', 'MM'], function (input, array) { - array[MONTH] = toInt(input) - 1; -}); - -addParseToken(['MMM', 'MMMM'], function (input, array, config, token) { - var month = config._locale.monthsParse(input, token, config._strict); - // if we didn't find a month name, mark the date as invalid. - if (month != null) { - array[MONTH] = month; - } else { - getParsingFlags(config).invalidMonth = input; - } -}); - -// LOCALES - -var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/; -var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'); -function localeMonths (m, format) { - if (!m) { - return isArray(this._months) ? this._months : - this._months['standalone']; - } - return isArray(this._months) ? this._months[m.month()] : - this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()]; -} - -var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'); -function localeMonthsShort (m, format) { - if (!m) { - return isArray(this._monthsShort) ? this._monthsShort : - this._monthsShort['standalone']; - } - return isArray(this._monthsShort) ? this._monthsShort[m.month()] : - this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()]; -} - -function handleStrictParse(monthName, format, strict) { - var i, ii, mom, llc = monthName.toLocaleLowerCase(); - if (!this._monthsParse) { - // this is not used - this._monthsParse = []; - this._longMonthsParse = []; - this._shortMonthsParse = []; - for (i = 0; i < 12; ++i) { - mom = createUTC([2000, i]); - this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase(); - this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase(); + SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) { + if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { + throw new Error('bad call'); } - } - - if (strict) { - if (format === 'MMM') { - ii = indexOf.call(this._shortMonthsParse, llc); - return ii !== -1 ? ii : null; - } else { - ii = indexOf.call(this._longMonthsParse, llc); - return ii !== -1 ? ii : null; + try { + fn.call(this._context, value); } - } else { - if (format === 'MMM') { - ii = indexOf.call(this._shortMonthsParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._longMonthsParse, llc); - return ii !== -1 ? ii : null; - } else { - ii = indexOf.call(this._longMonthsParse, llc); - if (ii !== -1) { - return ii; + catch (err) { + if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { + parent.syncErrorValue = err; + parent.syncErrorThrown = true; + return true; } - ii = indexOf.call(this._shortMonthsParse, llc); - return ii !== -1 ? ii : null; - } - } -} - -function localeMonthsParse (monthName, format, strict) { - var i, mom, regex; - - if (this._monthsParseExact) { - return handleStrictParse.call(this, monthName, format, strict); - } - - if (!this._monthsParse) { - this._monthsParse = []; - this._longMonthsParse = []; - this._shortMonthsParse = []; - } - - // TODO: add sorting - // Sorting makes sure if one month (or abbr) is a prefix of another - // see sorting in computeMonthsParse - for (i = 0; i < 12; i++) { - // make the regex if we don't have it already - mom = createUTC([2000, i]); - if (strict && !this._longMonthsParse[i]) { - this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i'); - this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i'); - } - if (!strict && !this._monthsParse[i]) { - regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); - this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); - } - // test the regex - if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) { - return i; - } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) { - return i; - } else if (!strict && this._monthsParse[i].test(monthName)) { - return i; - } - } -} - -// MOMENTS - -function setMonth (mom, value) { - var dayOfMonth; - - if (!mom.isValid()) { - // No op - return mom; - } - - if (typeof value === 'string') { - if (/^\d+$/.test(value)) { - value = toInt(value); - } else { - value = mom.localeData().monthsParse(value); - // TODO: Another silent failure? - if (!isNumber(value)) { - return mom; + else { + Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); + return true; } } - } - - dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value)); - mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth); - return mom; -} - -function getSetMonth (value) { - if (value != null) { - setMonth(this, value); - hooks.updateOffset(this, true); - return this; - } else { - return get(this, 'Month'); - } -} - -function getDaysInMonth () { - return daysInMonth(this.year(), this.month()); -} - -var defaultMonthsShortRegex = matchWord; -function monthsShortRegex (isStrict) { - if (this._monthsParseExact) { - if (!hasOwnProp(this, '_monthsRegex')) { - computeMonthsParse.call(this); - } - if (isStrict) { - return this._monthsShortStrictRegex; - } else { - return this._monthsShortRegex; - } - } else { - if (!hasOwnProp(this, '_monthsShortRegex')) { - this._monthsShortRegex = defaultMonthsShortRegex; - } - return this._monthsShortStrictRegex && isStrict ? - this._monthsShortStrictRegex : this._monthsShortRegex; - } -} - -var defaultMonthsRegex = matchWord; -function monthsRegex (isStrict) { - if (this._monthsParseExact) { - if (!hasOwnProp(this, '_monthsRegex')) { - computeMonthsParse.call(this); - } - if (isStrict) { - return this._monthsStrictRegex; - } else { - return this._monthsRegex; - } - } else { - if (!hasOwnProp(this, '_monthsRegex')) { - this._monthsRegex = defaultMonthsRegex; - } - return this._monthsStrictRegex && isStrict ? - this._monthsStrictRegex : this._monthsRegex; - } -} - -function computeMonthsParse () { - function cmpLenRev(a, b) { - return b.length - a.length; - } - - var shortPieces = [], longPieces = [], mixedPieces = [], - i, mom; - for (i = 0; i < 12; i++) { - // make the regex if we don't have it already - mom = createUTC([2000, i]); - shortPieces.push(this.monthsShort(mom, '')); - longPieces.push(this.months(mom, '')); - mixedPieces.push(this.months(mom, '')); - mixedPieces.push(this.monthsShort(mom, '')); - } - // Sorting makes sure if one month (or abbr) is a prefix of another it - // will match the longer piece. - shortPieces.sort(cmpLenRev); - longPieces.sort(cmpLenRev); - mixedPieces.sort(cmpLenRev); - for (i = 0; i < 12; i++) { - shortPieces[i] = regexEscape(shortPieces[i]); - longPieces[i] = regexEscape(longPieces[i]); - } - for (i = 0; i < 24; i++) { - mixedPieces[i] = regexEscape(mixedPieces[i]); - } - - this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i'); - this._monthsShortRegex = this._monthsRegex; - this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i'); - this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i'); -} - -function createDate (y, m, d, h, M, s, ms) { - // can't just apply() to create a date: - // https://stackoverflow.com/q/181348 - var date = new Date(y, m, d, h, M, s, ms); - - // the date constructor remaps years 0-99 to 1900-1999 - if (y < 100 && y >= 0 && isFinite(date.getFullYear())) { - date.setFullYear(y); - } - return date; -} - -function createUTCDate (y) { - var date = new Date(Date.UTC.apply(null, arguments)); - - // the Date.UTC function remaps years 0-99 to 1900-1999 - if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) { - date.setUTCFullYear(y); - } - return date; -} - -// start-of-first-week - start-of-year -function firstWeekOffset(year, dow, doy) { - var // first-week day -- which january is always in the first week (4 for iso, 1 for other) - fwd = 7 + dow - doy, - // first-week day local weekday -- which local weekday is fwd - fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7; - - return -fwdlw + fwd - 1; -} - -// https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday -function dayOfYearFromWeeks(year, week, weekday, dow, doy) { - var localWeekday = (7 + weekday - dow) % 7, - weekOffset = firstWeekOffset(year, dow, doy), - dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset, - resYear, resDayOfYear; - - if (dayOfYear <= 0) { - resYear = year - 1; - resDayOfYear = daysInYear(resYear) + dayOfYear; - } else if (dayOfYear > daysInYear(year)) { - resYear = year + 1; - resDayOfYear = dayOfYear - daysInYear(year); - } else { - resYear = year; - resDayOfYear = dayOfYear; - } - - return { - year: resYear, - dayOfYear: resDayOfYear + return false; }; -} - -function weekOfYear(mom, dow, doy) { - var weekOffset = firstWeekOffset(mom.year(), dow, doy), - week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1, - resWeek, resYear; - - if (week < 1) { - resYear = mom.year() - 1; - resWeek = week + weeksInYear(resYear, dow, doy); - } else if (week > weeksInYear(mom.year(), dow, doy)) { - resWeek = week - weeksInYear(mom.year(), dow, doy); - resYear = mom.year() + 1; - } else { - resYear = mom.year(); - resWeek = week; - } - - return { - week: resWeek, - year: resYear + SafeSubscriber.prototype._unsubscribe = function () { + var _parentSubscriber = this._parentSubscriber; + this._context = null; + this._parentSubscriber = null; + _parentSubscriber.unsubscribe(); }; + return SafeSubscriber; +}(Subscriber)); +function isTrustedSubscriber(obj) { + return obj instanceof Subscriber || ('syncErrorThrowable' in obj && obj[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]]); } +//# sourceMappingURL=Subscriber.js.map -function weeksInYear(year, dow, doy) { - var weekOffset = firstWeekOffset(year, dow, doy), - weekOffsetNext = firstWeekOffset(year + 1, dow, doy); - return (daysInYear(year) - weekOffset + weekOffsetNext) / 7; -} - -// FORMATTING - -addFormatToken('w', ['ww', 2], 'wo', 'week'); -addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek'); - -// ALIASES - -addUnitAlias('week', 'w'); -addUnitAlias('isoWeek', 'W'); - -// PRIORITIES - -addUnitPriority('week', 5); -addUnitPriority('isoWeek', 5); - -// PARSING - -addRegexToken('w', match1to2); -addRegexToken('ww', match1to2, match2); -addRegexToken('W', match1to2); -addRegexToken('WW', match1to2, match2); - -addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) { - week[token.substr(0, 1)] = toInt(input); -}); - -// HELPERS - -// LOCALES - -function localeWeek (mom) { - return weekOfYear(mom, this._week.dow, this._week.doy).week; -} - -var defaultLocaleWeek = { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. -}; - -function localeFirstDayOfWeek () { - return this._week.dow; -} - -function localeFirstDayOfYear () { - return this._week.doy; -} - -// MOMENTS - -function getSetWeek (input) { - var week = this.localeData().week(this); - return input == null ? week : this.add((input - week) * 7, 'd'); -} - -function getSetISOWeek (input) { - var week = weekOfYear(this, 1, 4).week; - return input == null ? week : this.add((input - week) * 7, 'd'); -} - -// FORMATTING - -addFormatToken('d', 0, 'do', 'day'); - -addFormatToken('dd', 0, 0, function (format) { - return this.localeData().weekdaysMin(this, format); -}); - -addFormatToken('ddd', 0, 0, function (format) { - return this.localeData().weekdaysShort(this, format); -}); - -addFormatToken('dddd', 0, 0, function (format) { - return this.localeData().weekdays(this, format); -}); - -addFormatToken('e', 0, 0, 'weekday'); -addFormatToken('E', 0, 0, 'isoWeekday'); - -// ALIASES - -addUnitAlias('day', 'd'); -addUnitAlias('weekday', 'e'); -addUnitAlias('isoWeekday', 'E'); - -// PRIORITY -addUnitPriority('day', 11); -addUnitPriority('weekday', 11); -addUnitPriority('isoWeekday', 11); - -// PARSING - -addRegexToken('d', match1to2); -addRegexToken('e', match1to2); -addRegexToken('E', match1to2); -addRegexToken('dd', function (isStrict, locale) { - return locale.weekdaysMinRegex(isStrict); -}); -addRegexToken('ddd', function (isStrict, locale) { - return locale.weekdaysShortRegex(isStrict); -}); -addRegexToken('dddd', function (isStrict, locale) { - return locale.weekdaysRegex(isStrict); -}); - -addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) { - var weekday = config._locale.weekdaysParse(input, token, config._strict); - // if we didn't get a weekday name, mark the date as invalid - if (weekday != null) { - week.d = weekday; - } else { - getParsingFlags(config).invalidWeekday = input; - } -}); - -addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) { - week[token] = toInt(input); -}); - -// HELPERS - -function parseWeekday(input, locale) { - if (typeof input !== 'string') { - return input; - } - - if (!isNaN(input)) { - return parseInt(input, 10); - } - - input = locale.weekdaysParse(input); - if (typeof input === 'number') { - return input; - } - - return null; -} - -function parseIsoWeekday(input, locale) { - if (typeof input === 'string') { - return locale.weekdaysParse(input) % 7 || 7; - } - return isNaN(input) ? null : input; -} - -// LOCALES - -var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'); -function localeWeekdays (m, format) { - if (!m) { - return isArray(this._weekdays) ? this._weekdays : - this._weekdays['standalone']; - } - return isArray(this._weekdays) ? this._weekdays[m.day()] : - this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()]; -} - -var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'); -function localeWeekdaysShort (m) { - return (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort; -} - -var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'); -function localeWeekdaysMin (m) { - return (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin; -} - -function handleStrictParse$1(weekdayName, format, strict) { - var i, ii, mom, llc = weekdayName.toLocaleLowerCase(); - if (!this._weekdaysParse) { - this._weekdaysParse = []; - this._shortWeekdaysParse = []; - this._minWeekdaysParse = []; - - for (i = 0; i < 7; ++i) { - mom = createUTC([2000, 1]).day(i); - this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase(); - this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase(); - this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase(); - } - } - - if (strict) { - if (format === 'dddd') { - ii = indexOf.call(this._weekdaysParse, llc); - return ii !== -1 ? ii : null; - } else if (format === 'ddd') { - ii = indexOf.call(this._shortWeekdaysParse, llc); - return ii !== -1 ? ii : null; - } else { - ii = indexOf.call(this._minWeekdaysParse, llc); - return ii !== -1 ? ii : null; - } - } else { - if (format === 'dddd') { - ii = indexOf.call(this._weekdaysParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._shortWeekdaysParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._minWeekdaysParse, llc); - return ii !== -1 ? ii : null; - } else if (format === 'ddd') { - ii = indexOf.call(this._shortWeekdaysParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._weekdaysParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._minWeekdaysParse, llc); - return ii !== -1 ? ii : null; - } else { - ii = indexOf.call(this._minWeekdaysParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._weekdaysParse, llc); - if (ii !== -1) { - return ii; - } - ii = indexOf.call(this._shortWeekdaysParse, llc); - return ii !== -1 ? ii : null; - } - } -} - -function localeWeekdaysParse (weekdayName, format, strict) { - var i, mom, regex; - - if (this._weekdaysParseExact) { - return handleStrictParse$1.call(this, weekdayName, format, strict); - } - - if (!this._weekdaysParse) { - this._weekdaysParse = []; - this._minWeekdaysParse = []; - this._shortWeekdaysParse = []; - this._fullWeekdaysParse = []; - } - - for (i = 0; i < 7; i++) { - // make the regex if we don't have it already - - mom = createUTC([2000, 1]).day(i); - if (strict && !this._fullWeekdaysParse[i]) { - this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i'); - this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i'); - this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i'); - } - if (!this._weekdaysParse[i]) { - regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, ''); - this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i'); - } - // test the regex - if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) { - return i; - } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) { - return i; - } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) { - return i; - } else if (!strict && this._weekdaysParse[i].test(weekdayName)) { - return i; - } - } -} - -// MOMENTS - -function getSetDayOfWeek (input) { - if (!this.isValid()) { - return input != null ? this : NaN; - } - var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); - if (input != null) { - input = parseWeekday(input, this.localeData()); - return this.add(input - day, 'd'); - } else { - return day; - } -} - -function getSetLocaleDayOfWeek (input) { - if (!this.isValid()) { - return input != null ? this : NaN; - } - var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7; - return input == null ? weekday : this.add(input - weekday, 'd'); -} - -function getSetISODayOfWeek (input) { - if (!this.isValid()) { - return input != null ? this : NaN; - } - - // behaves the same as moment#day except - // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6) - // as a setter, sunday should belong to the previous week. - - if (input != null) { - var weekday = parseIsoWeekday(input, this.localeData()); - return this.day(this.day() % 7 ? weekday : weekday - 7); - } else { - return this.day() || 7; - } -} - -var defaultWeekdaysRegex = matchWord; -function weekdaysRegex (isStrict) { - if (this._weekdaysParseExact) { - if (!hasOwnProp(this, '_weekdaysRegex')) { - computeWeekdaysParse.call(this); - } - if (isStrict) { - return this._weekdaysStrictRegex; - } else { - return this._weekdaysRegex; - } - } else { - if (!hasOwnProp(this, '_weekdaysRegex')) { - this._weekdaysRegex = defaultWeekdaysRegex; - } - return this._weekdaysStrictRegex && isStrict ? - this._weekdaysStrictRegex : this._weekdaysRegex; - } -} - -var defaultWeekdaysShortRegex = matchWord; -function weekdaysShortRegex (isStrict) { - if (this._weekdaysParseExact) { - if (!hasOwnProp(this, '_weekdaysRegex')) { - computeWeekdaysParse.call(this); - } - if (isStrict) { - return this._weekdaysShortStrictRegex; - } else { - return this._weekdaysShortRegex; - } - } else { - if (!hasOwnProp(this, '_weekdaysShortRegex')) { - this._weekdaysShortRegex = defaultWeekdaysShortRegex; - } - return this._weekdaysShortStrictRegex && isStrict ? - this._weekdaysShortStrictRegex : this._weekdaysShortRegex; - } -} - -var defaultWeekdaysMinRegex = matchWord; -function weekdaysMinRegex (isStrict) { - if (this._weekdaysParseExact) { - if (!hasOwnProp(this, '_weekdaysRegex')) { - computeWeekdaysParse.call(this); - } - if (isStrict) { - return this._weekdaysMinStrictRegex; - } else { - return this._weekdaysMinRegex; - } - } else { - if (!hasOwnProp(this, '_weekdaysMinRegex')) { - this._weekdaysMinRegex = defaultWeekdaysMinRegex; - } - return this._weekdaysMinStrictRegex && isStrict ? - this._weekdaysMinStrictRegex : this._weekdaysMinRegex; - } -} - - -function computeWeekdaysParse () { - function cmpLenRev(a, b) { - return b.length - a.length; - } - - var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [], - i, mom, minp, shortp, longp; - for (i = 0; i < 7; i++) { - // make the regex if we don't have it already - mom = createUTC([2000, 1]).day(i); - minp = this.weekdaysMin(mom, ''); - shortp = this.weekdaysShort(mom, ''); - longp = this.weekdays(mom, ''); - minPieces.push(minp); - shortPieces.push(shortp); - longPieces.push(longp); - mixedPieces.push(minp); - mixedPieces.push(shortp); - mixedPieces.push(longp); - } - // Sorting makes sure if one weekday (or abbr) is a prefix of another it - // will match the longer piece. - minPieces.sort(cmpLenRev); - shortPieces.sort(cmpLenRev); - longPieces.sort(cmpLenRev); - mixedPieces.sort(cmpLenRev); - for (i = 0; i < 7; i++) { - shortPieces[i] = regexEscape(shortPieces[i]); - longPieces[i] = regexEscape(longPieces[i]); - mixedPieces[i] = regexEscape(mixedPieces[i]); - } - - this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i'); - this._weekdaysShortRegex = this._weekdaysRegex; - this._weekdaysMinRegex = this._weekdaysRegex; - - this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i'); - this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i'); - this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i'); -} - -// FORMATTING - -function hFormat() { - return this.hours() % 12 || 12; -} - -function kFormat() { - return this.hours() || 24; -} - -addFormatToken('H', ['HH', 2], 0, 'hour'); -addFormatToken('h', ['hh', 2], 0, hFormat); -addFormatToken('k', ['kk', 2], 0, kFormat); - -addFormatToken('hmm', 0, 0, function () { - return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2); -}); - -addFormatToken('hmmss', 0, 0, function () { - return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) + - zeroFill(this.seconds(), 2); -}); - -addFormatToken('Hmm', 0, 0, function () { - return '' + this.hours() + zeroFill(this.minutes(), 2); -}); - -addFormatToken('Hmmss', 0, 0, function () { - return '' + this.hours() + zeroFill(this.minutes(), 2) + - zeroFill(this.seconds(), 2); -}); - -function meridiem (token, lowercase) { - addFormatToken(token, 0, 0, function () { - return this.localeData().meridiem(this.hours(), this.minutes(), lowercase); - }); -} - -meridiem('a', true); -meridiem('A', false); - -// ALIASES - -addUnitAlias('hour', 'h'); - -// PRIORITY -addUnitPriority('hour', 13); - -// PARSING - -function matchMeridiem (isStrict, locale) { - return locale._meridiemParse; -} - -addRegexToken('a', matchMeridiem); -addRegexToken('A', matchMeridiem); -addRegexToken('H', match1to2); -addRegexToken('h', match1to2); -addRegexToken('k', match1to2); -addRegexToken('HH', match1to2, match2); -addRegexToken('hh', match1to2, match2); -addRegexToken('kk', match1to2, match2); - -addRegexToken('hmm', match3to4); -addRegexToken('hmmss', match5to6); -addRegexToken('Hmm', match3to4); -addRegexToken('Hmmss', match5to6); - -addParseToken(['H', 'HH'], HOUR); -addParseToken(['k', 'kk'], function (input, array, config) { - var kInput = toInt(input); - array[HOUR] = kInput === 24 ? 0 : kInput; -}); -addParseToken(['a', 'A'], function (input, array, config) { - config._isPm = config._locale.isPM(input); - config._meridiem = input; -}); -addParseToken(['h', 'hh'], function (input, array, config) { - array[HOUR] = toInt(input); - getParsingFlags(config).bigHour = true; -}); -addParseToken('hmm', function (input, array, config) { - var pos = input.length - 2; - array[HOUR] = toInt(input.substr(0, pos)); - array[MINUTE] = toInt(input.substr(pos)); - getParsingFlags(config).bigHour = true; -}); -addParseToken('hmmss', function (input, array, config) { - var pos1 = input.length - 4; - var pos2 = input.length - 2; - array[HOUR] = toInt(input.substr(0, pos1)); - array[MINUTE] = toInt(input.substr(pos1, 2)); - array[SECOND] = toInt(input.substr(pos2)); - getParsingFlags(config).bigHour = true; -}); -addParseToken('Hmm', function (input, array, config) { - var pos = input.length - 2; - array[HOUR] = toInt(input.substr(0, pos)); - array[MINUTE] = toInt(input.substr(pos)); -}); -addParseToken('Hmmss', function (input, array, config) { - var pos1 = input.length - 4; - var pos2 = input.length - 2; - array[HOUR] = toInt(input.substr(0, pos1)); - array[MINUTE] = toInt(input.substr(pos1, 2)); - array[SECOND] = toInt(input.substr(pos2)); -}); - -// LOCALES - -function localeIsPM (input) { - // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays - // Using charAt should be more compatible. - return ((input + '').toLowerCase().charAt(0) === 'p'); -} - -var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i; -function localeMeridiem (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'pm' : 'PM'; - } else { - return isLower ? 'am' : 'AM'; - } -} - - -// MOMENTS - -// Setting the hour should keep the time, because the user explicitly -// specified which hour he wants. So trying to maintain the same hour (in -// a new timezone) makes sense. Adding/subtracting hours does not follow -// this rule. -var getSetHour = makeGetSet('Hours', true); - -// months -// week -// weekdays -// meridiem -var baseConfig = { - calendar: defaultCalendar, - longDateFormat: defaultLongDateFormat, - invalidDate: defaultInvalidDate, - ordinal: defaultOrdinal, - dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse, - relativeTime: defaultRelativeTime, - - months: defaultLocaleMonths, - monthsShort: defaultLocaleMonthsShort, - - week: defaultLocaleWeek, - - weekdays: defaultLocaleWeekdays, - weekdaysMin: defaultLocaleWeekdaysMin, - weekdaysShort: defaultLocaleWeekdaysShort, - - meridiemParse: defaultLocaleMeridiemParse -}; -// internal storage for locale config files -var locales = {}; -var localeFamilies = {}; -var globalLocale; - -function normalizeLocale(key) { - return key ? key.toLowerCase().replace('_', '-') : key; -} - -// pick the locale from the array -// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each -// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root -function chooseLocale(names) { - var i = 0, j, next, locale, split; - - while (i < names.length) { - split = normalizeLocale(names[i]).split('-'); - j = split.length; - next = normalizeLocale(names[i + 1]); - next = next ? next.split('-') : null; - while (j > 0) { - locale = loadLocale(split.slice(0, j).join('-')); - if (locale) { - return locale; - } - if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) { - //the next array item is better than a shallower substring of this one - break; - } - j--; - } - i++; - } - return null; -} - -function loadLocale(name) { - var oldLocale = null; - // TODO: Find a better way to register and load all the locales in Node - if (!locales[name] && (typeof module !== 'undefined') && - module && module.exports) { - try { - oldLocale = globalLocale._abbr; - var aliasedRequire = require; - __webpack_require__(347)("./" + name); - getSetGlobalLocale(oldLocale); - } catch (e) {} - } - return locales[name]; -} - -// This function will load locale and then set the global locale. If -// no arguments are passed in, it will simply return the current global -// locale key. -function getSetGlobalLocale (key, values) { - var data; - if (key) { - if (isUndefined(values)) { - data = getLocale(key); - } - else { - data = defineLocale(key, values); - } - - if (data) { - // moment.duration._locale = moment._locale = data; - globalLocale = data; - } - } - - return globalLocale._abbr; -} - -function defineLocale (name, config) { - if (config !== null) { - var parentConfig = baseConfig; - config.abbr = name; - if (locales[name] != null) { - deprecateSimple('defineLocaleOverride', - 'use moment.updateLocale(localeName, config) to change ' + - 'an existing locale. moment.defineLocale(localeName, ' + - 'config) should only be used for creating a new locale ' + - 'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.'); - parentConfig = locales[name]._config; - } else if (config.parentLocale != null) { - if (locales[config.parentLocale] != null) { - parentConfig = locales[config.parentLocale]._config; - } else { - if (!localeFamilies[config.parentLocale]) { - localeFamilies[config.parentLocale] = []; - } - localeFamilies[config.parentLocale].push({ - name: name, - config: config - }); - return null; - } - } - locales[name] = new Locale(mergeConfigs(parentConfig, config)); - - if (localeFamilies[name]) { - localeFamilies[name].forEach(function (x) { - defineLocale(x.name, x.config); - }); - } - - // backwards compat for now: also set the locale - // make sure we set the locale AFTER all child locales have been - // created, so we won't end up with the child locale set. - getSetGlobalLocale(name); - - - return locales[name]; - } else { - // useful for testing - delete locales[name]; - return null; - } -} - -function updateLocale(name, config) { - if (config != null) { - var locale, tmpLocale, parentConfig = baseConfig; - // MERGE - tmpLocale = loadLocale(name); - if (tmpLocale != null) { - parentConfig = tmpLocale._config; - } - config = mergeConfigs(parentConfig, config); - locale = new Locale(config); - locale.parentLocale = locales[name]; - locales[name] = locale; - - // backwards compat for now: also set the locale - getSetGlobalLocale(name); - } else { - // pass null for config to unupdate, useful for tests - if (locales[name] != null) { - if (locales[name].parentLocale != null) { - locales[name] = locales[name].parentLocale; - } else if (locales[name] != null) { - delete locales[name]; - } - } - } - return locales[name]; -} - -// returns locale data -function getLocale (key) { - var locale; - - if (key && key._locale && key._locale._abbr) { - key = key._locale._abbr; - } - - if (!key) { - return globalLocale; - } - - if (!isArray(key)) { - //short-circuit everything else - locale = loadLocale(key); - if (locale) { - return locale; - } - key = [key]; - } - - return chooseLocale(key); -} - -function listLocales() { - return keys(locales); -} - -function checkOverflow (m) { - var overflow; - var a = m._a; - - if (a && getParsingFlags(m).overflow === -2) { - overflow = - a[MONTH] < 0 || a[MONTH] > 11 ? MONTH : - a[DATE] < 1 || a[DATE] > daysInMonth(a[YEAR], a[MONTH]) ? DATE : - a[HOUR] < 0 || a[HOUR] > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR : - a[MINUTE] < 0 || a[MINUTE] > 59 ? MINUTE : - a[SECOND] < 0 || a[SECOND] > 59 ? SECOND : - a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND : - -1; - - if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) { - overflow = DATE; - } - if (getParsingFlags(m)._overflowWeeks && overflow === -1) { - overflow = WEEK; - } - if (getParsingFlags(m)._overflowWeekday && overflow === -1) { - overflow = WEEKDAY; - } - - getParsingFlags(m).overflow = overflow; - } - - return m; -} - -// Pick the first defined of two or three arguments. -function defaults(a, b, c) { - if (a != null) { - return a; - } - if (b != null) { - return b; - } - return c; -} - -function currentDateArray(config) { - // hooks is actually the exported moment object - var nowValue = new Date(hooks.now()); - if (config._useUTC) { - return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()]; - } - return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()]; -} - -// convert an array to a date. -// the array should mirror the parameters below -// note: all values past the year are optional and will default to the lowest possible value. -// [year, month, day , hour, minute, second, millisecond] -function configFromArray (config) { - var i, date, input = [], currentDate, expectedWeekday, yearToUse; - - if (config._d) { - return; - } - - currentDate = currentDateArray(config); - - //compute day of the year from weeks and weekdays - if (config._w && config._a[DATE] == null && config._a[MONTH] == null) { - dayOfYearFromWeekInfo(config); - } - - //if the day of the year is set, figure out what it is - if (config._dayOfYear != null) { - yearToUse = defaults(config._a[YEAR], currentDate[YEAR]); - - if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) { - getParsingFlags(config)._overflowDayOfYear = true; - } - - date = createUTCDate(yearToUse, 0, config._dayOfYear); - config._a[MONTH] = date.getUTCMonth(); - config._a[DATE] = date.getUTCDate(); - } - - // Default to current date. - // * if no year, month, day of month are given, default to today - // * if day of month is given, default month and year - // * if month is given, default only year - // * if year is given, don't default anything - for (i = 0; i < 3 && config._a[i] == null; ++i) { - config._a[i] = input[i] = currentDate[i]; - } - - // Zero out whatever was not defaulted, including time - for (; i < 7; i++) { - config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; - } - - // Check for 24:00:00.000 - if (config._a[HOUR] === 24 && - config._a[MINUTE] === 0 && - config._a[SECOND] === 0 && - config._a[MILLISECOND] === 0) { - config._nextDay = true; - config._a[HOUR] = 0; - } - - config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input); - expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay(); - - // Apply timezone offset from input. The actual utcOffset can be changed - // with parseZone. - if (config._tzm != null) { - config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm); - } - - if (config._nextDay) { - config._a[HOUR] = 24; - } - - // check for mismatching day of week - if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) { - getParsingFlags(config).weekdayMismatch = true; - } -} - -function dayOfYearFromWeekInfo(config) { - var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow; - - w = config._w; - if (w.GG != null || w.W != null || w.E != null) { - dow = 1; - doy = 4; - - // TODO: We need to take the current isoWeekYear, but that depends on - // how we interpret now (local, utc, fixed offset). So create - // a now version of current config (take local/utc/offset flags, and - // create now). - weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year); - week = defaults(w.W, 1); - weekday = defaults(w.E, 1); - if (weekday < 1 || weekday > 7) { - weekdayOverflow = true; - } - } else { - dow = config._locale._week.dow; - doy = config._locale._week.doy; - - var curWeek = weekOfYear(createLocal(), dow, doy); - - weekYear = defaults(w.gg, config._a[YEAR], curWeek.year); - - // Default to current week. - week = defaults(w.w, curWeek.week); - - if (w.d != null) { - // weekday -- low day numbers are considered next week - weekday = w.d; - if (weekday < 0 || weekday > 6) { - weekdayOverflow = true; - } - } else if (w.e != null) { - // local weekday -- counting starts from begining of week - weekday = w.e + dow; - if (w.e < 0 || w.e > 6) { - weekdayOverflow = true; - } - } else { - // default to begining of week - weekday = dow; - } - } - if (week < 1 || week > weeksInYear(weekYear, dow, doy)) { - getParsingFlags(config)._overflowWeeks = true; - } else if (weekdayOverflow != null) { - getParsingFlags(config)._overflowWeekday = true; - } else { - temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy); - config._a[YEAR] = temp.year; - config._dayOfYear = temp.dayOfYear; - } -} - -// iso 8601 regex -// 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00) -var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/; -var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/; - -var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/; - -var isoDates = [ - ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/], - ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/], - ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/], - ['GGGG-[W]WW', /\d{4}-W\d\d/, false], - ['YYYY-DDD', /\d{4}-\d{3}/], - ['YYYY-MM', /\d{4}-\d\d/, false], - ['YYYYYYMMDD', /[+-]\d{10}/], - ['YYYYMMDD', /\d{8}/], - // YYYYMM is NOT allowed by the standard - ['GGGG[W]WWE', /\d{4}W\d{3}/], - ['GGGG[W]WW', /\d{4}W\d{2}/, false], - ['YYYYDDD', /\d{7}/] -]; - -// iso time formats and regexes -var isoTimes = [ - ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/], - ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/], - ['HH:mm:ss', /\d\d:\d\d:\d\d/], - ['HH:mm', /\d\d:\d\d/], - ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/], - ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/], - ['HHmmss', /\d\d\d\d\d\d/], - ['HHmm', /\d\d\d\d/], - ['HH', /\d\d/] -]; - -var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i; - -// date from iso format -function configFromISO(config) { - var i, l, - string = config._i, - match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string), - allowTime, dateFormat, timeFormat, tzFormat; - - if (match) { - getParsingFlags(config).iso = true; - - for (i = 0, l = isoDates.length; i < l; i++) { - if (isoDates[i][1].exec(match[1])) { - dateFormat = isoDates[i][0]; - allowTime = isoDates[i][2] !== false; - break; - } - } - if (dateFormat == null) { - config._isValid = false; - return; - } - if (match[3]) { - for (i = 0, l = isoTimes.length; i < l; i++) { - if (isoTimes[i][1].exec(match[3])) { - // match[2] should be 'T' or space - timeFormat = (match[2] || ' ') + isoTimes[i][0]; - break; - } - } - if (timeFormat == null) { - config._isValid = false; - return; - } - } - if (!allowTime && timeFormat != null) { - config._isValid = false; - return; - } - if (match[4]) { - if (tzRegex.exec(match[4])) { - tzFormat = 'Z'; - } else { - config._isValid = false; - return; - } - } - config._f = dateFormat + (timeFormat || '') + (tzFormat || ''); - configFromStringAndFormat(config); - } else { - config._isValid = false; - } -} - -// RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3 -var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/; - -function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) { - var result = [ - untruncateYear(yearStr), - defaultLocaleMonthsShort.indexOf(monthStr), - parseInt(dayStr, 10), - parseInt(hourStr, 10), - parseInt(minuteStr, 10) - ]; - - if (secondStr) { - result.push(parseInt(secondStr, 10)); - } - - return result; -} - -function untruncateYear(yearStr) { - var year = parseInt(yearStr, 10); - if (year <= 49) { - return 2000 + year; - } else if (year <= 999) { - return 1900 + year; - } - return year; -} - -function preprocessRFC2822(s) { - // Remove comments and folding whitespace and replace multiple-spaces with a single space - return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').trim(); -} - -function checkWeekday(weekdayStr, parsedInput, config) { - if (weekdayStr) { - // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check. - var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr), - weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay(); - if (weekdayProvided !== weekdayActual) { - getParsingFlags(config).weekdayMismatch = true; - config._isValid = false; - return false; - } - } - return true; -} - -var obsOffsets = { - UT: 0, - GMT: 0, - EDT: -4 * 60, - EST: -5 * 60, - CDT: -5 * 60, - CST: -6 * 60, - MDT: -6 * 60, - MST: -7 * 60, - PDT: -7 * 60, - PST: -8 * 60 -}; - -function calculateOffset(obsOffset, militaryOffset, numOffset) { - if (obsOffset) { - return obsOffsets[obsOffset]; - } else if (militaryOffset) { - // the only allowed military tz is Z - return 0; - } else { - var hm = parseInt(numOffset, 10); - var m = hm % 100, h = (hm - m) / 100; - return h * 60 + m; - } -} - -// date and time from ref 2822 format -function configFromRFC2822(config) { - var match = rfc2822.exec(preprocessRFC2822(config._i)); - if (match) { - var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]); - if (!checkWeekday(match[1], parsedArray, config)) { - return; - } - - config._a = parsedArray; - config._tzm = calculateOffset(match[8], match[9], match[10]); - - config._d = createUTCDate.apply(null, config._a); - config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm); - - getParsingFlags(config).rfc2822 = true; - } else { - config._isValid = false; - } -} - -// date from iso format or fallback -function configFromString(config) { - var matched = aspNetJsonRegex.exec(config._i); - - if (matched !== null) { - config._d = new Date(+matched[1]); - return; - } - - configFromISO(config); - if (config._isValid === false) { - delete config._isValid; - } else { - return; - } - - configFromRFC2822(config); - if (config._isValid === false) { - delete config._isValid; - } else { - return; - } - - // Final attempt, use Input Fallback - hooks.createFromInputFallback(config); -} - -hooks.createFromInputFallback = deprecate( - 'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' + - 'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' + - 'discouraged and will be removed in an upcoming major release. Please refer to ' + - 'http://momentjs.com/guides/#/warnings/js-date/ for more info.', - function (config) { - config._d = new Date(config._i + (config._useUTC ? ' UTC' : '')); - } -); - -// constant that refers to the ISO standard -hooks.ISO_8601 = function () {}; - -// constant that refers to the RFC 2822 form -hooks.RFC_2822 = function () {}; - -// date from string and format string -function configFromStringAndFormat(config) { - // TODO: Move this to another part of the creation flow to prevent circular deps - if (config._f === hooks.ISO_8601) { - configFromISO(config); - return; - } - if (config._f === hooks.RFC_2822) { - configFromRFC2822(config); - return; - } - config._a = []; - getParsingFlags(config).empty = true; - - // This array is used to make a Date, either with `new Date` or `Date.UTC` - var string = '' + config._i, - i, parsedInput, tokens, token, skipped, - stringLength = string.length, - totalParsedInputLength = 0; - - tokens = expandFormat(config._f, config._locale).match(formattingTokens) || []; - - for (i = 0; i < tokens.length; i++) { - token = tokens[i]; - parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0]; - // console.log('token', token, 'parsedInput', parsedInput, - // 'regex', getParseRegexForToken(token, config)); - if (parsedInput) { - skipped = string.substr(0, string.indexOf(parsedInput)); - if (skipped.length > 0) { - getParsingFlags(config).unusedInput.push(skipped); - } - string = string.slice(string.indexOf(parsedInput) + parsedInput.length); - totalParsedInputLength += parsedInput.length; - } - // don't parse if it's not a known token - if (formatTokenFunctions[token]) { - if (parsedInput) { - getParsingFlags(config).empty = false; - } - else { - getParsingFlags(config).unusedTokens.push(token); - } - addTimeToArrayFromToken(token, parsedInput, config); - } - else if (config._strict && !parsedInput) { - getParsingFlags(config).unusedTokens.push(token); - } - } - - // add remaining unparsed input length to the string - getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength; - if (string.length > 0) { - getParsingFlags(config).unusedInput.push(string); - } - - // clear _12h flag if hour is <= 12 - if (config._a[HOUR] <= 12 && - getParsingFlags(config).bigHour === true && - config._a[HOUR] > 0) { - getParsingFlags(config).bigHour = undefined; - } - - getParsingFlags(config).parsedDateParts = config._a.slice(0); - getParsingFlags(config).meridiem = config._meridiem; - // handle meridiem - config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem); - - configFromArray(config); - checkOverflow(config); -} - - -function meridiemFixWrap (locale, hour, meridiem) { - var isPm; - - if (meridiem == null) { - // nothing to do - return hour; - } - if (locale.meridiemHour != null) { - return locale.meridiemHour(hour, meridiem); - } else if (locale.isPM != null) { - // Fallback - isPm = locale.isPM(meridiem); - if (isPm && hour < 12) { - hour += 12; - } - if (!isPm && hour === 12) { - hour = 0; - } - return hour; - } else { - // this is not supposed to happen - return hour; - } -} - -// date from string and array of format strings -function configFromStringAndArray(config) { - var tempConfig, - bestMoment, - - scoreToBeat, - i, - currentScore; - - if (config._f.length === 0) { - getParsingFlags(config).invalidFormat = true; - config._d = new Date(NaN); - return; - } - - for (i = 0; i < config._f.length; i++) { - currentScore = 0; - tempConfig = copyConfig({}, config); - if (config._useUTC != null) { - tempConfig._useUTC = config._useUTC; - } - tempConfig._f = config._f[i]; - configFromStringAndFormat(tempConfig); - - if (!isValid(tempConfig)) { - continue; - } - - // if there is any input that was not parsed add a penalty for that format - currentScore += getParsingFlags(tempConfig).charsLeftOver; - - //or tokens - currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10; - - getParsingFlags(tempConfig).score = currentScore; - - if (scoreToBeat == null || currentScore < scoreToBeat) { - scoreToBeat = currentScore; - bestMoment = tempConfig; - } - } - - extend(config, bestMoment || tempConfig); -} - -function configFromObject(config) { - if (config._d) { - return; - } - - var i = normalizeObjectUnits(config._i); - config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) { - return obj && parseInt(obj, 10); - }); - - configFromArray(config); -} - -function createFromConfig (config) { - var res = new Moment(checkOverflow(prepareConfig(config))); - if (res._nextDay) { - // Adding is smart enough around DST - res.add(1, 'd'); - res._nextDay = undefined; - } - - return res; -} - -function prepareConfig (config) { - var input = config._i, - format = config._f; - - config._locale = config._locale || getLocale(config._l); - - if (input === null || (format === undefined && input === '')) { - return createInvalid({nullInput: true}); - } - - if (typeof input === 'string') { - config._i = input = config._locale.preparse(input); - } - - if (isMoment(input)) { - return new Moment(checkOverflow(input)); - } else if (isDate(input)) { - config._d = input; - } else if (isArray(format)) { - configFromStringAndArray(config); - } else if (format) { - configFromStringAndFormat(config); - } else { - configFromInput(config); - } - - if (!isValid(config)) { - config._d = null; - } - - return config; -} - -function configFromInput(config) { - var input = config._i; - if (isUndefined(input)) { - config._d = new Date(hooks.now()); - } else if (isDate(input)) { - config._d = new Date(input.valueOf()); - } else if (typeof input === 'string') { - configFromString(config); - } else if (isArray(input)) { - config._a = map(input.slice(0), function (obj) { - return parseInt(obj, 10); - }); - configFromArray(config); - } else if (isObject(input)) { - configFromObject(config); - } else if (isNumber(input)) { - // from milliseconds - config._d = new Date(input); - } else { - hooks.createFromInputFallback(config); - } -} - -function createLocalOrUTC (input, format, locale, strict, isUTC) { - var c = {}; - - if (locale === true || locale === false) { - strict = locale; - locale = undefined; - } - - if ((isObject(input) && isObjectEmpty(input)) || - (isArray(input) && input.length === 0)) { - input = undefined; - } - // object construction must be done this way. - // https://github.com/moment/moment/issues/1423 - c._isAMomentObject = true; - c._useUTC = c._isUTC = isUTC; - c._l = locale; - c._i = input; - c._f = format; - c._strict = strict; - - return createFromConfig(c); -} - -function createLocal (input, format, locale, strict) { - return createLocalOrUTC(input, format, locale, strict, false); -} - -var prototypeMin = deprecate( - 'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/', - function () { - var other = createLocal.apply(null, arguments); - if (this.isValid() && other.isValid()) { - return other < this ? this : other; - } else { - return createInvalid(); - } - } -); - -var prototypeMax = deprecate( - 'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/', - function () { - var other = createLocal.apply(null, arguments); - if (this.isValid() && other.isValid()) { - return other > this ? this : other; - } else { - return createInvalid(); - } - } -); - -// Pick a moment m from moments so that m[fn](other) is true for all -// other. This relies on the function fn to be transitive. -// -// moments should either be an array of moment objects or an array, whose -// first element is an array of moment objects. -function pickBy(fn, moments) { - var res, i; - if (moments.length === 1 && isArray(moments[0])) { - moments = moments[0]; - } - if (!moments.length) { - return createLocal(); - } - res = moments[0]; - for (i = 1; i < moments.length; ++i) { - if (!moments[i].isValid() || moments[i][fn](res)) { - res = moments[i]; - } - } - return res; -} - -// TODO: Use [].sort instead? -function min () { - var args = [].slice.call(arguments, 0); - - return pickBy('isBefore', args); -} - -function max () { - var args = [].slice.call(arguments, 0); - - return pickBy('isAfter', args); -} - -var now = function () { - return Date.now ? Date.now() : +(new Date()); -}; - -var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond']; - -function isDurationValid(m) { - for (var key in m) { - if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) { - return false; - } - } - - var unitHasDecimal = false; - for (var i = 0; i < ordering.length; ++i) { - if (m[ordering[i]]) { - if (unitHasDecimal) { - return false; // only allow non-integers for smallest unit - } - if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) { - unitHasDecimal = true; - } - } - } - - return true; -} - -function isValid$1() { - return this._isValid; -} - -function createInvalid$1() { - return createDuration(NaN); -} - -function Duration (duration) { - var normalizedInput = normalizeObjectUnits(duration), - years = normalizedInput.year || 0, - quarters = normalizedInput.quarter || 0, - months = normalizedInput.month || 0, - weeks = normalizedInput.week || 0, - days = normalizedInput.day || 0, - hours = normalizedInput.hour || 0, - minutes = normalizedInput.minute || 0, - seconds = normalizedInput.second || 0, - milliseconds = normalizedInput.millisecond || 0; - - this._isValid = isDurationValid(normalizedInput); - - // representation for dateAddRemove - this._milliseconds = +milliseconds + - seconds * 1e3 + // 1000 - minutes * 6e4 + // 1000 * 60 - hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978 - // Because of dateAddRemove treats 24 hours as different from a - // day when working around DST, we need to store them separately - this._days = +days + - weeks * 7; - // It is impossible to translate months into days without knowing - // which months you are are talking about, so we have to store - // it separately. - this._months = +months + - quarters * 3 + - years * 12; - - this._data = {}; - - this._locale = getLocale(); - - this._bubble(); -} - -function isDuration (obj) { - return obj instanceof Duration; -} - -function absRound (number) { - if (number < 0) { - return Math.round(-1 * number) * -1; - } else { - return Math.round(number); - } -} - -// FORMATTING - -function offset (token, separator) { - addFormatToken(token, 0, 0, function () { - var offset = this.utcOffset(); - var sign = '+'; - if (offset < 0) { - offset = -offset; - sign = '-'; - } - return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2); - }); -} - -offset('Z', ':'); -offset('ZZ', ''); - -// PARSING - -addRegexToken('Z', matchShortOffset); -addRegexToken('ZZ', matchShortOffset); -addParseToken(['Z', 'ZZ'], function (input, array, config) { - config._useUTC = true; - config._tzm = offsetFromString(matchShortOffset, input); -}); - -// HELPERS - -// timezone chunker -// '+10:00' > ['10', '00'] -// '-1530' > ['-15', '30'] -var chunkOffset = /([\+\-]|\d\d)/gi; - -function offsetFromString(matcher, string) { - var matches = (string || '').match(matcher); - - if (matches === null) { - return null; - } - - var chunk = matches[matches.length - 1] || []; - var parts = (chunk + '').match(chunkOffset) || ['-', 0, 0]; - var minutes = +(parts[1] * 60) + toInt(parts[2]); - - return minutes === 0 ? - 0 : - parts[0] === '+' ? minutes : -minutes; -} - -// Return a moment from input, that is local/utc/zone equivalent to model. -function cloneWithOffset(input, model) { - var res, diff; - if (model._isUTC) { - res = model.clone(); - diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf(); - // Use low-level api, because this fn is low-level api. - res._d.setTime(res._d.valueOf() + diff); - hooks.updateOffset(res, false); - return res; - } else { - return createLocal(input).local(); - } -} - -function getDateOffset (m) { - // On Firefox.24 Date#getTimezoneOffset returns a floating point. - // https://github.com/moment/moment/pull/1871 - return -Math.round(m._d.getTimezoneOffset() / 15) * 15; -} - -// HOOKS - -// This function will be called whenever a moment is mutated. -// It is intended to keep the offset in sync with the timezone. -hooks.updateOffset = function () {}; - -// MOMENTS - -// keepLocalTime = true means only change the timezone, without -// affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]--> -// 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset -// +0200, so we adjust the time as needed, to be valid. -// -// Keeping the time actually adds/subtracts (one hour) -// from the actual represented time. That is why we call updateOffset -// a second time. In case it wants us to change the offset again -// _changeInProgress == true case, then we have to adjust, because -// there is no such time in the given timezone. -function getSetOffset (input, keepLocalTime, keepMinutes) { - var offset = this._offset || 0, - localAdjust; - if (!this.isValid()) { - return input != null ? this : NaN; - } - if (input != null) { - if (typeof input === 'string') { - input = offsetFromString(matchShortOffset, input); - if (input === null) { - return this; - } - } else if (Math.abs(input) < 16 && !keepMinutes) { - input = input * 60; - } - if (!this._isUTC && keepLocalTime) { - localAdjust = getDateOffset(this); - } - this._offset = input; - this._isUTC = true; - if (localAdjust != null) { - this.add(localAdjust, 'm'); - } - if (offset !== input) { - if (!keepLocalTime || this._changeInProgress) { - addSubtract(this, createDuration(input - offset, 'm'), 1, false); - } else if (!this._changeInProgress) { - this._changeInProgress = true; - hooks.updateOffset(this, true); - this._changeInProgress = null; - } - } - return this; - } else { - return this._isUTC ? offset : getDateOffset(this); - } -} - -function getSetZone (input, keepLocalTime) { - if (input != null) { - if (typeof input !== 'string') { - input = -input; - } - - this.utcOffset(input, keepLocalTime); - - return this; - } else { - return -this.utcOffset(); - } -} - -function setOffsetToUTC (keepLocalTime) { - return this.utcOffset(0, keepLocalTime); -} - -function setOffsetToLocal (keepLocalTime) { - if (this._isUTC) { - this.utcOffset(0, keepLocalTime); - this._isUTC = false; - - if (keepLocalTime) { - this.subtract(getDateOffset(this), 'm'); - } - } - return this; -} - -function setOffsetToParsedOffset () { - if (this._tzm != null) { - this.utcOffset(this._tzm, false, true); - } else if (typeof this._i === 'string') { - var tZone = offsetFromString(matchOffset, this._i); - if (tZone != null) { - this.utcOffset(tZone); - } - else { - this.utcOffset(0, true); - } - } - return this; -} - -function hasAlignedHourOffset (input) { - if (!this.isValid()) { - return false; - } - input = input ? createLocal(input).utcOffset() : 0; - - return (this.utcOffset() - input) % 60 === 0; -} - -function isDaylightSavingTime () { - return ( - this.utcOffset() > this.clone().month(0).utcOffset() || - this.utcOffset() > this.clone().month(5).utcOffset() - ); -} - -function isDaylightSavingTimeShifted () { - if (!isUndefined(this._isDSTShifted)) { - return this._isDSTShifted; - } - - var c = {}; - - copyConfig(c, this); - c = prepareConfig(c); - - if (c._a) { - var other = c._isUTC ? createUTC(c._a) : createLocal(c._a); - this._isDSTShifted = this.isValid() && - compareArrays(c._a, other.toArray()) > 0; - } else { - this._isDSTShifted = false; - } - - return this._isDSTShifted; -} - -function isLocal () { - return this.isValid() ? !this._isUTC : false; -} - -function isUtcOffset () { - return this.isValid() ? this._isUTC : false; -} - -function isUtc () { - return this.isValid() ? this._isUTC && this._offset === 0 : false; -} - -// ASP.NET json date format regex -var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/; - -// from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html -// somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere -// and further modified to allow for strings containing both week and day -var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/; - -function createDuration (input, key) { - var duration = input, - // matching against regexp is expensive, do it on demand - match = null, - sign, - ret, - diffRes; - - if (isDuration(input)) { - duration = { - ms : input._milliseconds, - d : input._days, - M : input._months - }; - } else if (isNumber(input)) { - duration = {}; - if (key) { - duration[key] = input; - } else { - duration.milliseconds = input; - } - } else if (!!(match = aspNetRegex.exec(input))) { - sign = (match[1] === '-') ? -1 : 1; - duration = { - y : 0, - d : toInt(match[DATE]) * sign, - h : toInt(match[HOUR]) * sign, - m : toInt(match[MINUTE]) * sign, - s : toInt(match[SECOND]) * sign, - ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match - }; - } else if (!!(match = isoRegex.exec(input))) { - sign = (match[1] === '-') ? -1 : (match[1] === '+') ? 1 : 1; - duration = { - y : parseIso(match[2], sign), - M : parseIso(match[3], sign), - w : parseIso(match[4], sign), - d : parseIso(match[5], sign), - h : parseIso(match[6], sign), - m : parseIso(match[7], sign), - s : parseIso(match[8], sign) - }; - } else if (duration == null) {// checks for null or undefined - duration = {}; - } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) { - diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to)); - - duration = {}; - duration.ms = diffRes.milliseconds; - duration.M = diffRes.months; - } - - ret = new Duration(duration); - - if (isDuration(input) && hasOwnProp(input, '_locale')) { - ret._locale = input._locale; - } - - return ret; -} - -createDuration.fn = Duration.prototype; -createDuration.invalid = createInvalid$1; - -function parseIso (inp, sign) { - // We'd normally use ~~inp for this, but unfortunately it also - // converts floats to ints. - // inp may be undefined, so careful calling replace on it. - var res = inp && parseFloat(inp.replace(',', '.')); - // apply sign while we're at it - return (isNaN(res) ? 0 : res) * sign; -} - -function positiveMomentsDifference(base, other) { - var res = {milliseconds: 0, months: 0}; - - res.months = other.month() - base.month() + - (other.year() - base.year()) * 12; - if (base.clone().add(res.months, 'M').isAfter(other)) { - --res.months; - } - - res.milliseconds = +other - +(base.clone().add(res.months, 'M')); - - return res; -} - -function momentsDifference(base, other) { - var res; - if (!(base.isValid() && other.isValid())) { - return {milliseconds: 0, months: 0}; - } - - other = cloneWithOffset(other, base); - if (base.isBefore(other)) { - res = positiveMomentsDifference(base, other); - } else { - res = positiveMomentsDifference(other, base); - res.milliseconds = -res.milliseconds; - res.months = -res.months; - } - - return res; -} - -// TODO: remove 'name' arg after deprecation is removed -function createAdder(direction, name) { - return function (val, period) { - var dur, tmp; - //invert the arguments, but complain about it - if (period !== null && !isNaN(+period)) { - deprecateSimple(name, 'moment().' + name + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' + - 'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.'); - tmp = val; val = period; period = tmp; - } - - val = typeof val === 'string' ? +val : val; - dur = createDuration(val, period); - addSubtract(this, dur, direction); - return this; - }; -} - -function addSubtract (mom, duration, isAdding, updateOffset) { - var milliseconds = duration._milliseconds, - days = absRound(duration._days), - months = absRound(duration._months); - - if (!mom.isValid()) { - // No op - return; - } - - updateOffset = updateOffset == null ? true : updateOffset; - - if (months) { - setMonth(mom, get(mom, 'Month') + months * isAdding); - } - if (days) { - set$1(mom, 'Date', get(mom, 'Date') + days * isAdding); - } - if (milliseconds) { - mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding); - } - if (updateOffset) { - hooks.updateOffset(mom, days || months); - } -} - -var add = createAdder(1, 'add'); -var subtract = createAdder(-1, 'subtract'); - -function getCalendarFormat(myMoment, now) { - var diff = myMoment.diff(now, 'days', true); - return diff < -6 ? 'sameElse' : - diff < -1 ? 'lastWeek' : - diff < 0 ? 'lastDay' : - diff < 1 ? 'sameDay' : - diff < 2 ? 'nextDay' : - diff < 7 ? 'nextWeek' : 'sameElse'; -} - -function calendar$1 (time, formats) { - // We want to compare the start of today, vs this. - // Getting start-of-today depends on whether we're local/utc/offset or not. - var now = time || createLocal(), - sod = cloneWithOffset(now, this).startOf('day'), - format = hooks.calendarFormat(this, sod) || 'sameElse'; - - var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]); - - return this.format(output || this.localeData().calendar(format, this, createLocal(now))); -} - -function clone () { - return new Moment(this); -} - -function isAfter (input, units) { - var localInput = isMoment(input) ? input : createLocal(input); - if (!(this.isValid() && localInput.isValid())) { - return false; - } - units = normalizeUnits(!isUndefined(units) ? units : 'millisecond'); - if (units === 'millisecond') { - return this.valueOf() > localInput.valueOf(); - } else { - return localInput.valueOf() < this.clone().startOf(units).valueOf(); - } -} - -function isBefore (input, units) { - var localInput = isMoment(input) ? input : createLocal(input); - if (!(this.isValid() && localInput.isValid())) { - return false; - } - units = normalizeUnits(!isUndefined(units) ? units : 'millisecond'); - if (units === 'millisecond') { - return this.valueOf() < localInput.valueOf(); - } else { - return this.clone().endOf(units).valueOf() < localInput.valueOf(); - } -} - -function isBetween (from, to, units, inclusivity) { - inclusivity = inclusivity || '()'; - return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) && - (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units)); -} - -function isSame (input, units) { - var localInput = isMoment(input) ? input : createLocal(input), - inputMs; - if (!(this.isValid() && localInput.isValid())) { - return false; - } - units = normalizeUnits(units || 'millisecond'); - if (units === 'millisecond') { - return this.valueOf() === localInput.valueOf(); - } else { - inputMs = localInput.valueOf(); - return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf(); - } -} - -function isSameOrAfter (input, units) { - return this.isSame(input, units) || this.isAfter(input,units); -} - -function isSameOrBefore (input, units) { - return this.isSame(input, units) || this.isBefore(input,units); -} - -function diff (input, units, asFloat) { - var that, - zoneDelta, - delta, output; - - if (!this.isValid()) { - return NaN; - } - - that = cloneWithOffset(input, this); - - if (!that.isValid()) { - return NaN; - } - - zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4; - - units = normalizeUnits(units); - - switch (units) { - case 'year': output = monthDiff(this, that) / 12; break; - case 'month': output = monthDiff(this, that); break; - case 'quarter': output = monthDiff(this, that) / 3; break; - case 'second': output = (this - that) / 1e3; break; // 1000 - case 'minute': output = (this - that) / 6e4; break; // 1000 * 60 - case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60 - case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst - case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst - default: output = this - that; - } - - return asFloat ? output : absFloor(output); -} - -function monthDiff (a, b) { - // difference in months - var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()), - // b is in (anchor - 1 month, anchor + 1 month) - anchor = a.clone().add(wholeMonthDiff, 'months'), - anchor2, adjust; - - if (b - anchor < 0) { - anchor2 = a.clone().add(wholeMonthDiff - 1, 'months'); - // linear across the month - adjust = (b - anchor) / (anchor - anchor2); - } else { - anchor2 = a.clone().add(wholeMonthDiff + 1, 'months'); - // linear across the month - adjust = (b - anchor) / (anchor2 - anchor); - } - - //check for negative zero, return zero if negative zero - return -(wholeMonthDiff + adjust) || 0; -} - -hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ'; -hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]'; - -function toString () { - return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ'); -} - -function toISOString(keepOffset) { - if (!this.isValid()) { - return null; - } - var utc = keepOffset !== true; - var m = utc ? this.clone().utc() : this; - if (m.year() < 0 || m.year() > 9999) { - return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ'); - } - if (isFunction(Date.prototype.toISOString)) { - // native implementation is ~50x faster, use it when we can - if (utc) { - return this.toDate().toISOString(); - } else { - return new Date(this._d.valueOf()).toISOString().replace('Z', formatMoment(m, 'Z')); - } - } - return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ'); -} - -/** - * Return a human readable representation of a moment that can - * also be evaluated to get a new moment which is the same - * - * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects - */ -function inspect () { - if (!this.isValid()) { - return 'moment.invalid(/* ' + this._i + ' */)'; - } - var func = 'moment'; - var zone = ''; - if (!this.isLocal()) { - func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone'; - zone = 'Z'; - } - var prefix = '[' + func + '("]'; - var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY'; - var datetime = '-MM-DD[T]HH:mm:ss.SSS'; - var suffix = zone + '[")]'; - - return this.format(prefix + year + datetime + suffix); -} - -function format (inputString) { - if (!inputString) { - inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat; - } - var output = formatMoment(this, inputString); - return this.localeData().postformat(output); -} - -function from (time, withoutSuffix) { - if (this.isValid() && - ((isMoment(time) && time.isValid()) || - createLocal(time).isValid())) { - return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix); - } else { - return this.localeData().invalidDate(); - } -} - -function fromNow (withoutSuffix) { - return this.from(createLocal(), withoutSuffix); -} - -function to (time, withoutSuffix) { - if (this.isValid() && - ((isMoment(time) && time.isValid()) || - createLocal(time).isValid())) { - return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix); - } else { - return this.localeData().invalidDate(); - } -} - -function toNow (withoutSuffix) { - return this.to(createLocal(), withoutSuffix); -} - -// If passed a locale key, it will set the locale for this -// instance. Otherwise, it will return the locale configuration -// variables for this instance. -function locale (key) { - var newLocaleData; - - if (key === undefined) { - return this._locale._abbr; - } else { - newLocaleData = getLocale(key); - if (newLocaleData != null) { - this._locale = newLocaleData; - } - return this; - } -} - -var lang = deprecate( - 'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.', - function (key) { - if (key === undefined) { - return this.localeData(); - } else { - return this.locale(key); - } - } -); - -function localeData () { - return this._locale; -} - -function startOf (units) { - units = normalizeUnits(units); - // the following switch intentionally omits break keywords - // to utilize falling through the cases. - switch (units) { - case 'year': - this.month(0); - /* falls through */ - case 'quarter': - case 'month': - this.date(1); - /* falls through */ - case 'week': - case 'isoWeek': - case 'day': - case 'date': - this.hours(0); - /* falls through */ - case 'hour': - this.minutes(0); - /* falls through */ - case 'minute': - this.seconds(0); - /* falls through */ - case 'second': - this.milliseconds(0); - } - - // weeks are a special case - if (units === 'week') { - this.weekday(0); - } - if (units === 'isoWeek') { - this.isoWeekday(1); - } - - // quarters are also special - if (units === 'quarter') { - this.month(Math.floor(this.month() / 3) * 3); - } - - return this; -} - -function endOf (units) { - units = normalizeUnits(units); - if (units === undefined || units === 'millisecond') { - return this; - } - - // 'date' is an alias for 'day', so it should be considered as such. - if (units === 'date') { - units = 'day'; - } - - return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms'); -} - -function valueOf () { - return this._d.valueOf() - ((this._offset || 0) * 60000); -} - -function unix () { - return Math.floor(this.valueOf() / 1000); -} - -function toDate () { - return new Date(this.valueOf()); -} - -function toArray () { - var m = this; - return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()]; -} - -function toObject () { - var m = this; - return { - years: m.year(), - months: m.month(), - date: m.date(), - hours: m.hours(), - minutes: m.minutes(), - seconds: m.seconds(), - milliseconds: m.milliseconds() - }; -} - -function toJSON () { - // new Date(NaN).toJSON() === null - return this.isValid() ? this.toISOString() : null; -} - -function isValid$2 () { - return isValid(this); -} - -function parsingFlags () { - return extend({}, getParsingFlags(this)); -} - -function invalidAt () { - return getParsingFlags(this).overflow; -} - -function creationData() { - return { - input: this._i, - format: this._f, - locale: this._locale, - isUTC: this._isUTC, - strict: this._strict - }; -} - -// FORMATTING - -addFormatToken(0, ['gg', 2], 0, function () { - return this.weekYear() % 100; -}); - -addFormatToken(0, ['GG', 2], 0, function () { - return this.isoWeekYear() % 100; -}); - -function addWeekYearFormatToken (token, getter) { - addFormatToken(0, [token, token.length], 0, getter); -} - -addWeekYearFormatToken('gggg', 'weekYear'); -addWeekYearFormatToken('ggggg', 'weekYear'); -addWeekYearFormatToken('GGGG', 'isoWeekYear'); -addWeekYearFormatToken('GGGGG', 'isoWeekYear'); - -// ALIASES - -addUnitAlias('weekYear', 'gg'); -addUnitAlias('isoWeekYear', 'GG'); - -// PRIORITY - -addUnitPriority('weekYear', 1); -addUnitPriority('isoWeekYear', 1); - - -// PARSING - -addRegexToken('G', matchSigned); -addRegexToken('g', matchSigned); -addRegexToken('GG', match1to2, match2); -addRegexToken('gg', match1to2, match2); -addRegexToken('GGGG', match1to4, match4); -addRegexToken('gggg', match1to4, match4); -addRegexToken('GGGGG', match1to6, match6); -addRegexToken('ggggg', match1to6, match6); - -addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) { - week[token.substr(0, 2)] = toInt(input); -}); - -addWeekParseToken(['gg', 'GG'], function (input, week, config, token) { - week[token] = hooks.parseTwoDigitYear(input); -}); - -// MOMENTS - -function getSetWeekYear (input) { - return getSetWeekYearHelper.call(this, - input, - this.week(), - this.weekday(), - this.localeData()._week.dow, - this.localeData()._week.doy); -} - -function getSetISOWeekYear (input) { - return getSetWeekYearHelper.call(this, - input, this.isoWeek(), this.isoWeekday(), 1, 4); -} - -function getISOWeeksInYear () { - return weeksInYear(this.year(), 1, 4); -} - -function getWeeksInYear () { - var weekInfo = this.localeData()._week; - return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy); -} - -function getSetWeekYearHelper(input, week, weekday, dow, doy) { - var weeksTarget; - if (input == null) { - return weekOfYear(this, dow, doy).year; - } else { - weeksTarget = weeksInYear(input, dow, doy); - if (week > weeksTarget) { - week = weeksTarget; - } - return setWeekAll.call(this, input, week, weekday, dow, doy); - } -} - -function setWeekAll(weekYear, week, weekday, dow, doy) { - var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy), - date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear); - - this.year(date.getUTCFullYear()); - this.month(date.getUTCMonth()); - this.date(date.getUTCDate()); - return this; -} - -// FORMATTING - -addFormatToken('Q', 0, 'Qo', 'quarter'); - -// ALIASES - -addUnitAlias('quarter', 'Q'); - -// PRIORITY - -addUnitPriority('quarter', 7); - -// PARSING - -addRegexToken('Q', match1); -addParseToken('Q', function (input, array) { - array[MONTH] = (toInt(input) - 1) * 3; -}); - -// MOMENTS - -function getSetQuarter (input) { - return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3); -} - -// FORMATTING - -addFormatToken('D', ['DD', 2], 'Do', 'date'); - -// ALIASES - -addUnitAlias('date', 'D'); - -// PRIOROITY -addUnitPriority('date', 9); - -// PARSING - -addRegexToken('D', match1to2); -addRegexToken('DD', match1to2, match2); -addRegexToken('Do', function (isStrict, locale) { - // TODO: Remove "ordinalParse" fallback in next major release. - return isStrict ? - (locale._dayOfMonthOrdinalParse || locale._ordinalParse) : - locale._dayOfMonthOrdinalParseLenient; -}); - -addParseToken(['D', 'DD'], DATE); -addParseToken('Do', function (input, array) { - array[DATE] = toInt(input.match(match1to2)[0]); -}); - -// MOMENTS - -var getSetDayOfMonth = makeGetSet('Date', true); - -// FORMATTING - -addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear'); - -// ALIASES - -addUnitAlias('dayOfYear', 'DDD'); - -// PRIORITY -addUnitPriority('dayOfYear', 4); - -// PARSING - -addRegexToken('DDD', match1to3); -addRegexToken('DDDD', match3); -addParseToken(['DDD', 'DDDD'], function (input, array, config) { - config._dayOfYear = toInt(input); -}); - -// HELPERS - -// MOMENTS - -function getSetDayOfYear (input) { - var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1; - return input == null ? dayOfYear : this.add((input - dayOfYear), 'd'); -} - -// FORMATTING - -addFormatToken('m', ['mm', 2], 0, 'minute'); - -// ALIASES - -addUnitAlias('minute', 'm'); - -// PRIORITY - -addUnitPriority('minute', 14); - -// PARSING - -addRegexToken('m', match1to2); -addRegexToken('mm', match1to2, match2); -addParseToken(['m', 'mm'], MINUTE); - -// MOMENTS - -var getSetMinute = makeGetSet('Minutes', false); - -// FORMATTING - -addFormatToken('s', ['ss', 2], 0, 'second'); - -// ALIASES - -addUnitAlias('second', 's'); - -// PRIORITY - -addUnitPriority('second', 15); - -// PARSING - -addRegexToken('s', match1to2); -addRegexToken('ss', match1to2, match2); -addParseToken(['s', 'ss'], SECOND); - -// MOMENTS - -var getSetSecond = makeGetSet('Seconds', false); - -// FORMATTING - -addFormatToken('S', 0, 0, function () { - return ~~(this.millisecond() / 100); -}); - -addFormatToken(0, ['SS', 2], 0, function () { - return ~~(this.millisecond() / 10); -}); - -addFormatToken(0, ['SSS', 3], 0, 'millisecond'); -addFormatToken(0, ['SSSS', 4], 0, function () { - return this.millisecond() * 10; -}); -addFormatToken(0, ['SSSSS', 5], 0, function () { - return this.millisecond() * 100; -}); -addFormatToken(0, ['SSSSSS', 6], 0, function () { - return this.millisecond() * 1000; -}); -addFormatToken(0, ['SSSSSSS', 7], 0, function () { - return this.millisecond() * 10000; -}); -addFormatToken(0, ['SSSSSSSS', 8], 0, function () { - return this.millisecond() * 100000; -}); -addFormatToken(0, ['SSSSSSSSS', 9], 0, function () { - return this.millisecond() * 1000000; -}); - - -// ALIASES - -addUnitAlias('millisecond', 'ms'); - -// PRIORITY - -addUnitPriority('millisecond', 16); - -// PARSING - -addRegexToken('S', match1to3, match1); -addRegexToken('SS', match1to3, match2); -addRegexToken('SSS', match1to3, match3); - -var token; -for (token = 'SSSS'; token.length <= 9; token += 'S') { - addRegexToken(token, matchUnsigned); -} - -function parseMs(input, array) { - array[MILLISECOND] = toInt(('0.' + input) * 1000); -} - -for (token = 'S'; token.length <= 9; token += 'S') { - addParseToken(token, parseMs); -} -// MOMENTS - -var getSetMillisecond = makeGetSet('Milliseconds', false); - -// FORMATTING - -addFormatToken('z', 0, 0, 'zoneAbbr'); -addFormatToken('zz', 0, 0, 'zoneName'); - -// MOMENTS - -function getZoneAbbr () { - return this._isUTC ? 'UTC' : ''; -} - -function getZoneName () { - return this._isUTC ? 'Coordinated Universal Time' : ''; -} - -var proto = Moment.prototype; - -proto.add = add; -proto.calendar = calendar$1; -proto.clone = clone; -proto.diff = diff; -proto.endOf = endOf; -proto.format = format; -proto.from = from; -proto.fromNow = fromNow; -proto.to = to; -proto.toNow = toNow; -proto.get = stringGet; -proto.invalidAt = invalidAt; -proto.isAfter = isAfter; -proto.isBefore = isBefore; -proto.isBetween = isBetween; -proto.isSame = isSame; -proto.isSameOrAfter = isSameOrAfter; -proto.isSameOrBefore = isSameOrBefore; -proto.isValid = isValid$2; -proto.lang = lang; -proto.locale = locale; -proto.localeData = localeData; -proto.max = prototypeMax; -proto.min = prototypeMin; -proto.parsingFlags = parsingFlags; -proto.set = stringSet; -proto.startOf = startOf; -proto.subtract = subtract; -proto.toArray = toArray; -proto.toObject = toObject; -proto.toDate = toDate; -proto.toISOString = toISOString; -proto.inspect = inspect; -proto.toJSON = toJSON; -proto.toString = toString; -proto.unix = unix; -proto.valueOf = valueOf; -proto.creationData = creationData; - -// Year -proto.year = getSetYear; -proto.isLeapYear = getIsLeapYear; - -// Week Year -proto.weekYear = getSetWeekYear; -proto.isoWeekYear = getSetISOWeekYear; - -// Quarter -proto.quarter = proto.quarters = getSetQuarter; - -// Month -proto.month = getSetMonth; -proto.daysInMonth = getDaysInMonth; - -// Week -proto.week = proto.weeks = getSetWeek; -proto.isoWeek = proto.isoWeeks = getSetISOWeek; -proto.weeksInYear = getWeeksInYear; -proto.isoWeeksInYear = getISOWeeksInYear; - -// Day -proto.date = getSetDayOfMonth; -proto.day = proto.days = getSetDayOfWeek; -proto.weekday = getSetLocaleDayOfWeek; -proto.isoWeekday = getSetISODayOfWeek; -proto.dayOfYear = getSetDayOfYear; - -// Hour -proto.hour = proto.hours = getSetHour; - -// Minute -proto.minute = proto.minutes = getSetMinute; - -// Second -proto.second = proto.seconds = getSetSecond; - -// Millisecond -proto.millisecond = proto.milliseconds = getSetMillisecond; - -// Offset -proto.utcOffset = getSetOffset; -proto.utc = setOffsetToUTC; -proto.local = setOffsetToLocal; -proto.parseZone = setOffsetToParsedOffset; -proto.hasAlignedHourOffset = hasAlignedHourOffset; -proto.isDST = isDaylightSavingTime; -proto.isLocal = isLocal; -proto.isUtcOffset = isUtcOffset; -proto.isUtc = isUtc; -proto.isUTC = isUtc; - -// Timezone -proto.zoneAbbr = getZoneAbbr; -proto.zoneName = getZoneName; - -// Deprecations -proto.dates = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth); -proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth); -proto.years = deprecate('years accessor is deprecated. Use year instead', getSetYear); -proto.zone = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone); -proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted); - -function createUnix (input) { - return createLocal(input * 1000); -} - -function createInZone () { - return createLocal.apply(null, arguments).parseZone(); -} - -function preParsePostFormat (string) { - return string; -} - -var proto$1 = Locale.prototype; - -proto$1.calendar = calendar; -proto$1.longDateFormat = longDateFormat; -proto$1.invalidDate = invalidDate; -proto$1.ordinal = ordinal; -proto$1.preparse = preParsePostFormat; -proto$1.postformat = preParsePostFormat; -proto$1.relativeTime = relativeTime; -proto$1.pastFuture = pastFuture; -proto$1.set = set; - -// Month -proto$1.months = localeMonths; -proto$1.monthsShort = localeMonthsShort; -proto$1.monthsParse = localeMonthsParse; -proto$1.monthsRegex = monthsRegex; -proto$1.monthsShortRegex = monthsShortRegex; - -// Week -proto$1.week = localeWeek; -proto$1.firstDayOfYear = localeFirstDayOfYear; -proto$1.firstDayOfWeek = localeFirstDayOfWeek; - -// Day of Week -proto$1.weekdays = localeWeekdays; -proto$1.weekdaysMin = localeWeekdaysMin; -proto$1.weekdaysShort = localeWeekdaysShort; -proto$1.weekdaysParse = localeWeekdaysParse; - -proto$1.weekdaysRegex = weekdaysRegex; -proto$1.weekdaysShortRegex = weekdaysShortRegex; -proto$1.weekdaysMinRegex = weekdaysMinRegex; - -// Hours -proto$1.isPM = localeIsPM; -proto$1.meridiem = localeMeridiem; - -function get$1 (format, index, field, setter) { - var locale = getLocale(); - var utc = createUTC().set(setter, index); - return locale[field](utc, format); -} - -function listMonthsImpl (format, index, field) { - if (isNumber(format)) { - index = format; - format = undefined; - } - - format = format || ''; - - if (index != null) { - return get$1(format, index, field, 'month'); - } - - var i; - var out = []; - for (i = 0; i < 12; i++) { - out[i] = get$1(format, i, field, 'month'); - } - return out; -} - -// () -// (5) -// (fmt, 5) -// (fmt) -// (true) -// (true, 5) -// (true, fmt, 5) -// (true, fmt) -function listWeekdaysImpl (localeSorted, format, index, field) { - if (typeof localeSorted === 'boolean') { - if (isNumber(format)) { - index = format; - format = undefined; - } - - format = format || ''; - } else { - format = localeSorted; - index = format; - localeSorted = false; - - if (isNumber(format)) { - index = format; - format = undefined; - } - - format = format || ''; - } - - var locale = getLocale(), - shift = localeSorted ? locale._week.dow : 0; - - if (index != null) { - return get$1(format, (index + shift) % 7, field, 'day'); - } - - var i; - var out = []; - for (i = 0; i < 7; i++) { - out[i] = get$1(format, (i + shift) % 7, field, 'day'); - } - return out; -} - -function listMonths (format, index) { - return listMonthsImpl(format, index, 'months'); -} - -function listMonthsShort (format, index) { - return listMonthsImpl(format, index, 'monthsShort'); -} - -function listWeekdays (localeSorted, format, index) { - return listWeekdaysImpl(localeSorted, format, index, 'weekdays'); -} - -function listWeekdaysShort (localeSorted, format, index) { - return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort'); -} - -function listWeekdaysMin (localeSorted, format, index) { - return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin'); -} - -getSetGlobalLocale('en', { - dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, - ordinal : function (number) { - var b = number % 10, - output = (toInt(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - } -}); - -// Side effect imports -hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale); -hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale); - -var mathAbs = Math.abs; - -function abs () { - var data = this._data; - - this._milliseconds = mathAbs(this._milliseconds); - this._days = mathAbs(this._days); - this._months = mathAbs(this._months); - - data.milliseconds = mathAbs(data.milliseconds); - data.seconds = mathAbs(data.seconds); - data.minutes = mathAbs(data.minutes); - data.hours = mathAbs(data.hours); - data.months = mathAbs(data.months); - data.years = mathAbs(data.years); - - return this; -} - -function addSubtract$1 (duration, input, value, direction) { - var other = createDuration(input, value); - - duration._milliseconds += direction * other._milliseconds; - duration._days += direction * other._days; - duration._months += direction * other._months; - - return duration._bubble(); -} - -// supports only 2.0-style add(1, 's') or add(duration) -function add$1 (input, value) { - return addSubtract$1(this, input, value, 1); -} - -// supports only 2.0-style subtract(1, 's') or subtract(duration) -function subtract$1 (input, value) { - return addSubtract$1(this, input, value, -1); -} - -function absCeil (number) { - if (number < 0) { - return Math.floor(number); - } else { - return Math.ceil(number); - } -} - -function bubble () { - var milliseconds = this._milliseconds; - var days = this._days; - var months = this._months; - var data = this._data; - var seconds, minutes, hours, years, monthsFromDays; - - // if we have a mix of positive and negative values, bubble down first - // check: https://github.com/moment/moment/issues/2166 - if (!((milliseconds >= 0 && days >= 0 && months >= 0) || - (milliseconds <= 0 && days <= 0 && months <= 0))) { - milliseconds += absCeil(monthsToDays(months) + days) * 864e5; - days = 0; - months = 0; - } - - // The following code bubbles up values, see the tests for - // examples of what that means. - data.milliseconds = milliseconds % 1000; - - seconds = absFloor(milliseconds / 1000); - data.seconds = seconds % 60; - - minutes = absFloor(seconds / 60); - data.minutes = minutes % 60; - - hours = absFloor(minutes / 60); - data.hours = hours % 24; - - days += absFloor(hours / 24); - - // convert days to months - monthsFromDays = absFloor(daysToMonths(days)); - months += monthsFromDays; - days -= absCeil(monthsToDays(monthsFromDays)); - - // 12 months -> 1 year - years = absFloor(months / 12); - months %= 12; - - data.days = days; - data.months = months; - data.years = years; - - return this; -} - -function daysToMonths (days) { - // 400 years have 146097 days (taking into account leap year rules) - // 400 years have 12 months === 4800 - return days * 4800 / 146097; -} - -function monthsToDays (months) { - // the reverse of daysToMonths - return months * 146097 / 4800; -} - -function as (units) { - if (!this.isValid()) { - return NaN; - } - var days; - var months; - var milliseconds = this._milliseconds; - - units = normalizeUnits(units); - - if (units === 'month' || units === 'year') { - days = this._days + milliseconds / 864e5; - months = this._months + daysToMonths(days); - return units === 'month' ? months : months / 12; - } else { - // handle milliseconds separately because of floating point math errors (issue #1867) - days = this._days + Math.round(monthsToDays(this._months)); - switch (units) { - case 'week' : return days / 7 + milliseconds / 6048e5; - case 'day' : return days + milliseconds / 864e5; - case 'hour' : return days * 24 + milliseconds / 36e5; - case 'minute' : return days * 1440 + milliseconds / 6e4; - case 'second' : return days * 86400 + milliseconds / 1000; - // Math.floor prevents floating point math errors here - case 'millisecond': return Math.floor(days * 864e5) + milliseconds; - default: throw new Error('Unknown unit ' + units); - } - } -} - -// TODO: Use this.as('ms')? -function valueOf$1 () { - if (!this.isValid()) { - return NaN; - } - return ( - this._milliseconds + - this._days * 864e5 + - (this._months % 12) * 2592e6 + - toInt(this._months / 12) * 31536e6 - ); -} - -function makeAs (alias) { - return function () { - return this.as(alias); - }; -} - -var asMilliseconds = makeAs('ms'); -var asSeconds = makeAs('s'); -var asMinutes = makeAs('m'); -var asHours = makeAs('h'); -var asDays = makeAs('d'); -var asWeeks = makeAs('w'); -var asMonths = makeAs('M'); -var asYears = makeAs('y'); - -function clone$1 () { - return createDuration(this); -} - -function get$2 (units) { - units = normalizeUnits(units); - return this.isValid() ? this[units + 's']() : NaN; -} - -function makeGetter(name) { - return function () { - return this.isValid() ? this._data[name] : NaN; - }; -} - -var milliseconds = makeGetter('milliseconds'); -var seconds = makeGetter('seconds'); -var minutes = makeGetter('minutes'); -var hours = makeGetter('hours'); -var days = makeGetter('days'); -var months = makeGetter('months'); -var years = makeGetter('years'); - -function weeks () { - return absFloor(this.days() / 7); -} - -var round = Math.round; -var thresholds = { - ss: 44, // a few seconds to seconds - s : 45, // seconds to minute - m : 45, // minutes to hour - h : 22, // hours to day - d : 26, // days to month - M : 11 // months to year -}; - -// helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize -function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) { - return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture); -} - -function relativeTime$1 (posNegDuration, withoutSuffix, locale) { - var duration = createDuration(posNegDuration).abs(); - var seconds = round(duration.as('s')); - var minutes = round(duration.as('m')); - var hours = round(duration.as('h')); - var days = round(duration.as('d')); - var months = round(duration.as('M')); - var years = round(duration.as('y')); - - var a = seconds <= thresholds.ss && ['s', seconds] || - seconds < thresholds.s && ['ss', seconds] || - minutes <= 1 && ['m'] || - minutes < thresholds.m && ['mm', minutes] || - hours <= 1 && ['h'] || - hours < thresholds.h && ['hh', hours] || - days <= 1 && ['d'] || - days < thresholds.d && ['dd', days] || - months <= 1 && ['M'] || - months < thresholds.M && ['MM', months] || - years <= 1 && ['y'] || ['yy', years]; - - a[2] = withoutSuffix; - a[3] = +posNegDuration > 0; - a[4] = locale; - return substituteTimeAgo.apply(null, a); -} - -// This function allows you to set the rounding function for relative time strings -function getSetRelativeTimeRounding (roundingFunction) { - if (roundingFunction === undefined) { - return round; - } - if (typeof(roundingFunction) === 'function') { - round = roundingFunction; - return true; - } - return false; -} - -// This function allows you to set a threshold for relative time strings -function getSetRelativeTimeThreshold (threshold, limit) { - if (thresholds[threshold] === undefined) { - return false; - } - if (limit === undefined) { - return thresholds[threshold]; - } - thresholds[threshold] = limit; - if (threshold === 's') { - thresholds.ss = limit - 1; - } - return true; -} - -function humanize (withSuffix) { - if (!this.isValid()) { - return this.localeData().invalidDate(); - } - - var locale = this.localeData(); - var output = relativeTime$1(this, !withSuffix, locale); - - if (withSuffix) { - output = locale.pastFuture(+this, output); - } - - return locale.postformat(output); -} - -var abs$1 = Math.abs; - -function sign(x) { - return ((x > 0) - (x < 0)) || +x; -} - -function toISOString$1() { - // for ISO strings we do not use the normal bubbling rules: - // * milliseconds bubble up until they become hours - // * days do not bubble at all - // * months bubble up until they become years - // This is because there is no context-free conversion between hours and days - // (think of clock changes) - // and also not between days and months (28-31 days per month) - if (!this.isValid()) { - return this.localeData().invalidDate(); - } - - var seconds = abs$1(this._milliseconds) / 1000; - var days = abs$1(this._days); - var months = abs$1(this._months); - var minutes, hours, years; - - // 3600 seconds -> 60 minutes -> 1 hour - minutes = absFloor(seconds / 60); - hours = absFloor(minutes / 60); - seconds %= 60; - minutes %= 60; - - // 12 months -> 1 year - years = absFloor(months / 12); - months %= 12; - - - // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js - var Y = years; - var M = months; - var D = days; - var h = hours; - var m = minutes; - var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : ''; - var total = this.asSeconds(); - - if (!total) { - // this is the same as C#'s (Noda) and python (isodate)... - // but not other JS (goog.date) - return 'P0D'; - } - - var totalSign = total < 0 ? '-' : ''; - var ymSign = sign(this._months) !== sign(total) ? '-' : ''; - var daysSign = sign(this._days) !== sign(total) ? '-' : ''; - var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : ''; - - return totalSign + 'P' + - (Y ? ymSign + Y + 'Y' : '') + - (M ? ymSign + M + 'M' : '') + - (D ? daysSign + D + 'D' : '') + - ((h || m || s) ? 'T' : '') + - (h ? hmsSign + h + 'H' : '') + - (m ? hmsSign + m + 'M' : '') + - (s ? hmsSign + s + 'S' : ''); -} - -var proto$2 = Duration.prototype; - -proto$2.isValid = isValid$1; -proto$2.abs = abs; -proto$2.add = add$1; -proto$2.subtract = subtract$1; -proto$2.as = as; -proto$2.asMilliseconds = asMilliseconds; -proto$2.asSeconds = asSeconds; -proto$2.asMinutes = asMinutes; -proto$2.asHours = asHours; -proto$2.asDays = asDays; -proto$2.asWeeks = asWeeks; -proto$2.asMonths = asMonths; -proto$2.asYears = asYears; -proto$2.valueOf = valueOf$1; -proto$2._bubble = bubble; -proto$2.clone = clone$1; -proto$2.get = get$2; -proto$2.milliseconds = milliseconds; -proto$2.seconds = seconds; -proto$2.minutes = minutes; -proto$2.hours = hours; -proto$2.days = days; -proto$2.weeks = weeks; -proto$2.months = months; -proto$2.years = years; -proto$2.humanize = humanize; -proto$2.toISOString = toISOString$1; -proto$2.toString = toISOString$1; -proto$2.toJSON = toISOString$1; -proto$2.locale = locale; -proto$2.localeData = localeData; - -// Deprecations -proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1); -proto$2.lang = lang; - -// Side effect imports - -// FORMATTING - -addFormatToken('X', 0, 0, 'unix'); -addFormatToken('x', 0, 0, 'valueOf'); - -// PARSING - -addRegexToken('x', matchSigned); -addRegexToken('X', matchTimestamp); -addParseToken('X', function (input, array, config) { - config._d = new Date(parseFloat(input, 10) * 1000); -}); -addParseToken('x', function (input, array, config) { - config._d = new Date(toInt(input)); -}); - -// Side effect imports - - -hooks.version = '2.20.1'; - -setHookCallback(createLocal); - -hooks.fn = proto; -hooks.min = min; -hooks.max = max; -hooks.now = now; -hooks.utc = createUTC; -hooks.unix = createUnix; -hooks.months = listMonths; -hooks.isDate = isDate; -hooks.locale = getSetGlobalLocale; -hooks.invalid = createInvalid; -hooks.duration = createDuration; -hooks.isMoment = isMoment; -hooks.weekdays = listWeekdays; -hooks.parseZone = createInZone; -hooks.localeData = getLocale; -hooks.isDuration = isDuration; -hooks.monthsShort = listMonthsShort; -hooks.weekdaysMin = listWeekdaysMin; -hooks.defineLocale = defineLocale; -hooks.updateLocale = updateLocale; -hooks.locales = listLocales; -hooks.weekdaysShort = listWeekdaysShort; -hooks.normalizeUnits = normalizeUnits; -hooks.relativeTimeRounding = getSetRelativeTimeRounding; -hooks.relativeTimeThreshold = getSetRelativeTimeThreshold; -hooks.calendarFormat = getCalendarFormat; -hooks.prototype = proto; - -// currently HTML5 input type only supports 24-hour formats -hooks.HTML5_FMT = { - DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm', // - DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss', // - DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS', // - DATE: 'YYYY-MM-DD', // - TIME: 'HH:mm', // - TIME_SECONDS: 'HH:mm:ss', // - TIME_MS: 'HH:mm:ss.SSS', // - WEEK: 'YYYY-[W]WW', // - MONTH: 'YYYY-MM' // -}; - -return hooks; - -}))); - -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(27)(module))) - -/***/ }), -/* 1 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = __extends; -/* unused harmony export __assign */ -/* unused harmony export __rest */ -/* unused harmony export __decorate */ -/* unused harmony export __param */ -/* unused harmony export __metadata */ -/* unused harmony export __awaiter */ -/* unused harmony export __generator */ -/* unused harmony export __exportStar */ -/* unused harmony export __values */ -/* unused harmony export __read */ -/* unused harmony export __spread */ -/* unused harmony export __await */ -/* unused harmony export __asyncGenerator */ -/* unused harmony export __asyncDelegator */ -/* unused harmony export __asyncValues */ -/* unused harmony export __makeTemplateObject */ -/* unused harmony export __importStar */ -/* unused harmony export __importDefault */ -/*! ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ -/* global Reflect, Promise */ - -var extendStatics = Object.setPrototypeOf || - ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || - function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; - -function __extends(d, b) { - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); -} - -var __assign = Object.assign || function __assign(t) { - for (var s, i = 1, n = arguments.length; i < n; i++) { - s = arguments[i]; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]; - } - return t; -} - -function __rest(s, e) { - var t = {}; - for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) - t[p] = s[p]; - if (s != null && typeof Object.getOwnPropertySymbols === "function") - for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0) - t[p[i]] = s[p[i]]; - return t; -} - -function __decorate(decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; -} - -function __param(paramIndex, decorator) { - return function (target, key) { decorator(target, key, paramIndex); } -} - -function __metadata(metadataKey, metadataValue) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue); -} - -function __awaiter(thisArg, _arguments, P, generator) { - return new (P || (P = Promise))(function (resolve, reject) { - function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } - function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } - function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -} - -function __generator(thisArg, body) { - var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; - return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; - function verb(n) { return function (v) { return step([n, v]); }; } - function step(op) { - if (f) throw new TypeError("Generator is already executing."); - while (_) try { - if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t; - if (y = 0, t) op = [0, t.value]; - switch (op[0]) { - case 0: case 1: t = op; break; - case 4: _.label++; return { value: op[1], done: false }; - case 5: _.label++; y = op[1]; op = [0]; continue; - case 7: op = _.ops.pop(); _.trys.pop(); continue; - default: - if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } - if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } - if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } - if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } - if (t[2]) _.ops.pop(); - _.trys.pop(); continue; - } - op = body.call(thisArg, _); - } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } - if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; - } -} - -function __exportStar(m, exports) { - for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p]; -} - -function __values(o) { - var m = typeof Symbol === "function" && o[Symbol.iterator], i = 0; - if (m) return m.call(o); - return { - next: function () { - if (o && i >= o.length) o = void 0; - return { value: o && o[i++], done: !o }; - } - }; -} - -function __read(o, n) { - var m = typeof Symbol === "function" && o[Symbol.iterator]; - if (!m) return o; - var i = m.call(o), r, ar = [], e; - try { - while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value); - } - catch (error) { e = { error: error }; } - finally { - try { - if (r && !r.done && (m = i["return"])) m.call(i); - } - finally { if (e) throw e.error; } - } - return ar; -} - -function __spread() { - for (var ar = [], i = 0; i < arguments.length; i++) - ar = ar.concat(__read(arguments[i])); - return ar; -} - -function __await(v) { - return this instanceof __await ? (this.v = v, this) : new __await(v); -} - -function __asyncGenerator(thisArg, _arguments, generator) { - if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined."); - var g = generator.apply(thisArg, _arguments || []), i, q = []; - return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i; - function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; } - function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } } - function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); } - function fulfill(value) { resume("next", value); } - function reject(value) { resume("throw", value); } - function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); } -} - -function __asyncDelegator(o) { - var i, p; - return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i; - function verb(n, f) { if (o[n]) i[n] = function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; }; } -} - -function __asyncValues(o) { - if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined."); - var m = o[Symbol.asyncIterator]; - return m ? m.call(o) : typeof __values === "function" ? __values(o) : o[Symbol.iterator](); -} - -function __makeTemplateObject(cooked, raw) { - if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; } - return cooked; -}; - -function __importStar(mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; - result.default = mod; - return result; -} - -function __importDefault(mod) { - return (mod && mod.__esModule) ? mod : { default: mod }; -} - - -/***/ }), -/* 2 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscriber; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isFunction__ = __webpack_require__(32); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(221); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__ = __webpack_require__(64); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__config__ = __webpack_require__(43); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_hostReportError__ = __webpack_require__(63); -/** PURE_IMPORTS_START tslib,_util_isFunction,_Observer,_Subscription,_internal_symbol_rxSubscriber,_config,_util_hostReportError PURE_IMPORTS_END */ - - - - - - - -var Subscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subscriber, _super); - function Subscriber(destinationOrNext, error, complete) { - var _this = _super.call(this) || this; - _this.syncErrorValue = null; - _this.syncErrorThrown = false; - _this.syncErrorThrowable = false; - _this.isStopped = false; - switch (arguments.length) { - case 0: - _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]; - break; - case 1: - if (!destinationOrNext) { - _this.destination = __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]; - break; - } - if (typeof destinationOrNext === 'object') { - if (isTrustedSubscriber(destinationOrNext)) { - var trustedSubscriber = destinationOrNext[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]](); - _this.syncErrorThrowable = trustedSubscriber.syncErrorThrowable; - _this.destination = trustedSubscriber; - trustedSubscriber.add(_this); - } - else { - _this.syncErrorThrowable = true; - _this.destination = new SafeSubscriber(_this, destinationOrNext); - } - break; - } - default: - _this.syncErrorThrowable = true; - _this.destination = new SafeSubscriber(_this, destinationOrNext, error, complete); - break; - } - return _this; - } - Subscriber.prototype[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () { return this; }; - Subscriber.create = function (next, error, complete) { - var subscriber = new Subscriber(next, error, complete); - subscriber.syncErrorThrowable = false; - return subscriber; - }; - Subscriber.prototype.next = function (value) { - if (!this.isStopped) { - this._next(value); - } - }; - Subscriber.prototype.error = function (err) { - if (!this.isStopped) { - this.isStopped = true; - this._error(err); - } - }; - Subscriber.prototype.complete = function () { - if (!this.isStopped) { - this.isStopped = true; - this._complete(); - } - }; - Subscriber.prototype.unsubscribe = function () { - if (this.closed) { - return; - } - this.isStopped = true; - _super.prototype.unsubscribe.call(this); - }; - Subscriber.prototype._next = function (value) { - this.destination.next(value); - }; - Subscriber.prototype._error = function (err) { - this.destination.error(err); - this.unsubscribe(); - }; - Subscriber.prototype._complete = function () { - this.destination.complete(); - this.unsubscribe(); - }; - Subscriber.prototype._unsubscribeAndRecycle = function () { - var _a = this, _parent = _a._parent, _parents = _a._parents; - this._parent = null; - this._parents = null; - this.unsubscribe(); - this.closed = false; - this.isStopped = false; - this._parent = _parent; - this._parents = _parents; - return this; - }; - return Subscriber; -}(__WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */])); - -var SafeSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SafeSubscriber, _super); - function SafeSubscriber(_parentSubscriber, observerOrNext, error, complete) { - var _this = _super.call(this) || this; - _this._parentSubscriber = _parentSubscriber; - var next; - var context = _this; - if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(observerOrNext)) { - next = observerOrNext; - } - else if (observerOrNext) { - next = observerOrNext.next; - error = observerOrNext.error; - complete = observerOrNext.complete; - if (observerOrNext !== __WEBPACK_IMPORTED_MODULE_2__Observer__["a" /* empty */]) { - context = Object.create(observerOrNext); - if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isFunction__["a" /* isFunction */])(context.unsubscribe)) { - _this.add(context.unsubscribe.bind(context)); - } - context.unsubscribe = _this.unsubscribe.bind(_this); - } - } - _this._context = context; - _this._next = next; - _this._error = error; - _this._complete = complete; - return _this; - } - SafeSubscriber.prototype.next = function (value) { - if (!this.isStopped && this._next) { - var _parentSubscriber = this._parentSubscriber; - if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) { - this.__tryOrUnsub(this._next, value); - } - else if (this.__tryOrSetError(_parentSubscriber, this._next, value)) { - this.unsubscribe(); - } - } - }; - SafeSubscriber.prototype.error = function (err) { - if (!this.isStopped) { - var _parentSubscriber = this._parentSubscriber; - var useDeprecatedSynchronousErrorHandling = __WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling; - if (this._error) { - if (!useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) { - this.__tryOrUnsub(this._error, err); - this.unsubscribe(); - } - else { - this.__tryOrSetError(_parentSubscriber, this._error, err); - this.unsubscribe(); - } - } - else if (!_parentSubscriber.syncErrorThrowable) { - this.unsubscribe(); - if (useDeprecatedSynchronousErrorHandling) { - throw err; - } - Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); - } - else { - if (useDeprecatedSynchronousErrorHandling) { - _parentSubscriber.syncErrorValue = err; - _parentSubscriber.syncErrorThrown = true; - } - else { - Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); - } - this.unsubscribe(); - } - } - }; - SafeSubscriber.prototype.complete = function () { - var _this = this; - if (!this.isStopped) { - var _parentSubscriber = this._parentSubscriber; - if (this._complete) { - var wrappedComplete = function () { return _this._complete.call(_this._context); }; - if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling || !_parentSubscriber.syncErrorThrowable) { - this.__tryOrUnsub(wrappedComplete); - this.unsubscribe(); - } - else { - this.__tryOrSetError(_parentSubscriber, wrappedComplete); - this.unsubscribe(); - } - } - else { - this.unsubscribe(); - } - } - }; - SafeSubscriber.prototype.__tryOrUnsub = function (fn, value) { - try { - fn.call(this._context, value); - } - catch (err) { - this.unsubscribe(); - if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { - throw err; - } - else { - Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); - } - } - }; - SafeSubscriber.prototype.__tryOrSetError = function (parent, fn, value) { - if (!__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { - throw new Error('bad call'); - } - try { - fn.call(this._context, value); - } - catch (err) { - if (__WEBPACK_IMPORTED_MODULE_5__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { - parent.syncErrorValue = err; - parent.syncErrorThrown = true; - return true; - } - else { - Object(__WEBPACK_IMPORTED_MODULE_6__util_hostReportError__["a" /* hostReportError */])(err); - return true; - } - } - return false; - }; - SafeSubscriber.prototype._unsubscribe = function () { - var _parentSubscriber = this._parentSubscriber; - this._context = null; - this._parentSubscriber = null; - _parentSubscriber.unsubscribe(); - }; - return SafeSubscriber; -}(Subscriber)); -function isTrustedSubscriber(obj) { - return obj instanceof Subscriber || ('syncErrorThrowable' in obj && obj[__WEBPACK_IMPORTED_MODULE_4__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]]); -} -//# sourceMappingURL=Subscriber.js.map - - -/***/ }), -/* 3 */ -/***/ (function(module, exports) { - -module.exports = require("path"); - -/***/ }), -/* 4 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_toSubscriber__ = __webpack_require__(377); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_symbol_observable__ = __webpack_require__(24); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_pipe__ = __webpack_require__(65); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__config__ = __webpack_require__(43); -/** PURE_IMPORTS_START _util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */ - - - - -var Observable = /*@__PURE__*/ (function () { - function Observable(subscribe) { - this._isScalar = false; - if (subscribe) { - this._subscribe = subscribe; - } - } - Observable.prototype.lift = function (operator) { - var observable = new Observable(); - observable.source = this; - observable.operator = operator; - return observable; - }; - Observable.prototype.subscribe = function (observerOrNext, error, complete) { - var operator = this.operator; - var sink = Object(__WEBPACK_IMPORTED_MODULE_0__util_toSubscriber__["a" /* toSubscriber */])(observerOrNext, error, complete); - if (operator) { - operator.call(sink, this.source); - } - else { - sink.add(this.source || (__WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ? - this._subscribe(sink) : - this._trySubscribe(sink)); - } - if (__WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { - if (sink.syncErrorThrowable) { - sink.syncErrorThrowable = false; - if (sink.syncErrorThrown) { - throw sink.syncErrorValue; - } - } - } - return sink; - }; - Observable.prototype._trySubscribe = function (sink) { - try { - return this._subscribe(sink); - } - catch (err) { - if (__WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { - sink.syncErrorThrown = true; - sink.syncErrorValue = err; - } - sink.error(err); - } - }; - Observable.prototype.forEach = function (next, promiseCtor) { - var _this = this; - promiseCtor = getPromiseCtor(promiseCtor); - return new promiseCtor(function (resolve, reject) { - var subscription; - subscription = _this.subscribe(function (value) { - try { - next(value); - } - catch (err) { - reject(err); - if (subscription) { - subscription.unsubscribe(); - } - } - }, reject, resolve); - }); - }; - Observable.prototype._subscribe = function (subscriber) { - var source = this.source; - return source && source.subscribe(subscriber); - }; - Observable.prototype[__WEBPACK_IMPORTED_MODULE_1__internal_symbol_observable__["a" /* observable */]] = function () { - return this; - }; - Observable.prototype.pipe = function () { - var operations = []; - for (var _i = 0; _i < arguments.length; _i++) { - operations[_i] = arguments[_i]; - } - if (operations.length === 0) { - return this; - } - return Object(__WEBPACK_IMPORTED_MODULE_2__util_pipe__["b" /* pipeFromArray */])(operations)(this); - }; - Observable.prototype.toPromise = function (promiseCtor) { - var _this = this; - promiseCtor = getPromiseCtor(promiseCtor); - return new promiseCtor(function (resolve, reject) { - var value; - _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); }); - }); - }; - Observable.create = function (subscribe) { - return new Observable(subscribe); - }; - return Observable; -}()); - -function getPromiseCtor(promiseCtor) { - if (!promiseCtor) { - promiseCtor = __WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].Promise || Promise; - } - if (!promiseCtor) { - throw new Error('no Promise impl found'); - } - return promiseCtor; -} -//# sourceMappingURL=Observable.js.map - - -/***/ }), -/* 5 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OuterSubscriber; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - - -var OuterSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](OuterSubscriber, _super); - function OuterSubscriber() { - return _super !== null && _super.apply(this, arguments) || this; - } - OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); - }; - OuterSubscriber.prototype.notifyError = function (error, innerSub) { - this.destination.error(error); - }; - OuterSubscriber.prototype.notifyComplete = function (innerSub) { - this.destination.complete(); - }; - return OuterSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); - -//# sourceMappingURL=OuterSubscriber.js.map - - -/***/ }), -/* 6 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = subscribeToResult; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__ = __webpack_require__(391); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeTo__ = __webpack_require__(234); -/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo PURE_IMPORTS_END */ - - -function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) { - var destination = new __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__["a" /* InnerSubscriber */](outerSubscriber, outerValue, outerIndex); - return Object(__WEBPACK_IMPORTED_MODULE_1__subscribeTo__["a" /* subscribeTo */])(result)(destination); -} -//# sourceMappingURL=subscribeToResult.js.map - - -/***/ }), -/* 7 */ -/***/ (function(module, exports) { - -module.exports = require("fs"); - -/***/ }), -/* 8 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscription; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(222); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(32); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(223); -/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */ - - - - - - -var Subscription = /*@__PURE__*/ (function () { - function Subscription(unsubscribe) { - this.closed = false; - this._parent = null; - this._parents = null; - this._subscriptions = null; - if (unsubscribe) { - this._unsubscribe = unsubscribe; - } - } - Subscription.prototype.unsubscribe = function () { - var hasErrors = false; - var errors; - if (this.closed) { - return; - } - var _a = this, _parent = _a._parent, _parents = _a._parents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions; - this.closed = true; - this._parent = null; - this._parents = null; - this._subscriptions = null; - var index = -1; - var len = _parents ? _parents.length : 0; - while (_parent) { - _parent.remove(this); - _parent = ++index < len && _parents[index] || null; - } - if (Object(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(_unsubscribe)) { - var trial = Object(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(_unsubscribe).call(this); - if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) { - hasErrors = true; - errors = errors || (__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */] ? - flattenUnsubscriptionErrors(__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e.errors) : [__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e]); - } - } - if (Object(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(_subscriptions)) { - index = -1; - len = _subscriptions.length; - while (++index < len) { - var sub = _subscriptions[index]; - if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isObject__["a" /* isObject */])(sub)) { - var trial = Object(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(sub.unsubscribe).call(sub); - if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) { - hasErrors = true; - errors = errors || []; - var err = __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e; - if (err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) { - errors = errors.concat(flattenUnsubscriptionErrors(err.errors)); - } - else { - errors.push(err); - } - } - } - } - } - if (hasErrors) { - throw new __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */](errors); - } - }; - Subscription.prototype.add = function (teardown) { - if (!teardown || (teardown === Subscription.EMPTY)) { - return Subscription.EMPTY; - } - if (teardown === this) { - return this; - } - var subscription = teardown; - switch (typeof teardown) { - case 'function': - subscription = new Subscription(teardown); - case 'object': - if (subscription.closed || typeof subscription.unsubscribe !== 'function') { - return subscription; - } - else if (this.closed) { - subscription.unsubscribe(); - return subscription; - } - else if (typeof subscription._addParent !== 'function') { - var tmp = subscription; - subscription = new Subscription(); - subscription._subscriptions = [tmp]; - } - break; - default: - throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.'); - } - var subscriptions = this._subscriptions || (this._subscriptions = []); - subscriptions.push(subscription); - subscription._addParent(this); - return subscription; - }; - Subscription.prototype.remove = function (subscription) { - var subscriptions = this._subscriptions; - if (subscriptions) { - var subscriptionIndex = subscriptions.indexOf(subscription); - if (subscriptionIndex !== -1) { - subscriptions.splice(subscriptionIndex, 1); - } - } - }; - Subscription.prototype._addParent = function (parent) { - var _a = this, _parent = _a._parent, _parents = _a._parents; - if (!_parent || _parent === parent) { - this._parent = parent; - } - else if (!_parents) { - this._parents = [parent]; - } - else if (_parents.indexOf(parent) === -1) { - _parents.push(parent); - } - }; - Subscription.EMPTY = (function (empty) { - empty.closed = true; - return empty; - }(new Subscription())); - return Subscription; -}()); - -function flattenUnsubscriptionErrors(errors) { - return errors.reduce(function (errs, err) { return errs.concat((err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) ? err.errors : err); }, []); -} -//# sourceMappingURL=Subscription.js.map - - -/***/ }), -/* 9 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return SubjectSubscriber; }); -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subject; }); -/* unused harmony export AnonymousSubject */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__ = __webpack_require__(45); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__ = __webpack_require__(225); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__ = __webpack_require__(64); -/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */ - - - - - - - -var SubjectSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubjectSubscriber, _super); - function SubjectSubscriber(destination) { - var _this = _super.call(this, destination) || this; - _this.destination = destination; - return _this; - } - return SubjectSubscriber; -}(__WEBPACK_IMPORTED_MODULE_2__Subscriber__["a" /* Subscriber */])); - -var Subject = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subject, _super); - function Subject() { - var _this = _super.call(this) || this; - _this.observers = []; - _this.closed = false; - _this.isStopped = false; - _this.hasError = false; - _this.thrownError = null; - return _this; - } - Subject.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () { - return new SubjectSubscriber(this); - }; - Subject.prototype.lift = function (operator) { - var subject = new AnonymousSubject(this, this); - subject.operator = operator; - return subject; - }; - Subject.prototype.next = function (value) { - if (this.closed) { - throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); - } - if (!this.isStopped) { - var observers = this.observers; - var len = observers.length; - var copy = observers.slice(); - for (var i = 0; i < len; i++) { - copy[i].next(value); - } - } - }; - Subject.prototype.error = function (err) { - if (this.closed) { - throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); - } - this.hasError = true; - this.thrownError = err; - this.isStopped = true; - var observers = this.observers; - var len = observers.length; - var copy = observers.slice(); - for (var i = 0; i < len; i++) { - copy[i].error(err); - } - this.observers.length = 0; - }; - Subject.prototype.complete = function () { - if (this.closed) { - throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); - } - this.isStopped = true; - var observers = this.observers; - var len = observers.length; - var copy = observers.slice(); - for (var i = 0; i < len; i++) { - copy[i].complete(); - } - this.observers.length = 0; - }; - Subject.prototype.unsubscribe = function () { - this.isStopped = true; - this.closed = true; - this.observers = null; - }; - Subject.prototype._trySubscribe = function (subscriber) { - if (this.closed) { - throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); - } - else { - return _super.prototype._trySubscribe.call(this, subscriber); - } - }; - Subject.prototype._subscribe = function (subscriber) { - if (this.closed) { - throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); - } - else if (this.hasError) { - subscriber.error(this.thrownError); - return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; - } - else if (this.isStopped) { - subscriber.complete(); - return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; - } - else { - this.observers.push(subscriber); - return new __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber); - } - }; - Subject.prototype.asObservable = function () { - var observable = new __WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */](); - observable.source = this; - return observable; - }; - Subject.create = function (destination, source) { - return new AnonymousSubject(destination, source); - }; - return Subject; -}(__WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */])); - -var AnonymousSubject = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnonymousSubject, _super); - function AnonymousSubject(destination, source) { - var _this = _super.call(this) || this; - _this.destination = destination; - _this.source = source; - return _this; - } - AnonymousSubject.prototype.next = function (value) { - var destination = this.destination; - if (destination && destination.next) { - destination.next(value); - } - }; - AnonymousSubject.prototype.error = function (err) { - var destination = this.destination; - if (destination && destination.error) { - this.destination.error(err); - } - }; - AnonymousSubject.prototype.complete = function () { - var destination = this.destination; - if (destination && destination.complete) { - this.destination.complete(); - } - }; - AnonymousSubject.prototype._subscribe = function (subscriber) { - var source = this.source; - if (source) { - return this.source.subscribe(subscriber); - } - else { - return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; - } - }; - return AnonymousSubject; -}(Subject)); - -//# sourceMappingURL=Subject.js.map - - -/***/ }), -/* 10 */ -/***/ (function(module, exports) { - -module.exports = require("util"); - -/***/ }), -/* 11 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArray; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var isArray = Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); -//# sourceMappingURL=isArray.js.map - - -/***/ }), -/* 12 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EMPTY; }); -/* harmony export (immutable) */ __webpack_exports__["b"] = empty; -/* unused harmony export emptyScheduled */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ - -var EMPTY = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.complete(); }); -function empty(scheduler) { - return scheduler ? emptyScheduled(scheduler) : EMPTY; -} -function emptyScheduled(scheduler) { - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); }); -} -//# sourceMappingURL=empty.js.map - - -/***/ }), -/* 13 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return async; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncAction__ = __webpack_require__(33); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(34); -/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ - - -var async = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */](__WEBPACK_IMPORTED_MODULE_0__AsyncAction__["a" /* AsyncAction */]); -//# sourceMappingURL=async.js.map - - -/***/ }), -/* 14 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return errorObject; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var errorObject = { e: {} }; -//# sourceMappingURL=errorObject.js.map - - -/***/ }), -/* 15 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = isScheduler; -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function isScheduler(value) { - return value && typeof value.schedule === 'function'; -} -//# sourceMappingURL=isScheduler.js.map - - -/***/ }), -/* 16 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = map; -/* unused harmony export MapOperator */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - - -function map(project, thisArg) { - return function mapOperation(source) { - if (typeof project !== 'function') { - throw new TypeError('argument is not a function. Are you looking for `mapTo()`?'); - } - return source.lift(new MapOperator(project, thisArg)); - }; -} -var MapOperator = /*@__PURE__*/ (function () { - function MapOperator(project, thisArg) { - this.project = project; - this.thisArg = thisArg; - } - MapOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg)); - }; - return MapOperator; -}()); - -var MapSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MapSubscriber, _super); - function MapSubscriber(destination, project, thisArg) { - var _this = _super.call(this, destination) || this; - _this.project = project; - _this.count = 0; - _this.thisArg = thisArg || _this; - return _this; - } - MapSubscriber.prototype._next = function (value) { - var result; - try { - result = this.project.call(this.thisArg, value, this.count++); - } - catch (err) { - this.destination.error(err); - return; - } - this.destination.next(result); - }; - return MapSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=map.js.map - - -/***/ }), -/* 17 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = tryCatch; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(14); -/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */ - -var tryCatchTarget; -function tryCatcher() { - try { - return tryCatchTarget.apply(this, arguments); - } - catch (e) { - __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */].e = e; - return __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */]; - } -} -function tryCatch(fn) { - tryCatchTarget = fn; - return tryCatcher; -} -//# sourceMappingURL=tryCatch.js.map - - -/***/ }), -/* 18 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -const escapeStringRegexp = __webpack_require__(52); -const ansiStyles = __webpack_require__(259); -const stdoutColor = __webpack_require__(262).stdout; - -const template = __webpack_require__(263); - -const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); - -// `supportsColor.level` → `ansiStyles.color[name]` mapping -const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m']; - -// `color-convert` models to exclude from the Chalk API due to conflicts and such -const skipModels = new Set(['gray']); - -const styles = Object.create(null); - -function applyOptions(obj, options) { - options = options || {}; - - // Detect level if not set manually - const scLevel = stdoutColor ? stdoutColor.level : 0; - obj.level = options.level === undefined ? scLevel : options.level; - obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0; -} - -function Chalk(options) { - // We check for this.template here since calling `chalk.constructor()` - // by itself will have a `this` of a previously constructed chalk object - if (!this || !(this instanceof Chalk) || this.template) { - const chalk = {}; - applyOptions(chalk, options); - - chalk.template = function () { - const args = [].slice.call(arguments); - return chalkTag.apply(null, [chalk.template].concat(args)); - }; - - Object.setPrototypeOf(chalk, Chalk.prototype); - Object.setPrototypeOf(chalk.template, chalk); - - chalk.template.constructor = Chalk; - - return chalk.template; - } - - applyOptions(this, options); -} - -// Use bright blue on Windows as the normal blue color is illegible -if (isSimpleWindowsTerm) { - ansiStyles.blue.open = '\u001B[94m'; -} - -for (const key of Object.keys(ansiStyles)) { - ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g'); - - styles[key] = { - get() { - const codes = ansiStyles[key]; - return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key); - } - }; -} - -styles.visible = { - get() { - return build.call(this, this._styles || [], true, 'visible'); - } -}; - -ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g'); -for (const model of Object.keys(ansiStyles.color.ansi)) { - if (skipModels.has(model)) { - continue; - } - - styles[model] = { - get() { - const level = this.level; - return function () { - const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments); - const codes = { - open, - close: ansiStyles.color.close, - closeRe: ansiStyles.color.closeRe - }; - return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); - }; - } - }; -} - -ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g'); -for (const model of Object.keys(ansiStyles.bgColor.ansi)) { - if (skipModels.has(model)) { - continue; - } - - const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1); - styles[bgModel] = { - get() { - const level = this.level; - return function () { - const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments); - const codes = { - open, - close: ansiStyles.bgColor.close, - closeRe: ansiStyles.bgColor.closeRe - }; - return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); - }; - } - }; -} - -const proto = Object.defineProperties(() => {}, styles); - -function build(_styles, _empty, key) { - const builder = function () { - return applyStyle.apply(builder, arguments); - }; - - builder._styles = _styles; - builder._empty = _empty; - - const self = this; - - Object.defineProperty(builder, 'level', { - enumerable: true, - get() { - return self.level; - }, - set(level) { - self.level = level; - } - }); - - Object.defineProperty(builder, 'enabled', { - enumerable: true, - get() { - return self.enabled; - }, - set(enabled) { - self.enabled = enabled; - } - }); - - // See below for fix regarding invisible grey/dim combination on Windows - builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey'; - - // `__proto__` is used because we must return a function, but there is - // no way to create a function with a different prototype - builder.__proto__ = proto; // eslint-disable-line no-proto - - return builder; -} - -function applyStyle() { - // Support varags, but simply cast to string in case there's only one arg - const args = arguments; - const argsLen = args.length; - let str = String(arguments[0]); - - if (argsLen === 0) { - return ''; - } - - if (argsLen > 1) { - // Don't slice `arguments`, it prevents V8 optimizations - for (let a = 1; a < argsLen; a++) { - str += ' ' + args[a]; - } - } - - if (!this.enabled || this.level <= 0 || !str) { - return this._empty ? '' : str; - } - - // Turns out that on Windows dimmed gray text becomes invisible in cmd.exe, - // see https://github.com/chalk/chalk/issues/58 - // If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop. - const originalDim = ansiStyles.dim.open; - if (isSimpleWindowsTerm && this.hasGrey) { - ansiStyles.dim.open = ''; - } - - for (const code of this._styles.slice().reverse()) { - // Replace any instances already present with a re-opening code - // otherwise only the part of the string until said closing code - // will be colored, and the rest will simply be 'plain'. - str = code.open + str.replace(code.closeRe, code.open) + code.close; - - // Close the styling before a linebreak and reopen - // after next line to fix a bleed issue on macOS - // https://github.com/chalk/chalk/pull/92 - str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`); - } - - // Reset the original `dim` if we changed it to work around the Windows dimmed gray issue - ansiStyles.dim.open = originalDim; - - return str; -} - -function chalkTag(chalk, strings) { - if (!Array.isArray(strings)) { - // If chalk() was called by itself or with a string, - // return the string itself as a string. - return [].slice.call(arguments, 1).join(' '); - } - - const args = [].slice.call(arguments, 2); - const parts = [strings.raw[0]]; - - for (let i = 1; i < strings.length; i++) { - parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&')); - parts.push(String(strings.raw[i])); - } - - return template(chalk, parts.join('')); -} - -Object.defineProperties(Chalk.prototype, styles); - -module.exports = Chalk(); // eslint-disable-line new-cap -module.exports.supportsColor = stdoutColor; -module.exports.default = module.exports; // For TypeScript - - -/***/ }), -/* 19 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = from; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isPromise__ = __webpack_require__(239); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__ = __webpack_require__(238); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__ = __webpack_require__(392); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isIterable__ = __webpack_require__(393); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(21); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fromPromise__ = __webpack_require__(394); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fromIterable__ = __webpack_require__(395); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fromObservable__ = __webpack_require__(396); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__ = __webpack_require__(234); -/** PURE_IMPORTS_START _Observable,_util_isPromise,_util_isArrayLike,_util_isInteropObservable,_util_isIterable,_fromArray,_fromPromise,_fromIterable,_fromObservable,_util_subscribeTo PURE_IMPORTS_END */ - - - - - - - - - - -function from(input, scheduler) { - if (!scheduler) { - if (input instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) { - return input; - } - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](Object(__WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__["a" /* subscribeTo */])(input)); - } - if (input != null) { - if (Object(__WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__["a" /* isInteropObservable */])(input)) { - return Object(__WEBPACK_IMPORTED_MODULE_8__fromObservable__["a" /* fromObservable */])(input, scheduler); - } - else if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isPromise__["a" /* isPromise */])(input)) { - return Object(__WEBPACK_IMPORTED_MODULE_6__fromPromise__["a" /* fromPromise */])(input, scheduler); - } - else if (Object(__WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__["a" /* isArrayLike */])(input)) { - return Object(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(input, scheduler); - } - else if (Object(__WEBPACK_IMPORTED_MODULE_4__util_isIterable__["a" /* isIterable */])(input) || typeof input === 'string') { - return Object(__WEBPACK_IMPORTED_MODULE_7__fromIterable__["a" /* fromIterable */])(input, scheduler); - } - } - throw new TypeError((input !== null && typeof input || input) + ' is not observable'); -} -//# sourceMappingURL=from.js.map - - -/***/ }), -/* 20 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -const log = exports.log = { - /** - * Log something to the console. Ideally we would use a real logger in - * kbn-pm, but that's a pretty big change for now. - * @param ...args - */ - write(...args) { - // tslint:disable no-console - console.log(...args); - } -}; - -/***/ }), -/* 21 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = fromArray; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__ = __webpack_require__(231); -/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToArray PURE_IMPORTS_END */ - - - -function fromArray(input, scheduler) { - if (!scheduler) { - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](Object(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__["a" /* subscribeToArray */])(input)); - } - else { - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { - var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */](); - var i = 0; - sub.add(scheduler.schedule(function () { - if (i === input.length) { - subscriber.complete(); - return; - } - subscriber.next(input[i++]); - if (!subscriber.closed) { - sub.add(this.schedule()); - } - })); - return sub; - }); - } -} -//# sourceMappingURL=fromArray.js.map - - -/***/ }), -/* 22 */ -/***/ (function(module, exports) { - -module.exports = require("stream"); - -/***/ }), -/* 23 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -const processFn = (fn, opts) => function () { - const P = opts.promiseModule; - const args = new Array(arguments.length); - - for (let i = 0; i < arguments.length; i++) { - args[i] = arguments[i]; - } - - return new P((resolve, reject) => { - if (opts.errorFirst) { - args.push(function (err, result) { - if (opts.multiArgs) { - const results = new Array(arguments.length - 1); - - for (let i = 1; i < arguments.length; i++) { - results[i - 1] = arguments[i]; - } - - if (err) { - results.unshift(err); - reject(results); - } else { - resolve(results); - } - } else if (err) { - reject(err); - } else { - resolve(result); - } - }); - } else { - args.push(function (result) { - if (opts.multiArgs) { - const results = new Array(arguments.length - 1); - - for (let i = 0; i < arguments.length; i++) { - results[i] = arguments[i]; - } - - resolve(results); - } else { - resolve(result); - } - }); - } - - fn.apply(this, args); - }); -}; - -module.exports = (obj, opts) => { - opts = Object.assign({ - exclude: [/.+(Sync|Stream)$/], - errorFirst: true, - promiseModule: Promise - }, opts); - - const filter = key => { - const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); - return opts.include ? opts.include.some(match) : !opts.exclude.some(match); - }; - - let ret; - if (typeof obj === 'function') { - ret = function () { - if (opts.excludeMain) { - return obj.apply(this, arguments); - } - - return processFn(obj, opts).apply(this, arguments); - }; - } else { - ret = Object.create(Object.getPrototypeOf(obj)); - } - - for (const key in obj) { // eslint-disable-line guard-for-in - const x = obj[key]; - ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; - } - - return ret; -}; - - -/***/ }), -/* 24 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observable; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var observable = typeof Symbol === 'function' && Symbol.observable || '@@observable'; -//# sourceMappingURL=observable.js.map - - -/***/ }), -/* 25 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = identity; -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function identity(x) { - return x; -} -//# sourceMappingURL=identity.js.map - - -/***/ }), -/* 26 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = multicast; -/* unused harmony export MulticastOperator */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__ = __webpack_require__(224); -/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */ - -function multicast(subjectOrSubjectFactory, selector) { - return function multicastOperatorFunction(source) { - var subjectFactory; - if (typeof subjectOrSubjectFactory === 'function') { - subjectFactory = subjectOrSubjectFactory; - } - else { - subjectFactory = function subjectFactory() { - return subjectOrSubjectFactory; - }; - } - if (typeof selector === 'function') { - return source.lift(new MulticastOperator(subjectFactory, selector)); - } - var connectable = Object.create(source, __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__["b" /* connectableObservableDescriptor */]); - connectable.source = source; - connectable.subjectFactory = subjectFactory; - return connectable; - }; -} -var MulticastOperator = /*@__PURE__*/ (function () { - function MulticastOperator(subjectFactory, selector) { - this.subjectFactory = subjectFactory; - this.selector = selector; - } - MulticastOperator.prototype.call = function (subscriber, source) { - var selector = this.selector; - var subject = this.subjectFactory(); - var subscription = selector(subject).subscribe(subscriber); - subscription.add(source.subscribe(subject)); - return subscription; - }; - return MulticastOperator; -}()); - -//# sourceMappingURL=multicast.js.map - - -/***/ }), -/* 27 */ -/***/ (function(module, exports) { - -module.exports = function(module) { - if(!module.webpackPolyfill) { - module.deprecate = function() {}; - module.paths = []; - // module.parent = undefined by default - if(!module.children) module.children = []; - Object.defineProperty(module, "loaded", { - enumerable: true, - get: function() { - return module.l; - } - }); - Object.defineProperty(module, "id", { - enumerable: true, - get: function() { - return module.i; - } - }); - module.webpackPolyfill = 1; - } - return module; -}; - - -/***/ }), -/* 28 */ -/***/ (function(module, exports, __webpack_require__) { - -var fs = __webpack_require__(7) -var polyfills = __webpack_require__(270) -var legacy = __webpack_require__(272) -var queue = [] - -var util = __webpack_require__(10) - -function noop () {} - -var debug = noop -if (util.debuglog) - debug = util.debuglog('gfs4') -else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) - debug = function() { - var m = util.format.apply(util, arguments) - m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ') - console.error(m) - } - -if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) { - process.on('exit', function() { - debug(queue) - __webpack_require__(29).equal(queue.length, 0) - }) -} - -module.exports = patch(__webpack_require__(80)) -if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) { - module.exports = patch(fs) -} - -// Always patch fs.close/closeSync, because we want to -// retry() whenever a close happens *anywhere* in the program. -// This is essential when multiple graceful-fs instances are -// in play at the same time. -module.exports.close = -fs.close = (function (fs$close) { return function (fd, cb) { - return fs$close.call(fs, fd, function (err) { - if (!err) - retry() - - if (typeof cb === 'function') - cb.apply(this, arguments) - }) -}})(fs.close) - -module.exports.closeSync = -fs.closeSync = (function (fs$closeSync) { return function (fd) { - // Note that graceful-fs also retries when fs.closeSync() fails. - // Looks like a bug to me, although it's probably a harmless one. - var rval = fs$closeSync.apply(fs, arguments) - retry() - return rval -}})(fs.closeSync) - -function patch (fs) { - // Everything that references the open() function needs to be in here - polyfills(fs) - fs.gracefulify = patch - fs.FileReadStream = ReadStream; // Legacy name. - fs.FileWriteStream = WriteStream; // Legacy name. - fs.createReadStream = createReadStream - fs.createWriteStream = createWriteStream - var fs$readFile = fs.readFile - fs.readFile = readFile - function readFile (path, options, cb) { - if (typeof options === 'function') - cb = options, options = null - - return go$readFile(path, options, cb) - - function go$readFile (path, options, cb) { - return fs$readFile(path, options, function (err) { - if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) - enqueue([go$readFile, [path, options, cb]]) - else { - if (typeof cb === 'function') - cb.apply(this, arguments) - retry() - } - }) - } - } - - var fs$writeFile = fs.writeFile - fs.writeFile = writeFile - function writeFile (path, data, options, cb) { - if (typeof options === 'function') - cb = options, options = null - - return go$writeFile(path, data, options, cb) - - function go$writeFile (path, data, options, cb) { - return fs$writeFile(path, data, options, function (err) { - if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) - enqueue([go$writeFile, [path, data, options, cb]]) - else { - if (typeof cb === 'function') - cb.apply(this, arguments) - retry() - } - }) - } - } - - var fs$appendFile = fs.appendFile - if (fs$appendFile) - fs.appendFile = appendFile - function appendFile (path, data, options, cb) { - if (typeof options === 'function') - cb = options, options = null - - return go$appendFile(path, data, options, cb) - - function go$appendFile (path, data, options, cb) { - return fs$appendFile(path, data, options, function (err) { - if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) - enqueue([go$appendFile, [path, data, options, cb]]) - else { - if (typeof cb === 'function') - cb.apply(this, arguments) - retry() - } - }) - } - } - - var fs$readdir = fs.readdir - fs.readdir = readdir - function readdir (path, options, cb) { - var args = [path] - if (typeof options !== 'function') { - args.push(options) - } else { - cb = options - } - args.push(go$readdir$cb) - - return go$readdir(args) - - function go$readdir$cb (err, files) { - if (files && files.sort) - files.sort() - - if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) - enqueue([go$readdir, [args]]) - else { - if (typeof cb === 'function') - cb.apply(this, arguments) - retry() - } - } - } - - function go$readdir (args) { - return fs$readdir.apply(fs, args) - } - - if (process.version.substr(0, 4) === 'v0.8') { - var legStreams = legacy(fs) - ReadStream = legStreams.ReadStream - WriteStream = legStreams.WriteStream - } - - var fs$ReadStream = fs.ReadStream - ReadStream.prototype = Object.create(fs$ReadStream.prototype) - ReadStream.prototype.open = ReadStream$open - - var fs$WriteStream = fs.WriteStream - WriteStream.prototype = Object.create(fs$WriteStream.prototype) - WriteStream.prototype.open = WriteStream$open - - fs.ReadStream = ReadStream - fs.WriteStream = WriteStream - - function ReadStream (path, options) { - if (this instanceof ReadStream) - return fs$ReadStream.apply(this, arguments), this - else - return ReadStream.apply(Object.create(ReadStream.prototype), arguments) - } - - function ReadStream$open () { - var that = this - open(that.path, that.flags, that.mode, function (err, fd) { - if (err) { - if (that.autoClose) - that.destroy() - - that.emit('error', err) - } else { - that.fd = fd - that.emit('open', fd) - that.read() - } - }) - } - - function WriteStream (path, options) { - if (this instanceof WriteStream) - return fs$WriteStream.apply(this, arguments), this - else - return WriteStream.apply(Object.create(WriteStream.prototype), arguments) - } - - function WriteStream$open () { - var that = this - open(that.path, that.flags, that.mode, function (err, fd) { - if (err) { - that.destroy() - that.emit('error', err) - } else { - that.fd = fd - that.emit('open', fd) - } - }) - } - - function createReadStream (path, options) { - return new ReadStream(path, options) - } - - function createWriteStream (path, options) { - return new WriteStream(path, options) - } - - var fs$open = fs.open - fs.open = open - function open (path, flags, mode, cb) { - if (typeof mode === 'function') - cb = mode, mode = null - - return go$open(path, flags, mode, cb) - - function go$open (path, flags, mode, cb) { - return fs$open(path, flags, mode, function (err, fd) { - if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) - enqueue([go$open, [path, flags, mode, cb]]) - else { - if (typeof cb === 'function') - cb.apply(this, arguments) - retry() - } - }) - } - } - - return fs -} - -function enqueue (elem) { - debug('ENQUEUE', elem[0].name, elem[1]) - queue.push(elem) -} - -function retry () { - var elem = queue.shift() - if (elem) { - debug('RETRY', elem[0].name, elem[1]) - elem[0].apply(null, elem[1]) - } -} - - -/***/ }), -/* 29 */ -/***/ (function(module, exports) { - -module.exports = require("assert"); - -/***/ }), -/* 30 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.getProjects = undefined; - -let getProjects = exports.getProjects = (() => { - var _ref = _asyncToGenerator(function* (rootPath, projectsPathsPatterns, { include = [], exclude = [] } = {}) { - const projects = new Map(); - for (const pattern of projectsPathsPatterns) { - const pathsToProcess = yield packagesFromGlobPattern({ pattern, rootPath }); - for (const filePath of pathsToProcess) { - const projectConfigPath = normalize(filePath); - const projectDir = _path2.default.dirname(projectConfigPath); - const project = yield _project.Project.fromPath(projectDir); - const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name); - if (excludeProject) { - continue; - } - if (projects.has(project.name)) { - throw new _errors.CliError(`There are multiple projects with the same name [${project.name}]`, { - name: project.name, - paths: [project.path, projects.get(project.name).path] - }); - } - projects.set(project.name, project); - } - } - return projects; - }); - - return function getProjects(_x, _x2) { - return _ref.apply(this, arguments); - }; -})(); - -exports.buildProjectGraph = buildProjectGraph; -exports.topologicallyBatchProjects = topologicallyBatchProjects; -exports.includeTransitiveProjects = includeTransitiveProjects; - -var _glob = __webpack_require__(31); - -var _glob2 = _interopRequireDefault(_glob); - -var _path = __webpack_require__(3); - -var _path2 = _interopRequireDefault(_path); - -var _util = __webpack_require__(10); - -var _errors = __webpack_require__(60); - -var _project = __webpack_require__(87); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -const glob = (0, _util.promisify)(_glob2.default); - -function packagesFromGlobPattern({ pattern, rootPath }) { - const globOptions = { - cwd: rootPath, - // Should throw in case of unusual errors when reading the file system - strict: true, - // Always returns absolute paths for matched files - absolute: true, - // Do not match ** against multiple filenames - // (This is only specified because we currently don't have a need for it.) - noglobstar: true - }; - return glob(_path2.default.join(pattern, 'package.json'), globOptions); -} -// https://github.com/isaacs/node-glob/blob/master/common.js#L104 -// glob always returns "\\" as "/" in windows, so everyone -// gets normalized because we can't have nice things. -function normalize(dir) { - return _path2.default.normalize(dir); -} -function buildProjectGraph(projects) { - const projectGraph = new Map(); - for (const project of projects.values()) { - const projectDeps = []; - const dependencies = project.allDependencies; - for (const depName of Object.keys(dependencies)) { - if (projects.has(depName)) { - const dep = projects.get(depName); - project.ensureValidProjectDependency(dep); - projectDeps.push(dep); - } - } - projectGraph.set(project.name, projectDeps); - } - return projectGraph; -} -function topologicallyBatchProjects(projectsToBatch, projectGraph) { - // We're going to be chopping stuff out of this list, so copy it. - const projectToBatchNames = new Set(projectsToBatch.keys()); - const batches = []; - while (projectToBatchNames.size > 0) { - // Get all projects that have no remaining dependencies within the repo - // that haven't yet been picked. - const batch = []; - for (const projectName of projectToBatchNames) { - const projectDeps = projectGraph.get(projectName); - const hasNotBatchedDependencies = projectDeps.some(dep => projectToBatchNames.has(dep.name)); - if (!hasNotBatchedDependencies) { - batch.push(projectsToBatch.get(projectName)); - } - } - // If we weren't able to find a project with no remaining dependencies, - // then we've encountered a cycle in the dependency graph. - const hasCycles = batch.length === 0; - if (hasCycles) { - const cycleProjectNames = [...projectToBatchNames]; - const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', '); - throw new _errors.CliError(message); - } - batches.push(batch); - batch.forEach(project => projectToBatchNames.delete(project.name)); - } - return batches; -} -function includeTransitiveProjects(subsetOfProjects, allProjects, { onlyProductionDependencies = false } = {}) { - const dependentProjects = new Map(); - // the current list of packages we are expanding using breadth-first-search - const toProcess = [...subsetOfProjects]; - while (toProcess.length > 0) { - const project = toProcess.shift(); - const dependencies = onlyProductionDependencies ? project.productionDependencies : project.allDependencies; - Object.keys(dependencies).forEach(dep => { - if (allProjects.has(dep)) { - toProcess.push(allProjects.get(dep)); - } - }); - dependentProjects.set(project.name, project); - } - return dependentProjects; -} - -/***/ }), -/* 31 */ -/***/ (function(module, exports, __webpack_require__) { - -// Approach: -// -// 1. Get the minimatch set -// 2. For each pattern in the set, PROCESS(pattern, false) -// 3. Store matches per-set, then uniq them -// -// PROCESS(pattern, inGlobStar) -// Get the first [n] items from pattern that are all strings -// Join these together. This is PREFIX. -// If there is no more remaining, then stat(PREFIX) and -// add to matches if it succeeds. END. -// -// If inGlobStar and PREFIX is symlink and points to dir -// set ENTRIES = [] -// else readdir(PREFIX) as ENTRIES -// If fail, END -// -// with ENTRIES -// If pattern[n] is GLOBSTAR -// // handle the case where the globstar match is empty -// // by pruning it out, and testing the resulting pattern -// PROCESS(pattern[0..n] + pattern[n+1 .. $], false) -// // handle other cases. -// for ENTRY in ENTRIES (not dotfiles) -// // attach globstar + tail onto the entry -// // Mark that this entry is a globstar match -// PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true) -// -// else // not globstar -// for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot) -// Test ENTRY against pattern[n] -// If fails, continue -// If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $]) -// -// Caveat: -// Cache all stats and readdirs results to minimize syscall. Since all -// we ever care about is existence and directory-ness, we can just keep -// `true` for files, and [children,...] for directories, or `false` for -// things that don't exist. - -module.exports = glob - -var fs = __webpack_require__(7) -var rp = __webpack_require__(82) -var minimatch = __webpack_require__(58) -var Minimatch = minimatch.Minimatch -var inherits = __webpack_require__(83) -var EE = __webpack_require__(41).EventEmitter -var path = __webpack_require__(3) -var assert = __webpack_require__(29) -var isAbsolute = __webpack_require__(59) -var globSync = __webpack_require__(278) -var common = __webpack_require__(84) -var alphasort = common.alphasort -var alphasorti = common.alphasorti -var setopts = common.setopts -var ownProp = common.ownProp -var inflight = __webpack_require__(279) -var util = __webpack_require__(10) -var childrenIgnored = common.childrenIgnored -var isIgnored = common.isIgnored - -var once = __webpack_require__(86) - -function glob (pattern, options, cb) { - if (typeof options === 'function') cb = options, options = {} - if (!options) options = {} - - if (options.sync) { - if (cb) - throw new TypeError('callback provided to sync glob') - return globSync(pattern, options) - } - - return new Glob(pattern, options, cb) -} - -glob.sync = globSync -var GlobSync = glob.GlobSync = globSync.GlobSync - -// old api surface -glob.glob = glob - -function extend (origin, add) { - if (add === null || typeof add !== 'object') { - return origin - } - - var keys = Object.keys(add) - var i = keys.length - while (i--) { - origin[keys[i]] = add[keys[i]] - } - return origin -} - -glob.hasMagic = function (pattern, options_) { - var options = extend({}, options_) - options.noprocess = true - - var g = new Glob(pattern, options) - var set = g.minimatch.set - - if (!pattern) - return false - - if (set.length > 1) - return true - - for (var j = 0; j < set[0].length; j++) { - if (typeof set[0][j] !== 'string') - return true - } - - return false -} - -glob.Glob = Glob -inherits(Glob, EE) -function Glob (pattern, options, cb) { - if (typeof options === 'function') { - cb = options - options = null - } - - if (options && options.sync) { - if (cb) - throw new TypeError('callback provided to sync glob') - return new GlobSync(pattern, options) - } - - if (!(this instanceof Glob)) - return new Glob(pattern, options, cb) - - setopts(this, pattern, options) - this._didRealPath = false - - // process each pattern in the minimatch set - var n = this.minimatch.set.length - - // The matches are stored as {: true,...} so that - // duplicates are automagically pruned. - // Later, we do an Object.keys() on these. - // Keep them as a list so we can fill in when nonull is set. - this.matches = new Array(n) - - if (typeof cb === 'function') { - cb = once(cb) - this.on('error', cb) - this.on('end', function (matches) { - cb(null, matches) - }) - } - - var self = this - this._processing = 0 - - this._emitQueue = [] - this._processQueue = [] - this.paused = false - - if (this.noprocess) - return this - - if (n === 0) - return done() - - var sync = true - for (var i = 0; i < n; i ++) { - this._process(this.minimatch.set[i], i, false, done) - } - sync = false - - function done () { - --self._processing - if (self._processing <= 0) { - if (sync) { - process.nextTick(function () { - self._finish() - }) - } else { - self._finish() - } - } - } -} - -Glob.prototype._finish = function () { - assert(this instanceof Glob) - if (this.aborted) - return - - if (this.realpath && !this._didRealpath) - return this._realpath() - - common.finish(this) - this.emit('end', this.found) -} - -Glob.prototype._realpath = function () { - if (this._didRealpath) - return - - this._didRealpath = true - - var n = this.matches.length - if (n === 0) - return this._finish() - - var self = this - for (var i = 0; i < this.matches.length; i++) - this._realpathSet(i, next) - - function next () { - if (--n === 0) - self._finish() - } -} - -Glob.prototype._realpathSet = function (index, cb) { - var matchset = this.matches[index] - if (!matchset) - return cb() - - var found = Object.keys(matchset) - var self = this - var n = found.length - - if (n === 0) - return cb() - - var set = this.matches[index] = Object.create(null) - found.forEach(function (p, i) { - // If there's a problem with the stat, then it means that - // one or more of the links in the realpath couldn't be - // resolved. just return the abs value in that case. - p = self._makeAbs(p) - rp.realpath(p, self.realpathCache, function (er, real) { - if (!er) - set[real] = true - else if (er.syscall === 'stat') - set[p] = true - else - self.emit('error', er) // srsly wtf right here - - if (--n === 0) { - self.matches[index] = set - cb() - } - }) - }) -} - -Glob.prototype._mark = function (p) { - return common.mark(this, p) -} - -Glob.prototype._makeAbs = function (f) { - return common.makeAbs(this, f) -} - -Glob.prototype.abort = function () { - this.aborted = true - this.emit('abort') -} - -Glob.prototype.pause = function () { - if (!this.paused) { - this.paused = true - this.emit('pause') - } -} - -Glob.prototype.resume = function () { - if (this.paused) { - this.emit('resume') - this.paused = false - if (this._emitQueue.length) { - var eq = this._emitQueue.slice(0) - this._emitQueue.length = 0 - for (var i = 0; i < eq.length; i ++) { - var e = eq[i] - this._emitMatch(e[0], e[1]) - } - } - if (this._processQueue.length) { - var pq = this._processQueue.slice(0) - this._processQueue.length = 0 - for (var i = 0; i < pq.length; i ++) { - var p = pq[i] - this._processing-- - this._process(p[0], p[1], p[2], p[3]) - } - } - } -} - -Glob.prototype._process = function (pattern, index, inGlobStar, cb) { - assert(this instanceof Glob) - assert(typeof cb === 'function') - - if (this.aborted) - return - - this._processing++ - if (this.paused) { - this._processQueue.push([pattern, index, inGlobStar, cb]) - return - } - - //console.error('PROCESS %d', this._processing, pattern) - - // Get the first [n] parts of pattern that are all strings. - var n = 0 - while (typeof pattern[n] === 'string') { - n ++ - } - // now n is the index of the first one that is *not* a string. - - // see if there's anything else - var prefix - switch (n) { - // if not, then this is rather simple - case pattern.length: - this._processSimple(pattern.join('/'), index, cb) - return - - case 0: - // pattern *starts* with some non-trivial item. - // going to readdir(cwd), but not include the prefix in matches. - prefix = null - break - - default: - // pattern has some string bits in the front. - // whatever it starts with, whether that's 'absolute' like /foo/bar, - // or 'relative' like '../baz' - prefix = pattern.slice(0, n).join('/') - break - } - - var remain = pattern.slice(n) - - // get the list of entries. - var read - if (prefix === null) - read = '.' - else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) { - if (!prefix || !isAbsolute(prefix)) - prefix = '/' + prefix - read = prefix - } else - read = prefix - - var abs = this._makeAbs(read) - - //if ignored, skip _processing - if (childrenIgnored(this, read)) - return cb() - - var isGlobStar = remain[0] === minimatch.GLOBSTAR - if (isGlobStar) - this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb) - else - this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb) -} - -Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) { - var self = this - this._readdir(abs, inGlobStar, function (er, entries) { - return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb) - }) -} - -Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) { - - // if the abs isn't a dir, then nothing can match! - if (!entries) - return cb() - - // It will only match dot entries if it starts with a dot, or if - // dot is set. Stuff like @(.foo|.bar) isn't allowed. - var pn = remain[0] - var negate = !!this.minimatch.negate - var rawGlob = pn._glob - var dotOk = this.dot || rawGlob.charAt(0) === '.' - - var matchedEntries = [] - for (var i = 0; i < entries.length; i++) { - var e = entries[i] - if (e.charAt(0) !== '.' || dotOk) { - var m - if (negate && !prefix) { - m = !e.match(pn) - } else { - m = e.match(pn) - } - if (m) - matchedEntries.push(e) - } - } - - //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries) - - var len = matchedEntries.length - // If there are no matched entries, then nothing matches. - if (len === 0) - return cb() - - // if this is the last remaining pattern bit, then no need for - // an additional stat *unless* the user has specified mark or - // stat explicitly. We know they exist, since readdir returned - // them. - - if (remain.length === 1 && !this.mark && !this.stat) { - if (!this.matches[index]) - this.matches[index] = Object.create(null) - - for (var i = 0; i < len; i ++) { - var e = matchedEntries[i] - if (prefix) { - if (prefix !== '/') - e = prefix + '/' + e - else - e = prefix + e - } - - if (e.charAt(0) === '/' && !this.nomount) { - e = path.join(this.root, e) - } - this._emitMatch(index, e) - } - // This was the last one, and no stats were needed - return cb() - } - - // now test all matched entries as stand-ins for that part - // of the pattern. - remain.shift() - for (var i = 0; i < len; i ++) { - var e = matchedEntries[i] - var newPattern - if (prefix) { - if (prefix !== '/') - e = prefix + '/' + e - else - e = prefix + e - } - this._process([e].concat(remain), index, inGlobStar, cb) - } - cb() -} - -Glob.prototype._emitMatch = function (index, e) { - if (this.aborted) - return - - if (isIgnored(this, e)) - return - - if (this.paused) { - this._emitQueue.push([index, e]) - return - } - - var abs = isAbsolute(e) ? e : this._makeAbs(e) - - if (this.mark) - e = this._mark(e) - - if (this.absolute) - e = abs - - if (this.matches[index][e]) - return - - if (this.nodir) { - var c = this.cache[abs] - if (c === 'DIR' || Array.isArray(c)) - return - } - - this.matches[index][e] = true - - var st = this.statCache[abs] - if (st) - this.emit('stat', e, st) - - this.emit('match', e) -} - -Glob.prototype._readdirInGlobStar = function (abs, cb) { - if (this.aborted) - return - - // follow all symlinked directories forever - // just proceed as if this is a non-globstar situation - if (this.follow) - return this._readdir(abs, false, cb) - - var lstatkey = 'lstat\0' + abs - var self = this - var lstatcb = inflight(lstatkey, lstatcb_) - - if (lstatcb) - fs.lstat(abs, lstatcb) - - function lstatcb_ (er, lstat) { - if (er && er.code === 'ENOENT') - return cb() - - var isSym = lstat && lstat.isSymbolicLink() - self.symlinks[abs] = isSym - - // If it's not a symlink or a dir, then it's definitely a regular file. - // don't bother doing a readdir in that case. - if (!isSym && lstat && !lstat.isDirectory()) { - self.cache[abs] = 'FILE' - cb() - } else - self._readdir(abs, false, cb) - } -} - -Glob.prototype._readdir = function (abs, inGlobStar, cb) { - if (this.aborted) - return - - cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb) - if (!cb) - return - - //console.error('RD %j %j', +inGlobStar, abs) - if (inGlobStar && !ownProp(this.symlinks, abs)) - return this._readdirInGlobStar(abs, cb) - - if (ownProp(this.cache, abs)) { - var c = this.cache[abs] - if (!c || c === 'FILE') - return cb() - - if (Array.isArray(c)) - return cb(null, c) - } - - var self = this - fs.readdir(abs, readdirCb(this, abs, cb)) -} - -function readdirCb (self, abs, cb) { - return function (er, entries) { - if (er) - self._readdirError(abs, er, cb) - else - self._readdirEntries(abs, entries, cb) - } -} - -Glob.prototype._readdirEntries = function (abs, entries, cb) { - if (this.aborted) - return - - // if we haven't asked to stat everything, then just - // assume that everything in there exists, so we can avoid - // having to stat it a second time. - if (!this.mark && !this.stat) { - for (var i = 0; i < entries.length; i ++) { - var e = entries[i] - if (abs === '/') - e = abs + e - else - e = abs + '/' + e - this.cache[e] = true - } - } - - this.cache[abs] = entries - return cb(null, entries) -} - -Glob.prototype._readdirError = function (f, er, cb) { - if (this.aborted) - return - - // handle errors, and cache the information - switch (er.code) { - case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205 - case 'ENOTDIR': // totally normal. means it *does* exist. - var abs = this._makeAbs(f) - this.cache[abs] = 'FILE' - if (abs === this.cwdAbs) { - var error = new Error(er.code + ' invalid cwd ' + this.cwd) - error.path = this.cwd - error.code = er.code - this.emit('error', error) - this.abort() - } - break - - case 'ENOENT': // not terribly unusual - case 'ELOOP': - case 'ENAMETOOLONG': - case 'UNKNOWN': - this.cache[this._makeAbs(f)] = false - break - - default: // some unusual error. Treat as failure. - this.cache[this._makeAbs(f)] = false - if (this.strict) { - this.emit('error', er) - // If the error is handled, then we abort - // if not, we threw out of here - this.abort() - } - if (!this.silent) - console.error('glob error', er) - break - } - - return cb() -} - -Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) { - var self = this - this._readdir(abs, inGlobStar, function (er, entries) { - self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb) - }) -} - - -Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) { - //console.error('pgs2', prefix, remain[0], entries) - - // no entries means not a dir, so it can never have matches - // foo.txt/** doesn't match foo.txt - if (!entries) - return cb() - - // test without the globstar, and with every child both below - // and replacing the globstar. - var remainWithoutGlobStar = remain.slice(1) - var gspref = prefix ? [ prefix ] : [] - var noGlobStar = gspref.concat(remainWithoutGlobStar) - - // the noGlobStar pattern exits the inGlobStar state - this._process(noGlobStar, index, false, cb) - - var isSym = this.symlinks[abs] - var len = entries.length - - // If it's a symlink, and we're in a globstar, then stop - if (isSym && inGlobStar) - return cb() - - for (var i = 0; i < len; i++) { - var e = entries[i] - if (e.charAt(0) === '.' && !this.dot) - continue - - // these two cases enter the inGlobStar state - var instead = gspref.concat(entries[i], remainWithoutGlobStar) - this._process(instead, index, true, cb) - - var below = gspref.concat(entries[i], remain) - this._process(below, index, true, cb) - } - - cb() -} - -Glob.prototype._processSimple = function (prefix, index, cb) { - // XXX review this. Shouldn't it be doing the mounting etc - // before doing stat? kinda weird? - var self = this - this._stat(prefix, function (er, exists) { - self._processSimple2(prefix, index, er, exists, cb) - }) -} -Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) { - - //console.error('ps2', prefix, exists) - - if (!this.matches[index]) - this.matches[index] = Object.create(null) - - // If it doesn't exist, then just mark the lack of results - if (!exists) - return cb() - - if (prefix && isAbsolute(prefix) && !this.nomount) { - var trail = /[\/\\]$/.test(prefix) - if (prefix.charAt(0) === '/') { - prefix = path.join(this.root, prefix) - } else { - prefix = path.resolve(this.root, prefix) - if (trail) - prefix += '/' - } - } - - if (process.platform === 'win32') - prefix = prefix.replace(/\\/g, '/') - - // Mark this as a match - this._emitMatch(index, prefix) - cb() -} - -// Returns either 'DIR', 'FILE', or false -Glob.prototype._stat = function (f, cb) { - var abs = this._makeAbs(f) - var needDir = f.slice(-1) === '/' - - if (f.length > this.maxLength) - return cb() - - if (!this.stat && ownProp(this.cache, abs)) { - var c = this.cache[abs] - - if (Array.isArray(c)) - c = 'DIR' - - // It exists, but maybe not how we need it - if (!needDir || c === 'DIR') - return cb(null, c) - - if (needDir && c === 'FILE') - return cb() - - // otherwise we have to stat, because maybe c=true - // if we know it exists, but not what it is. - } - - var exists - var stat = this.statCache[abs] - if (stat !== undefined) { - if (stat === false) - return cb(null, stat) - else { - var type = stat.isDirectory() ? 'DIR' : 'FILE' - if (needDir && type === 'FILE') - return cb() - else - return cb(null, type, stat) - } - } - - var self = this - var statcb = inflight('stat\0' + abs, lstatcb_) - if (statcb) - fs.lstat(abs, statcb) - - function lstatcb_ (er, lstat) { - if (lstat && lstat.isSymbolicLink()) { - // If it's a symlink, then treat it as the target, unless - // the target does not exist, then treat it as a file. - return fs.stat(abs, function (er, stat) { - if (er) - self._stat2(f, abs, null, lstat, cb) - else - self._stat2(f, abs, er, stat, cb) - }) - } else { - self._stat2(f, abs, er, lstat, cb) - } - } -} - -Glob.prototype._stat2 = function (f, abs, er, stat, cb) { - if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) { - this.statCache[abs] = false - return cb() - } - - var needDir = f.slice(-1) === '/' - this.statCache[abs] = stat - - if (abs.slice(-1) === '/' && stat && !stat.isDirectory()) - return cb(null, false, stat) - - var c = true - if (stat) - c = stat.isDirectory() ? 'DIR' : 'FILE' - this.cache[abs] = this.cache[abs] || c - - if (needDir && c === 'FILE') - return cb() - - return cb(null, c, stat) -} - - -/***/ }), -/* 32 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = isFunction; -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function isFunction(x) { - return typeof x === 'function'; -} -//# sourceMappingURL=isFunction.js.map - - -/***/ }), -/* 33 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncAction; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Action__ = __webpack_require__(379); -/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */ - - -var AsyncAction = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncAction, _super); - function AsyncAction(scheduler, work) { - var _this = _super.call(this, scheduler, work) || this; - _this.scheduler = scheduler; - _this.work = work; - _this.pending = false; - return _this; - } - AsyncAction.prototype.schedule = function (state, delay) { - if (delay === void 0) { - delay = 0; - } - if (this.closed) { - return this; - } - this.state = state; - var id = this.id; - var scheduler = this.scheduler; - if (id != null) { - this.id = this.recycleAsyncId(scheduler, id, delay); - } - this.pending = true; - this.delay = delay; - this.id = this.id || this.requestAsyncId(scheduler, this.id, delay); - return this; - }; - AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - return setInterval(scheduler.flush.bind(scheduler, this), delay); - }; - AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) { - if (delay === void 0) { - delay = 0; - } - if (delay !== null && this.delay === delay && this.pending === false) { - return id; - } - return clearInterval(id) && undefined || undefined; - }; - AsyncAction.prototype.execute = function (state, delay) { - if (this.closed) { - return new Error('executing a cancelled action'); - } - this.pending = false; - var error = this._execute(state, delay); - if (error) { - return error; - } - else if (this.pending === false && this.id != null) { - this.id = this.recycleAsyncId(this.scheduler, this.id, null); - } - }; - AsyncAction.prototype._execute = function (state, delay) { - var errored = false; - var errorValue = undefined; - try { - this.work(state); - } - catch (e) { - errored = true; - errorValue = !!e && e || new Error(e); - } - if (errored) { - this.unsubscribe(); - return errorValue; - } - }; - AsyncAction.prototype._unsubscribe = function () { - var id = this.id; - var scheduler = this.scheduler; - var actions = scheduler.actions; - var index = actions.indexOf(this); - this.work = null; - this.state = null; - this.pending = false; - this.scheduler = null; - if (index !== -1) { - actions.splice(index, 1); - } - if (id != null) { - this.id = this.recycleAsyncId(scheduler, id, null); - } - this.delay = null; - }; - return AsyncAction; -}(__WEBPACK_IMPORTED_MODULE_1__Action__["a" /* Action */])); - -//# sourceMappingURL=AsyncAction.js.map - - -/***/ }), -/* 34 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncScheduler; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Scheduler__ = __webpack_require__(229); -/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */ - - -var AsyncScheduler = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncScheduler, _super); - function AsyncScheduler(SchedulerAction, now) { - if (now === void 0) { - now = __WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */].now; - } - var _this = _super.call(this, SchedulerAction, function () { - if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) { - return AsyncScheduler.delegate.now(); - } - else { - return now(); - } - }) || this; - _this.actions = []; - _this.active = false; - _this.scheduled = undefined; - return _this; - } - AsyncScheduler.prototype.schedule = function (work, delay, state) { - if (delay === void 0) { - delay = 0; - } - if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) { - return AsyncScheduler.delegate.schedule(work, delay, state); - } - else { - return _super.prototype.schedule.call(this, work, delay, state); - } - }; - AsyncScheduler.prototype.flush = function (action) { - var actions = this.actions; - if (this.active) { - actions.push(action); - return; - } - var error; - this.active = true; - do { - if (error = action.execute(action.state, action.delay)) { - break; - } - } while (action = actions.shift()); - this.active = false; - if (error) { - while (action = actions.shift()) { - action.unsubscribe(); - } - throw error; - } - }; - return AsyncScheduler; -}(__WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */])); - -//# sourceMappingURL=AsyncScheduler.js.map - - -/***/ }), -/* 35 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ArgumentOutOfRangeError; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var ArgumentOutOfRangeError = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ArgumentOutOfRangeError, _super); - function ArgumentOutOfRangeError() { - var _this = _super.call(this, 'argument out of range') || this; - _this.name = 'ArgumentOutOfRangeError'; - Object.setPrototypeOf(_this, ArgumentOutOfRangeError.prototype); - return _this; - } - return ArgumentOutOfRangeError; -}(Error)); - -//# sourceMappingURL=ArgumentOutOfRangeError.js.map - - -/***/ }), -/* 36 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EmptyError; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var EmptyError = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](EmptyError, _super); - function EmptyError() { - var _this = _super.call(this, 'no elements in sequence') || this; - _this.name = 'EmptyError'; - Object.setPrototypeOf(_this, EmptyError.prototype); - return _this; - } - return EmptyError; -}(Error)); - -//# sourceMappingURL=EmptyError.js.map - - -/***/ }), -/* 37 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* unused harmony export getSymbolIterator */ -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iterator; }); -/* unused harmony export $$iterator */ -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function getSymbolIterator() { - if (typeof Symbol !== 'function' || !Symbol.iterator) { - return '@@iterator'; - } - return Symbol.iterator; -} -var iterator = /*@__PURE__*/ getSymbolIterator(); -var $$iterator = iterator; -//# sourceMappingURL=iterator.js.map - - -/***/ }), -/* 38 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = mergeMap; -/* unused harmony export MergeMapOperator */ -/* unused harmony export MergeMapSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(16); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__observable_from__ = __webpack_require__(19); -/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_map,_observable_from PURE_IMPORTS_END */ - - - - - -function mergeMap(project, resultSelector, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - if (typeof resultSelector === 'function') { - return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(__WEBPACK_IMPORTED_MODULE_4__observable_from__["a" /* from */])(project(a, i)).pipe(Object(__WEBPACK_IMPORTED_MODULE_3__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); }; - } - else if (typeof resultSelector === 'number') { - concurrent = resultSelector; - } - return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); }; -} -var MergeMapOperator = /*@__PURE__*/ (function () { - function MergeMapOperator(project, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - this.project = project; - this.concurrent = concurrent; - } - MergeMapOperator.prototype.call = function (observer, source) { - return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent)); - }; - return MergeMapOperator; -}()); - -var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MergeMapSubscriber, _super); - function MergeMapSubscriber(destination, project, concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; - } - var _this = _super.call(this, destination) || this; - _this.project = project; - _this.concurrent = concurrent; - _this.hasCompleted = false; - _this.buffer = []; - _this.active = 0; - _this.index = 0; - return _this; - } - MergeMapSubscriber.prototype._next = function (value) { - if (this.active < this.concurrent) { - this._tryNext(value); - } - else { - this.buffer.push(value); - } - }; - MergeMapSubscriber.prototype._tryNext = function (value) { - var result; - var index = this.index++; - try { - result = this.project(value, index); - } - catch (err) { - this.destination.error(err); - return; - } - this.active++; - this._innerSub(result, value, index); - }; - MergeMapSubscriber.prototype._innerSub = function (ish, value, index) { - this.add(Object(__WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__["a" /* subscribeToResult */])(this, ish, value, index)); - }; - MergeMapSubscriber.prototype._complete = function () { - this.hasCompleted = true; - if (this.active === 0 && this.buffer.length === 0) { - this.destination.complete(); - } - }; - MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); - }; - MergeMapSubscriber.prototype.notifyComplete = function (innerSub) { - var buffer = this.buffer; - this.remove(innerSub); - this.active--; - if (buffer.length > 0) { - this._next(buffer.shift()); - } - else if (this.active === 0 && this.hasCompleted) { - this.destination.complete(); - } - }; - return MergeMapSubscriber; -}(__WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__["a" /* OuterSubscriber */])); - -//# sourceMappingURL=mergeMap.js.map - - -/***/ }), -/* 39 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = defaultIfEmpty; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - - -function defaultIfEmpty(defaultValue) { - if (defaultValue === void 0) { - defaultValue = null; - } - return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); }; -} -var DefaultIfEmptyOperator = /*@__PURE__*/ (function () { - function DefaultIfEmptyOperator(defaultValue) { - this.defaultValue = defaultValue; - } - DefaultIfEmptyOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue)); - }; - return DefaultIfEmptyOperator; -}()); -var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DefaultIfEmptySubscriber, _super); - function DefaultIfEmptySubscriber(destination, defaultValue) { - var _this = _super.call(this, destination) || this; - _this.defaultValue = defaultValue; - _this.isEmpty = true; - return _this; - } - DefaultIfEmptySubscriber.prototype._next = function (value) { - this.isEmpty = false; - this.destination.next(value); - }; - DefaultIfEmptySubscriber.prototype._complete = function () { - if (this.isEmpty) { - this.destination.next(this.defaultValue); - } - this.destination.complete(); - }; - return DefaultIfEmptySubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=defaultIfEmpty.js.map - - -/***/ }), -/* 40 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = filter; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - - -function filter(predicate, thisArg) { - return function filterOperatorFunction(source) { - return source.lift(new FilterOperator(predicate, thisArg)); - }; -} -var FilterOperator = /*@__PURE__*/ (function () { - function FilterOperator(predicate, thisArg) { - this.predicate = predicate; - this.thisArg = thisArg; - } - FilterOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg)); - }; - return FilterOperator; -}()); -var FilterSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FilterSubscriber, _super); - function FilterSubscriber(destination, predicate, thisArg) { - var _this = _super.call(this, destination) || this; - _this.predicate = predicate; - _this.thisArg = thisArg; - _this.count = 0; - return _this; - } - FilterSubscriber.prototype._next = function (value) { - var result; - try { - result = this.predicate.call(this.thisArg, value, this.count++); - } - catch (err) { - this.destination.error(err); - return; - } - if (result) { - this.destination.next(value); - } - }; - return FilterSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=filter.js.map - - -/***/ }), -/* 41 */ -/***/ (function(module, exports) { - -module.exports = require("events"); - -/***/ }), -/* 42 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.isLinkDependency = exports.createProductionPackageJson = undefined; - -var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -exports.readPackageJson = readPackageJson; -exports.writePackageJson = writePackageJson; -exports.transformDependencies = transformDependencies; - -var _readPkg = __webpack_require__(280); - -var _readPkg2 = _interopRequireDefault(_readPkg); - -var _writePkg = __webpack_require__(303); - -var _writePkg2 = _interopRequireDefault(_writePkg); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function readPackageJson(dir) { - return (0, _readPkg2.default)(dir, { normalize: false }); -} -function writePackageJson(path, json) { - return (0, _writePkg2.default)(path, json); -} -const createProductionPackageJson = exports.createProductionPackageJson = pkgJson => _extends({}, pkgJson, { - dependencies: transformDependencies(pkgJson.dependencies) -}); -const isLinkDependency = exports.isLinkDependency = depVersion => depVersion.startsWith('link:'); -/** - * Replaces `link:` dependencies with `file:` dependencies. When installing - * dependencies, these `file:` dependencies will be copied into `node_modules` - * instead of being symlinked. - * - * This will allow us to copy packages into the build and run `yarn`, which - * will then _copy_ the `file:` dependencies into `node_modules` instead of - * symlinking like we do in development. - */ -function transformDependencies(dependencies = {}) { - const newDeps = {}; - for (const name of Object.keys(dependencies)) { - const depVersion = dependencies[name]; - if (isLinkDependency(depVersion)) { - newDeps[name] = depVersion.replace('link:', 'file:'); - } else { - newDeps[name] = depVersion; - } - } - return newDeps; -} - -/***/ }), -/* 43 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; }); -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var _enable_super_gross_mode_that_will_cause_bad_things = false; -var config = { - Promise: undefined, - set useDeprecatedSynchronousErrorHandling(value) { - if (value) { - var error = /*@__PURE__*/ new Error(); - /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack); - } - else if (_enable_super_gross_mode_that_will_cause_bad_things) { - /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3'); - } - _enable_super_gross_mode_that_will_cause_bad_things = value; - }, - get useDeprecatedSynchronousErrorHandling() { - return _enable_super_gross_mode_that_will_cause_bad_things; - }, -}; -//# sourceMappingURL=config.js.map - - -/***/ }), -/* 44 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = noop; -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function noop() { } -//# sourceMappingURL=noop.js.map - - -/***/ }), -/* 45 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObjectUnsubscribedError; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - -var ObjectUnsubscribedError = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ObjectUnsubscribedError, _super); - function ObjectUnsubscribedError() { - var _this = _super.call(this, 'object unsubscribed') || this; - _this.name = 'ObjectUnsubscribedError'; - Object.setPrototypeOf(_this, ObjectUnsubscribedError.prototype); - return _this; - } - return ObjectUnsubscribedError; -}(Error)); - -//# sourceMappingURL=ObjectUnsubscribedError.js.map - - -/***/ }), -/* 46 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Notification; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_empty__ = __webpack_require__(12); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_of__ = __webpack_require__(68); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_throwError__ = __webpack_require__(70); -/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */ - - - -var Notification = /*@__PURE__*/ (function () { - function Notification(kind, value, error) { - this.kind = kind; - this.value = value; - this.error = error; - this.hasValue = kind === 'N'; - } - Notification.prototype.observe = function (observer) { - switch (this.kind) { - case 'N': - return observer.next && observer.next(this.value); - case 'E': - return observer.error && observer.error(this.error); - case 'C': - return observer.complete && observer.complete(); - } - }; - Notification.prototype.do = function (next, error, complete) { - var kind = this.kind; - switch (kind) { - case 'N': - return next && next(this.value); - case 'E': - return error && error(this.error); - case 'C': - return complete && complete(); - } - }; - Notification.prototype.accept = function (nextOrObserver, error, complete) { - if (nextOrObserver && typeof nextOrObserver.next === 'function') { - return this.observe(nextOrObserver); - } - else { - return this.do(nextOrObserver, error, complete); - } - }; - Notification.prototype.toObservable = function () { - var kind = this.kind; - switch (kind) { - case 'N': - return Object(__WEBPACK_IMPORTED_MODULE_1__observable_of__["a" /* of */])(this.value); - case 'E': - return Object(__WEBPACK_IMPORTED_MODULE_2__observable_throwError__["a" /* throwError */])(this.error); - case 'C': - return Object(__WEBPACK_IMPORTED_MODULE_0__observable_empty__["b" /* empty */])(); - } - throw new Error('unexpected notification kind value'); - }; - Notification.createNext = function (value) { - if (typeof value !== 'undefined') { - return new Notification('N', value); - } - return Notification.undefinedValueNotification; - }; - Notification.createError = function (err) { - return new Notification('E', undefined, err); - }; - Notification.createComplete = function () { - return Notification.completeNotification; - }; - Notification.completeNotification = new Notification('C'); - Notification.undefinedValueNotification = new Notification('N', undefined); - return Notification; -}()); - -//# sourceMappingURL=Notification.js.map - - -/***/ }), -/* 47 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncSubject; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(8); -/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */ - - - -var AsyncSubject = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncSubject, _super); - function AsyncSubject() { - var _this = _super !== null && _super.apply(this, arguments) || this; - _this.value = null; - _this.hasNext = false; - _this.hasCompleted = false; - return _this; - } - AsyncSubject.prototype._subscribe = function (subscriber) { - if (this.hasError) { - subscriber.error(this.thrownError); - return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY; - } - else if (this.hasCompleted && this.hasNext) { - subscriber.next(this.value); - subscriber.complete(); - return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY; - } - return _super.prototype._subscribe.call(this, subscriber); - }; - AsyncSubject.prototype.next = function (value) { - if (!this.hasCompleted) { - this.value = value; - this.hasNext = true; - } - }; - AsyncSubject.prototype.error = function (error) { - if (!this.hasCompleted) { - _super.prototype.error.call(this, error); - } - }; - AsyncSubject.prototype.complete = function () { - this.hasCompleted = true; - if (this.hasNext) { - _super.prototype.next.call(this, this.value); - } - _super.prototype.complete.call(this); - }; - return AsyncSubject; -}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */])); - -//# sourceMappingURL=AsyncSubject.js.map - - -/***/ }), -/* 48 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = concat; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(15); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__of__ = __webpack_require__(68); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__from__ = __webpack_require__(19); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_concatAll__ = __webpack_require__(240); -/** PURE_IMPORTS_START _util_isScheduler,_of,_from,_operators_concatAll PURE_IMPORTS_END */ - - - - -function concat() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - if (observables.length === 1 || (observables.length === 2 && Object(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(observables[1]))) { - return Object(__WEBPACK_IMPORTED_MODULE_2__from__["a" /* from */])(observables[0]); - } - return Object(__WEBPACK_IMPORTED_MODULE_3__operators_concatAll__["a" /* concatAll */])()(__WEBPACK_IMPORTED_MODULE_1__of__["a" /* of */].apply(void 0, observables)); -} -//# sourceMappingURL=concat.js.map - - -/***/ }), -/* 49 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = isNumeric; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__isArray__ = __webpack_require__(11); -/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */ - -function isNumeric(val) { - return !Object(__WEBPACK_IMPORTED_MODULE_0__isArray__["a" /* isArray */])(val) && (val - parseFloat(val) + 1) >= 0; -} -//# sourceMappingURL=isNumeric.js.map - - -/***/ }), -/* 50 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwIfEmpty; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__tap__ = __webpack_require__(249); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__ = __webpack_require__(36); -/** PURE_IMPORTS_START _tap,_util_EmptyError PURE_IMPORTS_END */ - - -var throwIfEmpty = function (errorFactory) { - if (errorFactory === void 0) { - errorFactory = defaultErrorFactory; - } - return Object(__WEBPACK_IMPORTED_MODULE_0__tap__["a" /* tap */])({ - hasValue: false, - next: function () { this.hasValue = true; }, - complete: function () { - if (!this.hasValue) { - throw errorFactory(); - } - } - }); -}; -function defaultErrorFactory() { - return new __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__["a" /* EmptyError */](); -} -//# sourceMappingURL=throwIfEmpty.js.map - - -/***/ }), -/* 51 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = reduce; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scan__ = __webpack_require__(77); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__takeLast__ = __webpack_require__(76); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__ = __webpack_require__(39); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(65); -/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */ - - - - -function reduce(accumulator, seed) { - if (arguments.length >= 2) { - return function reduceOperatorFunctionWithSeed(source) { - return Object(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(Object(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(accumulator, seed), Object(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1), Object(__WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__["a" /* defaultIfEmpty */])(seed))(source); - }; - } - return function reduceOperatorFunction(source) { - return Object(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(Object(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(function (acc, value, index) { - return accumulator(acc, value, index + 1); - }), Object(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1))(source); - }; -} -//# sourceMappingURL=reduce.js.map - - -/***/ }), -/* 52 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g; - -module.exports = function (str) { - if (typeof str !== 'string') { - throw new TypeError('Expected a string'); - } - - return str.replace(matchOperatorsRe, '\\$&'); -}; - - -/***/ }), -/* 53 */ -/***/ (function(module, exports, __webpack_require__) { - -var conversions = __webpack_require__(79); -var route = __webpack_require__(261); - -var convert = {}; - -var models = Object.keys(conversions); - -function wrapRaw(fn) { - var wrappedFn = function (args) { - if (args === undefined || args === null) { - return args; - } - - if (arguments.length > 1) { - args = Array.prototype.slice.call(arguments); - } - - return fn(args); - }; - - // preserve .conversion property if there is one - if ('conversion' in fn) { - wrappedFn.conversion = fn.conversion; - } - - return wrappedFn; -} - -function wrapRounded(fn) { - var wrappedFn = function (args) { - if (args === undefined || args === null) { - return args; - } - - if (arguments.length > 1) { - args = Array.prototype.slice.call(arguments); - } - - var result = fn(args); - - // we're assuming the result is an array here. - // see notice in conversions.js; don't use box types - // in conversion functions. - if (typeof result === 'object') { - for (var len = result.length, i = 0; i < len; i++) { - result[i] = Math.round(result[i]); - } - } - - return result; - }; - - // preserve .conversion property if there is one - if ('conversion' in fn) { - wrappedFn.conversion = fn.conversion; - } - - return wrappedFn; -} - -models.forEach(function (fromModel) { - convert[fromModel] = {}; - - Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels}); - Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels}); - - var routes = route(fromModel); - var routeModels = Object.keys(routes); - - routeModels.forEach(function (toModel) { - var fn = routes[toModel]; - - convert[fromModel][toModel] = wrapRounded(fn); - convert[fromModel][toModel].raw = wrapRaw(fn); - }); -}); - -module.exports = convert; - - -/***/ }), -/* 54 */ -/***/ (function(module, exports) { - -module.exports = require("os"); - -/***/ }), -/* 55 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -module.exports = (flag, argv) => { - argv = argv || process.argv; - const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); - const pos = argv.indexOf(prefix + flag); - const terminatorPos = argv.indexOf('--'); - return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos); -}; - - -/***/ }), -/* 56 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.createSymlink = exports.isFile = exports.isDirectory = exports.mkdirp = exports.readFile = exports.chmod = undefined; - -let statTest = (() => { - var _ref = _asyncToGenerator(function* (path, block) { - try { - return block((yield stat(path))); - } catch (e) { - if (e.code === 'ENOENT') { - return false; - } - throw e; - } - }); - - return function statTest(_x, _x2) { - return _ref.apply(this, arguments); - }; -})(); -/** - * Test if a path points to a directory. - * @param path - */ - - -let isDirectory = exports.isDirectory = (() => { - var _ref2 = _asyncToGenerator(function* (path) { - return yield statTest(path, function (stats) { - return stats.isDirectory(); - }); - }); - - return function isDirectory(_x3) { - return _ref2.apply(this, arguments); - }; -})(); -/** - * Test if a path points to a regular file. - * @param path - */ - - -let isFile = exports.isFile = (() => { - var _ref3 = _asyncToGenerator(function* (path) { - return yield statTest(path, function (stats) { - return stats.isFile(); - }); - }); - - return function isFile(_x4) { - return _ref3.apply(this, arguments); - }; -})(); -/** - * Create a symlink at dest that points to src. Adapted from - * https://github.com/lerna/lerna/blob/2f1b87d9e2295f587e4ac74269f714271d8ed428/src/FileSystemUtilities.js#L103. - * - * @param src - * @param dest - * @param type 'dir', 'file', 'junction', or 'exec'. 'exec' on - * windows will use the `cmd-shim` module since symlinks can't be used - * for executable files on windows. - */ - - -let createSymlink = exports.createSymlink = (() => { - var _ref4 = _asyncToGenerator(function* (src, dest, type) { - if (process.platform === 'win32') { - if (type === 'exec') { - yield cmdShim(src, dest); - } else { - yield forceCreate(src, dest, type); - } - } else { - const posixType = type === 'exec' ? 'file' : type; - const relativeSource = (0, _path.relative)((0, _path.dirname)(dest), src); - yield forceCreate(relativeSource, dest, posixType); - } - }); - - return function createSymlink(_x5, _x6, _x7) { - return _ref4.apply(this, arguments); - }; -})(); - -let forceCreate = (() => { - var _ref5 = _asyncToGenerator(function* (src, dest, type) { - try { - // If something exists at `dest` we need to remove it first. - yield unlink(dest); - } catch (error) { - if (error.code !== 'ENOENT') { - throw error; - } - } - yield symlink(src, dest, type); - }); - - return function forceCreate(_x8, _x9, _x10) { - return _ref5.apply(this, arguments); - }; -})(); - -var _cmdShim = __webpack_require__(269); - -var _cmdShim2 = _interopRequireDefault(_cmdShim); - -var _fs = __webpack_require__(7); - -var _fs2 = _interopRequireDefault(_fs); - -var _mkdirp = __webpack_require__(81); - -var _mkdirp2 = _interopRequireDefault(_mkdirp); - -var _path = __webpack_require__(3); - -var _util = __webpack_require__(10); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -const stat = (0, _util.promisify)(_fs2.default.stat); -const readFile = (0, _util.promisify)(_fs2.default.readFile); -const unlink = (0, _util.promisify)(_fs2.default.unlink); -const symlink = (0, _util.promisify)(_fs2.default.symlink); -const chmod = (0, _util.promisify)(_fs2.default.chmod); -const cmdShim = (0, _util.promisify)(_cmdShim2.default); -const mkdirp = (0, _util.promisify)(_mkdirp2.default); -exports.chmod = chmod; -exports.readFile = readFile; -exports.mkdirp = mkdirp; - -/***/ }), -/* 57 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -let parallelizeBatches = exports.parallelizeBatches = (() => { - var _ref = _asyncToGenerator(function* (batches, fn) { - for (const batch of batches) { - // We need to make sure the entire batch has completed before we can move on - // to the next batch - yield parallelize(batch, fn); - } - }); - - return function parallelizeBatches(_x, _x2) { - return _ref.apply(this, arguments); - }; -})(); - -let parallelize = exports.parallelize = (() => { - var _ref2 = _asyncToGenerator(function* (items, fn, concurrency = 4) { - if (items.length === 0) { - return; - } - return new Promise(function (resolve, reject) { - let scheduleItem = (() => { - var _ref3 = _asyncToGenerator(function* (item) { - activePromises++; - try { - yield fn(item); - activePromises--; - if (values.length > 0) { - // We have more work to do, so we schedule the next promise - scheduleItem(values.shift()); - } else if (activePromises === 0) { - // We have no more values left, and all items have completed, so we've - // completed all the work. - resolve(); - } - } catch (error) { - reject(error); - } - }); - - return function scheduleItem(_x5) { - return _ref3.apply(this, arguments); - }; - })(); - - let activePromises = 0; - const values = items.slice(0); - - values.splice(0, concurrency).map(scheduleItem); - }); - }); - - return function parallelize(_x3, _x4) { - return _ref2.apply(this, arguments); - }; -})(); - -function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } - -/***/ }), -/* 58 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = minimatch -minimatch.Minimatch = Minimatch - -var path = { sep: '/' } -try { - path = __webpack_require__(3) -} catch (er) {} - -var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {} -var expand = __webpack_require__(274) - -var plTypes = { - '!': { open: '(?:(?!(?:', close: '))[^/]*?)'}, - '?': { open: '(?:', close: ')?' }, - '+': { open: '(?:', close: ')+' }, - '*': { open: '(?:', close: ')*' }, - '@': { open: '(?:', close: ')' } -} - -// any single thing other than / -// don't need to escape / when using new RegExp() -var qmark = '[^/]' - -// * => any number of characters -var star = qmark + '*?' - -// ** when dots are allowed. Anything goes, except .. and . -// not (^ or / followed by one or two dots followed by $ or /), -// followed by anything, any number of times. -var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?' - -// not a ^ or / followed by a dot, -// followed by anything, any number of times. -var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?' - -// characters that need to be escaped in RegExp. -var reSpecials = charSet('().*{}+?[]^$\\!') - -// "abc" -> { a:true, b:true, c:true } -function charSet (s) { - return s.split('').reduce(function (set, c) { - set[c] = true - return set - }, {}) -} - -// normalizes slashes. -var slashSplit = /\/+/ - -minimatch.filter = filter -function filter (pattern, options) { - options = options || {} - return function (p, i, list) { - return minimatch(p, pattern, options) - } -} - -function ext (a, b) { - a = a || {} - b = b || {} - var t = {} - Object.keys(b).forEach(function (k) { - t[k] = b[k] - }) - Object.keys(a).forEach(function (k) { - t[k] = a[k] - }) - return t -} - -minimatch.defaults = function (def) { - if (!def || !Object.keys(def).length) return minimatch - - var orig = minimatch - - var m = function minimatch (p, pattern, options) { - return orig.minimatch(p, pattern, ext(def, options)) - } - - m.Minimatch = function Minimatch (pattern, options) { - return new orig.Minimatch(pattern, ext(def, options)) - } - - return m -} - -Minimatch.defaults = function (def) { - if (!def || !Object.keys(def).length) return Minimatch - return minimatch.defaults(def).Minimatch -} - -function minimatch (p, pattern, options) { - if (typeof pattern !== 'string') { - throw new TypeError('glob pattern string required') - } - - if (!options) options = {} - - // shortcut: comments match nothing. - if (!options.nocomment && pattern.charAt(0) === '#') { - return false - } - - // "" only matches "" - if (pattern.trim() === '') return p === '' - - return new Minimatch(pattern, options).match(p) -} - -function Minimatch (pattern, options) { - if (!(this instanceof Minimatch)) { - return new Minimatch(pattern, options) - } - - if (typeof pattern !== 'string') { - throw new TypeError('glob pattern string required') - } - - if (!options) options = {} - pattern = pattern.trim() - - // windows support: need to use /, not \ - if (path.sep !== '/') { - pattern = pattern.split(path.sep).join('/') - } - - this.options = options - this.set = [] - this.pattern = pattern - this.regexp = null - this.negate = false - this.comment = false - this.empty = false - - // make the set of regexps etc. - this.make() -} - -Minimatch.prototype.debug = function () {} - -Minimatch.prototype.make = make -function make () { - // don't do it more than once. - if (this._made) return - - var pattern = this.pattern - var options = this.options - - // empty patterns and comments match nothing. - if (!options.nocomment && pattern.charAt(0) === '#') { - this.comment = true - return - } - if (!pattern) { - this.empty = true - return - } - - // step 1: figure out negation, etc. - this.parseNegate() - - // step 2: expand braces - var set = this.globSet = this.braceExpand() - - if (options.debug) this.debug = console.error - - this.debug(this.pattern, set) - - // step 3: now we have a set, so turn each one into a series of path-portion - // matching patterns. - // These will be regexps, except in the case of "**", which is - // set to the GLOBSTAR object for globstar behavior, - // and will not contain any / characters - set = this.globParts = set.map(function (s) { - return s.split(slashSplit) - }) - - this.debug(this.pattern, set) - - // glob --> regexps - set = set.map(function (s, si, set) { - return s.map(this.parse, this) - }, this) - - this.debug(this.pattern, set) - - // filter out everything that didn't compile properly. - set = set.filter(function (s) { - return s.indexOf(false) === -1 - }) - - this.debug(this.pattern, set) - - this.set = set -} - -Minimatch.prototype.parseNegate = parseNegate -function parseNegate () { - var pattern = this.pattern - var negate = false - var options = this.options - var negateOffset = 0 - - if (options.nonegate) return - - for (var i = 0, l = pattern.length - ; i < l && pattern.charAt(i) === '!' - ; i++) { - negate = !negate - negateOffset++ - } - - if (negateOffset) this.pattern = pattern.substr(negateOffset) - this.negate = negate -} - -// Brace expansion: -// a{b,c}d -> abd acd -// a{b,}c -> abc ac -// a{0..3}d -> a0d a1d a2d a3d -// a{b,c{d,e}f}g -> abg acdfg acefg -// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg -// -// Invalid sets are not expanded. -// a{2..}b -> a{2..}b -// a{b}c -> a{b}c -minimatch.braceExpand = function (pattern, options) { - return braceExpand(pattern, options) -} - -Minimatch.prototype.braceExpand = braceExpand - -function braceExpand (pattern, options) { - if (!options) { - if (this instanceof Minimatch) { - options = this.options - } else { - options = {} - } - } - - pattern = typeof pattern === 'undefined' - ? this.pattern : pattern - - if (typeof pattern === 'undefined') { - throw new TypeError('undefined pattern') - } - - if (options.nobrace || - !pattern.match(/\{.*\}/)) { - // shortcut. no need to expand. - return [pattern] - } - - return expand(pattern) -} - -// parse a component of the expanded set. -// At this point, no pattern may contain "/" in it -// so we're going to return a 2d array, where each entry is the full -// pattern, split on '/', and then turned into a regular expression. -// A regexp is made at the end which joins each array with an -// escaped /, and another full one which joins each regexp with |. -// -// Following the lead of Bash 4.1, note that "**" only has special meaning -// when it is the *only* thing in a path portion. Otherwise, any series -// of * is equivalent to a single *. Globstar behavior is enabled by -// default, and can be disabled by setting options.noglobstar. -Minimatch.prototype.parse = parse -var SUBPARSE = {} -function parse (pattern, isSub) { - if (pattern.length > 1024 * 64) { - throw new TypeError('pattern is too long') - } - - var options = this.options - - // shortcuts - if (!options.noglobstar && pattern === '**') return GLOBSTAR - if (pattern === '') return '' - - var re = '' - var hasMagic = !!options.nocase - var escaping = false - // ? => one single character - var patternListStack = [] - var negativeLists = [] - var stateChar - var inClass = false - var reClassStart = -1 - var classStart = -1 - // . and .. never match anything that doesn't start with ., - // even when options.dot is set. - var patternStart = pattern.charAt(0) === '.' ? '' // anything - // not (start or / followed by . or .. followed by / or end) - : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))' - : '(?!\\.)' - var self = this - - function clearStateChar () { - if (stateChar) { - // we had some state-tracking character - // that wasn't consumed by this pass. - switch (stateChar) { - case '*': - re += star - hasMagic = true - break - case '?': - re += qmark - hasMagic = true - break - default: - re += '\\' + stateChar - break - } - self.debug('clearStateChar %j %j', stateChar, re) - stateChar = false - } - } - - for (var i = 0, len = pattern.length, c - ; (i < len) && (c = pattern.charAt(i)) - ; i++) { - this.debug('%s\t%s %s %j', pattern, i, re, c) - - // skip over any that are escaped. - if (escaping && reSpecials[c]) { - re += '\\' + c - escaping = false - continue - } - - switch (c) { - case '/': - // completely not allowed, even escaped. - // Should already be path-split by now. - return false - - case '\\': - clearStateChar() - escaping = true - continue - - // the various stateChar values - // for the "extglob" stuff. - case '?': - case '*': - case '+': - case '@': - case '!': - this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c) - - // all of those are literals inside a class, except that - // the glob [!a] means [^a] in regexp - if (inClass) { - this.debug(' in class') - if (c === '!' && i === classStart + 1) c = '^' - re += c - continue - } - - // if we already have a stateChar, then it means - // that there was something like ** or +? in there. - // Handle the stateChar, then proceed with this one. - self.debug('call clearStateChar %j', stateChar) - clearStateChar() - stateChar = c - // if extglob is disabled, then +(asdf|foo) isn't a thing. - // just clear the statechar *now*, rather than even diving into - // the patternList stuff. - if (options.noext) clearStateChar() - continue - - case '(': - if (inClass) { - re += '(' - continue - } - - if (!stateChar) { - re += '\\(' - continue - } - - patternListStack.push({ - type: stateChar, - start: i - 1, - reStart: re.length, - open: plTypes[stateChar].open, - close: plTypes[stateChar].close - }) - // negation is (?:(?!js)[^/]*) - re += stateChar === '!' ? '(?:(?!(?:' : '(?:' - this.debug('plType %j %j', stateChar, re) - stateChar = false - continue - - case ')': - if (inClass || !patternListStack.length) { - re += '\\)' - continue - } - - clearStateChar() - hasMagic = true - var pl = patternListStack.pop() - // negation is (?:(?!js)[^/]*) - // The others are (?:) - re += pl.close - if (pl.type === '!') { - negativeLists.push(pl) - } - pl.reEnd = re.length - continue - - case '|': - if (inClass || !patternListStack.length || escaping) { - re += '\\|' - escaping = false - continue - } - - clearStateChar() - re += '|' - continue - - // these are mostly the same in regexp and glob - case '[': - // swallow any state-tracking char before the [ - clearStateChar() - - if (inClass) { - re += '\\' + c - continue - } - - inClass = true - classStart = i - reClassStart = re.length - re += c - continue - - case ']': - // a right bracket shall lose its special - // meaning and represent itself in - // a bracket expression if it occurs - // first in the list. -- POSIX.2 2.8.3.2 - if (i === classStart + 1 || !inClass) { - re += '\\' + c - escaping = false - continue - } - - // handle the case where we left a class open. - // "[z-a]" is valid, equivalent to "\[z-a\]" - if (inClass) { - // split where the last [ was, make sure we don't have - // an invalid re. if so, re-walk the contents of the - // would-be class to re-translate any characters that - // were passed through as-is - // TODO: It would probably be faster to determine this - // without a try/catch and a new RegExp, but it's tricky - // to do safely. For now, this is safe and works. - var cs = pattern.substring(classStart + 1, i) - try { - RegExp('[' + cs + ']') - } catch (er) { - // not a valid class! - var sp = this.parse(cs, SUBPARSE) - re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]' - hasMagic = hasMagic || sp[1] - inClass = false - continue - } - } - - // finish up the class. - hasMagic = true - inClass = false - re += c - continue - - default: - // swallow any state char that wasn't consumed - clearStateChar() - - if (escaping) { - // no need - escaping = false - } else if (reSpecials[c] - && !(c === '^' && inClass)) { - re += '\\' - } - - re += c - - } // switch - } // for - - // handle the case where we left a class open. - // "[abc" is valid, equivalent to "\[abc" - if (inClass) { - // split where the last [ was, and escape it - // this is a huge pita. We now have to re-walk - // the contents of the would-be class to re-translate - // any characters that were passed through as-is - cs = pattern.substr(classStart + 1) - sp = this.parse(cs, SUBPARSE) - re = re.substr(0, reClassStart) + '\\[' + sp[0] - hasMagic = hasMagic || sp[1] - } - - // handle the case where we had a +( thing at the *end* - // of the pattern. - // each pattern list stack adds 3 chars, and we need to go through - // and escape any | chars that were passed through as-is for the regexp. - // Go through and escape them, taking care not to double-escape any - // | chars that were already escaped. - for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) { - var tail = re.slice(pl.reStart + pl.open.length) - this.debug('setting tail', re, pl) - // maybe some even number of \, then maybe 1 \, followed by a | - tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) { - if (!$2) { - // the | isn't already escaped, so escape it. - $2 = '\\' - } - - // need to escape all those slashes *again*, without escaping the - // one that we need for escaping the | character. As it works out, - // escaping an even number of slashes can be done by simply repeating - // it exactly after itself. That's why this trick works. - // - // I am sorry that you have to see this. - return $1 + $1 + $2 + '|' - }) - - this.debug('tail=%j\n %s', tail, tail, pl, re) - var t = pl.type === '*' ? star - : pl.type === '?' ? qmark - : '\\' + pl.type - - hasMagic = true - re = re.slice(0, pl.reStart) + t + '\\(' + tail - } - - // handle trailing things that only matter at the very end. - clearStateChar() - if (escaping) { - // trailing \\ - re += '\\\\' - } - - // only need to apply the nodot start if the re starts with - // something that could conceivably capture a dot - var addPatternStart = false - switch (re.charAt(0)) { - case '.': - case '[': - case '(': addPatternStart = true - } - - // Hack to work around lack of negative lookbehind in JS - // A pattern like: *.!(x).!(y|z) needs to ensure that a name - // like 'a.xyz.yz' doesn't match. So, the first negative - // lookahead, has to look ALL the way ahead, to the end of - // the pattern. - for (var n = negativeLists.length - 1; n > -1; n--) { - var nl = negativeLists[n] - - var nlBefore = re.slice(0, nl.reStart) - var nlFirst = re.slice(nl.reStart, nl.reEnd - 8) - var nlLast = re.slice(nl.reEnd - 8, nl.reEnd) - var nlAfter = re.slice(nl.reEnd) - - nlLast += nlAfter - - // Handle nested stuff like *(*.js|!(*.json)), where open parens - // mean that we should *not* include the ) in the bit that is considered - // "after" the negated section. - var openParensBefore = nlBefore.split('(').length - 1 - var cleanAfter = nlAfter - for (i = 0; i < openParensBefore; i++) { - cleanAfter = cleanAfter.replace(/\)[+*?]?/, '') - } - nlAfter = cleanAfter - - var dollar = '' - if (nlAfter === '' && isSub !== SUBPARSE) { - dollar = '$' - } - var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast - re = newRe - } - - // if the re is not "" at this point, then we need to make sure - // it doesn't match against an empty path part. - // Otherwise a/* will match a/, which it should not. - if (re !== '' && hasMagic) { - re = '(?=.)' + re - } - - if (addPatternStart) { - re = patternStart + re - } - - // parsing just a piece of a larger pattern. - if (isSub === SUBPARSE) { - return [re, hasMagic] - } - - // skip the regexp for non-magical patterns - // unescape anything in it, though, so that it'll be - // an exact match against a file etc. - if (!hasMagic) { - return globUnescape(pattern) - } - - var flags = options.nocase ? 'i' : '' - try { - var regExp = new RegExp('^' + re + '$', flags) - } catch (er) { - // If it was an invalid regular expression, then it can't match - // anything. This trick looks for a character after the end of - // the string, which is of course impossible, except in multi-line - // mode, but it's not a /m regex. - return new RegExp('$.') - } - - regExp._glob = pattern - regExp._src = re - - return regExp -} - -minimatch.makeRe = function (pattern, options) { - return new Minimatch(pattern, options || {}).makeRe() -} +/***/ }), +/* 2 */ +/***/ (function(module, exports) { -Minimatch.prototype.makeRe = makeRe -function makeRe () { - if (this.regexp || this.regexp === false) return this.regexp +module.exports = require("path"); - // at this point, this.set is a 2d array of partial - // pattern strings, or "**". - // - // It's better to use .match(). This function shouldn't - // be used, really, but it's pretty convenient sometimes, - // when you just want to work with a regex. - var set = this.set +/***/ }), +/* 3 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - if (!set.length) { - this.regexp = false - return this.regexp - } - var options = this.options +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Observable; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_toSubscriber__ = __webpack_require__(262); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_symbol_observable__ = __webpack_require__(24); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_pipe__ = __webpack_require__(63); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__config__ = __webpack_require__(42); +/** PURE_IMPORTS_START _util_toSubscriber,_internal_symbol_observable,_util_pipe,_config PURE_IMPORTS_END */ - var twoStar = options.noglobstar ? star - : options.dot ? twoStarDot - : twoStarNoDot - var flags = options.nocase ? 'i' : '' - var re = set.map(function (pattern) { - return pattern.map(function (p) { - return (p === GLOBSTAR) ? twoStar - : (typeof p === 'string') ? regExpEscape(p) - : p._src - }).join('\\\/') - }).join('|') - // must match entire pattern - // ending in a * or ** will make it less strict. - re = '^(?:' + re + ')$' - // can match anything, as long as it's not this. - if (this.negate) re = '^(?!' + re + ').*$' +var Observable = /*@__PURE__*/ (function () { + function Observable(subscribe) { + this._isScalar = false; + if (subscribe) { + this._subscribe = subscribe; + } + } + Observable.prototype.lift = function (operator) { + var observable = new Observable(); + observable.source = this; + observable.operator = operator; + return observable; + }; + Observable.prototype.subscribe = function (observerOrNext, error, complete) { + var operator = this.operator; + var sink = Object(__WEBPACK_IMPORTED_MODULE_0__util_toSubscriber__["a" /* toSubscriber */])(observerOrNext, error, complete); + if (operator) { + operator.call(sink, this.source); + } + else { + sink.add(this.source || (__WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].useDeprecatedSynchronousErrorHandling && !sink.syncErrorThrowable) ? + this._subscribe(sink) : + this._trySubscribe(sink)); + } + if (__WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { + if (sink.syncErrorThrowable) { + sink.syncErrorThrowable = false; + if (sink.syncErrorThrown) { + throw sink.syncErrorValue; + } + } + } + return sink; + }; + Observable.prototype._trySubscribe = function (sink) { + try { + return this._subscribe(sink); + } + catch (err) { + if (__WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].useDeprecatedSynchronousErrorHandling) { + sink.syncErrorThrown = true; + sink.syncErrorValue = err; + } + sink.error(err); + } + }; + Observable.prototype.forEach = function (next, promiseCtor) { + var _this = this; + promiseCtor = getPromiseCtor(promiseCtor); + return new promiseCtor(function (resolve, reject) { + var subscription; + subscription = _this.subscribe(function (value) { + try { + next(value); + } + catch (err) { + reject(err); + if (subscription) { + subscription.unsubscribe(); + } + } + }, reject, resolve); + }); + }; + Observable.prototype._subscribe = function (subscriber) { + var source = this.source; + return source && source.subscribe(subscriber); + }; + Observable.prototype[__WEBPACK_IMPORTED_MODULE_1__internal_symbol_observable__["a" /* observable */]] = function () { + return this; + }; + Observable.prototype.pipe = function () { + var operations = []; + for (var _i = 0; _i < arguments.length; _i++) { + operations[_i] = arguments[_i]; + } + if (operations.length === 0) { + return this; + } + return Object(__WEBPACK_IMPORTED_MODULE_2__util_pipe__["b" /* pipeFromArray */])(operations)(this); + }; + Observable.prototype.toPromise = function (promiseCtor) { + var _this = this; + promiseCtor = getPromiseCtor(promiseCtor); + return new promiseCtor(function (resolve, reject) { + var value; + _this.subscribe(function (x) { return value = x; }, function (err) { return reject(err); }, function () { return resolve(value); }); + }); + }; + Observable.create = function (subscribe) { + return new Observable(subscribe); + }; + return Observable; +}()); - try { - this.regexp = new RegExp(re, flags) - } catch (ex) { - this.regexp = false - } - return this.regexp +function getPromiseCtor(promiseCtor) { + if (!promiseCtor) { + promiseCtor = __WEBPACK_IMPORTED_MODULE_3__config__["a" /* config */].Promise || Promise; + } + if (!promiseCtor) { + throw new Error('no Promise impl found'); + } + return promiseCtor; } +//# sourceMappingURL=Observable.js.map -minimatch.match = function (list, pattern, options) { - options = options || {} - var mm = new Minimatch(pattern, options) - list = list.filter(function (f) { - return mm.match(f) - }) - if (mm.options.nonull && !list.length) { - list.push(pattern) - } - return list -} -Minimatch.prototype.match = match -function match (f, partial) { - this.debug('match', f, this.pattern) - // short-circuit in the case of busted things. - // comments, etc. - if (this.comment) return false - if (this.empty) return f === '' +/***/ }), +/* 4 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - if (f === '/' && partial) return true +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return OuterSubscriber; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - var options = this.options - // windows: need to use /, not \ - if (path.sep !== '/') { - f = f.split(path.sep).join('/') - } +var OuterSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](OuterSubscriber, _super); + function OuterSubscriber() { + return _super !== null && _super.apply(this, arguments) || this; + } + OuterSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); + }; + OuterSubscriber.prototype.notifyError = function (error, innerSub) { + this.destination.error(error); + }; + OuterSubscriber.prototype.notifyComplete = function (innerSub) { + this.destination.complete(); + }; + return OuterSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); - // treat the test path as a set of pathparts. - f = f.split(slashSplit) - this.debug(this.pattern, 'split', f) +//# sourceMappingURL=OuterSubscriber.js.map - // just ONE of the pattern sets in this.set needs to match - // in order for it to be valid. If negating, then just one - // match means that we have failed. - // Either way, return on the first hit. - var set = this.set - this.debug(this.pattern, 'set', set) +/***/ }), +/* 5 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - // Find the basename of the path by looking for the last non-empty segment - var filename - var i - for (i = f.length - 1; i >= 0; i--) { - filename = f[i] - if (filename) break - } +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = subscribeToResult; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__ = __webpack_require__(276); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeTo__ = __webpack_require__(115); +/** PURE_IMPORTS_START _InnerSubscriber,_subscribeTo PURE_IMPORTS_END */ - for (i = 0; i < set.length; i++) { - var pattern = set[i] - var file = f - if (options.matchBase && pattern.length === 1) { - file = [filename] - } - var hit = this.matchOne(file, pattern, partial) - if (hit) { - if (options.flipNegate) return true - return !this.negate - } - } - // didn't get any hits. this is success if it's a negative - // pattern, failure otherwise. - if (options.flipNegate) return false - return this.negate +function subscribeToResult(outerSubscriber, result, outerValue, outerIndex) { + var destination = new __WEBPACK_IMPORTED_MODULE_0__InnerSubscriber__["a" /* InnerSubscriber */](outerSubscriber, outerValue, outerIndex); + return Object(__WEBPACK_IMPORTED_MODULE_1__subscribeTo__["a" /* subscribeTo */])(result)(destination); } +//# sourceMappingURL=subscribeToResult.js.map -// set partial to true to test if, for example, -// "/a/b" matches the start of "/*/b/*/d" -// Partial means, if you run out of file before you run -// out of pattern, then that's fine, as long as all -// the parts match. -Minimatch.prototype.matchOne = function (file, pattern, partial) { - var options = this.options - - this.debug('matchOne', - { 'this': this, file: file, pattern: pattern }) - this.debug('matchOne', file.length, pattern.length) +/***/ }), +/* 6 */ +/***/ (function(module, exports) { - for (var fi = 0, - pi = 0, - fl = file.length, - pl = pattern.length - ; (fi < fl) && (pi < pl) - ; fi++, pi++) { - this.debug('matchOne loop') - var p = pattern[pi] - var f = file[fi] +module.exports = require("fs"); - this.debug(pattern, p, f) +/***/ }), +/* 7 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - // should be impossible. - // some invalid regexp stuff in the set. - if (p === false) return false +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subscription; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isObject__ = __webpack_require__(103); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(29); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__ = __webpack_require__(104); +/** PURE_IMPORTS_START _util_isArray,_util_isObject,_util_isFunction,_util_tryCatch,_util_errorObject,_util_UnsubscriptionError PURE_IMPORTS_END */ - if (p === GLOBSTAR) { - this.debug('GLOBSTAR', [pattern, p, f]) - // "**" - // a/**/b/**/c would match the following: - // a/b/x/y/z/c - // a/x/y/z/b/c - // a/b/x/b/x/c - // a/b/c - // To do this, take the rest of the pattern after - // the **, and see if it would match the file remainder. - // If so, return success. - // If not, the ** "swallows" a segment, and try again. - // This is recursively awful. - // - // a/**/b/**/c matching a/b/x/y/z/c - // - a matches a - // - doublestar - // - matchOne(b/x/y/z/c, b/**/c) - // - b matches b - // - doublestar - // - matchOne(x/y/z/c, c) -> no - // - matchOne(y/z/c, c) -> no - // - matchOne(z/c, c) -> no - // - matchOne(c, c) yes, hit - var fr = fi - var pr = pi + 1 - if (pr === pl) { - this.debug('** at the end') - // a ** at the end will just swallow the rest. - // We have found a match. - // however, it will not swallow /.x, unless - // options.dot is set. - // . and .. are *never* matched by **, for explosively - // exponential reasons. - for (; fi < fl; fi++) { - if (file[fi] === '.' || file[fi] === '..' || - (!options.dot && file[fi].charAt(0) === '.')) return false - } - return true - } - // ok, let's see if we can swallow whatever we can. - while (fr < fl) { - var swallowee = file[fr] - this.debug('\nglobstar while', file, fr, pattern, pr, swallowee) - // XXX remove this slice. Just pass the start index. - if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) { - this.debug('globstar found match!', fr, fl, swallowee) - // found a match. - return true - } else { - // can't swallow "." or ".." ever. - // can only swallow ".foo" when explicitly asked. - if (swallowee === '.' || swallowee === '..' || - (!options.dot && swallowee.charAt(0) === '.')) { - this.debug('dot detected!', file, fr, pattern, pr) - break - } - // ** swallows a segment, and continue. - this.debug('globstar swallow a segment, and continue') - fr++ +var Subscription = /*@__PURE__*/ (function () { + function Subscription(unsubscribe) { + this.closed = false; + this._parent = null; + this._parents = null; + this._subscriptions = null; + if (unsubscribe) { + this._unsubscribe = unsubscribe; } - } - - // no match was found. - // However, in partial mode, we can't say this is necessarily over. - // If there's more *pattern* left, then - if (partial) { - // ran out of file - this.debug('\n>>> no match, partial?', file, fr, pattern, pr) - if (fr === fl) return true - } - return false - } - - // something other than ** - // non-magic patterns just have to match exactly - // patterns with magic have been turned into regexps. - var hit - if (typeof p === 'string') { - if (options.nocase) { - hit = f.toLowerCase() === p.toLowerCase() - } else { - hit = f === p - } - this.debug('string match', p, f, hit) - } else { - hit = f.match(p) - this.debug('pattern match', p, f, hit) } + Subscription.prototype.unsubscribe = function () { + var hasErrors = false; + var errors; + if (this.closed) { + return; + } + var _a = this, _parent = _a._parent, _parents = _a._parents, _unsubscribe = _a._unsubscribe, _subscriptions = _a._subscriptions; + this.closed = true; + this._parent = null; + this._parents = null; + this._subscriptions = null; + var index = -1; + var len = _parents ? _parents.length : 0; + while (_parent) { + _parent.remove(this); + _parent = ++index < len && _parents[index] || null; + } + if (Object(__WEBPACK_IMPORTED_MODULE_2__util_isFunction__["a" /* isFunction */])(_unsubscribe)) { + var trial = Object(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(_unsubscribe).call(this); + if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) { + hasErrors = true; + errors = errors || (__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */] ? + flattenUnsubscriptionErrors(__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e.errors) : [__WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e]); + } + } + if (Object(__WEBPACK_IMPORTED_MODULE_0__util_isArray__["a" /* isArray */])(_subscriptions)) { + index = -1; + len = _subscriptions.length; + while (++index < len) { + var sub = _subscriptions[index]; + if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isObject__["a" /* isObject */])(sub)) { + var trial = Object(__WEBPACK_IMPORTED_MODULE_3__util_tryCatch__["a" /* tryCatch */])(sub.unsubscribe).call(sub); + if (trial === __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */]) { + hasErrors = true; + errors = errors || []; + var err = __WEBPACK_IMPORTED_MODULE_4__util_errorObject__["a" /* errorObject */].e; + if (err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) { + errors = errors.concat(flattenUnsubscriptionErrors(err.errors)); + } + else { + errors.push(err); + } + } + } + } + } + if (hasErrors) { + throw new __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */](errors); + } + }; + Subscription.prototype.add = function (teardown) { + if (!teardown || (teardown === Subscription.EMPTY)) { + return Subscription.EMPTY; + } + if (teardown === this) { + return this; + } + var subscription = teardown; + switch (typeof teardown) { + case 'function': + subscription = new Subscription(teardown); + case 'object': + if (subscription.closed || typeof subscription.unsubscribe !== 'function') { + return subscription; + } + else if (this.closed) { + subscription.unsubscribe(); + return subscription; + } + else if (typeof subscription._addParent !== 'function') { + var tmp = subscription; + subscription = new Subscription(); + subscription._subscriptions = [tmp]; + } + break; + default: + throw new Error('unrecognized teardown ' + teardown + ' added to Subscription.'); + } + var subscriptions = this._subscriptions || (this._subscriptions = []); + subscriptions.push(subscription); + subscription._addParent(this); + return subscription; + }; + Subscription.prototype.remove = function (subscription) { + var subscriptions = this._subscriptions; + if (subscriptions) { + var subscriptionIndex = subscriptions.indexOf(subscription); + if (subscriptionIndex !== -1) { + subscriptions.splice(subscriptionIndex, 1); + } + } + }; + Subscription.prototype._addParent = function (parent) { + var _a = this, _parent = _a._parent, _parents = _a._parents; + if (!_parent || _parent === parent) { + this._parent = parent; + } + else if (!_parents) { + this._parents = [parent]; + } + else if (_parents.indexOf(parent) === -1) { + _parents.push(parent); + } + }; + Subscription.EMPTY = (function (empty) { + empty.closed = true; + return empty; + }(new Subscription())); + return Subscription; +}()); - if (!hit) return false - } - - // Note: ending in / means that we'll get a final "" - // at the end of the pattern. This can only match a - // corresponding "" at the end of the file. - // If the file ends in /, then it can only match a - // a pattern that ends in /, unless the pattern just - // doesn't have any more for it. But, a/b/ should *not* - // match "a/b/*", even though "" matches against the - // [^/]*? pattern, except in partial mode, where it might - // simply not be reached yet. - // However, a/b/ should still satisfy a/* - - // now either we fell off the end of the pattern, or we're done. - if (fi === fl && pi === pl) { - // ran out of pattern and filename at the same time. - // an exact hit! - return true - } else if (fi === fl) { - // ran out of file, but still had pattern left. - // this is ok if we're doing the match as part of - // a glob fs traversal. - return partial - } else if (pi === pl) { - // ran out of pattern, still have file left. - // this is only acceptable if we're on the very last - // empty segment of a file with a trailing slash. - // a/* should match a/b/ - var emptyFileEnd = (fi === fl - 1) && (file[fi] === '') - return emptyFileEnd - } - - // should be unreachable. - throw new Error('wtf?') -} - -// replace stuff like \* with * -function globUnescape (s) { - return s.replace(/\\(.)/g, '$1') +function flattenUnsubscriptionErrors(errors) { + return errors.reduce(function (errs, err) { return errs.concat((err instanceof __WEBPACK_IMPORTED_MODULE_5__util_UnsubscriptionError__["a" /* UnsubscriptionError */]) ? err.errors : err); }, []); } +//# sourceMappingURL=Subscription.js.map -function regExpEscape (s) { - return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') -} +/***/ }), +/* 8 */ +/***/ (function(module, exports) { + +module.exports = require("util"); /***/ }), -/* 59 */ -/***/ (function(module, exports, __webpack_require__) { +/* 9 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return SubjectSubscriber; }); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Subject; }); +/* unused harmony export AnonymousSubject */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__ = __webpack_require__(44); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__ = __webpack_require__(106); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__ = __webpack_require__(62); +/** PURE_IMPORTS_START tslib,_Observable,_Subscriber,_Subscription,_util_ObjectUnsubscribedError,_SubjectSubscription,_internal_symbol_rxSubscriber PURE_IMPORTS_END */ -function posix(path) { - return path.charAt(0) === '/'; -} -function win32(path) { - // https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56 - var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/; - var result = splitDeviceRe.exec(path); - var device = result[1] || ''; - var isUnc = Boolean(device && device.charAt(1) !== ':'); - // UNC paths are always absolute - return Boolean(result[2] || isUnc); -} -module.exports = process.platform === 'win32' ? win32 : posix; -module.exports.posix = posix; -module.exports.win32 = win32; + + +var SubjectSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SubjectSubscriber, _super); + function SubjectSubscriber(destination) { + var _this = _super.call(this, destination) || this; + _this.destination = destination; + return _this; + } + return SubjectSubscriber; +}(__WEBPACK_IMPORTED_MODULE_2__Subscriber__["a" /* Subscriber */])); + +var Subject = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](Subject, _super); + function Subject() { + var _this = _super.call(this) || this; + _this.observers = []; + _this.closed = false; + _this.isStopped = false; + _this.hasError = false; + _this.thrownError = null; + return _this; + } + Subject.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_rxSubscriber__["a" /* rxSubscriber */]] = function () { + return new SubjectSubscriber(this); + }; + Subject.prototype.lift = function (operator) { + var subject = new AnonymousSubject(this, this); + subject.operator = operator; + return subject; + }; + Subject.prototype.next = function (value) { + if (this.closed) { + throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); + } + if (!this.isStopped) { + var observers = this.observers; + var len = observers.length; + var copy = observers.slice(); + for (var i = 0; i < len; i++) { + copy[i].next(value); + } + } + }; + Subject.prototype.error = function (err) { + if (this.closed) { + throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); + } + this.hasError = true; + this.thrownError = err; + this.isStopped = true; + var observers = this.observers; + var len = observers.length; + var copy = observers.slice(); + for (var i = 0; i < len; i++) { + copy[i].error(err); + } + this.observers.length = 0; + }; + Subject.prototype.complete = function () { + if (this.closed) { + throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); + } + this.isStopped = true; + var observers = this.observers; + var len = observers.length; + var copy = observers.slice(); + for (var i = 0; i < len; i++) { + copy[i].complete(); + } + this.observers.length = 0; + }; + Subject.prototype.unsubscribe = function () { + this.isStopped = true; + this.closed = true; + this.observers = null; + }; + Subject.prototype._trySubscribe = function (subscriber) { + if (this.closed) { + throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); + } + else { + return _super.prototype._trySubscribe.call(this, subscriber); + } + }; + Subject.prototype._subscribe = function (subscriber) { + if (this.closed) { + throw new __WEBPACK_IMPORTED_MODULE_4__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); + } + else if (this.hasError) { + subscriber.error(this.thrownError); + return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; + } + else if (this.isStopped) { + subscriber.complete(); + return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; + } + else { + this.observers.push(subscriber); + return new __WEBPACK_IMPORTED_MODULE_5__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber); + } + }; + Subject.prototype.asObservable = function () { + var observable = new __WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */](); + observable.source = this; + return observable; + }; + Subject.create = function (destination, source) { + return new AnonymousSubject(destination, source); + }; + return Subject; +}(__WEBPACK_IMPORTED_MODULE_1__Observable__["a" /* Observable */])); + +var AnonymousSubject = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AnonymousSubject, _super); + function AnonymousSubject(destination, source) { + var _this = _super.call(this) || this; + _this.destination = destination; + _this.source = source; + return _this; + } + AnonymousSubject.prototype.next = function (value) { + var destination = this.destination; + if (destination && destination.next) { + destination.next(value); + } + }; + AnonymousSubject.prototype.error = function (err) { + var destination = this.destination; + if (destination && destination.error) { + this.destination.error(err); + } + }; + AnonymousSubject.prototype.complete = function () { + var destination = this.destination; + if (destination && destination.complete) { + this.destination.complete(); + } + }; + AnonymousSubject.prototype._subscribe = function (subscriber) { + var source = this.source; + if (source) { + return this.source.subscribe(subscriber); + } + else { + return __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; + } + }; + return AnonymousSubject; +}(Subject)); + +//# sourceMappingURL=Subject.js.map /***/ }), -/* 60 */ -/***/ (function(module, exports, __webpack_require__) { +/* 10 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return isArray; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var isArray = Array.isArray || (function (x) { return x && typeof x.length === 'number'; }); +//# sourceMappingURL=isArray.js.map -Object.defineProperty(exports, "__esModule", { - value: true -}); -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -class CliError extends Error { - constructor(message, meta = {}) { - super(message); - this.meta = meta; - } -} -exports.CliError = CliError; - /***/ }), -/* 61 */ -/***/ (function(module, exports, __webpack_require__) { +/* 11 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -// Note: since nyc uses this module to output coverage, any lines -// that are in the direct sync flow of nyc's outputCoverage are -// ignored, since we can never get coverage for them. -var assert = __webpack_require__(29) -var signals = __webpack_require__(307) +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EMPTY; }); +/* harmony export (immutable) */ __webpack_exports__["b"] = empty; +/* unused harmony export emptyScheduled */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ -var EE = __webpack_require__(41) -/* istanbul ignore if */ -if (typeof EE !== 'function') { - EE = EE.EventEmitter +var EMPTY = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.complete(); }); +function empty(scheduler) { + return scheduler ? emptyScheduled(scheduler) : EMPTY; } - -var emitter -if (process.__signal_exit_emitter__) { - emitter = process.__signal_exit_emitter__ -} else { - emitter = process.__signal_exit_emitter__ = new EE() - emitter.count = 0 - emitter.emitted = {} +function emptyScheduled(scheduler) { + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(function () { return subscriber.complete(); }); }); } +//# sourceMappingURL=empty.js.map -// Because this emitter is a global, we have to check to see if a -// previous version of this library failed to enable infinite listeners. -// I know what you're about to say. But literally everything about -// signal-exit is a compromise with evil. Get used to it. -if (!emitter.infinite) { - emitter.setMaxListeners(Infinity) - emitter.infinite = true -} -module.exports = function (cb, opts) { - assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler') +/***/ }), +/* 12 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - if (loaded === false) { - load() - } +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return async; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncAction__ = __webpack_require__(30); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(31); +/** PURE_IMPORTS_START _AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ - var ev = 'exit' - if (opts && opts.alwaysLast) { - ev = 'afterexit' - } - var remove = function () { - emitter.removeListener(ev, cb) - if (emitter.listeners('exit').length === 0 && - emitter.listeners('afterexit').length === 0) { - unload() - } - } - emitter.on(ev, cb) +var async = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__["a" /* AsyncScheduler */](__WEBPACK_IMPORTED_MODULE_0__AsyncAction__["a" /* AsyncAction */]); +//# sourceMappingURL=async.js.map - return remove -} -module.exports.unload = unload -function unload () { - if (!loaded) { - return - } - loaded = false +/***/ }), +/* 13 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - signals.forEach(function (sig) { - try { - process.removeListener(sig, sigListeners[sig]) - } catch (er) {} - }) - process.emit = originalProcessEmit - process.reallyExit = originalProcessReallyExit - emitter.count -= 1 -} +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return errorObject; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var errorObject = { e: {} }; +//# sourceMappingURL=errorObject.js.map -function emit (event, code, signal) { - if (emitter.emitted[event]) { - return - } - emitter.emitted[event] = true - emitter.emit(event, code, signal) -} -// { : , ... } -var sigListeners = {} -signals.forEach(function (sig) { - sigListeners[sig] = function listener () { - // If there are no other listeners, an exit is coming! - // Simplest way: remove us and then re-send the signal. - // We know that this will kill the process, so we can - // safely emit now. - var listeners = process.listeners(sig) - if (listeners.length === emitter.count) { - unload() - emit('exit', null, sig) - /* istanbul ignore next */ - emit('afterexit', null, sig) - /* istanbul ignore next */ - process.kill(process.pid, sig) - } - } -}) +/***/ }), +/* 14 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -module.exports.signals = function () { - return signals +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = isScheduler; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function isScheduler(value) { + return value && typeof value.schedule === 'function'; } +//# sourceMappingURL=isScheduler.js.map -module.exports.load = load - -var loaded = false - -function load () { - if (loaded) { - return - } - loaded = true - // This is the number of onSignalExit's that are in play. - // It's important so that we can count the correct number of - // listeners on signals, and don't wait for the other one to - // handle it instead of us. - emitter.count += 1 +/***/ }), +/* 15 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - signals = signals.filter(function (sig) { - try { - process.on(sig, sigListeners[sig]) - return true - } catch (er) { - return false - } - }) +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = map; +/* unused harmony export MapOperator */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - process.emit = processEmit - process.reallyExit = processReallyExit -} -var originalProcessReallyExit = process.reallyExit -function processReallyExit (code) { - process.exitCode = code || 0 - emit('exit', process.exitCode, null) - /* istanbul ignore next */ - emit('afterexit', process.exitCode, null) - /* istanbul ignore next */ - originalProcessReallyExit.call(process, process.exitCode) +function map(project, thisArg) { + return function mapOperation(source) { + if (typeof project !== 'function') { + throw new TypeError('argument is not a function. Are you looking for `mapTo()`?'); + } + return source.lift(new MapOperator(project, thisArg)); + }; } - -var originalProcessEmit = process.emit -function processEmit (ev, arg) { - if (ev === 'exit') { - if (arg !== undefined) { - process.exitCode = arg +var MapOperator = /*@__PURE__*/ (function () { + function MapOperator(project, thisArg) { + this.project = project; + this.thisArg = thisArg; } - var ret = originalProcessEmit.apply(this, arguments) - emit('exit', process.exitCode, null) - /* istanbul ignore next */ - emit('afterexit', process.exitCode, null) - return ret - } else { - return originalProcessEmit.apply(this, arguments) - } -} - + MapOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new MapSubscriber(subscriber, this.project, this.thisArg)); + }; + return MapOperator; +}()); -/***/ }), -/* 62 */ -/***/ (function(module, exports) { +var MapSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MapSubscriber, _super); + function MapSubscriber(destination, project, thisArg) { + var _this = _super.call(this, destination) || this; + _this.project = project; + _this.count = 0; + _this.thisArg = thisArg || _this; + return _this; + } + MapSubscriber.prototype._next = function (value) { + var result; + try { + result = this.project.call(this.thisArg, value, this.count++); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.next(result); + }; + return MapSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=map.js.map -module.exports = require("child_process"); /***/ }), -/* 63 */ +/* 16 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = hostReportError; -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -function hostReportError(err) { - setTimeout(function () { throw err; }); +/* harmony export (immutable) */ __webpack_exports__["a"] = tryCatch; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__errorObject__ = __webpack_require__(13); +/** PURE_IMPORTS_START _errorObject PURE_IMPORTS_END */ + +var tryCatchTarget; +function tryCatcher() { + try { + return tryCatchTarget.apply(this, arguments); + } + catch (e) { + __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */].e = e; + return __WEBPACK_IMPORTED_MODULE_0__errorObject__["a" /* errorObject */]; + } } -//# sourceMappingURL=hostReportError.js.map +function tryCatch(fn) { + tryCatchTarget = fn; + return tryCatcher; +} +//# sourceMappingURL=tryCatch.js.map /***/ }), -/* 64 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 17 */ +/***/ (function(module, exports, __webpack_require__) { "use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return rxSubscriber; }); -/* unused harmony export $$rxSubscriber */ -/** PURE_IMPORTS_START PURE_IMPORTS_END */ -var rxSubscriber = (typeof Symbol === 'function' && typeof Symbol.for === 'function') - ? /*@__PURE__*/ Symbol.for('rxSubscriber') - : '@@rxSubscriber'; -var $$rxSubscriber = rxSubscriber; -//# sourceMappingURL=rxSubscriber.js.map +const escapeStringRegexp = __webpack_require__(51); +const ansiStyles = __webpack_require__(138); +const stdoutColor = __webpack_require__(141).stdout; + +const template = __webpack_require__(142); + +const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); + +// `supportsColor.level` → `ansiStyles.color[name]` mapping +const levelMapping = ['ansi', 'ansi', 'ansi256', 'ansi16m']; + +// `color-convert` models to exclude from the Chalk API due to conflicts and such +const skipModels = new Set(['gray']); + +const styles = Object.create(null); + +function applyOptions(obj, options) { + options = options || {}; + + // Detect level if not set manually + const scLevel = stdoutColor ? stdoutColor.level : 0; + obj.level = options.level === undefined ? scLevel : options.level; + obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0; +} + +function Chalk(options) { + // We check for this.template here since calling `chalk.constructor()` + // by itself will have a `this` of a previously constructed chalk object + if (!this || !(this instanceof Chalk) || this.template) { + const chalk = {}; + applyOptions(chalk, options); + + chalk.template = function () { + const args = [].slice.call(arguments); + return chalkTag.apply(null, [chalk.template].concat(args)); + }; -/***/ }), -/* 65 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + Object.setPrototypeOf(chalk, Chalk.prototype); + Object.setPrototypeOf(chalk.template, chalk); -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = pipe; -/* harmony export (immutable) */ __webpack_exports__["b"] = pipeFromArray; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__noop__ = __webpack_require__(44); -/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */ + chalk.template.constructor = Chalk; -function pipe() { - var fns = []; - for (var _i = 0; _i < arguments.length; _i++) { - fns[_i] = arguments[_i]; - } - return pipeFromArray(fns); + return chalk.template; + } + + applyOptions(this, options); } -function pipeFromArray(fns) { - if (!fns) { - return __WEBPACK_IMPORTED_MODULE_0__noop__["a" /* noop */]; - } - if (fns.length === 1) { - return fns[0]; - } - return function piped(input) { - return fns.reduce(function (prev, fn) { return fn(prev); }, input); - }; + +// Use bright blue on Windows as the normal blue color is illegible +if (isSimpleWindowsTerm) { + ansiStyles.blue.open = '\u001B[94m'; } -//# sourceMappingURL=pipe.js.map +for (const key of Object.keys(ansiStyles)) { + ansiStyles[key].closeRe = new RegExp(escapeStringRegexp(ansiStyles[key].close), 'g'); -/***/ }), -/* 66 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + styles[key] = { + get() { + const codes = ansiStyles[key]; + return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, key); + } + }; +} -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = refCount; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ +styles.visible = { + get() { + return build.call(this, this._styles || [], true, 'visible'); + } +}; +ansiStyles.color.closeRe = new RegExp(escapeStringRegexp(ansiStyles.color.close), 'g'); +for (const model of Object.keys(ansiStyles.color.ansi)) { + if (skipModels.has(model)) { + continue; + } -function refCount() { - return function refCountOperatorFunction(source) { - return source.lift(new RefCountOperator(source)); - }; + styles[model] = { + get() { + const level = this.level; + return function () { + const open = ansiStyles.color[levelMapping[level]][model].apply(null, arguments); + const codes = { + open, + close: ansiStyles.color.close, + closeRe: ansiStyles.color.closeRe + }; + return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); + }; + } + }; } -var RefCountOperator = /*@__PURE__*/ (function () { - function RefCountOperator(connectable) { - this.connectable = connectable; - } - RefCountOperator.prototype.call = function (subscriber, source) { - var connectable = this.connectable; - connectable._refCount++; - var refCounter = new RefCountSubscriber(subscriber, connectable); - var subscription = source.subscribe(refCounter); - if (!refCounter.closed) { - refCounter.connection = connectable.connect(); - } - return subscription; - }; - return RefCountOperator; -}()); -var RefCountSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RefCountSubscriber, _super); - function RefCountSubscriber(destination, connectable) { - var _this = _super.call(this, destination) || this; - _this.connectable = connectable; - return _this; - } - RefCountSubscriber.prototype._unsubscribe = function () { - var connectable = this.connectable; - if (!connectable) { - this.connection = null; - return; - } - this.connectable = null; - var refCount = connectable._refCount; - if (refCount <= 0) { - this.connection = null; - return; - } - connectable._refCount = refCount - 1; - if (refCount > 1) { - this.connection = null; - return; - } - var connection = this.connection; - var sharedConnection = connectable._connection; - this.connection = null; - if (sharedConnection && (!connection || sharedConnection === connection)) { - sharedConnection.unsubscribe(); - } - }; - return RefCountSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=refCount.js.map +ansiStyles.bgColor.closeRe = new RegExp(escapeStringRegexp(ansiStyles.bgColor.close), 'g'); +for (const model of Object.keys(ansiStyles.bgColor.ansi)) { + if (skipModels.has(model)) { + continue; + } -/***/ }), -/* 67 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + const bgModel = 'bg' + model[0].toUpperCase() + model.slice(1); + styles[bgModel] = { + get() { + const level = this.level; + return function () { + const open = ansiStyles.bgColor[levelMapping[level]][model].apply(null, arguments); + const codes = { + open, + close: ansiStyles.bgColor.close, + closeRe: ansiStyles.bgColor.closeRe + }; + return build.call(this, this._styles ? this._styles.concat(codes) : [codes], this._empty, model); + }; + } + }; +} -"use strict"; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ReplaySubject; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__ = __webpack_require__(228); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__ = __webpack_require__(230); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__ = __webpack_require__(45); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__ = __webpack_require__(225); -/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */ +const proto = Object.defineProperties(() => {}, styles); +function build(_styles, _empty, key) { + const builder = function () { + return applyStyle.apply(builder, arguments); + }; + builder._styles = _styles; + builder._empty = _empty; + const self = this; + Object.defineProperty(builder, 'level', { + enumerable: true, + get() { + return self.level; + }, + set(level) { + self.level = level; + } + }); + Object.defineProperty(builder, 'enabled', { + enumerable: true, + get() { + return self.enabled; + }, + set(enabled) { + self.enabled = enabled; + } + }); + // See below for fix regarding invisible grey/dim combination on Windows + builder.hasGrey = this.hasGrey || key === 'gray' || key === 'grey'; -var ReplaySubject = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ReplaySubject, _super); - function ReplaySubject(bufferSize, windowTime, scheduler) { - if (bufferSize === void 0) { - bufferSize = Number.POSITIVE_INFINITY; - } - if (windowTime === void 0) { - windowTime = Number.POSITIVE_INFINITY; - } - var _this = _super.call(this) || this; - _this.scheduler = scheduler; - _this._events = []; - _this._infiniteTimeWindow = false; - _this._bufferSize = bufferSize < 1 ? 1 : bufferSize; - _this._windowTime = windowTime < 1 ? 1 : windowTime; - if (windowTime === Number.POSITIVE_INFINITY) { - _this._infiniteTimeWindow = true; - _this.next = _this.nextInfiniteTimeWindow; - } - else { - _this.next = _this.nextTimeWindow; - } - return _this; - } - ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) { - var _events = this._events; - _events.push(value); - if (_events.length > this._bufferSize) { - _events.shift(); - } - _super.prototype.next.call(this, value); - }; - ReplaySubject.prototype.nextTimeWindow = function (value) { - this._events.push(new ReplayEvent(this._getNow(), value)); - this._trimBufferThenGetEvents(); - _super.prototype.next.call(this, value); - }; - ReplaySubject.prototype._subscribe = function (subscriber) { - var _infiniteTimeWindow = this._infiniteTimeWindow; - var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents(); - var scheduler = this.scheduler; - var len = _events.length; - var subscription; - if (this.closed) { - throw new __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); - } - else if (this.isStopped || this.hasError) { - subscription = __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; - } - else { - this.observers.push(subscriber); - subscription = new __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber); - } - if (scheduler) { - subscriber.add(subscriber = new __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__["a" /* ObserveOnSubscriber */](subscriber, scheduler)); - } - if (_infiniteTimeWindow) { - for (var i = 0; i < len && !subscriber.closed; i++) { - subscriber.next(_events[i]); - } - } - else { - for (var i = 0; i < len && !subscriber.closed; i++) { - subscriber.next(_events[i].value); - } - } - if (this.hasError) { - subscriber.error(this.thrownError); - } - else if (this.isStopped) { - subscriber.complete(); - } - return subscription; - }; - ReplaySubject.prototype._getNow = function () { - return (this.scheduler || __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__["a" /* queue */]).now(); - }; - ReplaySubject.prototype._trimBufferThenGetEvents = function () { - var now = this._getNow(); - var _bufferSize = this._bufferSize; - var _windowTime = this._windowTime; - var _events = this._events; - var eventsCount = _events.length; - var spliceCount = 0; - while (spliceCount < eventsCount) { - if ((now - _events[spliceCount].time) < _windowTime) { - break; - } - spliceCount++; - } - if (eventsCount > _bufferSize) { - spliceCount = Math.max(spliceCount, eventsCount - _bufferSize); - } - if (spliceCount > 0) { - _events.splice(0, spliceCount); - } - return _events; - }; - return ReplaySubject; -}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */])); + // `__proto__` is used because we must return a function, but there is + // no way to create a function with a different prototype + builder.__proto__ = proto; // eslint-disable-line no-proto -var ReplayEvent = /*@__PURE__*/ (function () { - function ReplayEvent(time, value) { - this.time = time; - this.value = value; - } - return ReplayEvent; -}()); -//# sourceMappingURL=ReplaySubject.js.map + return builder; +} +function applyStyle() { + // Support varags, but simply cast to string in case there's only one arg + const args = arguments; + const argsLen = args.length; + let str = String(arguments[0]); -/***/ }), -/* 68 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + if (argsLen === 0) { + return ''; + } -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = of; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(15); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(21); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(12); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scalar__ = __webpack_require__(69); -/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_empty,_scalar PURE_IMPORTS_END */ + if (argsLen > 1) { + // Don't slice `arguments`, it prevents V8 optimizations + for (let a = 1; a < argsLen; a++) { + str += ' ' + args[a]; + } + } + if (!this.enabled || this.level <= 0 || !str) { + return this._empty ? '' : str; + } + // Turns out that on Windows dimmed gray text becomes invisible in cmd.exe, + // see https://github.com/chalk/chalk/issues/58 + // If we're on Windows and we're dealing with a gray color, temporarily make 'dim' a noop. + const originalDim = ansiStyles.dim.open; + if (isSimpleWindowsTerm && this.hasGrey) { + ansiStyles.dim.open = ''; + } + for (const code of this._styles.slice().reverse()) { + // Replace any instances already present with a re-opening code + // otherwise only the part of the string until said closing code + // will be colored, and the rest will simply be 'plain'. + str = code.open + str.replace(code.closeRe, code.open) + code.close; -function of() { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i] = arguments[_i]; - } - var scheduler = args[args.length - 1]; - if (Object(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(scheduler)) { - args.pop(); - } - else { - scheduler = undefined; - } - switch (args.length) { - case 0: - return Object(__WEBPACK_IMPORTED_MODULE_2__empty__["b" /* empty */])(scheduler); - case 1: - return scheduler ? Object(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler) : Object(__WEBPACK_IMPORTED_MODULE_3__scalar__["a" /* scalar */])(args[0]); - default: - return Object(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler); - } + // Close the styling before a linebreak and reopen + // after next line to fix a bleed issue on macOS + // https://github.com/chalk/chalk/pull/92 + str = str.replace(/\r?\n/g, `${code.close}$&${code.open}`); + } + + // Reset the original `dim` if we changed it to work around the Windows dimmed gray issue + ansiStyles.dim.open = originalDim; + + return str; } -//# sourceMappingURL=of.js.map +function chalkTag(chalk, strings) { + if (!Array.isArray(strings)) { + // If chalk() was called by itself or with a string, + // return the string itself as a string. + return [].slice.call(arguments, 1).join(' '); + } -/***/ }), -/* 69 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + const args = [].slice.call(arguments, 2); + const parts = [strings.raw[0]]; -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = scalar; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ + for (let i = 1; i < strings.length; i++) { + parts.push(String(args[i - 1]).replace(/[{}\\]/g, '\\$&')); + parts.push(String(strings.raw[i])); + } -function scalar(value) { - var result = new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { - subscriber.next(value); - subscriber.complete(); - }); - result._isScalar = true; - result.value = value; - return result; + return template(chalk, parts.join('')); } -//# sourceMappingURL=scalar.js.map + +Object.defineProperties(Chalk.prototype, styles); + +module.exports = Chalk(); // eslint-disable-line new-cap +module.exports.supportsColor = stdoutColor; +module.exports.default = module.exports; // For TypeScript /***/ }), -/* 70 */ +/* 18 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = throwError; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ - -function throwError(error, scheduler) { - if (!scheduler) { - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.error(error); }); - } - else { - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); }); - } -} -function dispatch(_a) { - var error = _a.error, subscriber = _a.subscriber; - subscriber.error(error); -} -//# sourceMappingURL=throwError.js.map +/* harmony export (immutable) */ __webpack_exports__["a"] = from; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isPromise__ = __webpack_require__(120); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__ = __webpack_require__(119); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__ = __webpack_require__(277); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isIterable__ = __webpack_require__(278); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(20); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__fromPromise__ = __webpack_require__(279); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__fromIterable__ = __webpack_require__(280); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__fromObservable__ = __webpack_require__(281); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__ = __webpack_require__(115); +/** PURE_IMPORTS_START _Observable,_util_isPromise,_util_isArrayLike,_util_isInteropObservable,_util_isIterable,_fromArray,_fromPromise,_fromIterable,_fromObservable,_util_subscribeTo PURE_IMPORTS_END */ -/***/ }), -/* 71 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["b"] = combineLatest; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CombineLatestOperator; }); -/* unused harmony export CombineLatestSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(15); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(21); -/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */ -var NONE = {}; -function combineLatest() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - var resultSelector = null; - var scheduler = null; - if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isScheduler__["a" /* isScheduler */])(observables[observables.length - 1])) { - scheduler = observables.pop(); - } - if (typeof observables[observables.length - 1] === 'function') { - resultSelector = observables.pop(); - } - if (observables.length === 1 && Object(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(observables[0])) { - observables = observables[0]; - } - return Object(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(observables, scheduler).lift(new CombineLatestOperator(resultSelector)); -} -var CombineLatestOperator = /*@__PURE__*/ (function () { - function CombineLatestOperator(resultSelector) { - this.resultSelector = resultSelector; - } - CombineLatestOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector)); - }; - return CombineLatestOperator; -}()); -var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CombineLatestSubscriber, _super); - function CombineLatestSubscriber(destination, resultSelector) { - var _this = _super.call(this, destination) || this; - _this.resultSelector = resultSelector; - _this.active = 0; - _this.values = []; - _this.observables = []; - return _this; - } - CombineLatestSubscriber.prototype._next = function (observable) { - this.values.push(NONE); - this.observables.push(observable); - }; - CombineLatestSubscriber.prototype._complete = function () { - var observables = this.observables; - var len = observables.length; - if (len === 0) { - this.destination.complete(); - } - else { - this.active = len; - this.toRespond = len; - for (var i = 0; i < len; i++) { - var observable = observables[i]; - this.add(Object(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, observable, observable, i)); - } - } - }; - CombineLatestSubscriber.prototype.notifyComplete = function (unused) { - if ((this.active -= 1) === 0) { - this.destination.complete(); +function from(input, scheduler) { + if (!scheduler) { + if (input instanceof __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */]) { + return input; } - }; - CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - var values = this.values; - var oldVal = values[outerIndex]; - var toRespond = !this.toRespond - ? 0 - : oldVal === NONE ? --this.toRespond : this.toRespond; - values[outerIndex] = innerValue; - if (toRespond === 0) { - if (this.resultSelector) { - this._tryResultSelector(values); - } - else { - this.destination.next(values.slice()); - } + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](Object(__WEBPACK_IMPORTED_MODULE_9__util_subscribeTo__["a" /* subscribeTo */])(input)); + } + if (input != null) { + if (Object(__WEBPACK_IMPORTED_MODULE_3__util_isInteropObservable__["a" /* isInteropObservable */])(input)) { + return Object(__WEBPACK_IMPORTED_MODULE_8__fromObservable__["a" /* fromObservable */])(input, scheduler); } - }; - CombineLatestSubscriber.prototype._tryResultSelector = function (values) { - var result; - try { - result = this.resultSelector.apply(this, values); + else if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isPromise__["a" /* isPromise */])(input)) { + return Object(__WEBPACK_IMPORTED_MODULE_6__fromPromise__["a" /* fromPromise */])(input, scheduler); } - catch (err) { - this.destination.error(err); - return; + else if (Object(__WEBPACK_IMPORTED_MODULE_2__util_isArrayLike__["a" /* isArrayLike */])(input)) { + return Object(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(input, scheduler); } - this.destination.next(result); - }; - return CombineLatestSubscriber; -}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */])); + else if (Object(__WEBPACK_IMPORTED_MODULE_4__util_isIterable__["a" /* isIterable */])(input) || typeof input === 'string') { + return Object(__WEBPACK_IMPORTED_MODULE_7__fromIterable__["a" /* fromIterable */])(input, scheduler); + } + } + throw new TypeError((input !== null && typeof input || input) + ' is not observable'); +} +//# sourceMappingURL=from.js.map + + +/***/ }), +/* 19 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; -//# sourceMappingURL=combineLatest.js.map +Object.defineProperty(exports, "__esModule", { + value: true +}); +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +const log = exports.log = { + /** + * Log something to the console. Ideally we would use a real logger in + * kbn-pm, but that's a pretty big change for now. + * @param ...args + */ + write(...args) { + // tslint:disable no-console + console.log(...args); + } +}; /***/ }), -/* 72 */ +/* 20 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = mergeAll; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(38); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(25); -/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */ +/* harmony export (immutable) */ __webpack_exports__["a"] = fromArray; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__ = __webpack_require__(112); +/** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToArray PURE_IMPORTS_END */ -function mergeAll(concurrent) { - if (concurrent === void 0) { - concurrent = Number.POSITIVE_INFINITY; + +function fromArray(input, scheduler) { + if (!scheduler) { + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](Object(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToArray__["a" /* subscribeToArray */])(input)); + } + else { + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { + var sub = new __WEBPACK_IMPORTED_MODULE_1__Subscription__["a" /* Subscription */](); + var i = 0; + sub.add(scheduler.schedule(function () { + if (i === input.length) { + subscriber.complete(); + return; + } + subscriber.next(input[i++]); + if (!subscriber.closed) { + sub.add(this.schedule()); + } + })); + return sub; + }); } - return Object(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(__WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */], concurrent); } -//# sourceMappingURL=mergeAll.js.map +//# sourceMappingURL=fromArray.js.map /***/ }), -/* 73 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +/* 21 */ +/***/ (function(module, exports) { + +module.exports = require("stream"); + +/***/ }), +/* 22 */ +/***/ (function(module, exports, __webpack_require__) { "use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = defer; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(19); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(12); -/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.getProjects = undefined; -function defer(observableFactory) { - return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { - var input; - try { - input = observableFactory(); - } - catch (err) { - subscriber.error(err); - return undefined; +let getProjects = exports.getProjects = (() => { + var _ref = _asyncToGenerator(function* (rootPath, projectsPathsPatterns, { include = [], exclude = [] } = {}) { + const projects = new Map(); + const workspaceProjectsPaths = yield (0, _workspaces.workspacePackagePaths)(rootPath); + for (const pattern of projectsPathsPatterns) { + const pathsToProcess = yield packagesFromGlobPattern({ pattern, rootPath }); + for (const filePath of pathsToProcess) { + const projectConfigPath = normalize(filePath); + const projectDir = _path2.default.dirname(projectConfigPath); + const project = yield _project.Project.fromPath(projectDir); + if (workspaceProjectsPaths.indexOf(filePath) >= 0) { + project.isWorkspaceProject = true; + } + const excludeProject = exclude.includes(project.name) || include.length > 0 && !include.includes(project.name); + if (excludeProject) { + continue; + } + if (projects.has(project.name)) { + throw new _errors.CliError(`There are multiple projects with the same name [${project.name}]`, { + name: project.name, + paths: [project.path, projects.get(project.name).path] + }); + } + projects.set(project.name, project); + } } - var source = input ? Object(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(input) : Object(__WEBPACK_IMPORTED_MODULE_2__empty__["b" /* empty */])(); - return source.subscribe(subscriber); + return projects; }); -} -//# sourceMappingURL=defer.js.map + return function getProjects(_x, _x2) { + return _ref.apply(this, arguments); + }; +})(); -/***/ }), -/* 74 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { +exports.buildProjectGraph = buildProjectGraph; +exports.topologicallyBatchProjects = topologicallyBatchProjects; +exports.includeTransitiveProjects = includeTransitiveProjects; -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["b"] = zip; -/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ZipOperator; }); -/* unused harmony export ZipSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(21); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__ = __webpack_require__(37); -/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */ +var _glob = __webpack_require__(23); +var _glob2 = _interopRequireDefault(_glob); +var _path = __webpack_require__(2); +var _path2 = _interopRequireDefault(_path); +var _util = __webpack_require__(8); +var _errors = __webpack_require__(57); +var _project = __webpack_require__(86); -function zip() { - var observables = []; - for (var _i = 0; _i < arguments.length; _i++) { - observables[_i] = arguments[_i]; - } - var resultSelector = observables[observables.length - 1]; - if (typeof resultSelector === 'function') { - observables.pop(); - } - return Object(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(observables, undefined).lift(new ZipOperator(resultSelector)); -} -var ZipOperator = /*@__PURE__*/ (function () { - function ZipOperator(resultSelector) { - this.resultSelector = resultSelector; - } - ZipOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector)); - }; - return ZipOperator; -}()); +var _workspaces = __webpack_require__(97); -var ZipSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipSubscriber, _super); - function ZipSubscriber(destination, resultSelector, values) { - if (values === void 0) { - values = Object.create(null); - } - var _this = _super.call(this, destination) || this; - _this.iterators = []; - _this.active = 0; - _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null; - _this.values = values; - return _this; - } - ZipSubscriber.prototype._next = function (value) { - var iterators = this.iterators; - if (Object(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(value)) { - iterators.push(new StaticArrayIterator(value)); - } - else if (typeof value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] === 'function') { - iterators.push(new StaticIterator(value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]]())); - } - else { - iterators.push(new ZipBufferIterator(this.destination, this, value)); - } - }; - ZipSubscriber.prototype._complete = function () { - var iterators = this.iterators; - var len = iterators.length; - if (len === 0) { - this.destination.complete(); - return; - } - this.active = len; - for (var i = 0; i < len; i++) { - var iterator = iterators[i]; - if (iterator.stillUnsubscribed) { - this.add(iterator.subscribe(iterator, i)); - } - else { - this.active--; - } - } - }; - ZipSubscriber.prototype.notifyInactive = function () { - this.active--; - if (this.active === 0) { - this.destination.complete(); - } +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +const glob = (0, _util.promisify)(_glob2.default); + +function packagesFromGlobPattern({ pattern, rootPath }) { + const globOptions = { + cwd: rootPath, + // Should throw in case of unusual errors when reading the file system + strict: true, + // Always returns absolute paths for matched files + absolute: true, + // Do not match ** against multiple filenames + // (This is only specified because we currently don't have a need for it.) + noglobstar: true }; - ZipSubscriber.prototype.checkIterators = function () { - var iterators = this.iterators; - var len = iterators.length; - var destination = this.destination; - for (var i = 0; i < len; i++) { - var iterator = iterators[i]; - if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) { - return; + return glob(_path2.default.join(pattern, 'package.json'), globOptions); +} +// https://github.com/isaacs/node-glob/blob/master/common.js#L104 +// glob always returns "\\" as "/" in windows, so everyone +// gets normalized because we can't have nice things. +function normalize(dir) { + return _path2.default.normalize(dir); +} +function buildProjectGraph(projects) { + const projectGraph = new Map(); + for (const project of projects.values()) { + const projectDeps = []; + const dependencies = project.allDependencies; + for (const depName of Object.keys(dependencies)) { + if (projects.has(depName)) { + const dep = projects.get(depName); + const dependentProjectIsInWorkspace = project.isWorkspaceProject || project.json.name === 'kibana'; + project.ensureValidProjectDependency(dep, dependentProjectIsInWorkspace); + projectDeps.push(dep); } } - var shouldComplete = false; - var args = []; - for (var i = 0; i < len; i++) { - var iterator = iterators[i]; - var result = iterator.next(); - if (iterator.hasCompleted()) { - shouldComplete = true; - } - if (result.done) { - destination.complete(); - return; + projectGraph.set(project.name, projectDeps); + } + return projectGraph; +} +function topologicallyBatchProjects(projectsToBatch, projectGraph, { batchByWorkspace = false } = {}) { + // We're going to be chopping stuff out of this list, so copy it. + const projectsLeftToBatch = new Set(projectsToBatch.keys()); + const batches = []; + if (batchByWorkspace) { + const workspaceRootProject = Array.from(projectsToBatch.values()).find(p => p.isWorkspaceRoot); + if (!workspaceRootProject) { + throw new _errors.CliError(`There was no yarn workspace root found.`); + } + // Push in the workspace root first. + batches.push([workspaceRootProject]); + projectsLeftToBatch.delete(workspaceRootProject.name); + // In the next batch, push in all workspace projects. + const workspaceBatch = []; + for (const projectName of projectsLeftToBatch) { + const project = projectsToBatch.get(projectName); + if (project.isWorkspaceProject) { + workspaceBatch.push(project); + projectsLeftToBatch.delete(projectName); + } + } + batches.push(workspaceBatch); + } + while (projectsLeftToBatch.size > 0) { + // Get all projects that have no remaining dependencies within the repo + // that haven't yet been picked. + const batch = []; + for (const projectName of projectsLeftToBatch) { + const projectDeps = projectGraph.get(projectName); + const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name)); + if (!needsDependenciesBatched) { + batch.push(projectsToBatch.get(projectName)); } - args.push(result.value); - } - if (this.resultSelector) { - this._tryresultSelector(args); - } - else { - destination.next(args); - } - if (shouldComplete) { - destination.complete(); } - }; - ZipSubscriber.prototype._tryresultSelector = function (args) { - var result; - try { - result = this.resultSelector.apply(this, args); - } - catch (err) { - this.destination.error(err); - return; + // If we weren't able to find a project with no remaining dependencies, + // then we've encountered a cycle in the dependency graph. + const hasCycles = batch.length === 0; + if (hasCycles) { + const cycleProjectNames = [...projectsLeftToBatch]; + const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', '); + throw new _errors.CliError(message); } - this.destination.next(result); - }; - return ZipSubscriber; -}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */])); - -var StaticIterator = /*@__PURE__*/ (function () { - function StaticIterator(iterator) { - this.iterator = iterator; - this.nextResult = iterator.next(); - } - StaticIterator.prototype.hasValue = function () { - return true; - }; - StaticIterator.prototype.next = function () { - var result = this.nextResult; - this.nextResult = this.iterator.next(); - return result; - }; - StaticIterator.prototype.hasCompleted = function () { - var nextResult = this.nextResult; - return nextResult && nextResult.done; - }; - return StaticIterator; -}()); -var StaticArrayIterator = /*@__PURE__*/ (function () { - function StaticArrayIterator(array) { - this.array = array; - this.index = 0; - this.length = 0; - this.length = array.length; + batches.push(batch); + batch.forEach(project => projectsLeftToBatch.delete(project.name)); } - StaticArrayIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () { - return this; - }; - StaticArrayIterator.prototype.next = function (value) { - var i = this.index++; - var array = this.array; - return i < this.length ? { value: array[i], done: false } : { value: null, done: true }; - }; - StaticArrayIterator.prototype.hasValue = function () { - return this.array.length > this.index; - }; - StaticArrayIterator.prototype.hasCompleted = function () { - return this.array.length === this.index; - }; - return StaticArrayIterator; -}()); -var ZipBufferIterator = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipBufferIterator, _super); - function ZipBufferIterator(destination, parent, observable) { - var _this = _super.call(this, destination) || this; - _this.parent = parent; - _this.observable = observable; - _this.stillUnsubscribed = true; - _this.buffer = []; - _this.isComplete = false; - return _this; + return batches; +} +function includeTransitiveProjects(subsetOfProjects, allProjects, { onlyProductionDependencies = false } = {}) { + const dependentProjects = new Map(); + // the current list of packages we are expanding using breadth-first-search + const toProcess = [...subsetOfProjects]; + while (toProcess.length > 0) { + const project = toProcess.shift(); + const dependencies = onlyProductionDependencies ? project.productionDependencies : project.allDependencies; + Object.keys(dependencies).forEach(dep => { + if (allProjects.has(dep)) { + toProcess.push(allProjects.get(dep)); + } + }); + dependentProjects.set(project.name, project); } - ZipBufferIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () { - return this; - }; - ZipBufferIterator.prototype.next = function () { - var buffer = this.buffer; - if (buffer.length === 0 && this.isComplete) { - return { value: null, done: true }; - } - else { - return { value: buffer.shift(), done: false }; - } - }; - ZipBufferIterator.prototype.hasValue = function () { - return this.buffer.length > 0; - }; - ZipBufferIterator.prototype.hasCompleted = function () { - return this.buffer.length === 0 && this.isComplete; - }; - ZipBufferIterator.prototype.notifyComplete = function () { - if (this.buffer.length > 0) { - this.isComplete = true; - this.parent.notifyInactive(); - } - else { - this.destination.complete(); - } - }; - ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.buffer.push(innerValue); - this.parent.checkIterators(); - }; - ZipBufferIterator.prototype.subscribe = function (value, index) { - return Object(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, this.observable, this, index); - }; - return ZipBufferIterator; -}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */])); -//# sourceMappingURL=zip.js.map + return dependentProjects; +} + +/***/ }), +/* 23 */ +/***/ (function(module, exports, __webpack_require__) { + +// Approach: +// +// 1. Get the minimatch set +// 2. For each pattern in the set, PROCESS(pattern, false) +// 3. Store matches per-set, then uniq them +// +// PROCESS(pattern, inGlobStar) +// Get the first [n] items from pattern that are all strings +// Join these together. This is PREFIX. +// If there is no more remaining, then stat(PREFIX) and +// add to matches if it succeeds. END. +// +// If inGlobStar and PREFIX is symlink and points to dir +// set ENTRIES = [] +// else readdir(PREFIX) as ENTRIES +// If fail, END +// +// with ENTRIES +// If pattern[n] is GLOBSTAR +// // handle the case where the globstar match is empty +// // by pruning it out, and testing the resulting pattern +// PROCESS(pattern[0..n] + pattern[n+1 .. $], false) +// // handle other cases. +// for ENTRY in ENTRIES (not dotfiles) +// // attach globstar + tail onto the entry +// // Mark that this entry is a globstar match +// PROCESS(pattern[0..n] + ENTRY + pattern[n .. $], true) +// +// else // not globstar +// for ENTRY in ENTRIES (not dotfiles, unless pattern[n] is dot) +// Test ENTRY against pattern[n] +// If fails, continue +// If passes, PROCESS(pattern[0..n] + item + pattern[n+1 .. $]) +// +// Caveat: +// Cache all stats and readdirs results to minimize syscall. Since all +// we ever care about is existence and directory-ness, we can just keep +// `true` for files, and [children,...] for directories, or `false` for +// things that don't exist. + +module.exports = glob + +var fs = __webpack_require__(6) +var rp = __webpack_require__(81) +var minimatch = __webpack_require__(55) +var Minimatch = minimatch.Minimatch +var inherits = __webpack_require__(82) +var EE = __webpack_require__(40).EventEmitter +var path = __webpack_require__(2) +var assert = __webpack_require__(28) +var isAbsolute = __webpack_require__(56) +var globSync = __webpack_require__(158) +var common = __webpack_require__(83) +var alphasort = common.alphasort +var alphasorti = common.alphasorti +var setopts = common.setopts +var ownProp = common.ownProp +var inflight = __webpack_require__(159) +var util = __webpack_require__(8) +var childrenIgnored = common.childrenIgnored +var isIgnored = common.isIgnored +var once = __webpack_require__(85) + +function glob (pattern, options, cb) { + if (typeof options === 'function') cb = options, options = {} + if (!options) options = {} -/***/ }), -/* 75 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + if (options.sync) { + if (cb) + throw new TypeError('callback provided to sync glob') + return globSync(pattern, options) + } -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = take; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(35); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(12); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ + return new Glob(pattern, options, cb) +} +glob.sync = globSync +var GlobSync = glob.GlobSync = globSync.GlobSync +// old api surface +glob.glob = glob +function extend (origin, add) { + if (add === null || typeof add !== 'object') { + return origin + } -function take(count) { - return function (source) { - if (count === 0) { - return Object(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["b" /* empty */])(); - } - else { - return source.lift(new TakeOperator(count)); - } - }; + var keys = Object.keys(add) + var i = keys.length + while (i--) { + origin[keys[i]] = add[keys[i]] + } + return origin } -var TakeOperator = /*@__PURE__*/ (function () { - function TakeOperator(total) { - this.total = total; - if (this.total < 0) { - throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */]; - } - } - TakeOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TakeSubscriber(subscriber, this.total)); - }; - return TakeOperator; -}()); -var TakeSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeSubscriber, _super); - function TakeSubscriber(destination, total) { - var _this = _super.call(this, destination) || this; - _this.total = total; - _this.count = 0; - return _this; - } - TakeSubscriber.prototype._next = function (value) { - var total = this.total; - var count = ++this.count; - if (count <= total) { - this.destination.next(value); - if (count === total) { - this.destination.complete(); - this.unsubscribe(); - } - } - }; - return TakeSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=take.js.map +glob.hasMagic = function (pattern, options_) { + var options = extend({}, options_) + options.noprocess = true -/***/ }), -/* 76 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { - -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = takeLast; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(35); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(12); -/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ + var g = new Glob(pattern, options) + var set = g.minimatch.set + if (!pattern) + return false + if (set.length > 1) + return true + for (var j = 0; j < set[0].length; j++) { + if (typeof set[0][j] !== 'string') + return true + } -function takeLast(count) { - return function takeLastOperatorFunction(source) { - if (count === 0) { - return Object(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["b" /* empty */])(); - } - else { - return source.lift(new TakeLastOperator(count)); - } - }; + return false } -var TakeLastOperator = /*@__PURE__*/ (function () { - function TakeLastOperator(total) { - this.total = total; - if (this.total < 0) { - throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */]; - } - } - TakeLastOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new TakeLastSubscriber(subscriber, this.total)); - }; - return TakeLastOperator; -}()); -var TakeLastSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeLastSubscriber, _super); - function TakeLastSubscriber(destination, total) { - var _this = _super.call(this, destination) || this; - _this.total = total; - _this.ring = new Array(); - _this.count = 0; - return _this; - } - TakeLastSubscriber.prototype._next = function (value) { - var ring = this.ring; - var total = this.total; - var count = this.count++; - if (ring.length < total) { - ring.push(value); - } - else { - var index = count % total; - ring[index] = value; - } - }; - TakeLastSubscriber.prototype._complete = function () { - var destination = this.destination; - var count = this.count; - if (count > 0) { - var total = this.count >= this.total ? this.total : this.count; - var ring = this.ring; - for (var i = 0; i < total; i++) { - var idx = (count++) % total; - destination.next(ring[idx]); - } - } - destination.complete(); - }; - return TakeLastSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=takeLast.js.map +glob.Glob = Glob +inherits(Glob, EE) +function Glob (pattern, options, cb) { + if (typeof options === 'function') { + cb = options + options = null + } -/***/ }), -/* 77 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + if (options && options.sync) { + if (cb) + throw new TypeError('callback provided to sync glob') + return new GlobSync(pattern, options) + } -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = scan; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + if (!(this instanceof Glob)) + return new Glob(pattern, options, cb) + setopts(this, pattern, options) + this._didRealPath = false -function scan(accumulator, seed) { - var hasSeed = false; - if (arguments.length >= 2) { - hasSeed = true; - } - return function scanOperatorFunction(source) { - return source.lift(new ScanOperator(accumulator, seed, hasSeed)); - }; -} -var ScanOperator = /*@__PURE__*/ (function () { - function ScanOperator(accumulator, seed, hasSeed) { - if (hasSeed === void 0) { - hasSeed = false; - } - this.accumulator = accumulator; - this.seed = seed; - this.hasSeed = hasSeed; - } - ScanOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed)); - }; - return ScanOperator; -}()); -var ScanSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ScanSubscriber, _super); - function ScanSubscriber(destination, accumulator, _seed, hasSeed) { - var _this = _super.call(this, destination) || this; - _this.accumulator = accumulator; - _this._seed = _seed; - _this.hasSeed = hasSeed; - _this.index = 0; - return _this; - } - Object.defineProperty(ScanSubscriber.prototype, "seed", { - get: function () { - return this._seed; - }, - set: function (value) { - this.hasSeed = true; - this._seed = value; - }, - enumerable: true, - configurable: true - }); - ScanSubscriber.prototype._next = function (value) { - if (!this.hasSeed) { - this.seed = value; - this.destination.next(value); - } - else { - return this._tryNext(value); - } - }; - ScanSubscriber.prototype._tryNext = function (value) { - var index = this.index++; - var result; - try { - result = this.accumulator(this.seed, value, index); - } - catch (err) { - this.destination.error(err); - } - this.seed = result; - this.destination.next(result); - }; - return ScanSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); -//# sourceMappingURL=scan.js.map + // process each pattern in the minimatch set + var n = this.minimatch.set.length + // The matches are stored as {: true,...} so that + // duplicates are automagically pruned. + // Later, we do an Object.keys() on these. + // Keep them as a list so we can fill in when nonull is set. + this.matches = new Array(n) -/***/ }), -/* 78 */ -/***/ (function(module, __webpack_exports__, __webpack_require__) { + if (typeof cb === 'function') { + cb = once(cb) + this.on('error', cb) + this.on('end', function (matches) { + cb(null, matches) + }) + } -"use strict"; -/* harmony export (immutable) */ __webpack_exports__["a"] = switchMap; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(16); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__observable_from__ = __webpack_require__(19); -/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ + var self = this + this._processing = 0 + this._emitQueue = [] + this._processQueue = [] + this.paused = false + if (this.noprocess) + return this + if (n === 0) + return done() + var sync = true + for (var i = 0; i < n; i ++) { + this._process(this.minimatch.set[i], i, false, done) + } + sync = false -function switchMap(project, resultSelector) { - if (typeof resultSelector === 'function') { - return function (source) { return source.pipe(switchMap(function (a, i) { return Object(__WEBPACK_IMPORTED_MODULE_4__observable_from__["a" /* from */])(project(a, i)).pipe(Object(__WEBPACK_IMPORTED_MODULE_3__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; + function done () { + --self._processing + if (self._processing <= 0) { + if (sync) { + process.nextTick(function () { + self._finish() + }) + } else { + self._finish() + } } - return function (source) { return source.lift(new SwitchMapOperator(project)); }; + } } -var SwitchMapOperator = /*@__PURE__*/ (function () { - function SwitchMapOperator(project) { - this.project = project; - } - SwitchMapOperator.prototype.call = function (subscriber, source) { - return source.subscribe(new SwitchMapSubscriber(subscriber, this.project)); - }; - return SwitchMapOperator; -}()); -var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) { - __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SwitchMapSubscriber, _super); - function SwitchMapSubscriber(destination, project) { - var _this = _super.call(this, destination) || this; - _this.project = project; - _this.index = 0; - return _this; - } - SwitchMapSubscriber.prototype._next = function (value) { - var result; - var index = this.index++; - try { - result = this.project(value, index); - } - catch (error) { - this.destination.error(error); - return; - } - this._innerSub(result, value, index); - }; - SwitchMapSubscriber.prototype._innerSub = function (result, value, index) { - var innerSubscription = this.innerSubscription; - if (innerSubscription) { - innerSubscription.unsubscribe(); - } - this.add(this.innerSubscription = Object(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index)); - }; - SwitchMapSubscriber.prototype._complete = function () { - var innerSubscription = this.innerSubscription; - if (!innerSubscription || innerSubscription.closed) { - _super.prototype._complete.call(this); - } - }; - SwitchMapSubscriber.prototype._unsubscribe = function () { - this.innerSubscription = null; - }; - SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) { - this.remove(innerSub); - this.innerSubscription = null; - if (this.isStopped) { - _super.prototype._complete.call(this); - } - }; - SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { - this.destination.next(innerValue); - }; - return SwitchMapSubscriber; -}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */])); -//# sourceMappingURL=switchMap.js.map - - -/***/ }), -/* 79 */ -/***/ (function(module, exports, __webpack_require__) { -/* MIT license */ -var cssKeywords = __webpack_require__(260); +Glob.prototype._finish = function () { + assert(this instanceof Glob) + if (this.aborted) + return -// NOTE: conversions should only return primitive values (i.e. arrays, or -// values that give correct `typeof` results). -// do not use box values types (i.e. Number(), String(), etc.) + if (this.realpath && !this._didRealpath) + return this._realpath() -var reverseKeywords = {}; -for (var key in cssKeywords) { - if (cssKeywords.hasOwnProperty(key)) { - reverseKeywords[cssKeywords[key]] = key; - } + common.finish(this) + this.emit('end', this.found) } -var convert = module.exports = { - rgb: {channels: 3, labels: 'rgb'}, - hsl: {channels: 3, labels: 'hsl'}, - hsv: {channels: 3, labels: 'hsv'}, - hwb: {channels: 3, labels: 'hwb'}, - cmyk: {channels: 4, labels: 'cmyk'}, - xyz: {channels: 3, labels: 'xyz'}, - lab: {channels: 3, labels: 'lab'}, - lch: {channels: 3, labels: 'lch'}, - hex: {channels: 1, labels: ['hex']}, - keyword: {channels: 1, labels: ['keyword']}, - ansi16: {channels: 1, labels: ['ansi16']}, - ansi256: {channels: 1, labels: ['ansi256']}, - hcg: {channels: 3, labels: ['h', 'c', 'g']}, - apple: {channels: 3, labels: ['r16', 'g16', 'b16']}, - gray: {channels: 1, labels: ['gray']} -}; +Glob.prototype._realpath = function () { + if (this._didRealpath) + return -// hide .channels and .labels properties -for (var model in convert) { - if (convert.hasOwnProperty(model)) { - if (!('channels' in convert[model])) { - throw new Error('missing channels property: ' + model); - } + this._didRealpath = true - if (!('labels' in convert[model])) { - throw new Error('missing channel labels property: ' + model); - } + var n = this.matches.length + if (n === 0) + return this._finish() - if (convert[model].labels.length !== convert[model].channels) { - throw new Error('channel and label counts mismatch: ' + model); - } + var self = this + for (var i = 0; i < this.matches.length; i++) + this._realpathSet(i, next) - var channels = convert[model].channels; - var labels = convert[model].labels; - delete convert[model].channels; - delete convert[model].labels; - Object.defineProperty(convert[model], 'channels', {value: channels}); - Object.defineProperty(convert[model], 'labels', {value: labels}); - } + function next () { + if (--n === 0) + self._finish() + } } -convert.rgb.hsl = function (rgb) { - var r = rgb[0] / 255; - var g = rgb[1] / 255; - var b = rgb[2] / 255; - var min = Math.min(r, g, b); - var max = Math.max(r, g, b); - var delta = max - min; - var h; - var s; - var l; - - if (max === min) { - h = 0; - } else if (r === max) { - h = (g - b) / delta; - } else if (g === max) { - h = 2 + (b - r) / delta; - } else if (b === max) { - h = 4 + (r - g) / delta; - } - - h = Math.min(h * 60, 360); +Glob.prototype._realpathSet = function (index, cb) { + var matchset = this.matches[index] + if (!matchset) + return cb() - if (h < 0) { - h += 360; - } + var found = Object.keys(matchset) + var self = this + var n = found.length - l = (min + max) / 2; + if (n === 0) + return cb() - if (max === min) { - s = 0; - } else if (l <= 0.5) { - s = delta / (max + min); - } else { - s = delta / (2 - max - min); - } + var set = this.matches[index] = Object.create(null) + found.forEach(function (p, i) { + // If there's a problem with the stat, then it means that + // one or more of the links in the realpath couldn't be + // resolved. just return the abs value in that case. + p = self._makeAbs(p) + rp.realpath(p, self.realpathCache, function (er, real) { + if (!er) + set[real] = true + else if (er.syscall === 'stat') + set[p] = true + else + self.emit('error', er) // srsly wtf right here - return [h, s * 100, l * 100]; -}; + if (--n === 0) { + self.matches[index] = set + cb() + } + }) + }) +} -convert.rgb.hsv = function (rgb) { - var r = rgb[0]; - var g = rgb[1]; - var b = rgb[2]; - var min = Math.min(r, g, b); - var max = Math.max(r, g, b); - var delta = max - min; - var h; - var s; - var v; +Glob.prototype._mark = function (p) { + return common.mark(this, p) +} - if (max === 0) { - s = 0; - } else { - s = (delta / max * 1000) / 10; - } +Glob.prototype._makeAbs = function (f) { + return common.makeAbs(this, f) +} - if (max === min) { - h = 0; - } else if (r === max) { - h = (g - b) / delta; - } else if (g === max) { - h = 2 + (b - r) / delta; - } else if (b === max) { - h = 4 + (r - g) / delta; - } +Glob.prototype.abort = function () { + this.aborted = true + this.emit('abort') +} - h = Math.min(h * 60, 360); +Glob.prototype.pause = function () { + if (!this.paused) { + this.paused = true + this.emit('pause') + } +} - if (h < 0) { - h += 360; - } +Glob.prototype.resume = function () { + if (this.paused) { + this.emit('resume') + this.paused = false + if (this._emitQueue.length) { + var eq = this._emitQueue.slice(0) + this._emitQueue.length = 0 + for (var i = 0; i < eq.length; i ++) { + var e = eq[i] + this._emitMatch(e[0], e[1]) + } + } + if (this._processQueue.length) { + var pq = this._processQueue.slice(0) + this._processQueue.length = 0 + for (var i = 0; i < pq.length; i ++) { + var p = pq[i] + this._processing-- + this._process(p[0], p[1], p[2], p[3]) + } + } + } +} - v = ((max / 255) * 1000) / 10; +Glob.prototype._process = function (pattern, index, inGlobStar, cb) { + assert(this instanceof Glob) + assert(typeof cb === 'function') - return [h, s, v]; -}; + if (this.aborted) + return -convert.rgb.hwb = function (rgb) { - var r = rgb[0]; - var g = rgb[1]; - var b = rgb[2]; - var h = convert.rgb.hsl(rgb)[0]; - var w = 1 / 255 * Math.min(r, Math.min(g, b)); + this._processing++ + if (this.paused) { + this._processQueue.push([pattern, index, inGlobStar, cb]) + return + } - b = 1 - 1 / 255 * Math.max(r, Math.max(g, b)); + //console.error('PROCESS %d', this._processing, pattern) - return [h, w * 100, b * 100]; -}; + // Get the first [n] parts of pattern that are all strings. + var n = 0 + while (typeof pattern[n] === 'string') { + n ++ + } + // now n is the index of the first one that is *not* a string. -convert.rgb.cmyk = function (rgb) { - var r = rgb[0] / 255; - var g = rgb[1] / 255; - var b = rgb[2] / 255; - var c; - var m; - var y; - var k; + // see if there's anything else + var prefix + switch (n) { + // if not, then this is rather simple + case pattern.length: + this._processSimple(pattern.join('/'), index, cb) + return - k = Math.min(1 - r, 1 - g, 1 - b); - c = (1 - r - k) / (1 - k) || 0; - m = (1 - g - k) / (1 - k) || 0; - y = (1 - b - k) / (1 - k) || 0; + case 0: + // pattern *starts* with some non-trivial item. + // going to readdir(cwd), but not include the prefix in matches. + prefix = null + break - return [c * 100, m * 100, y * 100, k * 100]; -}; + default: + // pattern has some string bits in the front. + // whatever it starts with, whether that's 'absolute' like /foo/bar, + // or 'relative' like '../baz' + prefix = pattern.slice(0, n).join('/') + break + } -/** - * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance - * */ -function comparativeDistance(x, y) { - return ( - Math.pow(x[0] - y[0], 2) + - Math.pow(x[1] - y[1], 2) + - Math.pow(x[2] - y[2], 2) - ); -} + var remain = pattern.slice(n) -convert.rgb.keyword = function (rgb) { - var reversed = reverseKeywords[rgb]; - if (reversed) { - return reversed; - } + // get the list of entries. + var read + if (prefix === null) + read = '.' + else if (isAbsolute(prefix) || isAbsolute(pattern.join('/'))) { + if (!prefix || !isAbsolute(prefix)) + prefix = '/' + prefix + read = prefix + } else + read = prefix - var currentClosestDistance = Infinity; - var currentClosestKeyword; + var abs = this._makeAbs(read) - for (var keyword in cssKeywords) { - if (cssKeywords.hasOwnProperty(keyword)) { - var value = cssKeywords[keyword]; + //if ignored, skip _processing + if (childrenIgnored(this, read)) + return cb() - // Compute comparative distance - var distance = comparativeDistance(rgb, value); + var isGlobStar = remain[0] === minimatch.GLOBSTAR + if (isGlobStar) + this._processGlobStar(prefix, read, abs, remain, index, inGlobStar, cb) + else + this._processReaddir(prefix, read, abs, remain, index, inGlobStar, cb) +} - // Check if its less, if so set as closest - if (distance < currentClosestDistance) { - currentClosestDistance = distance; - currentClosestKeyword = keyword; - } - } - } +Glob.prototype._processReaddir = function (prefix, read, abs, remain, index, inGlobStar, cb) { + var self = this + this._readdir(abs, inGlobStar, function (er, entries) { + return self._processReaddir2(prefix, read, abs, remain, index, inGlobStar, entries, cb) + }) +} - return currentClosestKeyword; -}; +Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) { -convert.keyword.rgb = function (keyword) { - return cssKeywords[keyword]; -}; + // if the abs isn't a dir, then nothing can match! + if (!entries) + return cb() -convert.rgb.xyz = function (rgb) { - var r = rgb[0] / 255; - var g = rgb[1] / 255; - var b = rgb[2] / 255; + // It will only match dot entries if it starts with a dot, or if + // dot is set. Stuff like @(.foo|.bar) isn't allowed. + var pn = remain[0] + var negate = !!this.minimatch.negate + var rawGlob = pn._glob + var dotOk = this.dot || rawGlob.charAt(0) === '.' - // assume sRGB - r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92); - g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92); - b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92); + var matchedEntries = [] + for (var i = 0; i < entries.length; i++) { + var e = entries[i] + if (e.charAt(0) !== '.' || dotOk) { + var m + if (negate && !prefix) { + m = !e.match(pn) + } else { + m = e.match(pn) + } + if (m) + matchedEntries.push(e) + } + } - var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805); - var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722); - var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505); + //console.error('prd2', prefix, entries, remain[0]._glob, matchedEntries) - return [x * 100, y * 100, z * 100]; -}; + var len = matchedEntries.length + // If there are no matched entries, then nothing matches. + if (len === 0) + return cb() -convert.rgb.lab = function (rgb) { - var xyz = convert.rgb.xyz(rgb); - var x = xyz[0]; - var y = xyz[1]; - var z = xyz[2]; - var l; - var a; - var b; + // if this is the last remaining pattern bit, then no need for + // an additional stat *unless* the user has specified mark or + // stat explicitly. We know they exist, since readdir returned + // them. - x /= 95.047; - y /= 100; - z /= 108.883; + if (remain.length === 1 && !this.mark && !this.stat) { + if (!this.matches[index]) + this.matches[index] = Object.create(null) - x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116); - y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116); - z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116); + for (var i = 0; i < len; i ++) { + var e = matchedEntries[i] + if (prefix) { + if (prefix !== '/') + e = prefix + '/' + e + else + e = prefix + e + } - l = (116 * y) - 16; - a = 500 * (x - y); - b = 200 * (y - z); + if (e.charAt(0) === '/' && !this.nomount) { + e = path.join(this.root, e) + } + this._emitMatch(index, e) + } + // This was the last one, and no stats were needed + return cb() + } - return [l, a, b]; -}; + // now test all matched entries as stand-ins for that part + // of the pattern. + remain.shift() + for (var i = 0; i < len; i ++) { + var e = matchedEntries[i] + var newPattern + if (prefix) { + if (prefix !== '/') + e = prefix + '/' + e + else + e = prefix + e + } + this._process([e].concat(remain), index, inGlobStar, cb) + } + cb() +} -convert.hsl.rgb = function (hsl) { - var h = hsl[0] / 360; - var s = hsl[1] / 100; - var l = hsl[2] / 100; - var t1; - var t2; - var t3; - var rgb; - var val; +Glob.prototype._emitMatch = function (index, e) { + if (this.aborted) + return - if (s === 0) { - val = l * 255; - return [val, val, val]; - } + if (isIgnored(this, e)) + return - if (l < 0.5) { - t2 = l * (1 + s); - } else { - t2 = l + s - l * s; - } + if (this.paused) { + this._emitQueue.push([index, e]) + return + } - t1 = 2 * l - t2; + var abs = isAbsolute(e) ? e : this._makeAbs(e) - rgb = [0, 0, 0]; - for (var i = 0; i < 3; i++) { - t3 = h + 1 / 3 * -(i - 1); - if (t3 < 0) { - t3++; - } - if (t3 > 1) { - t3--; - } + if (this.mark) + e = this._mark(e) - if (6 * t3 < 1) { - val = t1 + (t2 - t1) * 6 * t3; - } else if (2 * t3 < 1) { - val = t2; - } else if (3 * t3 < 2) { - val = t1 + (t2 - t1) * (2 / 3 - t3) * 6; - } else { - val = t1; - } + if (this.absolute) + e = abs - rgb[i] = val * 255; - } + if (this.matches[index][e]) + return - return rgb; -}; + if (this.nodir) { + var c = this.cache[abs] + if (c === 'DIR' || Array.isArray(c)) + return + } -convert.hsl.hsv = function (hsl) { - var h = hsl[0]; - var s = hsl[1] / 100; - var l = hsl[2] / 100; - var smin = s; - var lmin = Math.max(l, 0.01); - var sv; - var v; + this.matches[index][e] = true - l *= 2; - s *= (l <= 1) ? l : 2 - l; - smin *= lmin <= 1 ? lmin : 2 - lmin; - v = (l + s) / 2; - sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s); + var st = this.statCache[abs] + if (st) + this.emit('stat', e, st) - return [h, sv * 100, v * 100]; -}; + this.emit('match', e) +} -convert.hsv.rgb = function (hsv) { - var h = hsv[0] / 60; - var s = hsv[1] / 100; - var v = hsv[2] / 100; - var hi = Math.floor(h) % 6; +Glob.prototype._readdirInGlobStar = function (abs, cb) { + if (this.aborted) + return - var f = h - Math.floor(h); - var p = 255 * v * (1 - s); - var q = 255 * v * (1 - (s * f)); - var t = 255 * v * (1 - (s * (1 - f))); - v *= 255; + // follow all symlinked directories forever + // just proceed as if this is a non-globstar situation + if (this.follow) + return this._readdir(abs, false, cb) - switch (hi) { - case 0: - return [v, t, p]; - case 1: - return [q, v, p]; - case 2: - return [p, v, t]; - case 3: - return [p, q, v]; - case 4: - return [t, p, v]; - case 5: - return [v, p, q]; - } -}; + var lstatkey = 'lstat\0' + abs + var self = this + var lstatcb = inflight(lstatkey, lstatcb_) -convert.hsv.hsl = function (hsv) { - var h = hsv[0]; - var s = hsv[1] / 100; - var v = hsv[2] / 100; - var vmin = Math.max(v, 0.01); - var lmin; - var sl; - var l; + if (lstatcb) + fs.lstat(abs, lstatcb) - l = (2 - s) * v; - lmin = (2 - s) * vmin; - sl = s * vmin; - sl /= (lmin <= 1) ? lmin : 2 - lmin; - sl = sl || 0; - l /= 2; + function lstatcb_ (er, lstat) { + if (er && er.code === 'ENOENT') + return cb() - return [h, sl * 100, l * 100]; -}; + var isSym = lstat && lstat.isSymbolicLink() + self.symlinks[abs] = isSym -// http://dev.w3.org/csswg/css-color/#hwb-to-rgb -convert.hwb.rgb = function (hwb) { - var h = hwb[0] / 360; - var wh = hwb[1] / 100; - var bl = hwb[2] / 100; - var ratio = wh + bl; - var i; - var v; - var f; - var n; + // If it's not a symlink or a dir, then it's definitely a regular file. + // don't bother doing a readdir in that case. + if (!isSym && lstat && !lstat.isDirectory()) { + self.cache[abs] = 'FILE' + cb() + } else + self._readdir(abs, false, cb) + } +} - // wh + bl cant be > 1 - if (ratio > 1) { - wh /= ratio; - bl /= ratio; - } +Glob.prototype._readdir = function (abs, inGlobStar, cb) { + if (this.aborted) + return - i = Math.floor(6 * h); - v = 1 - bl; - f = 6 * h - i; + cb = inflight('readdir\0'+abs+'\0'+inGlobStar, cb) + if (!cb) + return - if ((i & 0x01) !== 0) { - f = 1 - f; - } + //console.error('RD %j %j', +inGlobStar, abs) + if (inGlobStar && !ownProp(this.symlinks, abs)) + return this._readdirInGlobStar(abs, cb) - n = wh + f * (v - wh); // linear interpolation + if (ownProp(this.cache, abs)) { + var c = this.cache[abs] + if (!c || c === 'FILE') + return cb() - var r; - var g; - var b; - switch (i) { - default: - case 6: - case 0: r = v; g = n; b = wh; break; - case 1: r = n; g = v; b = wh; break; - case 2: r = wh; g = v; b = n; break; - case 3: r = wh; g = n; b = v; break; - case 4: r = n; g = wh; b = v; break; - case 5: r = v; g = wh; b = n; break; - } + if (Array.isArray(c)) + return cb(null, c) + } - return [r * 255, g * 255, b * 255]; -}; + var self = this + fs.readdir(abs, readdirCb(this, abs, cb)) +} -convert.cmyk.rgb = function (cmyk) { - var c = cmyk[0] / 100; - var m = cmyk[1] / 100; - var y = cmyk[2] / 100; - var k = cmyk[3] / 100; - var r; - var g; - var b; +function readdirCb (self, abs, cb) { + return function (er, entries) { + if (er) + self._readdirError(abs, er, cb) + else + self._readdirEntries(abs, entries, cb) + } +} - r = 1 - Math.min(1, c * (1 - k) + k); - g = 1 - Math.min(1, m * (1 - k) + k); - b = 1 - Math.min(1, y * (1 - k) + k); +Glob.prototype._readdirEntries = function (abs, entries, cb) { + if (this.aborted) + return - return [r * 255, g * 255, b * 255]; -}; + // if we haven't asked to stat everything, then just + // assume that everything in there exists, so we can avoid + // having to stat it a second time. + if (!this.mark && !this.stat) { + for (var i = 0; i < entries.length; i ++) { + var e = entries[i] + if (abs === '/') + e = abs + e + else + e = abs + '/' + e + this.cache[e] = true + } + } -convert.xyz.rgb = function (xyz) { - var x = xyz[0] / 100; - var y = xyz[1] / 100; - var z = xyz[2] / 100; - var r; - var g; - var b; + this.cache[abs] = entries + return cb(null, entries) +} - r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986); - g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415); - b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570); +Glob.prototype._readdirError = function (f, er, cb) { + if (this.aborted) + return - // assume sRGB - r = r > 0.0031308 - ? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055) - : r * 12.92; + // handle errors, and cache the information + switch (er.code) { + case 'ENOTSUP': // https://github.com/isaacs/node-glob/issues/205 + case 'ENOTDIR': // totally normal. means it *does* exist. + var abs = this._makeAbs(f) + this.cache[abs] = 'FILE' + if (abs === this.cwdAbs) { + var error = new Error(er.code + ' invalid cwd ' + this.cwd) + error.path = this.cwd + error.code = er.code + this.emit('error', error) + this.abort() + } + break - g = g > 0.0031308 - ? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055) - : g * 12.92; + case 'ENOENT': // not terribly unusual + case 'ELOOP': + case 'ENAMETOOLONG': + case 'UNKNOWN': + this.cache[this._makeAbs(f)] = false + break - b = b > 0.0031308 - ? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055) - : b * 12.92; + default: // some unusual error. Treat as failure. + this.cache[this._makeAbs(f)] = false + if (this.strict) { + this.emit('error', er) + // If the error is handled, then we abort + // if not, we threw out of here + this.abort() + } + if (!this.silent) + console.error('glob error', er) + break + } - r = Math.min(Math.max(0, r), 1); - g = Math.min(Math.max(0, g), 1); - b = Math.min(Math.max(0, b), 1); + return cb() +} - return [r * 255, g * 255, b * 255]; -}; +Glob.prototype._processGlobStar = function (prefix, read, abs, remain, index, inGlobStar, cb) { + var self = this + this._readdir(abs, inGlobStar, function (er, entries) { + self._processGlobStar2(prefix, read, abs, remain, index, inGlobStar, entries, cb) + }) +} -convert.xyz.lab = function (xyz) { - var x = xyz[0]; - var y = xyz[1]; - var z = xyz[2]; - var l; - var a; - var b; - x /= 95.047; - y /= 100; - z /= 108.883; +Glob.prototype._processGlobStar2 = function (prefix, read, abs, remain, index, inGlobStar, entries, cb) { + //console.error('pgs2', prefix, remain[0], entries) - x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116); - y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116); - z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116); + // no entries means not a dir, so it can never have matches + // foo.txt/** doesn't match foo.txt + if (!entries) + return cb() - l = (116 * y) - 16; - a = 500 * (x - y); - b = 200 * (y - z); + // test without the globstar, and with every child both below + // and replacing the globstar. + var remainWithoutGlobStar = remain.slice(1) + var gspref = prefix ? [ prefix ] : [] + var noGlobStar = gspref.concat(remainWithoutGlobStar) - return [l, a, b]; -}; + // the noGlobStar pattern exits the inGlobStar state + this._process(noGlobStar, index, false, cb) -convert.lab.xyz = function (lab) { - var l = lab[0]; - var a = lab[1]; - var b = lab[2]; - var x; - var y; - var z; + var isSym = this.symlinks[abs] + var len = entries.length - y = (l + 16) / 116; - x = a / 500 + y; - z = y - b / 200; + // If it's a symlink, and we're in a globstar, then stop + if (isSym && inGlobStar) + return cb() - var y2 = Math.pow(y, 3); - var x2 = Math.pow(x, 3); - var z2 = Math.pow(z, 3); - y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787; - x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787; - z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787; + for (var i = 0; i < len; i++) { + var e = entries[i] + if (e.charAt(0) === '.' && !this.dot) + continue - x *= 95.047; - y *= 100; - z *= 108.883; + // these two cases enter the inGlobStar state + var instead = gspref.concat(entries[i], remainWithoutGlobStar) + this._process(instead, index, true, cb) - return [x, y, z]; -}; + var below = gspref.concat(entries[i], remain) + this._process(below, index, true, cb) + } -convert.lab.lch = function (lab) { - var l = lab[0]; - var a = lab[1]; - var b = lab[2]; - var hr; - var h; - var c; + cb() +} - hr = Math.atan2(b, a); - h = hr * 360 / 2 / Math.PI; +Glob.prototype._processSimple = function (prefix, index, cb) { + // XXX review this. Shouldn't it be doing the mounting etc + // before doing stat? kinda weird? + var self = this + this._stat(prefix, function (er, exists) { + self._processSimple2(prefix, index, er, exists, cb) + }) +} +Glob.prototype._processSimple2 = function (prefix, index, er, exists, cb) { - if (h < 0) { - h += 360; - } + //console.error('ps2', prefix, exists) - c = Math.sqrt(a * a + b * b); + if (!this.matches[index]) + this.matches[index] = Object.create(null) - return [l, c, h]; -}; + // If it doesn't exist, then just mark the lack of results + if (!exists) + return cb() -convert.lch.lab = function (lch) { - var l = lch[0]; - var c = lch[1]; - var h = lch[2]; - var a; - var b; - var hr; + if (prefix && isAbsolute(prefix) && !this.nomount) { + var trail = /[\/\\]$/.test(prefix) + if (prefix.charAt(0) === '/') { + prefix = path.join(this.root, prefix) + } else { + prefix = path.resolve(this.root, prefix) + if (trail) + prefix += '/' + } + } - hr = h / 360 * 2 * Math.PI; - a = c * Math.cos(hr); - b = c * Math.sin(hr); + if (process.platform === 'win32') + prefix = prefix.replace(/\\/g, '/') - return [l, a, b]; -}; + // Mark this as a match + this._emitMatch(index, prefix) + cb() +} -convert.rgb.ansi16 = function (args) { - var r = args[0]; - var g = args[1]; - var b = args[2]; - var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization +// Returns either 'DIR', 'FILE', or false +Glob.prototype._stat = function (f, cb) { + var abs = this._makeAbs(f) + var needDir = f.slice(-1) === '/' - value = Math.round(value / 50); + if (f.length > this.maxLength) + return cb() - if (value === 0) { - return 30; - } + if (!this.stat && ownProp(this.cache, abs)) { + var c = this.cache[abs] - var ansi = 30 - + ((Math.round(b / 255) << 2) - | (Math.round(g / 255) << 1) - | Math.round(r / 255)); + if (Array.isArray(c)) + c = 'DIR' - if (value === 2) { - ansi += 60; - } + // It exists, but maybe not how we need it + if (!needDir || c === 'DIR') + return cb(null, c) - return ansi; -}; + if (needDir && c === 'FILE') + return cb() -convert.hsv.ansi16 = function (args) { - // optimization here; we already know the value and don't need to get - // it converted for us. - return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]); -}; + // otherwise we have to stat, because maybe c=true + // if we know it exists, but not what it is. + } -convert.rgb.ansi256 = function (args) { - var r = args[0]; - var g = args[1]; - var b = args[2]; + var exists + var stat = this.statCache[abs] + if (stat !== undefined) { + if (stat === false) + return cb(null, stat) + else { + var type = stat.isDirectory() ? 'DIR' : 'FILE' + if (needDir && type === 'FILE') + return cb() + else + return cb(null, type, stat) + } + } - // we use the extended greyscale palette here, with the exception of - // black and white. normal palette only has 4 greyscale shades. - if (r === g && g === b) { - if (r < 8) { - return 16; - } + var self = this + var statcb = inflight('stat\0' + abs, lstatcb_) + if (statcb) + fs.lstat(abs, statcb) - if (r > 248) { - return 231; - } + function lstatcb_ (er, lstat) { + if (lstat && lstat.isSymbolicLink()) { + // If it's a symlink, then treat it as the target, unless + // the target does not exist, then treat it as a file. + return fs.stat(abs, function (er, stat) { + if (er) + self._stat2(f, abs, null, lstat, cb) + else + self._stat2(f, abs, er, stat, cb) + }) + } else { + self._stat2(f, abs, er, lstat, cb) + } + } +} - return Math.round(((r - 8) / 247) * 24) + 232; - } +Glob.prototype._stat2 = function (f, abs, er, stat, cb) { + if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) { + this.statCache[abs] = false + return cb() + } - var ansi = 16 - + (36 * Math.round(r / 255 * 5)) - + (6 * Math.round(g / 255 * 5)) - + Math.round(b / 255 * 5); + var needDir = f.slice(-1) === '/' + this.statCache[abs] = stat - return ansi; -}; + if (abs.slice(-1) === '/' && stat && !stat.isDirectory()) + return cb(null, false, stat) -convert.ansi16.rgb = function (args) { - var color = args % 10; + var c = true + if (stat) + c = stat.isDirectory() ? 'DIR' : 'FILE' + this.cache[abs] = this.cache[abs] || c - // handle greyscale - if (color === 0 || color === 7) { - if (args > 50) { - color += 3.5; - } + if (needDir && c === 'FILE') + return cb() - color = color / 10.5 * 255; + return cb(null, c, stat) +} - return [color, color, color]; - } - var mult = (~~(args > 50) + 1) * 0.5; - var r = ((color & 1) * mult) * 255; - var g = (((color >> 1) & 1) * mult) * 255; - var b = (((color >> 2) & 1) * mult) * 255; +/***/ }), +/* 24 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - return [r, g, b]; -}; +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return observable; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var observable = typeof Symbol === 'function' && Symbol.observable || '@@observable'; +//# sourceMappingURL=observable.js.map -convert.ansi256.rgb = function (args) { - // handle greyscale - if (args >= 232) { - var c = (args - 232) * 10 + 8; - return [c, c, c]; - } - args -= 16; +/***/ }), +/* 25 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - var rem; - var r = Math.floor(args / 36) / 5 * 255; - var g = Math.floor((rem = args % 36) / 6) / 5 * 255; - var b = (rem % 6) / 5 * 255; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = identity; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function identity(x) { + return x; +} +//# sourceMappingURL=identity.js.map - return [r, g, b]; -}; -convert.rgb.hex = function (args) { - var integer = ((Math.round(args[0]) & 0xFF) << 16) - + ((Math.round(args[1]) & 0xFF) << 8) - + (Math.round(args[2]) & 0xFF); +/***/ }), +/* 26 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - var string = integer.toString(16).toUpperCase(); - return '000000'.substring(string.length) + string; -}; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = multicast; +/* unused harmony export MulticastOperator */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__ = __webpack_require__(105); +/** PURE_IMPORTS_START _observable_ConnectableObservable PURE_IMPORTS_END */ -convert.hex.rgb = function (args) { - var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i); - if (!match) { - return [0, 0, 0]; - } +function multicast(subjectOrSubjectFactory, selector) { + return function multicastOperatorFunction(source) { + var subjectFactory; + if (typeof subjectOrSubjectFactory === 'function') { + subjectFactory = subjectOrSubjectFactory; + } + else { + subjectFactory = function subjectFactory() { + return subjectOrSubjectFactory; + }; + } + if (typeof selector === 'function') { + return source.lift(new MulticastOperator(subjectFactory, selector)); + } + var connectable = Object.create(source, __WEBPACK_IMPORTED_MODULE_0__observable_ConnectableObservable__["b" /* connectableObservableDescriptor */]); + connectable.source = source; + connectable.subjectFactory = subjectFactory; + return connectable; + }; +} +var MulticastOperator = /*@__PURE__*/ (function () { + function MulticastOperator(subjectFactory, selector) { + this.subjectFactory = subjectFactory; + this.selector = selector; + } + MulticastOperator.prototype.call = function (subscriber, source) { + var selector = this.selector; + var subject = this.subjectFactory(); + var subscription = selector(subject).subscribe(subscriber); + subscription.add(source.subscribe(subject)); + return subscription; + }; + return MulticastOperator; +}()); - var colorString = match[0]; +//# sourceMappingURL=multicast.js.map - if (match[0].length === 3) { - colorString = colorString.split('').map(function (char) { - return char + char; - }).join(''); - } - var integer = parseInt(colorString, 16); - var r = (integer >> 16) & 0xFF; - var g = (integer >> 8) & 0xFF; - var b = integer & 0xFF; +/***/ }), +/* 27 */ +/***/ (function(module, exports, __webpack_require__) { - return [r, g, b]; -}; +var fs = __webpack_require__(6) +var polyfills = __webpack_require__(149) +var legacy = __webpack_require__(151) +var queue = [] -convert.rgb.hcg = function (rgb) { - var r = rgb[0] / 255; - var g = rgb[1] / 255; - var b = rgb[2] / 255; - var max = Math.max(Math.max(r, g), b); - var min = Math.min(Math.min(r, g), b); - var chroma = (max - min); - var grayscale; - var hue; +var util = __webpack_require__(8) - if (chroma < 1) { - grayscale = min / (1 - chroma); - } else { - grayscale = 0; - } +function noop () {} - if (chroma <= 0) { - hue = 0; - } else - if (max === r) { - hue = ((g - b) / chroma) % 6; - } else - if (max === g) { - hue = 2 + (b - r) / chroma; - } else { - hue = 4 + (r - g) / chroma + 4; - } +var debug = noop +if (util.debuglog) + debug = util.debuglog('gfs4') +else if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) + debug = function() { + var m = util.format.apply(util, arguments) + m = 'GFS4: ' + m.split(/\n/).join('\nGFS4: ') + console.error(m) + } - hue /= 6; - hue %= 1; +if (/\bgfs4\b/i.test(process.env.NODE_DEBUG || '')) { + process.on('exit', function() { + debug(queue) + __webpack_require__(28).equal(queue.length, 0) + }) +} - return [hue * 360, chroma * 100, grayscale * 100]; -}; +module.exports = patch(__webpack_require__(79)) +if (process.env.TEST_GRACEFUL_FS_GLOBAL_PATCH) { + module.exports = patch(fs) +} -convert.hsl.hcg = function (hsl) { - var s = hsl[1] / 100; - var l = hsl[2] / 100; - var c = 1; - var f = 0; +// Always patch fs.close/closeSync, because we want to +// retry() whenever a close happens *anywhere* in the program. +// This is essential when multiple graceful-fs instances are +// in play at the same time. +module.exports.close = +fs.close = (function (fs$close) { return function (fd, cb) { + return fs$close.call(fs, fd, function (err) { + if (!err) + retry() - if (l < 0.5) { - c = 2.0 * s * l; - } else { - c = 2.0 * s * (1.0 - l); - } + if (typeof cb === 'function') + cb.apply(this, arguments) + }) +}})(fs.close) - if (c < 1.0) { - f = (l - 0.5 * c) / (1.0 - c); - } +module.exports.closeSync = +fs.closeSync = (function (fs$closeSync) { return function (fd) { + // Note that graceful-fs also retries when fs.closeSync() fails. + // Looks like a bug to me, although it's probably a harmless one. + var rval = fs$closeSync.apply(fs, arguments) + retry() + return rval +}})(fs.closeSync) - return [hsl[0], c * 100, f * 100]; -}; +function patch (fs) { + // Everything that references the open() function needs to be in here + polyfills(fs) + fs.gracefulify = patch + fs.FileReadStream = ReadStream; // Legacy name. + fs.FileWriteStream = WriteStream; // Legacy name. + fs.createReadStream = createReadStream + fs.createWriteStream = createWriteStream + var fs$readFile = fs.readFile + fs.readFile = readFile + function readFile (path, options, cb) { + if (typeof options === 'function') + cb = options, options = null -convert.hsv.hcg = function (hsv) { - var s = hsv[1] / 100; - var v = hsv[2] / 100; + return go$readFile(path, options, cb) - var c = s * v; - var f = 0; + function go$readFile (path, options, cb) { + return fs$readFile(path, options, function (err) { + if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) + enqueue([go$readFile, [path, options, cb]]) + else { + if (typeof cb === 'function') + cb.apply(this, arguments) + retry() + } + }) + } + } - if (c < 1.0) { - f = (v - c) / (1 - c); - } + var fs$writeFile = fs.writeFile + fs.writeFile = writeFile + function writeFile (path, data, options, cb) { + if (typeof options === 'function') + cb = options, options = null - return [hsv[0], c * 100, f * 100]; -}; + return go$writeFile(path, data, options, cb) -convert.hcg.rgb = function (hcg) { - var h = hcg[0] / 360; - var c = hcg[1] / 100; - var g = hcg[2] / 100; + function go$writeFile (path, data, options, cb) { + return fs$writeFile(path, data, options, function (err) { + if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) + enqueue([go$writeFile, [path, data, options, cb]]) + else { + if (typeof cb === 'function') + cb.apply(this, arguments) + retry() + } + }) + } + } - if (c === 0.0) { - return [g * 255, g * 255, g * 255]; - } + var fs$appendFile = fs.appendFile + if (fs$appendFile) + fs.appendFile = appendFile + function appendFile (path, data, options, cb) { + if (typeof options === 'function') + cb = options, options = null - var pure = [0, 0, 0]; - var hi = (h % 1) * 6; - var v = hi % 1; - var w = 1 - v; - var mg = 0; + return go$appendFile(path, data, options, cb) - switch (Math.floor(hi)) { - case 0: - pure[0] = 1; pure[1] = v; pure[2] = 0; break; - case 1: - pure[0] = w; pure[1] = 1; pure[2] = 0; break; - case 2: - pure[0] = 0; pure[1] = 1; pure[2] = v; break; - case 3: - pure[0] = 0; pure[1] = w; pure[2] = 1; break; - case 4: - pure[0] = v; pure[1] = 0; pure[2] = 1; break; - default: - pure[0] = 1; pure[1] = 0; pure[2] = w; - } + function go$appendFile (path, data, options, cb) { + return fs$appendFile(path, data, options, function (err) { + if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) + enqueue([go$appendFile, [path, data, options, cb]]) + else { + if (typeof cb === 'function') + cb.apply(this, arguments) + retry() + } + }) + } + } - mg = (1.0 - c) * g; + var fs$readdir = fs.readdir + fs.readdir = readdir + function readdir (path, options, cb) { + var args = [path] + if (typeof options !== 'function') { + args.push(options) + } else { + cb = options + } + args.push(go$readdir$cb) - return [ - (c * pure[0] + mg) * 255, - (c * pure[1] + mg) * 255, - (c * pure[2] + mg) * 255 - ]; -}; + return go$readdir(args) -convert.hcg.hsv = function (hcg) { - var c = hcg[1] / 100; - var g = hcg[2] / 100; + function go$readdir$cb (err, files) { + if (files && files.sort) + files.sort() - var v = c + g * (1.0 - c); - var f = 0; + if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) + enqueue([go$readdir, [args]]) + else { + if (typeof cb === 'function') + cb.apply(this, arguments) + retry() + } + } + } - if (v > 0.0) { - f = c / v; - } + function go$readdir (args) { + return fs$readdir.apply(fs, args) + } - return [hcg[0], f * 100, v * 100]; -}; + if (process.version.substr(0, 4) === 'v0.8') { + var legStreams = legacy(fs) + ReadStream = legStreams.ReadStream + WriteStream = legStreams.WriteStream + } -convert.hcg.hsl = function (hcg) { - var c = hcg[1] / 100; - var g = hcg[2] / 100; + var fs$ReadStream = fs.ReadStream + ReadStream.prototype = Object.create(fs$ReadStream.prototype) + ReadStream.prototype.open = ReadStream$open - var l = g * (1.0 - c) + 0.5 * c; - var s = 0; + var fs$WriteStream = fs.WriteStream + WriteStream.prototype = Object.create(fs$WriteStream.prototype) + WriteStream.prototype.open = WriteStream$open - if (l > 0.0 && l < 0.5) { - s = c / (2 * l); - } else - if (l >= 0.5 && l < 1.0) { - s = c / (2 * (1 - l)); - } + fs.ReadStream = ReadStream + fs.WriteStream = WriteStream - return [hcg[0], s * 100, l * 100]; -}; + function ReadStream (path, options) { + if (this instanceof ReadStream) + return fs$ReadStream.apply(this, arguments), this + else + return ReadStream.apply(Object.create(ReadStream.prototype), arguments) + } -convert.hcg.hwb = function (hcg) { - var c = hcg[1] / 100; - var g = hcg[2] / 100; - var v = c + g * (1.0 - c); - return [hcg[0], (v - c) * 100, (1 - v) * 100]; -}; + function ReadStream$open () { + var that = this + open(that.path, that.flags, that.mode, function (err, fd) { + if (err) { + if (that.autoClose) + that.destroy() -convert.hwb.hcg = function (hwb) { - var w = hwb[1] / 100; - var b = hwb[2] / 100; - var v = 1 - b; - var c = v - w; - var g = 0; + that.emit('error', err) + } else { + that.fd = fd + that.emit('open', fd) + that.read() + } + }) + } - if (c < 1) { - g = (v - c) / (1 - c); - } + function WriteStream (path, options) { + if (this instanceof WriteStream) + return fs$WriteStream.apply(this, arguments), this + else + return WriteStream.apply(Object.create(WriteStream.prototype), arguments) + } - return [hwb[0], c * 100, g * 100]; -}; + function WriteStream$open () { + var that = this + open(that.path, that.flags, that.mode, function (err, fd) { + if (err) { + that.destroy() + that.emit('error', err) + } else { + that.fd = fd + that.emit('open', fd) + } + }) + } -convert.apple.rgb = function (apple) { - return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255]; -}; + function createReadStream (path, options) { + return new ReadStream(path, options) + } -convert.rgb.apple = function (rgb) { - return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535]; -}; + function createWriteStream (path, options) { + return new WriteStream(path, options) + } -convert.gray.rgb = function (args) { - return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255]; -}; + var fs$open = fs.open + fs.open = open + function open (path, flags, mode, cb) { + if (typeof mode === 'function') + cb = mode, mode = null -convert.gray.hsl = convert.gray.hsv = function (args) { - return [0, 0, args[0]]; -}; + return go$open(path, flags, mode, cb) -convert.gray.hwb = function (gray) { - return [0, 100, gray[0]]; -}; + function go$open (path, flags, mode, cb) { + return fs$open(path, flags, mode, function (err, fd) { + if (err && (err.code === 'EMFILE' || err.code === 'ENFILE')) + enqueue([go$open, [path, flags, mode, cb]]) + else { + if (typeof cb === 'function') + cb.apply(this, arguments) + retry() + } + }) + } + } -convert.gray.cmyk = function (gray) { - return [0, 0, 0, gray[0]]; -}; + return fs +} -convert.gray.lab = function (gray) { - return [gray[0], 0, 0]; -}; +function enqueue (elem) { + debug('ENQUEUE', elem[0].name, elem[1]) + queue.push(elem) +} -convert.gray.hex = function (gray) { - var val = Math.round(gray[0] / 100 * 255) & 0xFF; - var integer = (val << 16) + (val << 8) + val; +function retry () { + var elem = queue.shift() + if (elem) { + debug('RETRY', elem[0].name, elem[1]) + elem[0].apply(null, elem[1]) + } +} - var string = integer.toString(16).toUpperCase(); - return '000000'.substring(string.length) + string; -}; -convert.rgb.gray = function (rgb) { - var val = (rgb[0] + rgb[1] + rgb[2]) / 3; - return [val / 255 * 100]; -}; +/***/ }), +/* 28 */ +/***/ (function(module, exports) { +module.exports = require("assert"); /***/ }), -/* 80 */ -/***/ (function(module, exports, __webpack_require__) { +/* 29 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; - - -var fs = __webpack_require__(7) - -module.exports = clone(fs) - -function clone (obj) { - if (obj === null || typeof obj !== 'object') - return obj - - if (obj instanceof Object) - var copy = { __proto__: obj.__proto__ } - else - var copy = Object.create(null) - - Object.getOwnPropertyNames(obj).forEach(function (key) { - Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key)) - }) - - return copy +/* harmony export (immutable) */ __webpack_exports__["a"] = isFunction; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function isFunction(x) { + return typeof x === 'function'; } +//# sourceMappingURL=isFunction.js.map /***/ }), -/* 81 */ -/***/ (function(module, exports, __webpack_require__) { +/* 30 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -var path = __webpack_require__(3); -var fs = __webpack_require__(7); -var _0777 = parseInt('0777', 8); +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncAction; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Action__ = __webpack_require__(264); +/** PURE_IMPORTS_START tslib,_Action PURE_IMPORTS_END */ -module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP; -function mkdirP (p, opts, f, made) { - if (typeof opts === 'function') { - f = opts; - opts = {}; - } - else if (!opts || typeof opts !== 'object') { - opts = { mode: opts }; - } - - var mode = opts.mode; - var xfs = opts.fs || fs; - - if (mode === undefined) { - mode = _0777 & (~process.umask()); +var AsyncAction = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncAction, _super); + function AsyncAction(scheduler, work) { + var _this = _super.call(this, scheduler, work) || this; + _this.scheduler = scheduler; + _this.work = work; + _this.pending = false; + return _this; } - if (!made) made = null; - - var cb = f || function () {}; - p = path.resolve(p); - - xfs.mkdir(p, mode, function (er) { - if (!er) { - made = made || p; - return cb(null, made); + AsyncAction.prototype.schedule = function (state, delay) { + if (delay === void 0) { + delay = 0; } - switch (er.code) { - case 'ENOENT': - mkdirP(path.dirname(p), opts, function (er, made) { - if (er) cb(er, made); - else mkdirP(p, opts, cb, made); - }); - break; - - // In the case of any other error, just see if there's a dir - // there already. If so, then hooray! If not, then something - // is borked. - default: - xfs.stat(p, function (er2, stat) { - // if the stat fails, then that's super weird. - // let the original error be the failure reason. - if (er2 || !stat.isDirectory()) cb(er, made) - else cb(null, made); - }); - break; + if (this.closed) { + return this; } - }); -} + this.state = state; + var id = this.id; + var scheduler = this.scheduler; + if (id != null) { + this.id = this.recycleAsyncId(scheduler, id, delay); + } + this.pending = true; + this.delay = delay; + this.id = this.id || this.requestAsyncId(scheduler, this.id, delay); + return this; + }; + AsyncAction.prototype.requestAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + return setInterval(scheduler.flush.bind(scheduler, this), delay); + }; + AsyncAction.prototype.recycleAsyncId = function (scheduler, id, delay) { + if (delay === void 0) { + delay = 0; + } + if (delay !== null && this.delay === delay && this.pending === false) { + return id; + } + return clearInterval(id) && undefined || undefined; + }; + AsyncAction.prototype.execute = function (state, delay) { + if (this.closed) { + return new Error('executing a cancelled action'); + } + this.pending = false; + var error = this._execute(state, delay); + if (error) { + return error; + } + else if (this.pending === false && this.id != null) { + this.id = this.recycleAsyncId(this.scheduler, this.id, null); + } + }; + AsyncAction.prototype._execute = function (state, delay) { + var errored = false; + var errorValue = undefined; + try { + this.work(state); + } + catch (e) { + errored = true; + errorValue = !!e && e || new Error(e); + } + if (errored) { + this.unsubscribe(); + return errorValue; + } + }; + AsyncAction.prototype._unsubscribe = function () { + var id = this.id; + var scheduler = this.scheduler; + var actions = scheduler.actions; + var index = actions.indexOf(this); + this.work = null; + this.state = null; + this.pending = false; + this.scheduler = null; + if (index !== -1) { + actions.splice(index, 1); + } + if (id != null) { + this.id = this.recycleAsyncId(scheduler, id, null); + } + this.delay = null; + }; + return AsyncAction; +}(__WEBPACK_IMPORTED_MODULE_1__Action__["a" /* Action */])); -mkdirP.sync = function sync (p, opts, made) { - if (!opts || typeof opts !== 'object') { - opts = { mode: opts }; - } - - var mode = opts.mode; - var xfs = opts.fs || fs; - - if (mode === undefined) { - mode = _0777 & (~process.umask()); - } - if (!made) made = null; +//# sourceMappingURL=AsyncAction.js.map - p = path.resolve(p); - try { - xfs.mkdirSync(p, mode); - made = made || p; - } - catch (err0) { - switch (err0.code) { - case 'ENOENT' : - made = sync(path.dirname(p), opts, made); - sync(p, opts, made); - break; +/***/ }), +/* 31 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - // In the case of any other error, just see if there's a dir - // there already. If so, then hooray! If not, then something - // is borked. - default: - var stat; - try { - stat = xfs.statSync(p); - } - catch (err1) { - throw err0; - } - if (!stat.isDirectory()) throw err0; +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncScheduler; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Scheduler__ = __webpack_require__(110); +/** PURE_IMPORTS_START tslib,_Scheduler PURE_IMPORTS_END */ + + +var AsyncScheduler = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncScheduler, _super); + function AsyncScheduler(SchedulerAction, now) { + if (now === void 0) { + now = __WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */].now; + } + var _this = _super.call(this, SchedulerAction, function () { + if (AsyncScheduler.delegate && AsyncScheduler.delegate !== _this) { + return AsyncScheduler.delegate.now(); + } + else { + return now(); + } + }) || this; + _this.actions = []; + _this.active = false; + _this.scheduled = undefined; + return _this; + } + AsyncScheduler.prototype.schedule = function (work, delay, state) { + if (delay === void 0) { + delay = 0; + } + if (AsyncScheduler.delegate && AsyncScheduler.delegate !== this) { + return AsyncScheduler.delegate.schedule(work, delay, state); + } + else { + return _super.prototype.schedule.call(this, work, delay, state); + } + }; + AsyncScheduler.prototype.flush = function (action) { + var actions = this.actions; + if (this.active) { + actions.push(action); + return; + } + var error; + this.active = true; + do { + if (error = action.execute(action.state, action.delay)) { break; + } + } while (action = actions.shift()); + this.active = false; + if (error) { + while (action = actions.shift()) { + action.unsubscribe(); + } + throw error; } - } + }; + return AsyncScheduler; +}(__WEBPACK_IMPORTED_MODULE_1__Scheduler__["a" /* Scheduler */])); - return made; -}; +//# sourceMappingURL=AsyncScheduler.js.map /***/ }), -/* 82 */ -/***/ (function(module, exports, __webpack_require__) { - -module.exports = realpath -realpath.realpath = realpath -realpath.sync = realpathSync -realpath.realpathSync = realpathSync -realpath.monkeypatch = monkeypatch -realpath.unmonkeypatch = unmonkeypatch +/* 32 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -var fs = __webpack_require__(7) -var origRealpath = fs.realpath -var origRealpathSync = fs.realpathSync +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ArgumentOutOfRangeError; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ -var version = process.version -var ok = /^v[0-5]\./.test(version) -var old = __webpack_require__(273) +var ArgumentOutOfRangeError = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ArgumentOutOfRangeError, _super); + function ArgumentOutOfRangeError() { + var _this = _super.call(this, 'argument out of range') || this; + _this.name = 'ArgumentOutOfRangeError'; + Object.setPrototypeOf(_this, ArgumentOutOfRangeError.prototype); + return _this; + } + return ArgumentOutOfRangeError; +}(Error)); -function newError (er) { - return er && er.syscall === 'realpath' && ( - er.code === 'ELOOP' || - er.code === 'ENOMEM' || - er.code === 'ENAMETOOLONG' - ) -} +//# sourceMappingURL=ArgumentOutOfRangeError.js.map -function realpath (p, cache, cb) { - if (ok) { - return origRealpath(p, cache, cb) - } - if (typeof cache === 'function') { - cb = cache - cache = null - } - origRealpath(p, cache, function (er, result) { - if (newError(er)) { - old.realpath(p, cache, cb) - } else { - cb(er, result) - } - }) -} +/***/ }), +/* 33 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function realpathSync (p, cache) { - if (ok) { - return origRealpathSync(p, cache) - } +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return EmptyError; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ - try { - return origRealpathSync(p, cache) - } catch (er) { - if (newError(er)) { - return old.realpathSync(p, cache) - } else { - throw er +var EmptyError = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](EmptyError, _super); + function EmptyError() { + var _this = _super.call(this, 'no elements in sequence') || this; + _this.name = 'EmptyError'; + Object.setPrototypeOf(_this, EmptyError.prototype); + return _this; } - } -} - -function monkeypatch () { - fs.realpath = realpath - fs.realpathSync = realpathSync -} + return EmptyError; +}(Error)); -function unmonkeypatch () { - fs.realpath = origRealpath - fs.realpathSync = origRealpathSync -} +//# sourceMappingURL=EmptyError.js.map /***/ }), -/* 83 */ -/***/ (function(module, exports, __webpack_require__) { +/* 34 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -try { - var util = __webpack_require__(10); - if (typeof util.inherits !== 'function') throw ''; - module.exports = util.inherits; -} catch (e) { - module.exports = __webpack_require__(277); +"use strict"; +/* unused harmony export getSymbolIterator */ +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return iterator; }); +/* unused harmony export $$iterator */ +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function getSymbolIterator() { + if (typeof Symbol !== 'function' || !Symbol.iterator) { + return '@@iterator'; + } + return Symbol.iterator; } +var iterator = /*@__PURE__*/ getSymbolIterator(); +var $$iterator = iterator; +//# sourceMappingURL=iterator.js.map /***/ }), -/* 84 */ -/***/ (function(module, exports, __webpack_require__) { - -exports.alphasort = alphasort -exports.alphasorti = alphasorti -exports.setopts = setopts -exports.ownProp = ownProp -exports.makeAbs = makeAbs -exports.finish = finish -exports.mark = mark -exports.isIgnored = isIgnored -exports.childrenIgnored = childrenIgnored - -function ownProp (obj, field) { - return Object.prototype.hasOwnProperty.call(obj, field) -} - -var path = __webpack_require__(3) -var minimatch = __webpack_require__(58) -var isAbsolute = __webpack_require__(59) -var Minimatch = minimatch.Minimatch - -function alphasorti (a, b) { - return a.toLowerCase().localeCompare(b.toLowerCase()) -} +/* 35 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function alphasort (a, b) { - return a.localeCompare(b) -} +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = mergeMap; +/* unused harmony export MergeMapOperator */ +/* unused harmony export MergeMapSubscriber */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__observable_from__ = __webpack_require__(18); +/** PURE_IMPORTS_START tslib,_util_subscribeToResult,_OuterSubscriber,_map,_observable_from PURE_IMPORTS_END */ -function setupIgnores (self, options) { - self.ignore = options.ignore || [] - if (!Array.isArray(self.ignore)) - self.ignore = [self.ignore] - if (self.ignore.length) { - self.ignore = self.ignore.map(ignoreMap) - } -} -// ignore patterns are always in dot:true mode. -function ignoreMap (pattern) { - var gmatcher = null - if (pattern.slice(-3) === '/**') { - var gpattern = pattern.replace(/(\/\*\*)+$/, '') - gmatcher = new Minimatch(gpattern, { dot: true }) - } - return { - matcher: new Minimatch(pattern, { dot: true }), - gmatcher: gmatcher - } +function mergeMap(project, resultSelector, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + if (typeof resultSelector === 'function') { + return function (source) { return source.pipe(mergeMap(function (a, i) { return Object(__WEBPACK_IMPORTED_MODULE_4__observable_from__["a" /* from */])(project(a, i)).pipe(Object(__WEBPACK_IMPORTED_MODULE_3__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); }, concurrent)); }; + } + else if (typeof resultSelector === 'number') { + concurrent = resultSelector; + } + return function (source) { return source.lift(new MergeMapOperator(project, concurrent)); }; } - -function setopts (self, pattern, options) { - if (!options) - options = {} - - // base-matching: just use globstar for that. - if (options.matchBase && -1 === pattern.indexOf("/")) { - if (options.noglobstar) { - throw new Error("base matching requires globstar") +var MergeMapOperator = /*@__PURE__*/ (function () { + function MergeMapOperator(project, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + this.project = project; + this.concurrent = concurrent; } - pattern = "**/" + pattern - } - - self.silent = !!options.silent - self.pattern = pattern - self.strict = options.strict !== false - self.realpath = !!options.realpath - self.realpathCache = options.realpathCache || Object.create(null) - self.follow = !!options.follow - self.dot = !!options.dot - self.mark = !!options.mark - self.nodir = !!options.nodir - if (self.nodir) - self.mark = true - self.sync = !!options.sync - self.nounique = !!options.nounique - self.nonull = !!options.nonull - self.nosort = !!options.nosort - self.nocase = !!options.nocase - self.stat = !!options.stat - self.noprocess = !!options.noprocess - self.absolute = !!options.absolute - - self.maxLength = options.maxLength || Infinity - self.cache = options.cache || Object.create(null) - self.statCache = options.statCache || Object.create(null) - self.symlinks = options.symlinks || Object.create(null) - - setupIgnores(self, options) + MergeMapOperator.prototype.call = function (observer, source) { + return source.subscribe(new MergeMapSubscriber(observer, this.project, this.concurrent)); + }; + return MergeMapOperator; +}()); - self.changedCwd = false - var cwd = process.cwd() - if (!ownProp(options, "cwd")) - self.cwd = cwd - else { - self.cwd = path.resolve(options.cwd) - self.changedCwd = self.cwd !== cwd - } +var MergeMapSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](MergeMapSubscriber, _super); + function MergeMapSubscriber(destination, project, concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + var _this = _super.call(this, destination) || this; + _this.project = project; + _this.concurrent = concurrent; + _this.hasCompleted = false; + _this.buffer = []; + _this.active = 0; + _this.index = 0; + return _this; + } + MergeMapSubscriber.prototype._next = function (value) { + if (this.active < this.concurrent) { + this._tryNext(value); + } + else { + this.buffer.push(value); + } + }; + MergeMapSubscriber.prototype._tryNext = function (value) { + var result; + var index = this.index++; + try { + result = this.project(value, index); + } + catch (err) { + this.destination.error(err); + return; + } + this.active++; + this._innerSub(result, value, index); + }; + MergeMapSubscriber.prototype._innerSub = function (ish, value, index) { + this.add(Object(__WEBPACK_IMPORTED_MODULE_1__util_subscribeToResult__["a" /* subscribeToResult */])(this, ish, value, index)); + }; + MergeMapSubscriber.prototype._complete = function () { + this.hasCompleted = true; + if (this.active === 0 && this.buffer.length === 0) { + this.destination.complete(); + } + }; + MergeMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); + }; + MergeMapSubscriber.prototype.notifyComplete = function (innerSub) { + var buffer = this.buffer; + this.remove(innerSub); + this.active--; + if (buffer.length > 0) { + this._next(buffer.shift()); + } + else if (this.active === 0 && this.hasCompleted) { + this.destination.complete(); + } + }; + return MergeMapSubscriber; +}(__WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__["a" /* OuterSubscriber */])); - self.root = options.root || path.resolve(self.cwd, "/") - self.root = path.resolve(self.root) - if (process.platform === "win32") - self.root = self.root.replace(/\\/g, "/") +//# sourceMappingURL=mergeMap.js.map - // TODO: is an absolute `cwd` supposed to be resolved against `root`? - // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test') - self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd) - if (process.platform === "win32") - self.cwdAbs = self.cwdAbs.replace(/\\/g, "/") - self.nomount = !!options.nomount - // disable comments and negation in Minimatch. - // Note that they are not supported in Glob itself anyway. - options.nonegate = true - options.nocomment = true +/***/ }), +/* 36 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { - self.minimatch = new Minimatch(pattern, options) - self.options = self.minimatch.options -} +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = defaultIfEmpty; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -function finish (self) { - var nou = self.nounique - var all = nou ? [] : Object.create(null) - for (var i = 0, l = self.matches.length; i < l; i ++) { - var matches = self.matches[i] - if (!matches || Object.keys(matches).length === 0) { - if (self.nonull) { - // do like the shell, and spit out the literal glob - var literal = self.minimatch.globSet[i] - if (nou) - all.push(literal) - else - all[literal] = true - } - } else { - // had matches - var m = Object.keys(matches) - if (nou) - all.push.apply(all, m) - else - m.forEach(function (m) { - all[m] = true - }) +function defaultIfEmpty(defaultValue) { + if (defaultValue === void 0) { + defaultValue = null; } - } - - if (!nou) - all = Object.keys(all) - - if (!self.nosort) - all = all.sort(self.nocase ? alphasorti : alphasort) - - // at *some* point we statted all of these - if (self.mark) { - for (var i = 0; i < all.length; i++) { - all[i] = self._mark(all[i]) + return function (source) { return source.lift(new DefaultIfEmptyOperator(defaultValue)); }; +} +var DefaultIfEmptyOperator = /*@__PURE__*/ (function () { + function DefaultIfEmptyOperator(defaultValue) { + this.defaultValue = defaultValue; } - if (self.nodir) { - all = all.filter(function (e) { - var notDir = !(/\/$/.test(e)) - var c = self.cache[e] || self.cache[makeAbs(self, e)] - if (notDir && c) - notDir = c !== 'DIR' && !Array.isArray(c) - return notDir - }) + DefaultIfEmptyOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new DefaultIfEmptySubscriber(subscriber, this.defaultValue)); + }; + return DefaultIfEmptyOperator; +}()); +var DefaultIfEmptySubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](DefaultIfEmptySubscriber, _super); + function DefaultIfEmptySubscriber(destination, defaultValue) { + var _this = _super.call(this, destination) || this; + _this.defaultValue = defaultValue; + _this.isEmpty = true; + return _this; } - } - - if (self.ignore.length) - all = all.filter(function(m) { - return !isIgnored(self, m) - }) - - self.found = all -} - -function mark (self, p) { - var abs = makeAbs(self, p) - var c = self.cache[abs] - var m = p - if (c) { - var isDir = c === 'DIR' || Array.isArray(c) - var slash = p.slice(-1) === '/' - - if (isDir && !slash) - m += '/' - else if (!isDir && slash) - m = m.slice(0, -1) + DefaultIfEmptySubscriber.prototype._next = function (value) { + this.isEmpty = false; + this.destination.next(value); + }; + DefaultIfEmptySubscriber.prototype._complete = function () { + if (this.isEmpty) { + this.destination.next(this.defaultValue); + } + this.destination.complete(); + }; + return DefaultIfEmptySubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=defaultIfEmpty.js.map - if (m !== p) { - var mabs = makeAbs(self, m) - self.statCache[mabs] = self.statCache[abs] - self.cache[mabs] = self.cache[abs] - } - } - return m -} +/***/ }), +/* 37 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -// lotta situps... -function makeAbs (self, f) { - var abs = f - if (f.charAt(0) === '/') { - abs = path.join(self.root, f) - } else if (isAbsolute(f) || f === '') { - abs = f - } else if (self.changedCwd) { - abs = path.resolve(self.cwd, f) - } else { - abs = path.resolve(f) - } +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = filter; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ - if (process.platform === 'win32') - abs = abs.replace(/\\/g, '/') - return abs +function filter(predicate, thisArg) { + return function filterOperatorFunction(source) { + return source.lift(new FilterOperator(predicate, thisArg)); + }; } +var FilterOperator = /*@__PURE__*/ (function () { + function FilterOperator(predicate, thisArg) { + this.predicate = predicate; + this.thisArg = thisArg; + } + FilterOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new FilterSubscriber(subscriber, this.predicate, this.thisArg)); + }; + return FilterOperator; +}()); +var FilterSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](FilterSubscriber, _super); + function FilterSubscriber(destination, predicate, thisArg) { + var _this = _super.call(this, destination) || this; + _this.predicate = predicate; + _this.thisArg = thisArg; + _this.count = 0; + return _this; + } + FilterSubscriber.prototype._next = function (value) { + var result; + try { + result = this.predicate.call(this.thisArg, value, this.count++); + } + catch (err) { + this.destination.error(err); + return; + } + if (result) { + this.destination.next(value); + } + }; + return FilterSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=filter.js.map -// Return true, if pattern ends with globstar '**', for the accompanying parent directory. -// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents -function isIgnored (self, path) { - if (!self.ignore.length) - return false - - return self.ignore.some(function(item) { - return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path)) - }) -} - -function childrenIgnored (self, path) { - if (!self.ignore.length) - return false +/***/ }), +/* 38 */ +/***/ (function(module, exports) { - return self.ignore.some(function(item) { - return !!(item.gmatcher && item.gmatcher.match(path)) - }) -} +module.exports = function(module) { + if(!module.webpackPolyfill) { + module.deprecate = function() {}; + module.paths = []; + // module.parent = undefined by default + if(!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + module.webpackPolyfill = 1; + } + return module; +}; /***/ }), -/* 85 */ -/***/ (function(module, exports) { - -// Returns a wrapper function that returns a wrapped callback -// The wrapper function should do some stuff, and return a -// presumably different callback function. -// This makes sure that own properties are retained, so that -// decorations and such are not lost along the way. -module.exports = wrappy -function wrappy (fn, cb) { - if (fn && cb) return wrappy(fn)(cb) +/* 39 */ +/***/ (function(module, exports, __webpack_require__) { - if (typeof fn !== 'function') - throw new TypeError('need wrapper function') +"use strict"; - Object.keys(fn).forEach(function (k) { - wrapper[k] = fn[k] - }) - return wrapper +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.createSymlink = exports.isFile = exports.isDirectory = exports.mkdirp = exports.readFile = exports.chmod = exports.copyDirectory = exports.unlink = undefined; - function wrapper() { - var args = new Array(arguments.length) - for (var i = 0; i < args.length; i++) { - args[i] = arguments[i] - } - var ret = fn.apply(this, args) - var cb = args[args.length-1] - if (typeof ret === 'function' && ret !== cb) { - Object.keys(cb).forEach(function (k) { - ret[k] = cb[k] - }) - } - return ret - } -} +let statTest = (() => { + var _ref = _asyncToGenerator(function* (path, block) { + try { + return block((yield stat(path))); + } catch (e) { + if (e.code === 'ENOENT') { + return false; + } + throw e; + } + }); + return function statTest(_x, _x2) { + return _ref.apply(this, arguments); + }; +})(); +/** + * Test if a path points to a directory. + * @param path + */ -/***/ }), -/* 86 */ -/***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(85) -module.exports = wrappy(once) -module.exports.strict = wrappy(onceStrict) +let isDirectory = exports.isDirectory = (() => { + var _ref2 = _asyncToGenerator(function* (path) { + return yield statTest(path, function (stats) { + return stats.isDirectory(); + }); + }); -once.proto = once(function () { - Object.defineProperty(Function.prototype, 'once', { - value: function () { - return once(this) - }, - configurable: true - }) + return function isDirectory(_x3) { + return _ref2.apply(this, arguments); + }; +})(); +/** + * Test if a path points to a regular file. + * @param path + */ - Object.defineProperty(Function.prototype, 'onceStrict', { - value: function () { - return onceStrict(this) - }, - configurable: true - }) -}) -function once (fn) { - var f = function () { - if (f.called) return f.value - f.called = true - return f.value = fn.apply(this, arguments) - } - f.called = false - return f -} +let isFile = exports.isFile = (() => { + var _ref3 = _asyncToGenerator(function* (path) { + return yield statTest(path, function (stats) { + return stats.isFile(); + }); + }); -function onceStrict (fn) { - var f = function () { - if (f.called) - throw new Error(f.onceError) - f.called = true - return f.value = fn.apply(this, arguments) - } - var name = fn.name || 'Function wrapped with `once`' - f.onceError = name + " shouldn't be called more than once" - f.called = false - return f -} + return function isFile(_x4) { + return _ref3.apply(this, arguments); + }; +})(); +/** + * Create a symlink at dest that points to src. Adapted from + * https://github.com/lerna/lerna/blob/2f1b87d9e2295f587e4ac74269f714271d8ed428/src/FileSystemUtilities.js#L103. + * + * @param src + * @param dest + * @param type 'dir', 'file', 'junction', or 'exec'. 'exec' on + * windows will use the `cmd-shim` module since symlinks can't be used + * for executable files on windows. + */ -/***/ }), -/* 87 */ -/***/ (function(module, exports, __webpack_require__) { +let createSymlink = exports.createSymlink = (() => { + var _ref4 = _asyncToGenerator(function* (src, dest, type) { + if (process.platform === 'win32') { + if (type === 'exec') { + yield cmdShim(src, dest); + } else { + yield forceCreate(src, dest, type); + } + } else { + const posixType = type === 'exec' ? 'file' : type; + const relativeSource = (0, _path.relative)((0, _path.dirname)(dest), src); + yield forceCreate(relativeSource, dest, posixType); + } + }); -"use strict"; + return function createSymlink(_x5, _x6, _x7) { + return _ref4.apply(this, arguments); + }; +})(); +let forceCreate = (() => { + var _ref5 = _asyncToGenerator(function* (src, dest, type) { + try { + // If something exists at `dest` we need to remove it first. + yield unlink(dest); + } catch (error) { + if (error.code !== 'ENOENT') { + throw error; + } + } + yield symlink(src, dest, type); + }); -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.Project = undefined; + return function forceCreate(_x8, _x9, _x10) { + return _ref5.apply(this, arguments); + }; +})(); -var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; +var _cmdShim = __webpack_require__(148); -var _chalk = __webpack_require__(18); +var _cmdShim2 = _interopRequireDefault(_cmdShim); -var _chalk2 = _interopRequireDefault(_chalk); +var _fs = __webpack_require__(6); -var _path = __webpack_require__(3); +var _fs2 = _interopRequireDefault(_fs); -var _util = __webpack_require__(10); +var _mkdirp = __webpack_require__(80); -var _errors = __webpack_require__(60); +var _mkdirp2 = _interopRequireDefault(_mkdirp); -var _log = __webpack_require__(20); +var _ncp = __webpack_require__(152); -var _package_json = __webpack_require__(42); +var _path = __webpack_require__(2); -var _scripts = __webpack_require__(310); +var _util = __webpack_require__(8); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -12419,12818 +3531,5606 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a */ -class Project { - static fromPath(path) { - return _asyncToGenerator(function* () { - const pkgJson = yield (0, _package_json.readPackageJson)(path); - return new Project(pkgJson, path); - })(); - } - constructor(packageJson, projectPath) { - this.json = Object.freeze(packageJson); - this.path = projectPath; - this.packageJsonLocation = (0, _path.resolve)(this.path, 'package.json'); - this.nodeModulesLocation = (0, _path.resolve)(this.path, 'node_modules'); - this.optimizeLocation = (0, _path.resolve)(this.path, 'optimize'); - this.targetLocation = (0, _path.resolve)(this.path, 'target'); - this.productionDependencies = this.json.dependencies || {}; - this.devDependencies = this.json.devDependencies || {}; - this.allDependencies = _extends({}, this.devDependencies, this.productionDependencies); - this.scripts = this.json.scripts || {}; - } - get name() { - return this.json.name; - } - ensureValidProjectDependency(project) { - const relativePathToProject = normalizePath((0, _path.relative)(this.path, project.path)); - const versionInPackageJson = this.allDependencies[project.name]; - const expectedVersionInPackageJson = `link:${relativePathToProject}`; - if (versionInPackageJson === expectedVersionInPackageJson) { - return; +const stat = (0, _util.promisify)(_fs2.default.stat); +const readFile = (0, _util.promisify)(_fs2.default.readFile); +const symlink = (0, _util.promisify)(_fs2.default.symlink); +const chmod = (0, _util.promisify)(_fs2.default.chmod); +const cmdShim = (0, _util.promisify)(_cmdShim2.default); +const mkdirp = (0, _util.promisify)(_mkdirp2.default); +const unlink = exports.unlink = (0, _util.promisify)(_fs2.default.unlink); +const copyDirectory = exports.copyDirectory = (0, _util.promisify)(_ncp.ncp); +exports.chmod = chmod; +exports.readFile = readFile; +exports.mkdirp = mkdirp; + +/***/ }), +/* 40 */ +/***/ (function(module, exports) { + +module.exports = require("events"); + +/***/ }), +/* 41 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.isLinkDependency = undefined; +exports.readPackageJson = readPackageJson; +exports.writePackageJson = writePackageJson; + +var _readPkg = __webpack_require__(160); + +var _readPkg2 = _interopRequireDefault(_readPkg); + +var _writePkg = __webpack_require__(185); + +var _writePkg2 = _interopRequireDefault(_writePkg); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +function readPackageJson(dir) { + return (0, _readPkg2.default)(dir, { normalize: false }); +} +function writePackageJson(path, json) { + return (0, _writePkg2.default)(path, json); +} +const isLinkDependency = exports.isLinkDependency = depVersion => depVersion.startsWith('link:'); + +/***/ }), +/* 42 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return config; }); +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var _enable_super_gross_mode_that_will_cause_bad_things = false; +var config = { + Promise: undefined, + set useDeprecatedSynchronousErrorHandling(value) { + if (value) { + var error = /*@__PURE__*/ new Error(); + /*@__PURE__*/ console.warn('DEPRECATED! RxJS was set to use deprecated synchronous error handling behavior by code at: \n' + error.stack); } - const updateMsg = 'Update its package.json to the expected value below.'; - const meta = { - actual: `"${project.name}": "${versionInPackageJson}"`, - expected: `"${project.name}": "${expectedVersionInPackageJson}"`, - package: `${this.name} (${this.packageJsonLocation})` - }; - if ((0, _package_json.isLinkDependency)(versionInPackageJson)) { - throw new _errors.CliError(`[${this.name}] depends on [${project.name}] using 'link:', but the path is wrong. ${updateMsg}`, meta); + else if (_enable_super_gross_mode_that_will_cause_bad_things) { + /*@__PURE__*/ console.log('RxJS: Back to a better error behavior. Thank you. <3'); } - throw new _errors.CliError(`[${this.name}] depends on [${project.name}], but it's not using the local package. ${updateMsg}`, meta); - } - getBuildConfig() { - return this.json.kibana && this.json.kibana.build || {}; - } - /** - * Returns the directory that should be copied into the Kibana build artifact. - * This config can be specified to only include the project's build artifacts - * instead of everything located in the project directory. - */ - getIntermediateBuildDirectory() { - return (0, _path.resolve)(this.path, this.getBuildConfig().intermediateBuildDirectory || '.'); + _enable_super_gross_mode_that_will_cause_bad_things = value; + }, + get useDeprecatedSynchronousErrorHandling() { + return _enable_super_gross_mode_that_will_cause_bad_things; + }, +}; +//# sourceMappingURL=config.js.map + + +/***/ }), +/* 43 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = noop; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function noop() { } +//# sourceMappingURL=noop.js.map + + +/***/ }), +/* 44 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObjectUnsubscribedError; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ + +var ObjectUnsubscribedError = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ObjectUnsubscribedError, _super); + function ObjectUnsubscribedError() { + var _this = _super.call(this, 'object unsubscribed') || this; + _this.name = 'ObjectUnsubscribedError'; + Object.setPrototypeOf(_this, ObjectUnsubscribedError.prototype); + return _this; } - hasScript(name) { - return name in this.scripts; + return ObjectUnsubscribedError; +}(Error)); + +//# sourceMappingURL=ObjectUnsubscribedError.js.map + + +/***/ }), +/* 45 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Notification; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_empty__ = __webpack_require__(11); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_of__ = __webpack_require__(66); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_throwError__ = __webpack_require__(68); +/** PURE_IMPORTS_START _observable_empty,_observable_of,_observable_throwError PURE_IMPORTS_END */ + + + +var Notification = /*@__PURE__*/ (function () { + function Notification(kind, value, error) { + this.kind = kind; + this.value = value; + this.error = error; + this.hasValue = kind === 'N'; } - getExecutables() { - const raw = this.json.bin; - if (!raw) { - return {}; + Notification.prototype.observe = function (observer) { + switch (this.kind) { + case 'N': + return observer.next && observer.next(this.value); + case 'E': + return observer.error && observer.error(this.error); + case 'C': + return observer.complete && observer.complete(); } - if (typeof raw === 'string') { - return { - [this.name]: (0, _path.resolve)(this.path, raw) - }; + }; + Notification.prototype.do = function (next, error, complete) { + var kind = this.kind; + switch (kind) { + case 'N': + return next && next(this.value); + case 'E': + return error && error(this.error); + case 'C': + return complete && complete(); } - if (typeof raw === 'object') { - const binsConfig = {}; - for (const binName of Object.keys(raw)) { - binsConfig[binName] = (0, _path.resolve)(this.path, raw[binName]); - } - return binsConfig; + }; + Notification.prototype.accept = function (nextOrObserver, error, complete) { + if (nextOrObserver && typeof nextOrObserver.next === 'function') { + return this.observe(nextOrObserver); } - throw new _errors.CliError(`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, { - binConfig: (0, _util.inspect)(raw), - package: `${this.name} (${this.packageJsonLocation})` - }); - } - runScript(scriptName, args = []) { - var _this = this; + else { + return this.do(nextOrObserver, error, complete); + } + }; + Notification.prototype.toObservable = function () { + var kind = this.kind; + switch (kind) { + case 'N': + return Object(__WEBPACK_IMPORTED_MODULE_1__observable_of__["a" /* of */])(this.value); + case 'E': + return Object(__WEBPACK_IMPORTED_MODULE_2__observable_throwError__["a" /* throwError */])(this.error); + case 'C': + return Object(__WEBPACK_IMPORTED_MODULE_0__observable_empty__["b" /* empty */])(); + } + throw new Error('unexpected notification kind value'); + }; + Notification.createNext = function (value) { + if (typeof value !== 'undefined') { + return new Notification('N', value); + } + return Notification.undefinedValueNotification; + }; + Notification.createError = function (err) { + return new Notification('E', undefined, err); + }; + Notification.createComplete = function () { + return Notification.completeNotification; + }; + Notification.completeNotification = new Notification('C'); + Notification.undefinedValueNotification = new Notification('N', undefined); + return Notification; +}()); - return _asyncToGenerator(function* () { - _log.log.write(_chalk2.default.bold(`\n\nRunning script [${_chalk2.default.green(scriptName)}] in [${_chalk2.default.green(_this.name)}]:\n`)); - return (0, _scripts.runScriptInPackage)(scriptName, args, _this); - })(); - } - runScriptStreaming(scriptName, args = []) { - return (0, _scripts.runScriptInPackageStreaming)(scriptName, args, this); - } - hasDependencies() { - return Object.keys(this.allDependencies).length > 0; +//# sourceMappingURL=Notification.js.map + + +/***/ }), +/* 46 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsyncSubject; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(7); +/** PURE_IMPORTS_START tslib,_Subject,_Subscription PURE_IMPORTS_END */ + + + +var AsyncSubject = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](AsyncSubject, _super); + function AsyncSubject() { + var _this = _super !== null && _super.apply(this, arguments) || this; + _this.value = null; + _this.hasNext = false; + _this.hasCompleted = false; + return _this; } - installDependencies({ extraArgs }) { - var _this2 = this; + AsyncSubject.prototype._subscribe = function (subscriber) { + if (this.hasError) { + subscriber.error(this.thrownError); + return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY; + } + else if (this.hasCompleted && this.hasNext) { + subscriber.next(this.value); + subscriber.complete(); + return __WEBPACK_IMPORTED_MODULE_2__Subscription__["a" /* Subscription */].EMPTY; + } + return _super.prototype._subscribe.call(this, subscriber); + }; + AsyncSubject.prototype.next = function (value) { + if (!this.hasCompleted) { + this.value = value; + this.hasNext = true; + } + }; + AsyncSubject.prototype.error = function (error) { + if (!this.hasCompleted) { + _super.prototype.error.call(this, error); + } + }; + AsyncSubject.prototype.complete = function () { + this.hasCompleted = true; + if (this.hasNext) { + _super.prototype.next.call(this, this.value); + } + _super.prototype.complete.call(this); + }; + return AsyncSubject; +}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */])); - return _asyncToGenerator(function* () { - _log.log.write(_chalk2.default.bold(`\n\nInstalling dependencies in [${_chalk2.default.green(_this2.name)}]:\n`)); - return (0, _scripts.installInDir)(_this2.path, extraArgs); - })(); - } -} -exports.Project = Project; // We normalize all path separators to `/` in generated files +//# sourceMappingURL=AsyncSubject.js.map -function normalizePath(path) { - return path.replace(/[\\\/]+/g, '/'); -} /***/ }), -/* 88 */ -/***/ (function(module, exports, __webpack_require__) { +/* 47 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -module.exports = normalize +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = concat; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__of__ = __webpack_require__(66); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__from__ = __webpack_require__(18); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_concatAll__ = __webpack_require__(121); +/** PURE_IMPORTS_START _util_isScheduler,_of,_from,_operators_concatAll PURE_IMPORTS_END */ -var fixer = __webpack_require__(288) -normalize.fixer = fixer -var makeWarning = __webpack_require__(301) -var fieldsToFix = ['name','version','description','repository','modules','scripts' - ,'files','bin','man','bugs','keywords','readme','homepage','license'] -var otherThingsToFix = ['dependencies','people', 'typos'] -var thingsToFix = fieldsToFix.map(function(fieldName) { - return ucFirst(fieldName) + "Field" -}) -// two ways to do this in CoffeeScript on only one line, sub-70 chars: -// thingsToFix = fieldsToFix.map (name) -> ucFirst(name) + "Field" -// thingsToFix = (ucFirst(name) + "Field" for name in fieldsToFix) -thingsToFix = thingsToFix.concat(otherThingsToFix) +function concat() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; + } + if (observables.length === 1 || (observables.length === 2 && Object(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(observables[1]))) { + return Object(__WEBPACK_IMPORTED_MODULE_2__from__["a" /* from */])(observables[0]); + } + return Object(__WEBPACK_IMPORTED_MODULE_3__operators_concatAll__["a" /* concatAll */])()(__WEBPACK_IMPORTED_MODULE_1__of__["a" /* of */].apply(void 0, observables)); +} +//# sourceMappingURL=concat.js.map -function normalize (data, warn, strict) { - if(warn === true) warn = null, strict = true - if(!strict) strict = false - if(!warn || data.private) warn = function(msg) { /* noop */ } - if (data.scripts && - data.scripts.install === "node-gyp rebuild" && - !data.scripts.preinstall) { - data.gypfile = true - } - fixer.warn = function() { warn(makeWarning.apply(null, arguments)) } - thingsToFix.forEach(function(thingName) { - fixer["fix" + ucFirst(thingName)](data, strict) - }) - data._id = data.name + "@" + data.version -} +/***/ }), +/* 48 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -function ucFirst (string) { - return string.charAt(0).toUpperCase() + string.slice(1); +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = isNumeric; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__isArray__ = __webpack_require__(10); +/** PURE_IMPORTS_START _isArray PURE_IMPORTS_END */ + +function isNumeric(val) { + return !Object(__WEBPACK_IMPORTED_MODULE_0__isArray__["a" /* isArray */])(val) && (val - parseFloat(val) + 1) >= 0; } +//# sourceMappingURL=isNumeric.js.map /***/ }), -/* 89 */ -/***/ (function(module, exports) { +/* 49 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return throwIfEmpty; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__tap__ = __webpack_require__(130); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__ = __webpack_require__(33); +/** PURE_IMPORTS_START _tap,_util_EmptyError PURE_IMPORTS_END */ + + +var throwIfEmpty = function (errorFactory) { + if (errorFactory === void 0) { + errorFactory = defaultErrorFactory; + } + return Object(__WEBPACK_IMPORTED_MODULE_0__tap__["a" /* tap */])({ + hasValue: false, + next: function () { this.hasValue = true; }, + complete: function () { + if (!this.hasValue) { + throw errorFactory(); + } + } + }); +}; +function defaultErrorFactory() { + return new __WEBPACK_IMPORTED_MODULE_1__util_EmptyError__["a" /* EmptyError */](); +} +//# sourceMappingURL=throwIfEmpty.js.map -module.exports = require("url"); /***/ }), -/* 90 */ -/***/ (function(module, exports, __webpack_require__) { +/* 50 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = reduce; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scan__ = __webpack_require__(75); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__takeLast__ = __webpack_require__(74); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__ = __webpack_require__(36); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_pipe__ = __webpack_require__(63); +/** PURE_IMPORTS_START _scan,_takeLast,_defaultIfEmpty,_util_pipe PURE_IMPORTS_END */ -var gitHosts = module.exports = { - github: { - // First two are insecure and generally shouldn't be used any more, but - // they are still supported. - 'protocols': [ 'git', 'http', 'git+ssh', 'git+https', 'ssh', 'https' ], - 'domain': 'github.com', - 'treepath': 'tree', - 'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}', - 'bugstemplate': 'https://{domain}/{user}/{project}/issues', - 'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}', - 'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz' - }, - bitbucket: { - 'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ], - 'domain': 'bitbucket.org', - 'treepath': 'src', - 'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz' - }, - gitlab: { - 'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ], - 'domain': 'gitlab.com', - 'treepath': 'tree', - 'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#README', - 'bugstemplate': 'https://{domain}/{user}/{project}/issues', - 'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}' - }, - gist: { - 'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ], - 'domain': 'gist.github.com', - 'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]+)(?:[.]git)?$/, - 'filetemplate': 'https://gist.githubusercontent.com/{user}/{project}/raw{/committish}/{path}', - 'bugstemplate': 'https://{domain}/{project}', - 'gittemplate': 'git://{domain}/{project}.git{#committish}', - 'sshtemplate': 'git@{domain}:/{project}.git{#committish}', - 'sshurltemplate': 'git+ssh://git@{domain}/{project}.git{#committish}', - 'browsetemplate': 'https://{domain}/{project}{/committish}', - 'docstemplate': 'https://{domain}/{project}{/committish}', - 'httpstemplate': 'git+https://{domain}/{project}.git{#committish}', - 'shortcuttemplate': '{type}:{project}{#committish}', - 'pathtemplate': '{project}{#committish}', - 'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz' - } -} -var gitHostDefaults = { - 'sshtemplate': 'git@{domain}:{user}/{project}.git{#committish}', - 'sshurltemplate': 'git+ssh://git@{domain}/{user}/{project}.git{#committish}', - 'browsetemplate': 'https://{domain}/{user}/{project}{/tree/committish}', - 'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#readme', - 'httpstemplate': 'git+https://{auth@}{domain}/{user}/{project}.git{#committish}', - 'filetemplate': 'https://{domain}/{user}/{project}/raw/{committish}/{path}', - 'shortcuttemplate': '{type}:{user}/{project}{#committish}', - 'pathtemplate': '{user}/{project}{#committish}', - 'pathmatch': /^[/]([^/]+)[/]([^/]+?)(?:[.]git|[/])?$/ -} -Object.keys(gitHosts).forEach(function (name) { - Object.keys(gitHostDefaults).forEach(function (key) { - if (gitHosts[name][key]) return - gitHosts[name][key] = gitHostDefaults[key] - }) - gitHosts[name].protocols_re = RegExp('^(' + - gitHosts[name].protocols.map(function (protocol) { - return protocol.replace(/([\\+*{}()[\]$^|])/g, '\\$1') - }).join('|') + '):$') -}) +function reduce(accumulator, seed) { + if (arguments.length >= 2) { + return function reduceOperatorFunctionWithSeed(source) { + return Object(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(Object(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(accumulator, seed), Object(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1), Object(__WEBPACK_IMPORTED_MODULE_2__defaultIfEmpty__["a" /* defaultIfEmpty */])(seed))(source); + }; + } + return function reduceOperatorFunction(source) { + return Object(__WEBPACK_IMPORTED_MODULE_3__util_pipe__["a" /* pipe */])(Object(__WEBPACK_IMPORTED_MODULE_0__scan__["a" /* scan */])(function (acc, value, index) { + return accumulator(acc, value, index + 1); + }), Object(__WEBPACK_IMPORTED_MODULE_1__takeLast__["a" /* takeLast */])(1))(source); + }; +} +//# sourceMappingURL=reduce.js.map /***/ }), -/* 91 */ +/* 51 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const isPlainObj = __webpack_require__(308); -module.exports = (obj, opts) => { - if (!isPlainObj(obj)) { - throw new TypeError('Expected a plain object'); +var matchOperatorsRe = /[|\\{}()[\]^$+*?.]/g; + +module.exports = function (str) { + if (typeof str !== 'string') { + throw new TypeError('Expected a string'); } - opts = opts || {}; + return str.replace(matchOperatorsRe, '\\$&'); +}; - // DEPRECATED - if (typeof opts === 'function') { - throw new TypeError('Specify the compare function as an option instead'); - } - const deep = opts.deep; - const seenInput = []; - const seenOutput = []; +/***/ }), +/* 52 */ +/***/ (function(module, exports, __webpack_require__) { - const sortKeys = x => { - const seenIndex = seenInput.indexOf(x); +var conversions = __webpack_require__(77); +var route = __webpack_require__(140); - if (seenIndex !== -1) { - return seenOutput[seenIndex]; +var convert = {}; + +var models = Object.keys(conversions); + +function wrapRaw(fn) { + var wrappedFn = function (args) { + if (args === undefined || args === null) { + return args; } - const ret = {}; - const keys = Object.keys(x).sort(opts.compare); + if (arguments.length > 1) { + args = Array.prototype.slice.call(arguments); + } - seenInput.push(x); - seenOutput.push(ret); + return fn(args); + }; - for (let i = 0; i < keys.length; i++) { - const key = keys[i]; - const val = x[key]; + // preserve .conversion property if there is one + if ('conversion' in fn) { + wrappedFn.conversion = fn.conversion; + } - if (deep && Array.isArray(val)) { - const retArr = []; + return wrappedFn; +} - for (let j = 0; j < val.length; j++) { - retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j]; - } +function wrapRounded(fn) { + var wrappedFn = function (args) { + if (args === undefined || args === null) { + return args; + } - ret[key] = retArr; - continue; - } + if (arguments.length > 1) { + args = Array.prototype.slice.call(arguments); + } - ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val; + var result = fn(args); + + // we're assuming the result is an array here. + // see notice in conversions.js; don't use box types + // in conversion functions. + if (typeof result === 'object') { + for (var len = result.length, i = 0; i < len; i++) { + result[i] = Math.round(result[i]); + } } - return ret; + return result; }; - return sortKeys(obj); -}; + // preserve .conversion property if there is one + if ('conversion' in fn) { + wrappedFn.conversion = fn.conversion; + } + return wrappedFn; +} -/***/ }), -/* 92 */ -/***/ (function(module, exports, __webpack_require__) { +models.forEach(function (fromModel) { + convert[fromModel] = {}; -"use strict"; + Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels}); + Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels}); -const fs = __webpack_require__(7); -const path = __webpack_require__(3); -const pify = __webpack_require__(23); + var routes = route(fromModel); + var routeModels = Object.keys(routes); -const defaults = { - mode: 0o777 & (~process.umask()), - fs -}; + routeModels.forEach(function (toModel) { + var fn = routes[toModel]; -// https://github.com/nodejs/node/issues/8987 -// https://github.com/libuv/libuv/pull/1088 -const checkPath = pth => { - if (process.platform === 'win32') { - const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, '')); + convert[fromModel][toModel] = wrapRounded(fn); + convert[fromModel][toModel].raw = wrapRaw(fn); + }); +}); - if (pathHasInvalidWinCharacters) { - const err = new Error(`Path contains invalid characters: ${pth}`); - err.code = 'EINVAL'; - throw err; - } - } -}; +module.exports = convert; -module.exports = (input, opts) => Promise.resolve().then(() => { - checkPath(input); - opts = Object.assign({}, defaults, opts); - const fsP = pify(opts.fs); - const make = pth => { - return fsP.mkdir(pth, opts.mode) - .then(() => pth) - .catch(err => { - if (err.code === 'ENOENT') { - if (err.message.includes('null bytes') || path.dirname(pth) === pth) { - throw err; - } +/***/ }), +/* 53 */ +/***/ (function(module, exports) { - return make(path.dirname(pth)).then(() => make(pth)); - } +module.exports = require("os"); - return fsP.stat(pth) - .then(stats => stats.isDirectory() ? pth : Promise.reject()) - .catch(() => { - throw err; - }); - }); - }; +/***/ }), +/* 54 */ +/***/ (function(module, exports, __webpack_require__) { - return make(path.resolve(input)); +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true }); -module.exports.sync = (input, opts) => { - checkPath(input); - opts = Object.assign({}, defaults, opts); +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +let parallelizeBatches = exports.parallelizeBatches = (() => { + var _ref = _asyncToGenerator(function* (batches, fn) { + for (const batch of batches) { + // We need to make sure the entire batch has completed before we can move on + // to the next batch + yield parallelize(batch, fn); + } + }); - const make = pth => { - try { - opts.fs.mkdirSync(pth, opts.mode); - } catch (err) { - if (err.code === 'ENOENT') { - if (err.message.includes('null bytes') || path.dirname(pth) === pth) { - throw err; - } + return function parallelizeBatches(_x, _x2) { + return _ref.apply(this, arguments); + }; +})(); - make(path.dirname(pth)); - return make(pth); - } +let parallelize = exports.parallelize = (() => { + var _ref2 = _asyncToGenerator(function* (items, fn, concurrency = 4) { + if (items.length === 0) { + return; + } + return new Promise(function (resolve, reject) { + let scheduleItem = (() => { + var _ref3 = _asyncToGenerator(function* (item) { + activePromises++; + try { + yield fn(item); + activePromises--; + if (values.length > 0) { + // We have more work to do, so we schedule the next promise + scheduleItem(values.shift()); + } else if (activePromises === 0) { + // We have no more values left, and all items have completed, so we've + // completed all the work. + resolve(); + } + } catch (error) { + reject(error); + } + }); - try { - if (!opts.fs.statSync(pth).isDirectory()) { - throw new Error('The path is not a directory'); - } - } catch (_) { - throw err; - } - } + return function scheduleItem(_x5) { + return _ref3.apply(this, arguments); + }; + })(); - return pth; - }; + let activePromises = 0; + const values = items.slice(0); - return make(path.resolve(input)); -}; + values.splice(0, concurrency).map(scheduleItem); + }); + }); + return function parallelize(_x3, _x4) { + return _ref2.apply(this, arguments); + }; +})(); + +function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /***/ }), -/* 93 */ +/* 55 */ /***/ (function(module, exports, __webpack_require__) { -"use strict"; +module.exports = minimatch +minimatch.Minimatch = Minimatch +var path = { sep: '/' } +try { + path = __webpack_require__(2) +} catch (er) {} -var path = __webpack_require__(3); -var which = __webpack_require__(315); -var LRU = __webpack_require__(94); +var GLOBSTAR = minimatch.GLOBSTAR = Minimatch.GLOBSTAR = {} +var expand = __webpack_require__(154) -var commandCache = new LRU({ max: 50, maxAge: 30 * 1000 }); // Cache just for 30sec +var plTypes = { + '!': { open: '(?:(?!(?:', close: '))[^/]*?)'}, + '?': { open: '(?:', close: ')?' }, + '+': { open: '(?:', close: ')+' }, + '*': { open: '(?:', close: ')*' }, + '@': { open: '(?:', close: ')' } +} -function resolveCommand(command, noExtension) { - var resolved; +// any single thing other than / +// don't need to escape / when using new RegExp() +var qmark = '[^/]' - noExtension = !!noExtension; - resolved = commandCache.get(command + '!' + noExtension); +// * => any number of characters +var star = qmark + '*?' - // Check if its resolved in the cache - if (commandCache.has(command)) { - return commandCache.get(command); - } +// ** when dots are allowed. Anything goes, except .. and . +// not (^ or / followed by one or two dots followed by $ or /), +// followed by anything, any number of times. +var twoStarDot = '(?:(?!(?:\\\/|^)(?:\\.{1,2})($|\\\/)).)*?' - try { - resolved = !noExtension ? - which.sync(command) : - which.sync(command, { pathExt: path.delimiter + (process.env.PATHEXT || '') }); - } catch (e) { /* empty */ } +// not a ^ or / followed by a dot, +// followed by anything, any number of times. +var twoStarNoDot = '(?:(?!(?:\\\/|^)\\.).)*?' + +// characters that need to be escaped in RegExp. +var reSpecials = charSet('().*{}+?[]^$\\!') + +// "abc" -> { a:true, b:true, c:true } +function charSet (s) { + return s.split('').reduce(function (set, c) { + set[c] = true + return set + }, {}) +} - commandCache.set(command + '!' + noExtension, resolved); +// normalizes slashes. +var slashSplit = /\/+/ - return resolved; +minimatch.filter = filter +function filter (pattern, options) { + options = options || {} + return function (p, i, list) { + return minimatch(p, pattern, options) + } } -module.exports = resolveCommand; - +function ext (a, b) { + a = a || {} + b = b || {} + var t = {} + Object.keys(b).forEach(function (k) { + t[k] = b[k] + }) + Object.keys(a).forEach(function (k) { + t[k] = a[k] + }) + return t +} -/***/ }), -/* 94 */ -/***/ (function(module, exports, __webpack_require__) { +minimatch.defaults = function (def) { + if (!def || !Object.keys(def).length) return minimatch -"use strict"; + var orig = minimatch + var m = function minimatch (p, pattern, options) { + return orig.minimatch(p, pattern, ext(def, options)) + } -module.exports = LRUCache + m.Minimatch = function Minimatch (pattern, options) { + return new orig.Minimatch(pattern, ext(def, options)) + } -// This will be a proper iterable 'Map' in engines that support it, -// or a fakey-fake PseudoMap in older versions. -var Map = __webpack_require__(319) -var util = __webpack_require__(10) + return m +} -// A linked list to keep track of recently-used-ness -var Yallist = __webpack_require__(321) +Minimatch.defaults = function (def) { + if (!def || !Object.keys(def).length) return Minimatch + return minimatch.defaults(def).Minimatch +} -// use symbols if possible, otherwise just _props -var hasSymbol = typeof Symbol === 'function' -var makeSymbol -if (hasSymbol) { - makeSymbol = function (key) { - return Symbol.for(key) +function minimatch (p, pattern, options) { + if (typeof pattern !== 'string') { + throw new TypeError('glob pattern string required') } -} else { - makeSymbol = function (key) { - return '_' + key + + if (!options) options = {} + + // shortcut: comments match nothing. + if (!options.nocomment && pattern.charAt(0) === '#') { + return false } -} -var MAX = makeSymbol('max') -var LENGTH = makeSymbol('length') -var LENGTH_CALCULATOR = makeSymbol('lengthCalculator') -var ALLOW_STALE = makeSymbol('allowStale') -var MAX_AGE = makeSymbol('maxAge') -var DISPOSE = makeSymbol('dispose') -var NO_DISPOSE_ON_SET = makeSymbol('noDisposeOnSet') -var LRU_LIST = makeSymbol('lruList') -var CACHE = makeSymbol('cache') + // "" only matches "" + if (pattern.trim() === '') return p === '' -function naiveLength () { return 1 } + return new Minimatch(pattern, options).match(p) +} -// lruList is a yallist where the head is the youngest -// item, and the tail is the oldest. the list contains the Hit -// objects as the entries. -// Each Hit object has a reference to its Yallist.Node. This -// never changes. -// -// cache is a Map (or PseudoMap) that matches the keys to -// the Yallist.Node object. -function LRUCache (options) { - if (!(this instanceof LRUCache)) { - return new LRUCache(options) +function Minimatch (pattern, options) { + if (!(this instanceof Minimatch)) { + return new Minimatch(pattern, options) } - if (typeof options === 'number') { - options = { max: options } + if (typeof pattern !== 'string') { + throw new TypeError('glob pattern string required') } - if (!options) { - options = {} - } + if (!options) options = {} + pattern = pattern.trim() - var max = this[MAX] = options.max - // Kind of weird to have a default max of Infinity, but oh well. - if (!max || - !(typeof max === 'number') || - max <= 0) { - this[MAX] = Infinity + // windows support: need to use /, not \ + if (path.sep !== '/') { + pattern = pattern.split(path.sep).join('/') } - var lc = options.length || naiveLength - if (typeof lc !== 'function') { - lc = naiveLength - } - this[LENGTH_CALCULATOR] = lc + this.options = options + this.set = [] + this.pattern = pattern + this.regexp = null + this.negate = false + this.comment = false + this.empty = false - this[ALLOW_STALE] = options.stale || false - this[MAX_AGE] = options.maxAge || 0 - this[DISPOSE] = options.dispose - this[NO_DISPOSE_ON_SET] = options.noDisposeOnSet || false - this.reset() + // make the set of regexps etc. + this.make() } -// resize the cache when the max changes. -Object.defineProperty(LRUCache.prototype, 'max', { - set: function (mL) { - if (!mL || !(typeof mL === 'number') || mL <= 0) { - mL = Infinity - } - this[MAX] = mL - trim(this) - }, - get: function () { - return this[MAX] - }, - enumerable: true -}) +Minimatch.prototype.debug = function () {} -Object.defineProperty(LRUCache.prototype, 'allowStale', { - set: function (allowStale) { - this[ALLOW_STALE] = !!allowStale - }, - get: function () { - return this[ALLOW_STALE] - }, - enumerable: true -}) +Minimatch.prototype.make = make +function make () { + // don't do it more than once. + if (this._made) return -Object.defineProperty(LRUCache.prototype, 'maxAge', { - set: function (mA) { - if (!mA || !(typeof mA === 'number') || mA < 0) { - mA = 0 - } - this[MAX_AGE] = mA - trim(this) - }, - get: function () { - return this[MAX_AGE] - }, - enumerable: true -}) + var pattern = this.pattern + var options = this.options -// resize the cache when the lengthCalculator changes. -Object.defineProperty(LRUCache.prototype, 'lengthCalculator', { - set: function (lC) { - if (typeof lC !== 'function') { - lC = naiveLength - } - if (lC !== this[LENGTH_CALCULATOR]) { - this[LENGTH_CALCULATOR] = lC - this[LENGTH] = 0 - this[LRU_LIST].forEach(function (hit) { - hit.length = this[LENGTH_CALCULATOR](hit.value, hit.key) - this[LENGTH] += hit.length - }, this) - } - trim(this) - }, - get: function () { return this[LENGTH_CALCULATOR] }, - enumerable: true -}) + // empty patterns and comments match nothing. + if (!options.nocomment && pattern.charAt(0) === '#') { + this.comment = true + return + } + if (!pattern) { + this.empty = true + return + } -Object.defineProperty(LRUCache.prototype, 'length', { - get: function () { return this[LENGTH] }, - enumerable: true -}) + // step 1: figure out negation, etc. + this.parseNegate() -Object.defineProperty(LRUCache.prototype, 'itemCount', { - get: function () { return this[LRU_LIST].length }, - enumerable: true -}) + // step 2: expand braces + var set = this.globSet = this.braceExpand() -LRUCache.prototype.rforEach = function (fn, thisp) { - thisp = thisp || this - for (var walker = this[LRU_LIST].tail; walker !== null;) { - var prev = walker.prev - forEachStep(this, fn, walker, thisp) - walker = prev - } -} + if (options.debug) this.debug = console.error -function forEachStep (self, fn, node, thisp) { - var hit = node.value - if (isStale(self, hit)) { - del(self, node) - if (!self[ALLOW_STALE]) { - hit = undefined - } - } - if (hit) { - fn.call(thisp, hit.value, hit.key, self) - } -} + this.debug(this.pattern, set) -LRUCache.prototype.forEach = function (fn, thisp) { - thisp = thisp || this - for (var walker = this[LRU_LIST].head; walker !== null;) { - var next = walker.next - forEachStep(this, fn, walker, thisp) - walker = next - } -} + // step 3: now we have a set, so turn each one into a series of path-portion + // matching patterns. + // These will be regexps, except in the case of "**", which is + // set to the GLOBSTAR object for globstar behavior, + // and will not contain any / characters + set = this.globParts = set.map(function (s) { + return s.split(slashSplit) + }) -LRUCache.prototype.keys = function () { - return this[LRU_LIST].toArray().map(function (k) { - return k.key - }, this) -} + this.debug(this.pattern, set) -LRUCache.prototype.values = function () { - return this[LRU_LIST].toArray().map(function (k) { - return k.value + // glob --> regexps + set = set.map(function (s, si, set) { + return s.map(this.parse, this) }, this) -} - -LRUCache.prototype.reset = function () { - if (this[DISPOSE] && - this[LRU_LIST] && - this[LRU_LIST].length) { - this[LRU_LIST].forEach(function (hit) { - this[DISPOSE](hit.key, hit.value) - }, this) - } - this[CACHE] = new Map() // hash of items by key - this[LRU_LIST] = new Yallist() // list of items in order of use recency - this[LENGTH] = 0 // length of items in the list -} + this.debug(this.pattern, set) -LRUCache.prototype.dump = function () { - return this[LRU_LIST].map(function (hit) { - if (!isStale(this, hit)) { - return { - k: hit.key, - v: hit.value, - e: hit.now + (hit.maxAge || 0) - } - } - }, this).toArray().filter(function (h) { - return h + // filter out everything that didn't compile properly. + set = set.filter(function (s) { + return s.indexOf(false) === -1 }) -} -LRUCache.prototype.dumpLru = function () { - return this[LRU_LIST] + this.debug(this.pattern, set) + + this.set = set } -LRUCache.prototype.inspect = function (n, opts) { - var str = 'LRUCache {' - var extras = false +Minimatch.prototype.parseNegate = parseNegate +function parseNegate () { + var pattern = this.pattern + var negate = false + var options = this.options + var negateOffset = 0 - var as = this[ALLOW_STALE] - if (as) { - str += '\n allowStale: true' - extras = true - } + if (options.nonegate) return - var max = this[MAX] - if (max && max !== Infinity) { - if (extras) { - str += ',' - } - str += '\n max: ' + util.inspect(max, opts) - extras = true + for (var i = 0, l = pattern.length + ; i < l && pattern.charAt(i) === '!' + ; i++) { + negate = !negate + negateOffset++ } - var maxAge = this[MAX_AGE] - if (maxAge) { - if (extras) { - str += ',' - } - str += '\n maxAge: ' + util.inspect(maxAge, opts) - extras = true - } + if (negateOffset) this.pattern = pattern.substr(negateOffset) + this.negate = negate +} - var lc = this[LENGTH_CALCULATOR] - if (lc && lc !== naiveLength) { - if (extras) { - str += ',' - } - str += '\n length: ' + util.inspect(this[LENGTH], opts) - extras = true - } +// Brace expansion: +// a{b,c}d -> abd acd +// a{b,}c -> abc ac +// a{0..3}d -> a0d a1d a2d a3d +// a{b,c{d,e}f}g -> abg acdfg acefg +// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg +// +// Invalid sets are not expanded. +// a{2..}b -> a{2..}b +// a{b}c -> a{b}c +minimatch.braceExpand = function (pattern, options) { + return braceExpand(pattern, options) +} - var didFirst = false - this[LRU_LIST].forEach(function (item) { - if (didFirst) { - str += ',\n ' +Minimatch.prototype.braceExpand = braceExpand + +function braceExpand (pattern, options) { + if (!options) { + if (this instanceof Minimatch) { + options = this.options } else { - if (extras) { - str += ',\n' - } - didFirst = true - str += '\n ' - } - var key = util.inspect(item.key).split('\n').join('\n ') - var val = { value: item.value } - if (item.maxAge !== maxAge) { - val.maxAge = item.maxAge - } - if (lc !== naiveLength) { - val.length = item.length - } - if (isStale(this, item)) { - val.stale = true + options = {} } + } - val = util.inspect(val, opts).split('\n').join('\n ') - str += key + ' => ' + val - }) + pattern = typeof pattern === 'undefined' + ? this.pattern : pattern - if (didFirst || extras) { - str += '\n' + if (typeof pattern === 'undefined') { + throw new TypeError('undefined pattern') } - str += '}' - return str + if (options.nobrace || + !pattern.match(/\{.*\}/)) { + // shortcut. no need to expand. + return [pattern] + } + + return expand(pattern) } -LRUCache.prototype.set = function (key, value, maxAge) { - maxAge = maxAge || this[MAX_AGE] +// parse a component of the expanded set. +// At this point, no pattern may contain "/" in it +// so we're going to return a 2d array, where each entry is the full +// pattern, split on '/', and then turned into a regular expression. +// A regexp is made at the end which joins each array with an +// escaped /, and another full one which joins each regexp with |. +// +// Following the lead of Bash 4.1, note that "**" only has special meaning +// when it is the *only* thing in a path portion. Otherwise, any series +// of * is equivalent to a single *. Globstar behavior is enabled by +// default, and can be disabled by setting options.noglobstar. +Minimatch.prototype.parse = parse +var SUBPARSE = {} +function parse (pattern, isSub) { + if (pattern.length > 1024 * 64) { + throw new TypeError('pattern is too long') + } - var now = maxAge ? Date.now() : 0 - var len = this[LENGTH_CALCULATOR](value, key) + var options = this.options - if (this[CACHE].has(key)) { - if (len > this[MAX]) { - del(this, this[CACHE].get(key)) - return false - } + // shortcuts + if (!options.noglobstar && pattern === '**') return GLOBSTAR + if (pattern === '') return '' - var node = this[CACHE].get(key) - var item = node.value + var re = '' + var hasMagic = !!options.nocase + var escaping = false + // ? => one single character + var patternListStack = [] + var negativeLists = [] + var stateChar + var inClass = false + var reClassStart = -1 + var classStart = -1 + // . and .. never match anything that doesn't start with ., + // even when options.dot is set. + var patternStart = pattern.charAt(0) === '.' ? '' // anything + // not (start or / followed by . or .. followed by / or end) + : options.dot ? '(?!(?:^|\\\/)\\.{1,2}(?:$|\\\/))' + : '(?!\\.)' + var self = this - // dispose of the old one before overwriting - // split out into 2 ifs for better coverage tracking - if (this[DISPOSE]) { - if (!this[NO_DISPOSE_ON_SET]) { - this[DISPOSE](key, item.value) + function clearStateChar () { + if (stateChar) { + // we had some state-tracking character + // that wasn't consumed by this pass. + switch (stateChar) { + case '*': + re += star + hasMagic = true + break + case '?': + re += qmark + hasMagic = true + break + default: + re += '\\' + stateChar + break } + self.debug('clearStateChar %j %j', stateChar, re) + stateChar = false } - - item.now = now - item.maxAge = maxAge - item.value = value - this[LENGTH] += len - item.length - item.length = len - this.get(key) - trim(this) - return true - } - - var hit = new Entry(key, value, len, now, maxAge) - - // oversized objects fall out of cache automatically. - if (hit.length > this[MAX]) { - if (this[DISPOSE]) { - this[DISPOSE](key, value) - } - return false - } - - this[LENGTH] += hit.length - this[LRU_LIST].unshift(hit) - this[CACHE].set(key, this[LRU_LIST].head) - trim(this) - return true -} - -LRUCache.prototype.has = function (key) { - if (!this[CACHE].has(key)) return false - var hit = this[CACHE].get(key).value - if (isStale(this, hit)) { - return false } - return true -} -LRUCache.prototype.get = function (key) { - return get(this, key, true) -} + for (var i = 0, len = pattern.length, c + ; (i < len) && (c = pattern.charAt(i)) + ; i++) { + this.debug('%s\t%s %s %j', pattern, i, re, c) -LRUCache.prototype.peek = function (key) { - return get(this, key, false) -} + // skip over any that are escaped. + if (escaping && reSpecials[c]) { + re += '\\' + c + escaping = false + continue + } -LRUCache.prototype.pop = function () { - var node = this[LRU_LIST].tail - if (!node) return null - del(this, node) - return node.value -} + switch (c) { + case '/': + // completely not allowed, even escaped. + // Should already be path-split by now. + return false -LRUCache.prototype.del = function (key) { - del(this, this[CACHE].get(key)) -} + case '\\': + clearStateChar() + escaping = true + continue -LRUCache.prototype.load = function (arr) { - // reset the cache - this.reset() + // the various stateChar values + // for the "extglob" stuff. + case '?': + case '*': + case '+': + case '@': + case '!': + this.debug('%s\t%s %s %j <-- stateChar', pattern, i, re, c) - var now = Date.now() - // A previous serialized cache has the most recent items first - for (var l = arr.length - 1; l >= 0; l--) { - var hit = arr[l] - var expiresAt = hit.e || 0 - if (expiresAt === 0) { - // the item was created without expiration in a non aged cache - this.set(hit.k, hit.v) - } else { - var maxAge = expiresAt - now - // dont add already expired items - if (maxAge > 0) { - this.set(hit.k, hit.v, maxAge) - } - } - } -} + // all of those are literals inside a class, except that + // the glob [!a] means [^a] in regexp + if (inClass) { + this.debug(' in class') + if (c === '!' && i === classStart + 1) c = '^' + re += c + continue + } -LRUCache.prototype.prune = function () { - var self = this - this[CACHE].forEach(function (value, key) { - get(self, key, false) - }) -} + // if we already have a stateChar, then it means + // that there was something like ** or +? in there. + // Handle the stateChar, then proceed with this one. + self.debug('call clearStateChar %j', stateChar) + clearStateChar() + stateChar = c + // if extglob is disabled, then +(asdf|foo) isn't a thing. + // just clear the statechar *now*, rather than even diving into + // the patternList stuff. + if (options.noext) clearStateChar() + continue -function get (self, key, doUse) { - var node = self[CACHE].get(key) - if (node) { - var hit = node.value - if (isStale(self, hit)) { - del(self, node) - if (!self[ALLOW_STALE]) hit = undefined - } else { - if (doUse) { - self[LRU_LIST].unshiftNode(node) - } - } - if (hit) hit = hit.value - } - return hit -} + case '(': + if (inClass) { + re += '(' + continue + } -function isStale (self, hit) { - if (!hit || (!hit.maxAge && !self[MAX_AGE])) { - return false - } - var stale = false - var diff = Date.now() - hit.now - if (hit.maxAge) { - stale = diff > hit.maxAge - } else { - stale = self[MAX_AGE] && (diff > self[MAX_AGE]) - } - return stale -} + if (!stateChar) { + re += '\\(' + continue + } -function trim (self) { - if (self[LENGTH] > self[MAX]) { - for (var walker = self[LRU_LIST].tail; - self[LENGTH] > self[MAX] && walker !== null;) { - // We know that we're about to delete this one, and also - // what the next least recently used key will be, so just - // go ahead and set it now. - var prev = walker.prev - del(self, walker) - walker = prev - } - } -} + patternListStack.push({ + type: stateChar, + start: i - 1, + reStart: re.length, + open: plTypes[stateChar].open, + close: plTypes[stateChar].close + }) + // negation is (?:(?!js)[^/]*) + re += stateChar === '!' ? '(?:(?!(?:' : '(?:' + this.debug('plType %j %j', stateChar, re) + stateChar = false + continue -function del (self, node) { - if (node) { - var hit = node.value - if (self[DISPOSE]) { - self[DISPOSE](hit.key, hit.value) - } - self[LENGTH] -= hit.length - self[CACHE].delete(hit.key) - self[LRU_LIST].removeNode(node) - } -} + case ')': + if (inClass || !patternListStack.length) { + re += '\\)' + continue + } -// classy, since V8 prefers predictable objects. -function Entry (key, value, length, now, maxAge) { - this.key = key - this.value = value - this.length = length - this.now = now - this.maxAge = maxAge || 0 -} + clearStateChar() + hasMagic = true + var pl = patternListStack.pop() + // negation is (?:(?!js)[^/]*) + // The others are (?:) + re += pl.close + if (pl.type === '!') { + negativeLists.push(pl) + } + pl.reEnd = re.length + continue + case '|': + if (inClass || !patternListStack.length || escaping) { + re += '\\|' + escaping = false + continue + } -/***/ }), -/* 95 */ -/***/ (function(module, exports, __webpack_require__) { + clearStateChar() + re += '|' + continue -"use strict"; + // these are mostly the same in regexp and glob + case '[': + // swallow any state-tracking char before the [ + clearStateChar() + if (inClass) { + re += '\\' + c + continue + } -function escapeArgument(arg, quote) { - // Convert to string - arg = '' + arg; + inClass = true + classStart = i + reClassStart = re.length + re += c + continue - // If we are not going to quote the argument, - // escape shell metacharacters, including double and single quotes: - if (!quote) { - arg = arg.replace(/([()%!^<>&|;,"'\s])/g, '^$1'); - } else { - // Sequence of backslashes followed by a double quote: - // double up all the backslashes and escape the double quote - arg = arg.replace(/(\\*)"/g, '$1$1\\"'); + case ']': + // a right bracket shall lose its special + // meaning and represent itself in + // a bracket expression if it occurs + // first in the list. -- POSIX.2 2.8.3.2 + if (i === classStart + 1 || !inClass) { + re += '\\' + c + escaping = false + continue + } - // Sequence of backslashes followed by the end of the string - // (which will become a double quote later): - // double up all the backslashes - arg = arg.replace(/(\\*)$/, '$1$1'); + // handle the case where we left a class open. + // "[z-a]" is valid, equivalent to "\[z-a\]" + if (inClass) { + // split where the last [ was, make sure we don't have + // an invalid re. if so, re-walk the contents of the + // would-be class to re-translate any characters that + // were passed through as-is + // TODO: It would probably be faster to determine this + // without a try/catch and a new RegExp, but it's tricky + // to do safely. For now, this is safe and works. + var cs = pattern.substring(classStart + 1, i) + try { + RegExp('[' + cs + ']') + } catch (er) { + // not a valid class! + var sp = this.parse(cs, SUBPARSE) + re = re.substr(0, reClassStart) + '\\[' + sp[0] + '\\]' + hasMagic = hasMagic || sp[1] + inClass = false + continue + } + } - // All other backslashes occur literally + // finish up the class. + hasMagic = true + inClass = false + re += c + continue - // Quote the whole thing: - arg = '"' + arg + '"'; - } + default: + // swallow any state char that wasn't consumed + clearStateChar() - return arg; -} + if (escaping) { + // no need + escaping = false + } else if (reSpecials[c] + && !(c === '^' && inClass)) { + re += '\\' + } -module.exports = escapeArgument; + re += c + } // switch + } // for -/***/ }), -/* 96 */ -/***/ (function(module, exports, __webpack_require__) { + // handle the case where we left a class open. + // "[abc" is valid, equivalent to "\[abc" + if (inClass) { + // split where the last [ was, and escape it + // this is a huge pita. We now have to re-walk + // the contents of the would-be class to re-translate + // any characters that were passed through as-is + cs = pattern.substr(classStart + 1) + sp = this.parse(cs, SUBPARSE) + re = re.substr(0, reClassStart) + '\\[' + sp[0] + hasMagic = hasMagic || sp[1] + } -"use strict"; + // handle the case where we had a +( thing at the *end* + // of the pattern. + // each pattern list stack adds 3 chars, and we need to go through + // and escape any | chars that were passed through as-is for the regexp. + // Go through and escape them, taking care not to double-escape any + // | chars that were already escaped. + for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) { + var tail = re.slice(pl.reStart + pl.open.length) + this.debug('setting tail', re, pl) + // maybe some even number of \, then maybe 1 \, followed by a | + tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) { + if (!$2) { + // the | isn't already escaped, so escape it. + $2 = '\\' + } + + // need to escape all those slashes *again*, without escaping the + // one that we need for escaping the | character. As it works out, + // escaping an even number of slashes can be done by simply repeating + // it exactly after itself. That's why this trick works. + // + // I am sorry that you have to see this. + return $1 + $1 + $2 + '|' + }) -const chalk = __webpack_require__(338); + this.debug('tail=%j\n %s', tail, tail, pl, re) + var t = pl.type === '*' ? star + : pl.type === '?' ? qmark + : '\\' + pl.type -const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color'; + hasMagic = true + re = re.slice(0, pl.reStart) + t + '\\(' + tail + } -const main = { - info: chalk.blue('ℹ'), - success: chalk.green('✔'), - warning: chalk.yellow('⚠'), - error: chalk.red('✖') -}; + // handle trailing things that only matter at the very end. + clearStateChar() + if (escaping) { + // trailing \\ + re += '\\\\' + } -const fallbacks = { - info: chalk.blue('i'), - success: chalk.green('√'), - warning: chalk.yellow('‼'), - error: chalk.red('×') -}; + // only need to apply the nodot start if the re starts with + // something that could conceivably capture a dot + var addPatternStart = false + switch (re.charAt(0)) { + case '.': + case '[': + case '(': addPatternStart = true + } -module.exports = isSupported ? main : fallbacks; + // Hack to work around lack of negative lookbehind in JS + // A pattern like: *.!(x).!(y|z) needs to ensure that a name + // like 'a.xyz.yz' doesn't match. So, the first negative + // lookahead, has to look ALL the way ahead, to the end of + // the pattern. + for (var n = negativeLists.length - 1; n > -1; n--) { + var nl = negativeLists[n] + var nlBefore = re.slice(0, nl.reStart) + var nlFirst = re.slice(nl.reStart, nl.reEnd - 8) + var nlLast = re.slice(nl.reEnd - 8, nl.reEnd) + var nlAfter = re.slice(nl.reEnd) -/***/ }), -/* 97 */ -/***/ (function(module, exports, __webpack_require__) { + nlLast += nlAfter -"use strict"; -// Copyright IBM Corp. 2014. All Rights Reserved. -// Node module: strong-log-transformer -// This file is licensed under the Artistic License 2.0. -// License text available at https://opensource.org/licenses/Artistic-2.0 + // Handle nested stuff like *(*.js|!(*.json)), where open parens + // mean that we should *not* include the ) in the bit that is considered + // "after" the negated section. + var openParensBefore = nlBefore.split('(').length - 1 + var cleanAfter = nlAfter + for (i = 0; i < openParensBefore; i++) { + cleanAfter = cleanAfter.replace(/\)[+*?]?/, '') + } + nlAfter = cleanAfter + var dollar = '' + if (nlAfter === '' && isSub !== SUBPARSE) { + dollar = '$' + } + var newRe = nlBefore + nlFirst + nlAfter + dollar + nlLast + re = newRe + } + // if the re is not "" at this point, then we need to make sure + // it doesn't match against an empty path part. + // Otherwise a/* will match a/, which it should not. + if (re !== '' && hasMagic) { + re = '(?=.)' + re + } -var stream = __webpack_require__(22); -var util = __webpack_require__(10); -var fs = __webpack_require__(7); + if (addPatternStart) { + re = patternStart + re + } -var byline = __webpack_require__(343); -var through = __webpack_require__(345); -var duplexer = __webpack_require__(346); -var moment = __webpack_require__(0); + // parsing just a piece of a larger pattern. + if (isSub === SUBPARSE) { + return [re, hasMagic] + } -module.exports = Logger; + // skip the regexp for non-magical patterns + // unescape anything in it, though, so that it'll be + // an exact match against a file etc. + if (!hasMagic) { + return globUnescape(pattern) + } -Logger.DEFAULTS = { - format: 'text', - tag: '', - mergeMultiline: false, - timeStamp: false, -}; + var flags = options.nocase ? 'i' : '' + try { + var regExp = new RegExp('^' + re + '$', flags) + } catch (er) { + // If it was an invalid regular expression, then it can't match + // anything. This trick looks for a character after the end of + // the string, which is of course impossible, except in multi-line + // mode, but it's not a /m regex. + return new RegExp('$.') + } -var formatters = { - text: textFormatter, - json: jsonFormatter, + regExp._glob = pattern + regExp._src = re + + return regExp } -function Logger(options) { - var defaults = JSON.parse(JSON.stringify(Logger.DEFAULTS)); - options = util._extend(defaults, options || {}); - var catcher = new byline.LineStream; - var emitter = catcher; - var transforms = [ - objectifier(), - ]; +minimatch.makeRe = function (pattern, options) { + return new Minimatch(pattern, options || {}).makeRe() +} - if (options.tag) { - transforms.push(staticTagger(options.tag)); - } +Minimatch.prototype.makeRe = makeRe +function makeRe () { + if (this.regexp || this.regexp === false) return this.regexp - if (options.mergeMultiline) { - transforms.push(lineMerger()); + // at this point, this.set is a 2d array of partial + // pattern strings, or "**". + // + // It's better to use .match(). This function shouldn't + // be used, really, but it's pretty convenient sometimes, + // when you just want to work with a regex. + var set = this.set + + if (!set.length) { + this.regexp = false + return this.regexp } + var options = this.options - // TODO - // if (options.pidStamp) { - // transforms.push(pidStamper(options.pid)); - // } + var twoStar = options.noglobstar ? star + : options.dot ? twoStarDot + : twoStarNoDot + var flags = options.nocase ? 'i' : '' - // TODO - // if (options.workerStamp) { - // transforms.push(workerStamper(options.worker)); - // } + var re = set.map(function (pattern) { + return pattern.map(function (p) { + return (p === GLOBSTAR) ? twoStar + : (typeof p === 'string') ? regExpEscape(p) + : p._src + }).join('\\\/') + }).join('|') - transforms.push(formatters[options.format](options)); + // must match entire pattern + // ending in a * or ** will make it less strict. + re = '^(?:' + re + ')$' - // restore line endings that were removed by byline - transforms.push(reLiner()); + // can match anything, as long as it's not this. + if (this.negate) re = '^(?!' + re + ').*$' - for (var t in transforms) { - emitter = emitter.pipe(transforms[t]); + try { + this.regexp = new RegExp(re, flags) + } catch (ex) { + this.regexp = false + } + return this.regexp +} + +minimatch.match = function (list, pattern, options) { + options = options || {} + var mm = new Minimatch(pattern, options) + list = list.filter(function (f) { + return mm.match(f) + }) + if (mm.options.nonull && !list.length) { + list.push(pattern) } - - return duplexer(catcher, emitter); + return list } -function reLiner() { - return through(appendNewline); +Minimatch.prototype.match = match +function match (f, partial) { + this.debug('match', f, this.pattern) + // short-circuit in the case of busted things. + // comments, etc. + if (this.comment) return false + if (this.empty) return f === '' - function appendNewline(line) { - this.emit('data', line + '\n'); - } -} + if (f === '/' && partial) return true -function objectifier() { - return through(objectify, null, {autoDestroy: false}); + var options = this.options - function objectify(line) { - this.emit('data', { - msg: line, - time: Date.now(), - }); + // windows: need to use /, not \ + if (path.sep !== '/') { + f = f.split(path.sep).join('/') } -} -function staticTagger(tag) { - return through(tagger); + // treat the test path as a set of pathparts. + f = f.split(slashSplit) + this.debug(this.pattern, 'split', f) - function tagger(logEvent) { - logEvent.tag = tag; - this.emit('data', logEvent); - } -} + // just ONE of the pattern sets in this.set needs to match + // in order for it to be valid. If negating, then just one + // match means that we have failed. + // Either way, return on the first hit. -function textFormatter(options) { - return through(textify); + var set = this.set + this.debug(this.pattern, 'set', set) - function textify(logEvent) { - var line = util.format('%s%s', textifyTags(logEvent.tag), - logEvent.msg.toString()); - if (options.timeStamp) { - line = util.format('%s %s', moment(logEvent.time).toISOString(), line); - } - this.emit('data', line.replace(/\n/g, '\\n')); + // Find the basename of the path by looking for the last non-empty segment + var filename + var i + for (i = f.length - 1; i >= 0; i--) { + filename = f[i] + if (filename) break } - function textifyTags(tags) { - var str = ''; - if (typeof tags === 'string') { - str = tags + ' '; - } else if (typeof tags === 'object') { - for (var t in tags) { - str += t + ':' + tags[t] + ' '; - } + for (i = 0; i < set.length; i++) { + var pattern = set[i] + var file = f + if (options.matchBase && pattern.length === 1) { + file = [filename] } - return str; - } -} - -function jsonFormatter(options) { - return through(jsonify); - - function jsonify(logEvent) { - if (options.timeStamp) { - logEvent.time = moment(logEvent.time).toISOString(); - } else { - delete logEvent.time; + var hit = this.matchOne(file, pattern, partial) + if (hit) { + if (options.flipNegate) return true + return !this.negate } - logEvent.msg = logEvent.msg.toString(); - this.emit('data', JSON.stringify(logEvent)); } + + // didn't get any hits. this is success if it's a negative + // pattern, failure otherwise. + if (options.flipNegate) return false + return this.negate } -function lineMerger(host) { - var previousLine = null; - var flushTimer = null; - var stream = through(lineMergerWrite, lineMergerEnd); - var flush = _flush.bind(stream); +// set partial to true to test if, for example, +// "/a/b" matches the start of "/*/b/*/d" +// Partial means, if you run out of file before you run +// out of pattern, then that's fine, as long as all +// the parts match. +Minimatch.prototype.matchOne = function (file, pattern, partial) { + var options = this.options - return stream; + this.debug('matchOne', + { 'this': this, file: file, pattern: pattern }) - function lineMergerWrite(line) { - if (/^\s+/.test(line.msg)) { - if (previousLine) { - previousLine.msg += '\n' + line.msg; - } else { - previousLine = line; - } - } else { - flush(); - previousLine = line; - } - // rolling timeout - clearTimeout(flushTimer); - flushTimer = setTimeout(flush.bind(this), 10); - } + this.debug('matchOne', file.length, pattern.length) - function _flush() { - if (previousLine) { - this.emit('data', previousLine); - previousLine = null; - } - } + for (var fi = 0, + pi = 0, + fl = file.length, + pl = pattern.length + ; (fi < fl) && (pi < pl) + ; fi++, pi++) { + this.debug('matchOne loop') + var p = pattern[pi] + var f = file[fi] - function lineMergerEnd() { - flush.call(this); - this.emit('end'); - } -} + this.debug(pattern, p, f) + // should be impossible. + // some invalid regexp stuff in the set. + if (p === false) return false -/***/ }), -/* 98 */ -/***/ (function(module, exports, __webpack_require__) { + if (p === GLOBSTAR) { + this.debug('GLOBSTAR', [pattern, p, f]) -//! moment.js locale configuration -//! locale : Afrikaans [af] -//! author : Werner Mollentze : https://github.com/wernerm - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var af = moment.defineLocale('af', { - months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'), - monthsShort : 'Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'), - weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'), - weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'), - weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'), - meridiemParse: /vm|nm/i, - isPM : function (input) { - return /^nm$/i.test(input); - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 12) { - return isLower ? 'vm' : 'VM'; - } else { - return isLower ? 'nm' : 'NM'; + // "**" + // a/**/b/**/c would match the following: + // a/b/x/y/z/c + // a/x/y/z/b/c + // a/b/x/b/x/c + // a/b/c + // To do this, take the rest of the pattern after + // the **, and see if it would match the file remainder. + // If so, return success. + // If not, the ** "swallows" a segment, and try again. + // This is recursively awful. + // + // a/**/b/**/c matching a/b/x/y/z/c + // - a matches a + // - doublestar + // - matchOne(b/x/y/z/c, b/**/c) + // - b matches b + // - doublestar + // - matchOne(x/y/z/c, c) -> no + // - matchOne(y/z/c, c) -> no + // - matchOne(z/c, c) -> no + // - matchOne(c, c) yes, hit + var fr = fi + var pr = pi + 1 + if (pr === pl) { + this.debug('** at the end') + // a ** at the end will just swallow the rest. + // We have found a match. + // however, it will not swallow /.x, unless + // options.dot is set. + // . and .. are *never* matched by **, for explosively + // exponential reasons. + for (; fi < fl; fi++) { + if (file[fi] === '.' || file[fi] === '..' || + (!options.dot && file[fi].charAt(0) === '.')) return false } - }, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Vandag om] LT', - nextDay : '[Môre om] LT', - nextWeek : 'dddd [om] LT', - lastDay : '[Gister om] LT', - lastWeek : '[Laas] dddd [om] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'oor %s', - past : '%s gelede', - s : '\'n paar sekondes', - ss : '%d sekondes', - m : '\'n minuut', - mm : '%d minute', - h : '\'n uur', - hh : '%d ure', - d : '\'n dag', - dd : '%d dae', - M : '\'n maand', - MM : '%d maande', - y : '\'n jaar', - yy : '%d jaar' - }, - dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, - ordinal : function (number) { - return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter - }, - week : { - dow : 1, // Maandag is die eerste dag van die week. - doy : 4 // Die week wat die 4de Januarie bevat is die eerste week van die jaar. - } -}); - -return af; + return true + } -}))); + // ok, let's see if we can swallow whatever we can. + while (fr < fl) { + var swallowee = file[fr] + this.debug('\nglobstar while', file, fr, pattern, pr, swallowee) -/***/ }), -/* 99 */ -/***/ (function(module, exports, __webpack_require__) { + // XXX remove this slice. Just pass the start index. + if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) { + this.debug('globstar found match!', fr, fl, swallowee) + // found a match. + return true + } else { + // can't swallow "." or ".." ever. + // can only swallow ".foo" when explicitly asked. + if (swallowee === '.' || swallowee === '..' || + (!options.dot && swallowee.charAt(0) === '.')) { + this.debug('dot detected!', file, fr, pattern, pr) + break + } -//! moment.js locale configuration -//! locale : Arabic [ar] -//! author : Abdel Said: https://github.com/abdelsaid -//! author : Ahmed Elkhatib -//! author : forabi https://github.com/forabi - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '١', - '2': '٢', - '3': '٣', - '4': '٤', - '5': '٥', - '6': '٦', - '7': '٧', - '8': '٨', - '9': '٩', - '0': '٠' -}; -var numberMap = { - '١': '1', - '٢': '2', - '٣': '3', - '٤': '4', - '٥': '5', - '٦': '6', - '٧': '7', - '٨': '8', - '٩': '9', - '٠': '0' -}; -var pluralForm = function (n) { - return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5; -}; -var plurals = { - s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'], - m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'], - h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'], - d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'], - M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'], - y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام'] -}; -var pluralize = function (u) { - return function (number, withoutSuffix, string, isFuture) { - var f = pluralForm(number), - str = plurals[u][pluralForm(number)]; - if (f === 2) { - str = str[withoutSuffix ? 0 : 1]; + // ** swallows a segment, and continue. + this.debug('globstar swallow a segment, and continue') + fr++ } - return str.replace(/%d/i, number); - }; -}; -var months = [ - 'يناير', - 'فبراير', - 'مارس', - 'أبريل', - 'مايو', - 'يونيو', - 'يوليو', - 'أغسطس', - 'سبتمبر', - 'أكتوبر', - 'نوفمبر', - 'ديسمبر' -]; + } -var ar = moment.defineLocale('ar', { - months : months, - monthsShort : months, - weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'D/\u200FM/\u200FYYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - meridiemParse: /ص|م/, - isPM : function (input) { - return 'م' === input; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'ص'; - } else { - return 'م'; - } - }, - calendar : { - sameDay: '[اليوم عند الساعة] LT', - nextDay: '[غدًا عند الساعة] LT', - nextWeek: 'dddd [عند الساعة] LT', - lastDay: '[أمس عند الساعة] LT', - lastWeek: 'dddd [عند الساعة] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'بعد %s', - past : 'منذ %s', - s : pluralize('s'), - ss : pluralize('s'), - m : pluralize('m'), - mm : pluralize('m'), - h : pluralize('h'), - hh : pluralize('h'), - d : pluralize('d'), - dd : pluralize('d'), - M : pluralize('M'), - MM : pluralize('M'), - y : pluralize('y'), - yy : pluralize('y') - }, - preparse: function (string) { - return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) { - return numberMap[match]; - }).replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }).replace(/,/g, '،'); - }, - week : { - dow : 6, // Saturday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. + // no match was found. + // However, in partial mode, we can't say this is necessarily over. + // If there's more *pattern* left, then + if (partial) { + // ran out of file + this.debug('\n>>> no match, partial?', file, fr, pattern, pr) + if (fr === fl) return true + } + return false } -}); -return ar; + // something other than ** + // non-magic patterns just have to match exactly + // patterns with magic have been turned into regexps. + var hit + if (typeof p === 'string') { + if (options.nocase) { + hit = f.toLowerCase() === p.toLowerCase() + } else { + hit = f === p + } + this.debug('string match', p, f, hit) + } else { + hit = f.match(p) + this.debug('pattern match', p, f, hit) + } -}))); + if (!hit) return false + } + // Note: ending in / means that we'll get a final "" + // at the end of the pattern. This can only match a + // corresponding "" at the end of the file. + // If the file ends in /, then it can only match a + // a pattern that ends in /, unless the pattern just + // doesn't have any more for it. But, a/b/ should *not* + // match "a/b/*", even though "" matches against the + // [^/]*? pattern, except in partial mode, where it might + // simply not be reached yet. + // However, a/b/ should still satisfy a/* -/***/ }), -/* 100 */ -/***/ (function(module, exports, __webpack_require__) { + // now either we fell off the end of the pattern, or we're done. + if (fi === fl && pi === pl) { + // ran out of pattern and filename at the same time. + // an exact hit! + return true + } else if (fi === fl) { + // ran out of file, but still had pattern left. + // this is ok if we're doing the match as part of + // a glob fs traversal. + return partial + } else if (pi === pl) { + // ran out of pattern, still have file left. + // this is only acceptable if we're on the very last + // empty segment of a file with a trailing slash. + // a/* should match a/b/ + var emptyFileEnd = (fi === fl - 1) && (file[fi] === '') + return emptyFileEnd + } -//! moment.js locale configuration -//! locale : Arabic (Algeria) [ar-dz] -//! author : Noureddine LOUAHEDJ : https://github.com/noureddineme - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var arDz = moment.defineLocale('ar-dz', { - months : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), - monthsShort : 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), - weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort : 'احد_اثنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin : 'أح_إث_ثلا_أر_خم_جم_سب'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[اليوم على الساعة] LT', - nextDay: '[غدا على الساعة] LT', - nextWeek: 'dddd [على الساعة] LT', - lastDay: '[أمس على الساعة] LT', - lastWeek: 'dddd [على الساعة] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'في %s', - past : 'منذ %s', - s : 'ثوان', - ss : '%d ثانية', - m : 'دقيقة', - mm : '%d دقائق', - h : 'ساعة', - hh : '%d ساعات', - d : 'يوم', - dd : '%d أيام', - M : 'شهر', - MM : '%d أشهر', - y : 'سنة', - yy : '%d سنوات' - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 4 // The week that contains Jan 1st is the first week of the year. - } -}); + // should be unreachable. + throw new Error('wtf?') +} -return arDz; +// replace stuff like \* with * +function globUnescape (s) { + return s.replace(/\\(.)/g, '$1') +} -}))); +function regExpEscape (s) { + return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') +} /***/ }), -/* 101 */ +/* 56 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Arabic (Kuwait) [ar-kw] -//! author : Nusret Parlak: https://github.com/nusretparlak - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var arKw = moment.defineLocale('ar-kw', { - months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'), - monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'), - weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[اليوم على الساعة] LT', - nextDay: '[غدا على الساعة] LT', - nextWeek: 'dddd [على الساعة] LT', - lastDay: '[أمس على الساعة] LT', - lastWeek: 'dddd [على الساعة] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'في %s', - past : 'منذ %s', - s : 'ثوان', - ss : '%d ثانية', - m : 'دقيقة', - mm : '%d دقائق', - h : 'ساعة', - hh : '%d ساعات', - d : 'يوم', - dd : '%d أيام', - M : 'شهر', - MM : '%d أشهر', - y : 'سنة', - yy : '%d سنوات' - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); - -return arKw; - -}))); - +"use strict"; -/***/ }), -/* 102 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Arabic (Lybia) [ar-ly] -//! author : Ali Hmer: https://github.com/kikoanis - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '1', - '2': '2', - '3': '3', - '4': '4', - '5': '5', - '6': '6', - '7': '7', - '8': '8', - '9': '9', - '0': '0' -}; -var pluralForm = function (n) { - return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5; -}; -var plurals = { - s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'], - m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'], - h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'], - d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'], - M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'], - y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام'] -}; -var pluralize = function (u) { - return function (number, withoutSuffix, string, isFuture) { - var f = pluralForm(number), - str = plurals[u][pluralForm(number)]; - if (f === 2) { - str = str[withoutSuffix ? 0 : 1]; - } - return str.replace(/%d/i, number); - }; -}; -var months = [ - 'يناير', - 'فبراير', - 'مارس', - 'أبريل', - 'مايو', - 'يونيو', - 'يوليو', - 'أغسطس', - 'سبتمبر', - 'أكتوبر', - 'نوفمبر', - 'ديسمبر' -]; +function posix(path) { + return path.charAt(0) === '/'; +} -var arLy = moment.defineLocale('ar-ly', { - months : months, - monthsShort : months, - weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'D/\u200FM/\u200FYYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - meridiemParse: /ص|م/, - isPM : function (input) { - return 'م' === input; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'ص'; - } else { - return 'م'; - } - }, - calendar : { - sameDay: '[اليوم عند الساعة] LT', - nextDay: '[غدًا عند الساعة] LT', - nextWeek: 'dddd [عند الساعة] LT', - lastDay: '[أمس عند الساعة] LT', - lastWeek: 'dddd [عند الساعة] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'بعد %s', - past : 'منذ %s', - s : pluralize('s'), - ss : pluralize('s'), - m : pluralize('m'), - mm : pluralize('m'), - h : pluralize('h'), - hh : pluralize('h'), - d : pluralize('d'), - dd : pluralize('d'), - M : pluralize('M'), - MM : pluralize('M'), - y : pluralize('y'), - yy : pluralize('y') - }, - preparse: function (string) { - return string.replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }).replace(/,/g, '،'); - }, - week : { - dow : 6, // Saturday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); +function win32(path) { + // https://github.com/nodejs/node/blob/b3fcc245fb25539909ef1d5eaa01dbf92e168633/lib/path.js#L56 + var splitDeviceRe = /^([a-zA-Z]:|[\\\/]{2}[^\\\/]+[\\\/]+[^\\\/]+)?([\\\/])?([\s\S]*?)$/; + var result = splitDeviceRe.exec(path); + var device = result[1] || ''; + var isUnc = Boolean(device && device.charAt(1) !== ':'); -return arLy; + // UNC paths are always absolute + return Boolean(result[2] || isUnc); +} -}))); +module.exports = process.platform === 'win32' ? win32 : posix; +module.exports.posix = posix; +module.exports.win32 = win32; /***/ }), -/* 103 */ +/* 57 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Arabic (Morocco) [ar-ma] -//! author : ElFadili Yassine : https://github.com/ElFadiliY -//! author : Abdel Said : https://github.com/abdelsaid - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var arMa = moment.defineLocale('ar-ma', { - months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'), - monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'), - weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[اليوم على الساعة] LT', - nextDay: '[غدا على الساعة] LT', - nextWeek: 'dddd [على الساعة] LT', - lastDay: '[أمس على الساعة] LT', - lastWeek: 'dddd [على الساعة] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'في %s', - past : 'منذ %s', - s : 'ثوان', - ss : '%d ثانية', - m : 'دقيقة', - mm : '%d دقائق', - h : 'ساعة', - hh : '%d ساعات', - d : 'يوم', - dd : '%d أيام', - M : 'شهر', - MM : '%d أشهر', - y : 'سنة', - yy : '%d سنوات' - }, - week : { - dow : 6, // Saturday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); - -return arMa; +"use strict"; -}))); +Object.defineProperty(exports, "__esModule", { + value: true +}); +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +class CliError extends Error { + constructor(message, meta = {}) { + super(message); + this.meta = meta; + } +} +exports.CliError = CliError; /***/ }), -/* 104 */ +/* 58 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Arabic (Saudi Arabia) [ar-sa] -//! author : Suhail Alkowaileet : https://github.com/xsoh - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '١', - '2': '٢', - '3': '٣', - '4': '٤', - '5': '٥', - '6': '٦', - '7': '٧', - '8': '٨', - '9': '٩', - '0': '٠' -}; -var numberMap = { - '١': '1', - '٢': '2', - '٣': '3', - '٤': '4', - '٥': '5', - '٦': '6', - '٧': '7', - '٨': '8', - '٩': '9', - '٠': '0' -}; +// Note: since nyc uses this module to output coverage, any lines +// that are in the direct sync flow of nyc's outputCoverage are +// ignored, since we can never get coverage for them. +var assert = __webpack_require__(28) +var signals = __webpack_require__(189) -var arSa = moment.defineLocale('ar-sa', { - months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), - monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), - weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - meridiemParse: /ص|م/, - isPM : function (input) { - return 'م' === input; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'ص'; - } else { - return 'م'; - } - }, - calendar : { - sameDay: '[اليوم على الساعة] LT', - nextDay: '[غدا على الساعة] LT', - nextWeek: 'dddd [على الساعة] LT', - lastDay: '[أمس على الساعة] LT', - lastWeek: 'dddd [على الساعة] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'في %s', - past : 'منذ %s', - s : 'ثوان', - ss : '%d ثانية', - m : 'دقيقة', - mm : '%d دقائق', - h : 'ساعة', - hh : '%d ساعات', - d : 'يوم', - dd : '%d أيام', - M : 'شهر', - MM : '%d أشهر', - y : 'سنة', - yy : '%d سنوات' - }, - preparse: function (string) { - return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) { - return numberMap[match]; - }).replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }).replace(/,/g, '،'); - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); +var EE = __webpack_require__(40) +/* istanbul ignore if */ +if (typeof EE !== 'function') { + EE = EE.EventEmitter +} -return arSa; +var emitter +if (process.__signal_exit_emitter__) { + emitter = process.__signal_exit_emitter__ +} else { + emitter = process.__signal_exit_emitter__ = new EE() + emitter.count = 0 + emitter.emitted = {} +} -}))); +// Because this emitter is a global, we have to check to see if a +// previous version of this library failed to enable infinite listeners. +// I know what you're about to say. But literally everything about +// signal-exit is a compromise with evil. Get used to it. +if (!emitter.infinite) { + emitter.setMaxListeners(Infinity) + emitter.infinite = true +} +module.exports = function (cb, opts) { + assert.equal(typeof cb, 'function', 'a callback must be provided for exit handler') -/***/ }), -/* 105 */ -/***/ (function(module, exports, __webpack_require__) { + if (loaded === false) { + load() + } -//! moment.js locale configuration -//! locale : Arabic (Tunisia) [ar-tn] -//! author : Nader Toukabri : https://github.com/naderio - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var arTn = moment.defineLocale('ar-tn', { - months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), - monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'), - weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'), - weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'), - weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'), - weekdaysParseExact : true, - longDateFormat: { - LT: 'HH:mm', - LTS: 'HH:mm:ss', - L: 'DD/MM/YYYY', - LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY HH:mm', - LLLL: 'dddd D MMMM YYYY HH:mm' - }, - calendar: { - sameDay: '[اليوم على الساعة] LT', - nextDay: '[غدا على الساعة] LT', - nextWeek: 'dddd [على الساعة] LT', - lastDay: '[أمس على الساعة] LT', - lastWeek: 'dddd [على الساعة] LT', - sameElse: 'L' - }, - relativeTime: { - future: 'في %s', - past: 'منذ %s', - s: 'ثوان', - ss : '%d ثانية', - m: 'دقيقة', - mm: '%d دقائق', - h: 'ساعة', - hh: '%d ساعات', - d: 'يوم', - dd: '%d أيام', - M: 'شهر', - MM: '%d أشهر', - y: 'سنة', - yy: '%d سنوات' - }, - week: { - dow: 1, // Monday is the first day of the week. - doy: 4 // The week that contains Jan 4th is the first week of the year. - } -}); + var ev = 'exit' + if (opts && opts.alwaysLast) { + ev = 'afterexit' + } -return arTn; + var remove = function () { + emitter.removeListener(ev, cb) + if (emitter.listeners('exit').length === 0 && + emitter.listeners('afterexit').length === 0) { + unload() + } + } + emitter.on(ev, cb) -}))); + return remove +} +module.exports.unload = unload +function unload () { + if (!loaded) { + return + } + loaded = false -/***/ }), -/* 106 */ -/***/ (function(module, exports, __webpack_require__) { + signals.forEach(function (sig) { + try { + process.removeListener(sig, sigListeners[sig]) + } catch (er) {} + }) + process.emit = originalProcessEmit + process.reallyExit = originalProcessReallyExit + emitter.count -= 1 +} -//! moment.js locale configuration -//! locale : Azerbaijani [az] -//! author : topchiyev : https://github.com/topchiyev - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var suffixes = { - 1: '-inci', - 5: '-inci', - 8: '-inci', - 70: '-inci', - 80: '-inci', - 2: '-nci', - 7: '-nci', - 20: '-nci', - 50: '-nci', - 3: '-üncü', - 4: '-üncü', - 100: '-üncü', - 6: '-ncı', - 9: '-uncu', - 10: '-uncu', - 30: '-uncu', - 60: '-ıncı', - 90: '-ıncı' -}; +function emit (event, code, signal) { + if (emitter.emitted[event]) { + return + } + emitter.emitted[event] = true + emitter.emit(event, code, signal) +} -var az = moment.defineLocale('az', { - months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'), - monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'), - weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'), - weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'), - weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[bugün saat] LT', - nextDay : '[sabah saat] LT', - nextWeek : '[gələn həftə] dddd [saat] LT', - lastDay : '[dünən] LT', - lastWeek : '[keçən həftə] dddd [saat] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s sonra', - past : '%s əvvəl', - s : 'birneçə saniyyə', - ss : '%d saniyə', - m : 'bir dəqiqə', - mm : '%d dəqiqə', - h : 'bir saat', - hh : '%d saat', - d : 'bir gün', - dd : '%d gün', - M : 'bir ay', - MM : '%d ay', - y : 'bir il', - yy : '%d il' - }, - meridiemParse: /gecə|səhər|gündüz|axşam/, - isPM : function (input) { - return /^(gündüz|axşam)$/.test(input); - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'gecə'; - } else if (hour < 12) { - return 'səhər'; - } else if (hour < 17) { - return 'gündüz'; - } else { - return 'axşam'; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/, - ordinal : function (number) { - if (number === 0) { // special case for zero - return number + '-ıncı'; - } - var a = number % 10, - b = number % 100 - a, - c = number >= 100 ? 100 : null; - return number + (suffixes[a] || suffixes[b] || suffixes[c]); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. +// { : , ... } +var sigListeners = {} +signals.forEach(function (sig) { + sigListeners[sig] = function listener () { + // If there are no other listeners, an exit is coming! + // Simplest way: remove us and then re-send the signal. + // We know that this will kill the process, so we can + // safely emit now. + var listeners = process.listeners(sig) + if (listeners.length === emitter.count) { + unload() + emit('exit', null, sig) + /* istanbul ignore next */ + emit('afterexit', null, sig) + /* istanbul ignore next */ + process.kill(process.pid, sig) } -}); - -return az; + } +}) -}))); +module.exports.signals = function () { + return signals +} +module.exports.load = load -/***/ }), -/* 107 */ -/***/ (function(module, exports, __webpack_require__) { +var loaded = false -//! moment.js locale configuration -//! locale : Belarusian [be] -//! author : Dmitry Demidov : https://github.com/demidov91 -//! author: Praleska: http://praleska.pro/ -//! Author : Menelion Elensúle : https://github.com/Oire +function load () { + if (loaded) { + return + } + loaded = true -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; + // This is the number of onSignalExit's that are in play. + // It's important so that we can count the correct number of + // listeners on signals, and don't wait for the other one to + // handle it instead of us. + emitter.count += 1 + signals = signals.filter(function (sig) { + try { + process.on(sig, sigListeners[sig]) + return true + } catch (er) { + return false + } + }) -function plural(word, num) { - var forms = word.split('_'); - return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]); + process.emit = processEmit + process.reallyExit = processReallyExit } -function relativeTimeWithPlural(number, withoutSuffix, key) { - var format = { - 'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд', - 'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін', - 'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін', - 'dd': 'дзень_дні_дзён', - 'MM': 'месяц_месяцы_месяцаў', - 'yy': 'год_гады_гадоў' - }; - if (key === 'm') { - return withoutSuffix ? 'хвіліна' : 'хвіліну'; - } - else if (key === 'h') { - return withoutSuffix ? 'гадзіна' : 'гадзіну'; - } - else { - return number + ' ' + plural(format[key], +number); - } + +var originalProcessReallyExit = process.reallyExit +function processReallyExit (code) { + process.exitCode = code || 0 + emit('exit', process.exitCode, null) + /* istanbul ignore next */ + emit('afterexit', process.exitCode, null) + /* istanbul ignore next */ + originalProcessReallyExit.call(process, process.exitCode) } -var be = moment.defineLocale('be', { - months : { - format: 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_'), - standalone: 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_') - }, - monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'), - weekdays : { - format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'), - standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'), - isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/ - }, - weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'), - weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY г.', - LLL : 'D MMMM YYYY г., HH:mm', - LLLL : 'dddd, D MMMM YYYY г., HH:mm' - }, - calendar : { - sameDay: '[Сёння ў] LT', - nextDay: '[Заўтра ў] LT', - lastDay: '[Учора ў] LT', - nextWeek: function () { - return '[У] dddd [ў] LT'; - }, - lastWeek: function () { - switch (this.day()) { - case 0: - case 3: - case 5: - case 6: - return '[У мінулую] dddd [ў] LT'; - case 1: - case 2: - case 4: - return '[У мінулы] dddd [ў] LT'; - } - }, - sameElse: 'L' - }, - relativeTime : { - future : 'праз %s', - past : '%s таму', - s : 'некалькі секунд', - m : relativeTimeWithPlural, - mm : relativeTimeWithPlural, - h : relativeTimeWithPlural, - hh : relativeTimeWithPlural, - d : 'дзень', - dd : relativeTimeWithPlural, - M : 'месяц', - MM : relativeTimeWithPlural, - y : 'год', - yy : relativeTimeWithPlural - }, - meridiemParse: /ночы|раніцы|дня|вечара/, - isPM : function (input) { - return /^(дня|вечара)$/.test(input); - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'ночы'; - } else if (hour < 12) { - return 'раніцы'; - } else if (hour < 17) { - return 'дня'; - } else { - return 'вечара'; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}-(і|ы|га)/, - ordinal: function (number, period) { - switch (period) { - case 'M': - case 'd': - case 'DDD': - case 'w': - case 'W': - return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы'; - case 'D': - return number + '-га'; - default: - return number; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. +var originalProcessEmit = process.emit +function processEmit (ev, arg) { + if (ev === 'exit') { + if (arg !== undefined) { + process.exitCode = arg } -}); - -return be; - -}))); + var ret = originalProcessEmit.apply(this, arguments) + emit('exit', process.exitCode, null) + /* istanbul ignore next */ + emit('afterexit', process.exitCode, null) + return ret + } else { + return originalProcessEmit.apply(this, arguments) + } +} /***/ }), -/* 108 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Bulgarian [bg] -//! author : Krasen Borisov : https://github.com/kraz - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var bg = moment.defineLocale('bg', { - months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'), - monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'), - weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'), - weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'), - weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'), - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'D.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY H:mm', - LLLL : 'dddd, D MMMM YYYY H:mm' - }, - calendar : { - sameDay : '[Днес в] LT', - nextDay : '[Утре в] LT', - nextWeek : 'dddd [в] LT', - lastDay : '[Вчера в] LT', - lastWeek : function () { - switch (this.day()) { - case 0: - case 3: - case 6: - return '[В изминалата] dddd [в] LT'; - case 1: - case 2: - case 4: - case 5: - return '[В изминалия] dddd [в] LT'; - } - }, - sameElse : 'L' - }, - relativeTime : { - future : 'след %s', - past : 'преди %s', - s : 'няколко секунди', - ss : '%d секунди', - m : 'минута', - mm : '%d минути', - h : 'час', - hh : '%d часа', - d : 'ден', - dd : '%d дни', - M : 'месец', - MM : '%d месеца', - y : 'година', - yy : '%d години' - }, - dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, - ordinal : function (number) { - var lastDigit = number % 10, - last2Digits = number % 100; - if (number === 0) { - return number + '-ев'; - } else if (last2Digits === 0) { - return number + '-ен'; - } else if (last2Digits > 10 && last2Digits < 20) { - return number + '-ти'; - } else if (lastDigit === 1) { - return number + '-ви'; - } else if (lastDigit === 2) { - return number + '-ри'; - } else if (lastDigit === 7 || lastDigit === 8) { - return number + '-ми'; - } else { - return number + '-ти'; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); - -return bg; - -}))); +/* 59 */ +/***/ (function(module, exports) { +module.exports = require("child_process"); /***/ }), -/* 109 */ +/* 60 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Bambara [bm] -//! author : Estelle Comment : https://github.com/estellecomment - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - -// Language contact person : Abdoufata Kane : https://github.com/abdoufata - -var bm = moment.defineLocale('bm', { - months : 'Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_Mɛkalo_Zuwɛnkalo_Zuluyekalo_Utikalo_Sɛtanburukalo_ɔkutɔburukalo_Nowanburukalo_Desanburukalo'.split('_'), - monthsShort : 'Zan_Few_Mar_Awi_Mɛ_Zuw_Zul_Uti_Sɛt_ɔku_Now_Des'.split('_'), - weekdays : 'Kari_Ntɛnɛn_Tarata_Araba_Alamisa_Juma_Sibiri'.split('_'), - weekdaysShort : 'Kar_Ntɛ_Tar_Ara_Ala_Jum_Sib'.split('_'), - weekdaysMin : 'Ka_Nt_Ta_Ar_Al_Ju_Si'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'MMMM [tile] D [san] YYYY', - LLL : 'MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm', - LLLL : 'dddd MMMM [tile] D [san] YYYY [lɛrɛ] HH:mm' - }, - calendar : { - sameDay : '[Bi lɛrɛ] LT', - nextDay : '[Sini lɛrɛ] LT', - nextWeek : 'dddd [don lɛrɛ] LT', - lastDay : '[Kunu lɛrɛ] LT', - lastWeek : 'dddd [tɛmɛnen lɛrɛ] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s kɔnɔ', - past : 'a bɛ %s bɔ', - s : 'sanga dama dama', - ss : 'sekondi %d', - m : 'miniti kelen', - mm : 'miniti %d', - h : 'lɛrɛ kelen', - hh : 'lɛrɛ %d', - d : 'tile kelen', - dd : 'tile %d', - M : 'kalo kelen', - MM : 'kalo %d', - y : 'san kelen', - yy : 'san %d' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return bm; - -}))); - - -/***/ }), -/* 110 */ -/***/ (function(module, exports, __webpack_require__) { +"use strict"; -//! moment.js locale configuration -//! locale : Bengali [bn] -//! author : Kaushik Gandhi : https://github.com/kaushikgandhi - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '১', - '2': '২', - '3': '৩', - '4': '৪', - '5': '৫', - '6': '৬', - '7': '৭', - '8': '৮', - '9': '৯', - '0': '০' -}; -var numberMap = { - '১': '1', - '২': '2', - '৩': '3', - '৪': '4', - '৫': '5', - '৬': '6', - '৭': '7', - '৮': '8', - '৯': '9', - '০': '0' -}; -var bn = moment.defineLocale('bn', { - months : 'জানুয়ারী_ফেব্রুয়ারি_মার্চ_এপ্রিল_মে_জুন_জুলাই_আগস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'), - monthsShort : 'জানু_ফেব_মার্চ_এপ্র_মে_জুন_জুল_আগ_সেপ্ট_অক্টো_নভে_ডিসে'.split('_'), - weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পতিবার_শুক্রবার_শনিবার'.split('_'), - weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পতি_শুক্র_শনি'.split('_'), - weekdaysMin : 'রবি_সোম_মঙ্গ_বুধ_বৃহঃ_শুক্র_শনি'.split('_'), - longDateFormat : { - LT : 'A h:mm সময়', - LTS : 'A h:mm:ss সময়', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm সময়', - LLLL : 'dddd, D MMMM YYYY, A h:mm সময়' - }, - calendar : { - sameDay : '[আজ] LT', - nextDay : '[আগামীকাল] LT', - nextWeek : 'dddd, LT', - lastDay : '[গতকাল] LT', - lastWeek : '[গত] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s পরে', - past : '%s আগে', - s : 'কয়েক সেকেন্ড', - ss : '%d সেকেন্ড', - m : 'এক মিনিট', - mm : '%d মিনিট', - h : 'এক ঘন্টা', - hh : '%d ঘন্টা', - d : 'এক দিন', - dd : '%d দিন', - M : 'এক মাস', - MM : '%d মাস', - y : 'এক বছর', - yy : '%d বছর' - }, - preparse: function (string) { - return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if ((meridiem === 'রাত' && hour >= 4) || - (meridiem === 'দুপুর' && hour < 5) || - meridiem === 'বিকাল') { - return hour + 12; - } else { - return hour; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'রাত'; - } else if (hour < 10) { - return 'সকাল'; - } else if (hour < 17) { - return 'দুপুর'; - } else if (hour < 20) { - return 'বিকাল'; - } else { - return 'রাত'; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } +Object.defineProperty(exports, "__esModule", { + value: true }); +exports.getProjectPaths = getProjectPaths; -return bn; - -}))); +var _path = __webpack_require__(2); +/** + * Returns all the paths where plugins are located + */ +function getProjectPaths(rootPath, options) { + const skipKibanaExtra = Boolean(options['skip-kibana-extra']); + const ossOnly = Boolean(options.oss); + const projectPaths = [rootPath, (0, _path.resolve)(rootPath, 'packages/*')]; + if (!ossOnly) { + projectPaths.push((0, _path.resolve)(rootPath, 'x-pack')); + projectPaths.push((0, _path.resolve)(rootPath, 'x-pack/plugins/*')); + } + if (!skipKibanaExtra) { + projectPaths.push((0, _path.resolve)(rootPath, '../kibana-extra/*')); + projectPaths.push((0, _path.resolve)(rootPath, '../kibana-extra/*/packages/*')); + projectPaths.push((0, _path.resolve)(rootPath, '../kibana-extra/*/plugins/*')); + } + return projectPaths; +} /* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ /***/ }), -/* 111 */ -/***/ (function(module, exports, __webpack_require__) { +/* 61 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -//! moment.js locale configuration -//! locale : Tibetan [bo] -//! author : Thupten N. Chakrishar : https://github.com/vajradog - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '༡', - '2': '༢', - '3': '༣', - '4': '༤', - '5': '༥', - '6': '༦', - '7': '༧', - '8': '༨', - '9': '༩', - '0': '༠' -}; -var numberMap = { - '༡': '1', - '༢': '2', - '༣': '3', - '༤': '4', - '༥': '5', - '༦': '6', - '༧': '7', - '༨': '8', - '༩': '9', - '༠': '0' -}; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = hostReportError; +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +function hostReportError(err) { + setTimeout(function () { throw err; }); +} +//# sourceMappingURL=hostReportError.js.map -var bo = moment.defineLocale('bo', { - months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'), - monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'), - weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'), - weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'), - weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'), - longDateFormat : { - LT : 'A h:mm', - LTS : 'A h:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm', - LLLL : 'dddd, D MMMM YYYY, A h:mm' - }, - calendar : { - sameDay : '[དི་རིང] LT', - nextDay : '[སང་ཉིན] LT', - nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT', - lastDay : '[ཁ་སང] LT', - lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s ལ་', - past : '%s སྔན་ལ', - s : 'ལམ་སང', - ss : '%d སྐར་ཆ།', - m : 'སྐར་མ་གཅིག', - mm : '%d སྐར་མ', - h : 'ཆུ་ཚོད་གཅིག', - hh : '%d ཆུ་ཚོད', - d : 'ཉིན་གཅིག', - dd : '%d ཉིན་', - M : 'ཟླ་བ་གཅིག', - MM : '%d ཟླ་བ', - y : 'ལོ་གཅིག', - yy : '%d ལོ' - }, - preparse: function (string) { - return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if ((meridiem === 'མཚན་མོ' && hour >= 4) || - (meridiem === 'ཉིན་གུང' && hour < 5) || - meridiem === 'དགོང་དག') { - return hour + 12; - } else { - return hour; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'མཚན་མོ'; - } else if (hour < 10) { - return 'ཞོགས་ཀས'; - } else if (hour < 17) { - return 'ཉིན་གུང'; - } else if (hour < 20) { - return 'དགོང་དག'; - } else { - return 'མཚན་མོ'; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); -return bo; +/***/ }), +/* 62 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -}))); +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return rxSubscriber; }); +/* unused harmony export $$rxSubscriber */ +/** PURE_IMPORTS_START PURE_IMPORTS_END */ +var rxSubscriber = (typeof Symbol === 'function' && typeof Symbol.for === 'function') + ? /*@__PURE__*/ Symbol.for('rxSubscriber') + : '@@rxSubscriber'; +var $$rxSubscriber = rxSubscriber; +//# sourceMappingURL=rxSubscriber.js.map /***/ }), -/* 112 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Breton [br] -//! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +/* 63 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = pipe; +/* harmony export (immutable) */ __webpack_exports__["b"] = pipeFromArray; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__noop__ = __webpack_require__(43); +/** PURE_IMPORTS_START _noop PURE_IMPORTS_END */ -function relativeTimeWithMutation(number, withoutSuffix, key) { - var format = { - 'mm': 'munutenn', - 'MM': 'miz', - 'dd': 'devezh' - }; - return number + ' ' + mutation(format[key], number); -} -function specialMutationForYears(number) { - switch (lastNumber(number)) { - case 1: - case 3: - case 4: - case 5: - case 9: - return number + ' bloaz'; - default: - return number + ' vloaz'; +function pipe() { + var fns = []; + for (var _i = 0; _i < arguments.length; _i++) { + fns[_i] = arguments[_i]; } + return pipeFromArray(fns); } -function lastNumber(number) { - if (number > 9) { - return lastNumber(number % 10); +function pipeFromArray(fns) { + if (!fns) { + return __WEBPACK_IMPORTED_MODULE_0__noop__["a" /* noop */]; } - return number; -} -function mutation(text, number) { - if (number === 2) { - return softMutation(text); + if (fns.length === 1) { + return fns[0]; } - return text; -} -function softMutation(text) { - var mutationTable = { - 'm': 'v', - 'b': 'v', - 'd': 'z' + return function piped(input) { + return fns.reduce(function (prev, fn) { return fn(prev); }, input); }; - if (mutationTable[text.charAt(0)] === undefined) { - return text; - } - return mutationTable[text.charAt(0)] + text.substring(1); } - -var br = moment.defineLocale('br', { - months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'), - monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'), - weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'), - weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'), - weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'h[e]mm A', - LTS : 'h[e]mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D [a viz] MMMM YYYY', - LLL : 'D [a viz] MMMM YYYY h[e]mm A', - LLLL : 'dddd, D [a viz] MMMM YYYY h[e]mm A' - }, - calendar : { - sameDay : '[Hiziv da] LT', - nextDay : '[Warc\'hoazh da] LT', - nextWeek : 'dddd [da] LT', - lastDay : '[Dec\'h da] LT', - lastWeek : 'dddd [paset da] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'a-benn %s', - past : '%s \'zo', - s : 'un nebeud segondennoù', - ss : '%d eilenn', - m : 'ur vunutenn', - mm : relativeTimeWithMutation, - h : 'un eur', - hh : '%d eur', - d : 'un devezh', - dd : relativeTimeWithMutation, - M : 'ur miz', - MM : relativeTimeWithMutation, - y : 'ur bloaz', - yy : specialMutationForYears - }, - dayOfMonthOrdinalParse: /\d{1,2}(añ|vet)/, - ordinal : function (number) { - var output = (number === 1) ? 'añ' : 'vet'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return br; - -}))); +//# sourceMappingURL=pipe.js.map /***/ }), -/* 113 */ -/***/ (function(module, exports, __webpack_require__) { +/* 64 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -//! moment.js locale configuration -//! locale : Bosnian [bs] -//! author : Nedim Cholich : https://github.com/frontyard -//! based on (hr) translation by Bojan Marković - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function translate(number, withoutSuffix, key) { - var result = number + ' '; - switch (key) { - case 'ss': - if (number === 1) { - result += 'sekunda'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'sekunde'; - } else { - result += 'sekundi'; - } - return result; - case 'm': - return withoutSuffix ? 'jedna minuta' : 'jedne minute'; - case 'mm': - if (number === 1) { - result += 'minuta'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'minute'; - } else { - result += 'minuta'; - } - return result; - case 'h': - return withoutSuffix ? 'jedan sat' : 'jednog sata'; - case 'hh': - if (number === 1) { - result += 'sat'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'sata'; - } else { - result += 'sati'; - } - return result; - case 'dd': - if (number === 1) { - result += 'dan'; - } else { - result += 'dana'; - } - return result; - case 'MM': - if (number === 1) { - result += 'mjesec'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'mjeseca'; - } else { - result += 'mjeseci'; - } - return result; - case 'yy': - if (number === 1) { - result += 'godina'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'godine'; - } else { - result += 'godina'; - } - return result; - } -} - -var bs = moment.defineLocale('bs', { - months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'), - monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'), - monthsParseExact: true, - weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'), - weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'), - weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY H:mm', - LLLL : 'dddd, D. MMMM YYYY H:mm' - }, - calendar : { - sameDay : '[danas u] LT', - nextDay : '[sutra u] LT', - nextWeek : function () { - switch (this.day()) { - case 0: - return '[u] [nedjelju] [u] LT'; - case 3: - return '[u] [srijedu] [u] LT'; - case 6: - return '[u] [subotu] [u] LT'; - case 1: - case 2: - case 4: - case 5: - return '[u] dddd [u] LT'; - } - }, - lastDay : '[jučer u] LT', - lastWeek : function () { - switch (this.day()) { - case 0: - case 3: - return '[prošlu] dddd [u] LT'; - case 6: - return '[prošle] [subote] [u] LT'; - case 1: - case 2: - case 4: - case 5: - return '[prošli] dddd [u] LT'; - } - }, - sameElse : 'L' - }, - relativeTime : { - future : 'za %s', - past : 'prije %s', - s : 'par sekundi', - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : 'dan', - dd : translate, - M : 'mjesec', - MM : translate, - y : 'godinu', - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = refCount; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ -return bs; -}))); +function refCount() { + return function refCountOperatorFunction(source) { + return source.lift(new RefCountOperator(source)); + }; +} +var RefCountOperator = /*@__PURE__*/ (function () { + function RefCountOperator(connectable) { + this.connectable = connectable; + } + RefCountOperator.prototype.call = function (subscriber, source) { + var connectable = this.connectable; + connectable._refCount++; + var refCounter = new RefCountSubscriber(subscriber, connectable); + var subscription = source.subscribe(refCounter); + if (!refCounter.closed) { + refCounter.connection = connectable.connect(); + } + return subscription; + }; + return RefCountOperator; +}()); +var RefCountSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](RefCountSubscriber, _super); + function RefCountSubscriber(destination, connectable) { + var _this = _super.call(this, destination) || this; + _this.connectable = connectable; + return _this; + } + RefCountSubscriber.prototype._unsubscribe = function () { + var connectable = this.connectable; + if (!connectable) { + this.connection = null; + return; + } + this.connectable = null; + var refCount = connectable._refCount; + if (refCount <= 0) { + this.connection = null; + return; + } + connectable._refCount = refCount - 1; + if (refCount > 1) { + this.connection = null; + return; + } + var connection = this.connection; + var sharedConnection = connectable._connection; + this.connection = null; + if (sharedConnection && (!connection || sharedConnection === connection)) { + sharedConnection.unsubscribe(); + } + }; + return RefCountSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=refCount.js.map /***/ }), -/* 114 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Catalan [ca] -//! author : Juan G. Hurtado : https://github.com/juanghurtado +/* 65 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +"use strict"; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ReplaySubject; }); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__ = __webpack_require__(109); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__ = __webpack_require__(111); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__ = __webpack_require__(44); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__ = __webpack_require__(106); +/** PURE_IMPORTS_START tslib,_Subject,_scheduler_queue,_Subscription,_operators_observeOn,_util_ObjectUnsubscribedError,_SubjectSubscription PURE_IMPORTS_END */ -var ca = moment.defineLocale('ca', { - months : { - standalone: 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'), - format: 'de gener_de febrer_de març_d\'abril_de maig_de juny_de juliol_d\'agost_de setembre_d\'octubre_de novembre_de desembre'.split('_'), - isFormat: /D[oD]?(\s)+MMMM/ - }, - monthsShort : 'gen._febr._març_abr._maig_juny_jul._ag._set._oct._nov._des.'.split('_'), - monthsParseExact : true, - weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'), - weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'), - weekdaysMin : 'dg_dl_dt_dc_dj_dv_ds'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM [de] YYYY', - ll : 'D MMM YYYY', - LLL : 'D MMMM [de] YYYY [a les] H:mm', - lll : 'D MMM YYYY, H:mm', - LLLL : 'dddd D MMMM [de] YYYY [a les] H:mm', - llll : 'ddd D MMM YYYY, H:mm' - }, - calendar : { - sameDay : function () { - return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; - }, - nextDay : function () { - return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; - }, - nextWeek : function () { - return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; - }, - lastDay : function () { - return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; - }, - lastWeek : function () { - return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT'; - }, - sameElse : 'L' - }, - relativeTime : { - future : 'd\'aquí %s', - past : 'fa %s', - s : 'uns segons', - ss : '%d segons', - m : 'un minut', - mm : '%d minuts', - h : 'una hora', - hh : '%d hores', - d : 'un dia', - dd : '%d dies', - M : 'un mes', - MM : '%d mesos', - y : 'un any', - yy : '%d anys' - }, - dayOfMonthOrdinalParse: /\d{1,2}(r|n|t|è|a)/, - ordinal : function (number, period) { - var output = (number === 1) ? 'r' : - (number === 2) ? 'n' : - (number === 3) ? 'r' : - (number === 4) ? 't' : 'è'; - if (period === 'w' || period === 'W') { - output = 'a'; - } - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); -return ca; -}))); -/***/ }), -/* 115 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Czech [cs] -//! author : petrbela : https://github.com/petrbela - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'); -var monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_'); -function plural(n) { - return (n > 1) && (n < 5) && (~~(n / 10) !== 1); -} -function translate(number, withoutSuffix, key, isFuture) { - var result = number + ' '; - switch (key) { - case 's': // a few seconds / in a few seconds / a few seconds ago - return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami'; - case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'sekundy' : 'sekund'); - } else { - return result + 'sekundami'; - } - break; - case 'm': // a minute / in a minute / a minute ago - return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou'); - case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'minuty' : 'minut'); - } else { - return result + 'minutami'; - } - break; - case 'h': // an hour / in an hour / an hour ago - return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou'); - case 'hh': // 9 hours / in 9 hours / 9 hours ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'hodiny' : 'hodin'); - } else { - return result + 'hodinami'; - } - break; - case 'd': // a day / in a day / a day ago - return (withoutSuffix || isFuture) ? 'den' : 'dnem'; - case 'dd': // 9 days / in 9 days / 9 days ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'dny' : 'dní'); - } else { - return result + 'dny'; - } - break; - case 'M': // a month / in a month / a month ago - return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem'; - case 'MM': // 9 months / in 9 months / 9 months ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'měsíce' : 'měsíců'); - } else { - return result + 'měsíci'; - } - break; - case 'y': // a year / in a year / a year ago - return (withoutSuffix || isFuture) ? 'rok' : 'rokem'; - case 'yy': // 9 years / in 9 years / 9 years ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'roky' : 'let'); - } else { - return result + 'lety'; - } - break; +var ReplaySubject = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ReplaySubject, _super); + function ReplaySubject(bufferSize, windowTime, scheduler) { + if (bufferSize === void 0) { + bufferSize = Number.POSITIVE_INFINITY; + } + if (windowTime === void 0) { + windowTime = Number.POSITIVE_INFINITY; + } + var _this = _super.call(this) || this; + _this.scheduler = scheduler; + _this._events = []; + _this._infiniteTimeWindow = false; + _this._bufferSize = bufferSize < 1 ? 1 : bufferSize; + _this._windowTime = windowTime < 1 ? 1 : windowTime; + if (windowTime === Number.POSITIVE_INFINITY) { + _this._infiniteTimeWindow = true; + _this.next = _this.nextInfiniteTimeWindow; + } + else { + _this.next = _this.nextTimeWindow; + } + return _this; } -} - -var cs = moment.defineLocale('cs', { - months : months, - monthsShort : monthsShort, - monthsParse : (function (months, monthsShort) { - var i, _monthsParse = []; - for (i = 0; i < 12; i++) { - // use custom parser to solve problem with July (červenec) - _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i'); - } - return _monthsParse; - }(months, monthsShort)), - shortMonthsParse : (function (monthsShort) { - var i, _shortMonthsParse = []; - for (i = 0; i < 12; i++) { - _shortMonthsParse[i] = new RegExp('^' + monthsShort[i] + '$', 'i'); - } - return _shortMonthsParse; - }(monthsShort)), - longMonthsParse : (function (months) { - var i, _longMonthsParse = []; - for (i = 0; i < 12; i++) { - _longMonthsParse[i] = new RegExp('^' + months[i] + '$', 'i'); - } - return _longMonthsParse; - }(months)), - weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'), - weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'), - weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'), - longDateFormat : { - LT: 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY H:mm', - LLLL : 'dddd D. MMMM YYYY H:mm', - l : 'D. M. YYYY' - }, - calendar : { - sameDay: '[dnes v] LT', - nextDay: '[zítra v] LT', - nextWeek: function () { - switch (this.day()) { - case 0: - return '[v neděli v] LT'; - case 1: - case 2: - return '[v] dddd [v] LT'; - case 3: - return '[ve středu v] LT'; - case 4: - return '[ve čtvrtek v] LT'; - case 5: - return '[v pátek v] LT'; - case 6: - return '[v sobotu v] LT'; + ReplaySubject.prototype.nextInfiniteTimeWindow = function (value) { + var _events = this._events; + _events.push(value); + if (_events.length > this._bufferSize) { + _events.shift(); + } + _super.prototype.next.call(this, value); + }; + ReplaySubject.prototype.nextTimeWindow = function (value) { + this._events.push(new ReplayEvent(this._getNow(), value)); + this._trimBufferThenGetEvents(); + _super.prototype.next.call(this, value); + }; + ReplaySubject.prototype._subscribe = function (subscriber) { + var _infiniteTimeWindow = this._infiniteTimeWindow; + var _events = _infiniteTimeWindow ? this._events : this._trimBufferThenGetEvents(); + var scheduler = this.scheduler; + var len = _events.length; + var subscription; + if (this.closed) { + throw new __WEBPACK_IMPORTED_MODULE_5__util_ObjectUnsubscribedError__["a" /* ObjectUnsubscribedError */](); + } + else if (this.isStopped || this.hasError) { + subscription = __WEBPACK_IMPORTED_MODULE_3__Subscription__["a" /* Subscription */].EMPTY; + } + else { + this.observers.push(subscriber); + subscription = new __WEBPACK_IMPORTED_MODULE_6__SubjectSubscription__["a" /* SubjectSubscription */](this, subscriber); + } + if (scheduler) { + subscriber.add(subscriber = new __WEBPACK_IMPORTED_MODULE_4__operators_observeOn__["a" /* ObserveOnSubscriber */](subscriber, scheduler)); + } + if (_infiniteTimeWindow) { + for (var i = 0; i < len && !subscriber.closed; i++) { + subscriber.next(_events[i]); } - }, - lastDay: '[včera v] LT', - lastWeek: function () { - switch (this.day()) { - case 0: - return '[minulou neděli v] LT'; - case 1: - case 2: - return '[minulé] dddd [v] LT'; - case 3: - return '[minulou středu v] LT'; - case 4: - case 5: - return '[minulý] dddd [v] LT'; - case 6: - return '[minulou sobotu v] LT'; + } + else { + for (var i = 0; i < len && !subscriber.closed; i++) { + subscriber.next(_events[i].value); } - }, - sameElse: 'L' - }, - relativeTime : { - future : 'za %s', - past : 'před %s', - s : translate, - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : translate, - dd : translate, - M : translate, - MM : translate, - y : translate, - yy : translate - }, - dayOfMonthOrdinalParse : /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return cs; - -}))); - - -/***/ }), -/* 116 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Chuvash [cv] -//! author : Anatoly Mironov : https://github.com/mirontoli - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var cv = moment.defineLocale('cv', { - months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'), - monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'), - weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'), - weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'), - weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD-MM-YYYY', - LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]', - LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm', - LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], HH:mm' - }, - calendar : { - sameDay: '[Паян] LT [сехетре]', - nextDay: '[Ыран] LT [сехетре]', - lastDay: '[Ӗнер] LT [сехетре]', - nextWeek: '[Ҫитес] dddd LT [сехетре]', - lastWeek: '[Иртнӗ] dddd LT [сехетре]', - sameElse: 'L' - }, - relativeTime : { - future : function (output) { - var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран'; - return output + affix; - }, - past : '%s каялла', - s : 'пӗр-ик ҫеккунт', - ss : '%d ҫеккунт', - m : 'пӗр минут', - mm : '%d минут', - h : 'пӗр сехет', - hh : '%d сехет', - d : 'пӗр кун', - dd : '%d кун', - M : 'пӗр уйӑх', - MM : '%d уйӑх', - y : 'пӗр ҫул', - yy : '%d ҫул' - }, - dayOfMonthOrdinalParse: /\d{1,2}-мӗш/, - ordinal : '%d-мӗш', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); - -return cv; - -}))); - - -/***/ }), -/* 117 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Welsh [cy] -//! author : Robert Allen : https://github.com/robgallen -//! author : https://github.com/ryangreaves - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var cy = moment.defineLocale('cy', { - months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'), - monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'), - weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'), - weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'), - weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'), - weekdaysParseExact : true, - // time formats are the same as en-gb - longDateFormat: { - LT: 'HH:mm', - LTS : 'HH:mm:ss', - L: 'DD/MM/YYYY', - LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY HH:mm', - LLLL: 'dddd, D MMMM YYYY HH:mm' - }, - calendar: { - sameDay: '[Heddiw am] LT', - nextDay: '[Yfory am] LT', - nextWeek: 'dddd [am] LT', - lastDay: '[Ddoe am] LT', - lastWeek: 'dddd [diwethaf am] LT', - sameElse: 'L' - }, - relativeTime: { - future: 'mewn %s', - past: '%s yn ôl', - s: 'ychydig eiliadau', - ss: '%d eiliad', - m: 'munud', - mm: '%d munud', - h: 'awr', - hh: '%d awr', - d: 'diwrnod', - dd: '%d diwrnod', - M: 'mis', - MM: '%d mis', - y: 'blwyddyn', - yy: '%d flynedd' - }, - dayOfMonthOrdinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/, - // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh - ordinal: function (number) { - var b = number, - output = '', - lookup = [ - '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed - 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed - ]; - if (b > 20) { - if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) { - output = 'fed'; // not 30ain, 70ain or 90ain - } else { - output = 'ain'; + } + if (this.hasError) { + subscriber.error(this.thrownError); + } + else if (this.isStopped) { + subscriber.complete(); + } + return subscription; + }; + ReplaySubject.prototype._getNow = function () { + return (this.scheduler || __WEBPACK_IMPORTED_MODULE_2__scheduler_queue__["a" /* queue */]).now(); + }; + ReplaySubject.prototype._trimBufferThenGetEvents = function () { + var now = this._getNow(); + var _bufferSize = this._bufferSize; + var _windowTime = this._windowTime; + var _events = this._events; + var eventsCount = _events.length; + var spliceCount = 0; + while (spliceCount < eventsCount) { + if ((now - _events[spliceCount].time) < _windowTime) { + break; } - } else if (b > 0) { - output = lookup[b]; + spliceCount++; } - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return cy; + if (eventsCount > _bufferSize) { + spliceCount = Math.max(spliceCount, eventsCount - _bufferSize); + } + if (spliceCount > 0) { + _events.splice(0, spliceCount); + } + return _events; + }; + return ReplaySubject; +}(__WEBPACK_IMPORTED_MODULE_1__Subject__["a" /* Subject */])); -}))); +var ReplayEvent = /*@__PURE__*/ (function () { + function ReplayEvent(time, value) { + this.time = time; + this.value = value; + } + return ReplayEvent; +}()); +//# sourceMappingURL=ReplaySubject.js.map /***/ }), -/* 118 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Danish [da] -//! author : Ulrik Nielsen : https://github.com/mrbase - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var da = moment.defineLocale('da', { - months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'), - monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'), - weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'), - weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'), - weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY HH:mm', - LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm' - }, - calendar : { - sameDay : '[i dag kl.] LT', - nextDay : '[i morgen kl.] LT', - nextWeek : 'på dddd [kl.] LT', - lastDay : '[i går kl.] LT', - lastWeek : '[i] dddd[s kl.] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'om %s', - past : '%s siden', - s : 'få sekunder', - ss : '%d sekunder', - m : 'et minut', - mm : '%d minutter', - h : 'en time', - hh : '%d timer', - d : 'en dag', - dd : '%d dage', - M : 'en måned', - MM : '%d måneder', - y : 'et år', - yy : '%d år' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +/* 66 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -return da; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = of; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isScheduler__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(20); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(11); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scalar__ = __webpack_require__(67); +/** PURE_IMPORTS_START _util_isScheduler,_fromArray,_empty,_scalar PURE_IMPORTS_END */ -}))); -/***/ }), -/* 119 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : German [de] -//! author : lluchs : https://github.com/lluchs -//! author: Menelion Elensúle: https://github.com/Oire -//! author : Mikolaj Dadela : https://github.com/mik01aj - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 'm': ['eine Minute', 'einer Minute'], - 'h': ['eine Stunde', 'einer Stunde'], - 'd': ['ein Tag', 'einem Tag'], - 'dd': [number + ' Tage', number + ' Tagen'], - 'M': ['ein Monat', 'einem Monat'], - 'MM': [number + ' Monate', number + ' Monaten'], - 'y': ['ein Jahr', 'einem Jahr'], - 'yy': [number + ' Jahre', number + ' Jahren'] - }; - return withoutSuffix ? format[key][0] : format[key][1]; -} - -var de = moment.defineLocale('de', { - months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'), - monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'), - monthsParseExact : true, - weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'), - weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'), - weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT: 'HH:mm', - LTS: 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY HH:mm', - LLLL : 'dddd, D. MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[heute um] LT [Uhr]', - sameElse: 'L', - nextDay: '[morgen um] LT [Uhr]', - nextWeek: 'dddd [um] LT [Uhr]', - lastDay: '[gestern um] LT [Uhr]', - lastWeek: '[letzten] dddd [um] LT [Uhr]' - }, - relativeTime : { - future : 'in %s', - past : 'vor %s', - s : 'ein paar Sekunden', - ss : '%d Sekunden', - m : processRelativeTime, - mm : '%d Minuten', - h : processRelativeTime, - hh : '%d Stunden', - d : processRelativeTime, - dd : processRelativeTime, - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. +function of() { + var args = []; + for (var _i = 0; _i < arguments.length; _i++) { + args[_i] = arguments[_i]; } -}); - -return de; - -}))); + var scheduler = args[args.length - 1]; + if (Object(__WEBPACK_IMPORTED_MODULE_0__util_isScheduler__["a" /* isScheduler */])(scheduler)) { + args.pop(); + } + else { + scheduler = undefined; + } + switch (args.length) { + case 0: + return Object(__WEBPACK_IMPORTED_MODULE_2__empty__["b" /* empty */])(scheduler); + case 1: + return scheduler ? Object(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler) : Object(__WEBPACK_IMPORTED_MODULE_3__scalar__["a" /* scalar */])(args[0]); + default: + return Object(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(args, scheduler); + } +} +//# sourceMappingURL=of.js.map /***/ }), -/* 120 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : German (Austria) [de-at] -//! author : lluchs : https://github.com/lluchs -//! author: Menelion Elensúle: https://github.com/Oire -//! author : Martin Groller : https://github.com/MadMG -//! author : Mikolaj Dadela : https://github.com/mik01aj - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 'm': ['eine Minute', 'einer Minute'], - 'h': ['eine Stunde', 'einer Stunde'], - 'd': ['ein Tag', 'einem Tag'], - 'dd': [number + ' Tage', number + ' Tagen'], - 'M': ['ein Monat', 'einem Monat'], - 'MM': [number + ' Monate', number + ' Monaten'], - 'y': ['ein Jahr', 'einem Jahr'], - 'yy': [number + ' Jahre', number + ' Jahren'] - }; - return withoutSuffix ? format[key][0] : format[key][1]; -} - -var deAt = moment.defineLocale('de-at', { - months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'), - monthsShort : 'Jän._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'), - monthsParseExact : true, - weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'), - weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'), - weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT: 'HH:mm', - LTS: 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY HH:mm', - LLLL : 'dddd, D. MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[heute um] LT [Uhr]', - sameElse: 'L', - nextDay: '[morgen um] LT [Uhr]', - nextWeek: 'dddd [um] LT [Uhr]', - lastDay: '[gestern um] LT [Uhr]', - lastWeek: '[letzten] dddd [um] LT [Uhr]' - }, - relativeTime : { - future : 'in %s', - past : 'vor %s', - s : 'ein paar Sekunden', - ss : '%d Sekunden', - m : processRelativeTime, - mm : '%d Minuten', - h : processRelativeTime, - hh : '%d Stunden', - d : processRelativeTime, - dd : processRelativeTime, - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +/* 67 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -return deAt; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = scalar; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ -}))); +function scalar(value) { + var result = new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { + subscriber.next(value); + subscriber.complete(); + }); + result._isScalar = true; + result.value = value; + return result; +} +//# sourceMappingURL=scalar.js.map /***/ }), -/* 121 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : German (Switzerland) [de-ch] -//! author : sschueller : https://github.com/sschueller - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -// based on: https://www.bk.admin.ch/dokumentation/sprachen/04915/05016/index.html?lang=de# - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 'm': ['eine Minute', 'einer Minute'], - 'h': ['eine Stunde', 'einer Stunde'], - 'd': ['ein Tag', 'einem Tag'], - 'dd': [number + ' Tage', number + ' Tagen'], - 'M': ['ein Monat', 'einem Monat'], - 'MM': [number + ' Monate', number + ' Monaten'], - 'y': ['ein Jahr', 'einem Jahr'], - 'yy': [number + ' Jahre', number + ' Jahren'] - }; - return withoutSuffix ? format[key][0] : format[key][1]; -} - -var deCh = moment.defineLocale('de-ch', { - months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'), - monthsShort : 'Jan._Feb._März_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.'.split('_'), - monthsParseExact : true, - weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'), - weekdaysShort : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'), - weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT: 'HH:mm', - LTS: 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY HH:mm', - LLLL : 'dddd, D. MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[heute um] LT [Uhr]', - sameElse: 'L', - nextDay: '[morgen um] LT [Uhr]', - nextWeek: 'dddd [um] LT [Uhr]', - lastDay: '[gestern um] LT [Uhr]', - lastWeek: '[letzten] dddd [um] LT [Uhr]' - }, - relativeTime : { - future : 'in %s', - past : 'vor %s', - s : 'ein paar Sekunden', - ss : '%d Sekunden', - m : processRelativeTime, - mm : '%d Minuten', - h : processRelativeTime, - hh : '%d Stunden', - d : processRelativeTime, - dd : processRelativeTime, - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +/* 68 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -return deCh; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = throwError; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ -}))); +function throwError(error, scheduler) { + if (!scheduler) { + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return subscriber.error(error); }); + } + else { + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { return scheduler.schedule(dispatch, 0, { error: error, subscriber: subscriber }); }); + } +} +function dispatch(_a) { + var error = _a.error, subscriber = _a.subscriber; + subscriber.error(error); +} +//# sourceMappingURL=throwError.js.map /***/ }), -/* 122 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Maldivian [dv] -//! author : Jawish Hameed : https://github.com/jawish - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var months = [ - 'ޖެނުއަރީ', - 'ފެބްރުއަރީ', - 'މާރިޗު', - 'އޭޕްރީލު', - 'މޭ', - 'ޖޫން', - 'ޖުލައި', - 'އޯގަސްޓު', - 'ސެޕްޓެމްބަރު', - 'އޮކްޓޯބަރު', - 'ނޮވެމްބަރު', - 'ޑިސެމްބަރު' -]; -var weekdays = [ - 'އާދިއްތަ', - 'ހޯމަ', - 'އަންގާރަ', - 'ބުދަ', - 'ބުރާސްފަތި', - 'ހުކުރު', - 'ހޮނިހިރު' -]; - -var dv = moment.defineLocale('dv', { - months : months, - monthsShort : months, - weekdays : weekdays, - weekdaysShort : weekdays, - weekdaysMin : 'އާދި_ހޯމަ_އަން_ބުދަ_ބުރާ_ހުކު_ހޮނި'.split('_'), - longDateFormat : { - - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'D/M/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - meridiemParse: /މކ|މފ/, - isPM : function (input) { - return 'މފ' === input; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'މކ'; - } else { - return 'މފ'; - } - }, - calendar : { - sameDay : '[މިއަދު] LT', - nextDay : '[މާދަމާ] LT', - nextWeek : 'dddd LT', - lastDay : '[އިއްޔެ] LT', - lastWeek : '[ފާއިތުވި] dddd LT', - sameElse : 'L' - }, - relativeTime : { - future : 'ތެރޭގައި %s', - past : 'ކުރިން %s', - s : 'ސިކުންތުކޮޅެއް', - ss : 'd% ސިކުންތު', - m : 'މިނިޓެއް', - mm : 'މިނިޓު %d', - h : 'ގަޑިއިރެއް', - hh : 'ގަޑިއިރު %d', - d : 'ދުވަހެއް', - dd : 'ދުވަސް %d', - M : 'މަހެއް', - MM : 'މަސް %d', - y : 'އަހަރެއް', - yy : 'އަހަރު %d' - }, - preparse: function (string) { - return string.replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/,/g, '،'); - }, - week : { - dow : 7, // Sunday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); +/* 69 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -return dv; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["b"] = combineLatest; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return CombineLatestOperator; }); +/* unused harmony export CombineLatestSubscriber */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__fromArray__ = __webpack_require__(20); +/** PURE_IMPORTS_START tslib,_util_isScheduler,_util_isArray,_OuterSubscriber,_util_subscribeToResult,_fromArray PURE_IMPORTS_END */ -}))); -/***/ }), -/* 123 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Greek [el] -//! author : Aggelos Karalias : https://github.com/mehiel -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; -function isFunction(input) { - return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]'; +var NONE = {}; +function combineLatest() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; + } + var resultSelector = null; + var scheduler = null; + if (Object(__WEBPACK_IMPORTED_MODULE_1__util_isScheduler__["a" /* isScheduler */])(observables[observables.length - 1])) { + scheduler = observables.pop(); + } + if (typeof observables[observables.length - 1] === 'function') { + resultSelector = observables.pop(); + } + if (observables.length === 1 && Object(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(observables[0])) { + observables = observables[0]; + } + return Object(__WEBPACK_IMPORTED_MODULE_5__fromArray__["a" /* fromArray */])(observables, scheduler).lift(new CombineLatestOperator(resultSelector)); } +var CombineLatestOperator = /*@__PURE__*/ (function () { + function CombineLatestOperator(resultSelector) { + this.resultSelector = resultSelector; + } + CombineLatestOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new CombineLatestSubscriber(subscriber, this.resultSelector)); + }; + return CombineLatestOperator; +}()); - -var el = moment.defineLocale('el', { - monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'), - monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'), - months : function (momentToFormat, format) { - if (!momentToFormat) { - return this._monthsNominativeEl; - } else if (typeof format === 'string' && /D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM' - return this._monthsGenitiveEl[momentToFormat.month()]; - } else { - return this._monthsNominativeEl[momentToFormat.month()]; +var CombineLatestSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](CombineLatestSubscriber, _super); + function CombineLatestSubscriber(destination, resultSelector) { + var _this = _super.call(this, destination) || this; + _this.resultSelector = resultSelector; + _this.active = 0; + _this.values = []; + _this.observables = []; + return _this; + } + CombineLatestSubscriber.prototype._next = function (observable) { + this.values.push(NONE); + this.observables.push(observable); + }; + CombineLatestSubscriber.prototype._complete = function () { + var observables = this.observables; + var len = observables.length; + if (len === 0) { + this.destination.complete(); } - }, - monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'), - weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'), - weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'), - weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'), - meridiem : function (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'μμ' : 'ΜΜ'; - } else { - return isLower ? 'πμ' : 'ΠΜ'; + else { + this.active = len; + this.toRespond = len; + for (var i = 0; i < len; i++) { + var observable = observables[i]; + this.add(Object(__WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__["a" /* subscribeToResult */])(this, observable, observable, i)); + } } - }, - isPM : function (input) { - return ((input + '').toLowerCase()[0] === 'μ'); - }, - meridiemParse : /[ΠΜ]\.?Μ?\.?/i, - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY h:mm A', - LLLL : 'dddd, D MMMM YYYY h:mm A' - }, - calendarEl : { - sameDay : '[Σήμερα {}] LT', - nextDay : '[Αύριο {}] LT', - nextWeek : 'dddd [{}] LT', - lastDay : '[Χθες {}] LT', - lastWeek : function () { - switch (this.day()) { - case 6: - return '[το προηγούμενο] dddd [{}] LT'; - default: - return '[την προηγούμενη] dddd [{}] LT'; + }; + CombineLatestSubscriber.prototype.notifyComplete = function (unused) { + if ((this.active -= 1) === 0) { + this.destination.complete(); + } + }; + CombineLatestSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + var values = this.values; + var oldVal = values[outerIndex]; + var toRespond = !this.toRespond + ? 0 + : oldVal === NONE ? --this.toRespond : this.toRespond; + values[outerIndex] = innerValue; + if (toRespond === 0) { + if (this.resultSelector) { + this._tryResultSelector(values); + } + else { + this.destination.next(values.slice()); } - }, - sameElse : 'L' - }, - calendar : function (key, mom) { - var output = this._calendarEl[key], - hours = mom && mom.hours(); - if (isFunction(output)) { - output = output.apply(mom); } - return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις')); - }, - relativeTime : { - future : 'σε %s', - past : '%s πριν', - s : 'λίγα δευτερόλεπτα', - ss : '%d δευτερόλεπτα', - m : 'ένα λεπτό', - mm : '%d λεπτά', - h : 'μία ώρα', - hh : '%d ώρες', - d : 'μία μέρα', - dd : '%d μέρες', - M : 'ένας μήνας', - MM : '%d μήνες', - y : 'ένας χρόνος', - yy : '%d χρόνια' - }, - dayOfMonthOrdinalParse: /\d{1,2}η/, - ordinal: '%dη', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4st is the first week of the year. - } -}); - -return el; + }; + CombineLatestSubscriber.prototype._tryResultSelector = function (values) { + var result; + try { + result = this.resultSelector.apply(this, values); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.next(result); + }; + return CombineLatestSubscriber; +}(__WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__["a" /* OuterSubscriber */])); -}))); +//# sourceMappingURL=combineLatest.js.map /***/ }), -/* 124 */ -/***/ (function(module, exports, __webpack_require__) { +/* 70 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -//! moment.js locale configuration -//! locale : English (Australia) [en-au] -//! author : Jared Morse : https://github.com/jarcoal - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var enAu = moment.defineLocale('en-au', { - months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), - weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), - weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), - weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY h:mm A', - LLLL : 'dddd, D MMMM YYYY h:mm A' - }, - calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - ss : '%d seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' - }, - dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = mergeAll; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(35); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(25); +/** PURE_IMPORTS_START _mergeMap,_util_identity PURE_IMPORTS_END */ -return enAu; -}))); +function mergeAll(concurrent) { + if (concurrent === void 0) { + concurrent = Number.POSITIVE_INFINITY; + } + return Object(__WEBPACK_IMPORTED_MODULE_0__mergeMap__["a" /* mergeMap */])(__WEBPACK_IMPORTED_MODULE_1__util_identity__["a" /* identity */], concurrent); +} +//# sourceMappingURL=mergeAll.js.map /***/ }), -/* 125 */ -/***/ (function(module, exports, __webpack_require__) { +/* 71 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = defer; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(18); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(11); +/** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ -//! moment.js locale configuration -//! locale : English (Canada) [en-ca] -//! author : Jonathan Abourbih : https://github.com/jonbca - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var enCa = moment.defineLocale('en-ca', { - months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), - weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), - weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), - weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'YYYY-MM-DD', - LL : 'MMMM D, YYYY', - LLL : 'MMMM D, YYYY h:mm A', - LLLL : 'dddd, MMMM D, YYYY h:mm A' - }, - calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - ss : '%d seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' - }, - dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - } -}); -return enCa; -}))); +function defer(observableFactory) { + return new __WEBPACK_IMPORTED_MODULE_0__Observable__["a" /* Observable */](function (subscriber) { + var input; + try { + input = observableFactory(); + } + catch (err) { + subscriber.error(err); + return undefined; + } + var source = input ? Object(__WEBPACK_IMPORTED_MODULE_1__from__["a" /* from */])(input) : Object(__WEBPACK_IMPORTED_MODULE_2__empty__["b" /* empty */])(); + return source.subscribe(subscriber); + }); +} +//# sourceMappingURL=defer.js.map /***/ }), -/* 126 */ -/***/ (function(module, exports, __webpack_require__) { +/* 72 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -//! moment.js locale configuration -//! locale : English (United Kingdom) [en-gb] -//! author : Chris Gedrim : https://github.com/chrisgedrim - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var enGb = moment.defineLocale('en-gb', { - months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), - weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), - weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), - weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - ss : '%d seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' - }, - dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["b"] = zip; +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ZipOperator; }); +/* unused harmony export ZipSubscriber */ +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__fromArray__ = __webpack_require__(20); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__ = __webpack_require__(34); +/** PURE_IMPORTS_START tslib,_fromArray,_util_isArray,_Subscriber,_OuterSubscriber,_util_subscribeToResult,_.._internal_symbol_iterator PURE_IMPORTS_END */ -return enGb; -}))); -/***/ }), -/* 127 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : English (Ireland) [en-ie] -//! author : Chris Cartlidge : https://github.com/chriscartlidge - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var enIe = moment.defineLocale('en-ie', { - months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), - weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), - weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), - weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD-MM-YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - ss : '%d seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' - }, - dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. + + +function zip() { + var observables = []; + for (var _i = 0; _i < arguments.length; _i++) { + observables[_i] = arguments[_i]; } -}); + var resultSelector = observables[observables.length - 1]; + if (typeof resultSelector === 'function') { + observables.pop(); + } + return Object(__WEBPACK_IMPORTED_MODULE_1__fromArray__["a" /* fromArray */])(observables, undefined).lift(new ZipOperator(resultSelector)); +} +var ZipOperator = /*@__PURE__*/ (function () { + function ZipOperator(resultSelector) { + this.resultSelector = resultSelector; + } + ZipOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ZipSubscriber(subscriber, this.resultSelector)); + }; + return ZipOperator; +}()); -return enIe; +var ZipSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipSubscriber, _super); + function ZipSubscriber(destination, resultSelector, values) { + if (values === void 0) { + values = Object.create(null); + } + var _this = _super.call(this, destination) || this; + _this.iterators = []; + _this.active = 0; + _this.resultSelector = (typeof resultSelector === 'function') ? resultSelector : null; + _this.values = values; + return _this; + } + ZipSubscriber.prototype._next = function (value) { + var iterators = this.iterators; + if (Object(__WEBPACK_IMPORTED_MODULE_2__util_isArray__["a" /* isArray */])(value)) { + iterators.push(new StaticArrayIterator(value)); + } + else if (typeof value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] === 'function') { + iterators.push(new StaticIterator(value[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]]())); + } + else { + iterators.push(new ZipBufferIterator(this.destination, this, value)); + } + }; + ZipSubscriber.prototype._complete = function () { + var iterators = this.iterators; + var len = iterators.length; + if (len === 0) { + this.destination.complete(); + return; + } + this.active = len; + for (var i = 0; i < len; i++) { + var iterator = iterators[i]; + if (iterator.stillUnsubscribed) { + this.add(iterator.subscribe(iterator, i)); + } + else { + this.active--; + } + } + }; + ZipSubscriber.prototype.notifyInactive = function () { + this.active--; + if (this.active === 0) { + this.destination.complete(); + } + }; + ZipSubscriber.prototype.checkIterators = function () { + var iterators = this.iterators; + var len = iterators.length; + var destination = this.destination; + for (var i = 0; i < len; i++) { + var iterator = iterators[i]; + if (typeof iterator.hasValue === 'function' && !iterator.hasValue()) { + return; + } + } + var shouldComplete = false; + var args = []; + for (var i = 0; i < len; i++) { + var iterator = iterators[i]; + var result = iterator.next(); + if (iterator.hasCompleted()) { + shouldComplete = true; + } + if (result.done) { + destination.complete(); + return; + } + args.push(result.value); + } + if (this.resultSelector) { + this._tryresultSelector(args); + } + else { + destination.next(args); + } + if (shouldComplete) { + destination.complete(); + } + }; + ZipSubscriber.prototype._tryresultSelector = function (args) { + var result; + try { + result = this.resultSelector.apply(this, args); + } + catch (err) { + this.destination.error(err); + return; + } + this.destination.next(result); + }; + return ZipSubscriber; +}(__WEBPACK_IMPORTED_MODULE_3__Subscriber__["a" /* Subscriber */])); -}))); +var StaticIterator = /*@__PURE__*/ (function () { + function StaticIterator(iterator) { + this.iterator = iterator; + this.nextResult = iterator.next(); + } + StaticIterator.prototype.hasValue = function () { + return true; + }; + StaticIterator.prototype.next = function () { + var result = this.nextResult; + this.nextResult = this.iterator.next(); + return result; + }; + StaticIterator.prototype.hasCompleted = function () { + var nextResult = this.nextResult; + return nextResult && nextResult.done; + }; + return StaticIterator; +}()); +var StaticArrayIterator = /*@__PURE__*/ (function () { + function StaticArrayIterator(array) { + this.array = array; + this.index = 0; + this.length = 0; + this.length = array.length; + } + StaticArrayIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () { + return this; + }; + StaticArrayIterator.prototype.next = function (value) { + var i = this.index++; + var array = this.array; + return i < this.length ? { value: array[i], done: false } : { value: null, done: true }; + }; + StaticArrayIterator.prototype.hasValue = function () { + return this.array.length > this.index; + }; + StaticArrayIterator.prototype.hasCompleted = function () { + return this.array.length === this.index; + }; + return StaticArrayIterator; +}()); +var ZipBufferIterator = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ZipBufferIterator, _super); + function ZipBufferIterator(destination, parent, observable) { + var _this = _super.call(this, destination) || this; + _this.parent = parent; + _this.observable = observable; + _this.stillUnsubscribed = true; + _this.buffer = []; + _this.isComplete = false; + return _this; + } + ZipBufferIterator.prototype[__WEBPACK_IMPORTED_MODULE_6__internal_symbol_iterator__["a" /* iterator */]] = function () { + return this; + }; + ZipBufferIterator.prototype.next = function () { + var buffer = this.buffer; + if (buffer.length === 0 && this.isComplete) { + return { value: null, done: true }; + } + else { + return { value: buffer.shift(), done: false }; + } + }; + ZipBufferIterator.prototype.hasValue = function () { + return this.buffer.length > 0; + }; + ZipBufferIterator.prototype.hasCompleted = function () { + return this.buffer.length === 0 && this.isComplete; + }; + ZipBufferIterator.prototype.notifyComplete = function () { + if (this.buffer.length > 0) { + this.isComplete = true; + this.parent.notifyInactive(); + } + else { + this.destination.complete(); + } + }; + ZipBufferIterator.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.buffer.push(innerValue); + this.parent.checkIterators(); + }; + ZipBufferIterator.prototype.subscribe = function (value, index) { + return Object(__WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__["a" /* subscribeToResult */])(this, this.observable, this, index); + }; + return ZipBufferIterator; +}(__WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__["a" /* OuterSubscriber */])); +//# sourceMappingURL=zip.js.map /***/ }), -/* 128 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : English (New Zealand) [en-nz] -//! author : Luke McGregor : https://github.com/lukemcgregor - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var enNz = moment.defineLocale('en-nz', { - months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), - weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), - weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), - weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY h:mm A', - LLLL : 'dddd, D MMMM YYYY h:mm A' - }, - calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - ss : '%d seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' - }, - dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +/* 73 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -return enNz; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = take; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(32); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(11); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ -}))); -/***/ }), -/* 129 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Esperanto [eo] -//! author : Colin Dean : https://github.com/colindean -//! author : Mia Nordentoft Imperatori : https://github.com/miestasmia -//! comment : miestasmia corrected the translation by colindean - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var eo = moment.defineLocale('eo', { - months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'), - monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'), - weekdays : 'dimanĉo_lundo_mardo_merkredo_ĵaŭdo_vendredo_sabato'.split('_'), - weekdaysShort : 'dim_lun_mard_merk_ĵaŭ_ven_sab'.split('_'), - weekdaysMin : 'di_lu_ma_me_ĵa_ve_sa'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY-MM-DD', - LL : 'D[-a de] MMMM, YYYY', - LLL : 'D[-a de] MMMM, YYYY HH:mm', - LLLL : 'dddd, [la] D[-a de] MMMM, YYYY HH:mm' - }, - meridiemParse: /[ap]\.t\.m/i, - isPM: function (input) { - return input.charAt(0).toLowerCase() === 'p'; - }, - meridiem : function (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'p.t.m.' : 'P.T.M.'; - } else { - return isLower ? 'a.t.m.' : 'A.T.M.'; +function take(count) { + return function (source) { + if (count === 0) { + return Object(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["b" /* empty */])(); + } + else { + return source.lift(new TakeOperator(count)); + } + }; +} +var TakeOperator = /*@__PURE__*/ (function () { + function TakeOperator(total) { + this.total = total; + if (this.total < 0) { + throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */]; } - }, - calendar : { - sameDay : '[Hodiaŭ je] LT', - nextDay : '[Morgaŭ je] LT', - nextWeek : 'dddd [je] LT', - lastDay : '[Hieraŭ je] LT', - lastWeek : '[pasinta] dddd [je] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'post %s', - past : 'antaŭ %s', - s : 'sekundoj', - ss : '%d sekundoj', - m : 'minuto', - mm : '%d minutoj', - h : 'horo', - hh : '%d horoj', - d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo - dd : '%d tagoj', - M : 'monato', - MM : '%d monatoj', - y : 'jaro', - yy : '%d jaroj' - }, - dayOfMonthOrdinalParse: /\d{1,2}a/, - ordinal : '%da', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. } -}); + TakeOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TakeSubscriber(subscriber, this.total)); + }; + return TakeOperator; +}()); +var TakeSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeSubscriber, _super); + function TakeSubscriber(destination, total) { + var _this = _super.call(this, destination) || this; + _this.total = total; + _this.count = 0; + return _this; + } + TakeSubscriber.prototype._next = function (value) { + var total = this.total; + var count = ++this.count; + if (count <= total) { + this.destination.next(value); + if (count === total) { + this.destination.complete(); + this.unsubscribe(); + } + } + }; + return TakeSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=take.js.map -return eo; -}))); +/***/ }), +/* 74 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = takeLast; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(32); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_empty__ = __webpack_require__(11); +/** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError,_observable_empty PURE_IMPORTS_END */ -/***/ }), -/* 130 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Spanish [es] -//! author : Julio Napurí : https://github.com/julionc -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +function takeLast(count) { + return function takeLastOperatorFunction(source) { + if (count === 0) { + return Object(__WEBPACK_IMPORTED_MODULE_3__observable_empty__["b" /* empty */])(); + } + else { + return source.lift(new TakeLastOperator(count)); + } + }; +} +var TakeLastOperator = /*@__PURE__*/ (function () { + function TakeLastOperator(total) { + this.total = total; + if (this.total < 0) { + throw new __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__["a" /* ArgumentOutOfRangeError */]; + } + } + TakeLastOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new TakeLastSubscriber(subscriber, this.total)); + }; + return TakeLastOperator; +}()); +var TakeLastSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](TakeLastSubscriber, _super); + function TakeLastSubscriber(destination, total) { + var _this = _super.call(this, destination) || this; + _this.total = total; + _this.ring = new Array(); + _this.count = 0; + return _this; + } + TakeLastSubscriber.prototype._next = function (value) { + var ring = this.ring; + var total = this.total; + var count = this.count++; + if (ring.length < total) { + ring.push(value); + } + else { + var index = count % total; + ring[index] = value; + } + }; + TakeLastSubscriber.prototype._complete = function () { + var destination = this.destination; + var count = this.count; + if (count > 0) { + var total = this.count >= this.total ? this.total : this.count; + var ring = this.ring; + for (var i = 0; i < total; i++) { + var idx = (count++) % total; + destination.next(ring[idx]); + } + } + destination.complete(); + }; + return TakeLastSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=takeLast.js.map -var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'); -var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'); -var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i]; -var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i; +/***/ }), +/* 75 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -var es = moment.defineLocale('es', { - months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), - monthsShort : function (m, format) { - if (!m) { - return monthsShortDot; - } else if (/-MMM-/.test(format)) { - return monthsShort[m.month()]; - } else { - return monthsShortDot[m.month()]; +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = scan; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ + + +function scan(accumulator, seed) { + var hasSeed = false; + if (arguments.length >= 2) { + hasSeed = true; + } + return function scanOperatorFunction(source) { + return source.lift(new ScanOperator(accumulator, seed, hasSeed)); + }; +} +var ScanOperator = /*@__PURE__*/ (function () { + function ScanOperator(accumulator, seed, hasSeed) { + if (hasSeed === void 0) { + hasSeed = false; } - }, - monthsRegex : monthsRegex, - monthsShortRegex : monthsRegex, - monthsStrictRegex : /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i, - monthsShortStrictRegex : /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i, - monthsParse : monthsParse, - longMonthsParse : monthsParse, - shortMonthsParse : monthsParse, - weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), - weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), - weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY H:mm', - LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm' - }, - calendar : { - sameDay : function () { - return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - nextDay : function () { - return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - nextWeek : function () { - return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - lastDay : function () { - return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + this.accumulator = accumulator; + this.seed = seed; + this.hasSeed = hasSeed; + } + ScanOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new ScanSubscriber(subscriber, this.accumulator, this.seed, this.hasSeed)); + }; + return ScanOperator; +}()); +var ScanSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](ScanSubscriber, _super); + function ScanSubscriber(destination, accumulator, _seed, hasSeed) { + var _this = _super.call(this, destination) || this; + _this.accumulator = accumulator; + _this._seed = _seed; + _this.hasSeed = hasSeed; + _this.index = 0; + return _this; + } + Object.defineProperty(ScanSubscriber.prototype, "seed", { + get: function () { + return this._seed; }, - lastWeek : function () { - return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; + set: function (value) { + this.hasSeed = true; + this._seed = value; }, - sameElse : 'L' - }, - relativeTime : { - future : 'en %s', - past : 'hace %s', - s : 'unos segundos', - ss : '%d segundos', - m : 'un minuto', - mm : '%d minutos', - h : 'una hora', - hh : '%d horas', - d : 'un día', - dd : '%d días', - M : 'un mes', - MM : '%d meses', - y : 'un año', - yy : '%d años' - }, - dayOfMonthOrdinalParse : /\d{1,2}º/, - ordinal : '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return es; - -}))); + enumerable: true, + configurable: true + }); + ScanSubscriber.prototype._next = function (value) { + if (!this.hasSeed) { + this.seed = value; + this.destination.next(value); + } + else { + return this._tryNext(value); + } + }; + ScanSubscriber.prototype._tryNext = function (value) { + var index = this.index++; + var result; + try { + result = this.accumulator(this.seed, value, index); + } + catch (err) { + this.destination.error(err); + } + this.seed = result; + this.destination.next(result); + }; + return ScanSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__Subscriber__["a" /* Subscriber */])); +//# sourceMappingURL=scan.js.map /***/ }), -/* 131 */ -/***/ (function(module, exports, __webpack_require__) { +/* 76 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { -//! moment.js locale configuration -//! locale : Spanish (Dominican Republic) [es-do] +"use strict"; +/* harmony export (immutable) */ __webpack_exports__["a"] = switchMap; +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__observable_from__ = __webpack_require__(18); +/** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; -var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'); -var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'); -var monthsParse = [/^ene/i, /^feb/i, /^mar/i, /^abr/i, /^may/i, /^jun/i, /^jul/i, /^ago/i, /^sep/i, /^oct/i, /^nov/i, /^dic/i]; -var monthsRegex = /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i; -var esDo = moment.defineLocale('es-do', { - months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), - monthsShort : function (m, format) { - if (!m) { - return monthsShortDot; - } else if (/-MMM-/.test(format)) { - return monthsShort[m.month()]; - } else { - return monthsShortDot[m.month()]; - } - }, - monthsRegex: monthsRegex, - monthsShortRegex: monthsRegex, - monthsStrictRegex: /^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i, - monthsShortStrictRegex: /^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i, - monthsParse: monthsParse, - longMonthsParse: monthsParse, - shortMonthsParse: monthsParse, - weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), - weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), - weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY h:mm A', - LLLL : 'dddd, D [de] MMMM [de] YYYY h:mm A' - }, - calendar : { - sameDay : function () { - return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - nextDay : function () { - return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - nextWeek : function () { - return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - lastDay : function () { - return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - lastWeek : function () { - return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - sameElse : 'L' - }, - relativeTime : { - future : 'en %s', - past : 'hace %s', - s : 'unos segundos', - ss : '%d segundos', - m : 'un minuto', - mm : '%d minutos', - h : 'una hora', - hh : '%d horas', - d : 'un día', - dd : '%d días', - M : 'un mes', - MM : '%d meses', - y : 'un año', - yy : '%d años' - }, - dayOfMonthOrdinalParse : /\d{1,2}º/, - ordinal : '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. +function switchMap(project, resultSelector) { + if (typeof resultSelector === 'function') { + return function (source) { return source.pipe(switchMap(function (a, i) { return Object(__WEBPACK_IMPORTED_MODULE_4__observable_from__["a" /* from */])(project(a, i)).pipe(Object(__WEBPACK_IMPORTED_MODULE_3__map__["a" /* map */])(function (b, ii) { return resultSelector(a, b, i, ii); })); })); }; } -}); - -return esDo; - -}))); + return function (source) { return source.lift(new SwitchMapOperator(project)); }; +} +var SwitchMapOperator = /*@__PURE__*/ (function () { + function SwitchMapOperator(project) { + this.project = project; + } + SwitchMapOperator.prototype.call = function (subscriber, source) { + return source.subscribe(new SwitchMapSubscriber(subscriber, this.project)); + }; + return SwitchMapOperator; +}()); +var SwitchMapSubscriber = /*@__PURE__*/ (function (_super) { + __WEBPACK_IMPORTED_MODULE_0_tslib__["a" /* __extends */](SwitchMapSubscriber, _super); + function SwitchMapSubscriber(destination, project) { + var _this = _super.call(this, destination) || this; + _this.project = project; + _this.index = 0; + return _this; + } + SwitchMapSubscriber.prototype._next = function (value) { + var result; + var index = this.index++; + try { + result = this.project(value, index); + } + catch (error) { + this.destination.error(error); + return; + } + this._innerSub(result, value, index); + }; + SwitchMapSubscriber.prototype._innerSub = function (result, value, index) { + var innerSubscription = this.innerSubscription; + if (innerSubscription) { + innerSubscription.unsubscribe(); + } + this.add(this.innerSubscription = Object(__WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__["a" /* subscribeToResult */])(this, result, value, index)); + }; + SwitchMapSubscriber.prototype._complete = function () { + var innerSubscription = this.innerSubscription; + if (!innerSubscription || innerSubscription.closed) { + _super.prototype._complete.call(this); + } + }; + SwitchMapSubscriber.prototype._unsubscribe = function () { + this.innerSubscription = null; + }; + SwitchMapSubscriber.prototype.notifyComplete = function (innerSub) { + this.remove(innerSub); + this.innerSubscription = null; + if (this.isStopped) { + _super.prototype._complete.call(this); + } + }; + SwitchMapSubscriber.prototype.notifyNext = function (outerValue, innerValue, outerIndex, innerIndex, innerSub) { + this.destination.next(innerValue); + }; + return SwitchMapSubscriber; +}(__WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__["a" /* OuterSubscriber */])); +//# sourceMappingURL=switchMap.js.map /***/ }), -/* 132 */ +/* 77 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Spanish (United States) [es-us] -//! author : bustta : https://github.com/bustta - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +/* MIT license */ +var cssKeywords = __webpack_require__(139); +// NOTE: conversions should only return primitive values (i.e. arrays, or +// values that give correct `typeof` results). +// do not use box values types (i.e. Number(), String(), etc.) -var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_'); -var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_'); +var reverseKeywords = {}; +for (var key in cssKeywords) { + if (cssKeywords.hasOwnProperty(key)) { + reverseKeywords[cssKeywords[key]] = key; + } +} -var esUs = moment.defineLocale('es-us', { - months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'), - monthsShort : function (m, format) { - if (!m) { - return monthsShortDot; - } else if (/-MMM-/.test(format)) { - return monthsShort[m.month()]; - } else { - return monthsShortDot[m.month()]; - } - }, - monthsParseExact : true, - weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'), - weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'), - weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'MM/DD/YYYY', - LL : 'MMMM [de] D [de] YYYY', - LLL : 'MMMM [de] D [de] YYYY h:mm A', - LLLL : 'dddd, MMMM [de] D [de] YYYY h:mm A' - }, - calendar : { - sameDay : function () { - return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - nextDay : function () { - return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - nextWeek : function () { - return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - lastDay : function () { - return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - lastWeek : function () { - return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT'; - }, - sameElse : 'L' - }, - relativeTime : { - future : 'en %s', - past : 'hace %s', - s : 'unos segundos', - ss : '%d segundos', - m : 'un minuto', - mm : '%d minutos', - h : 'una hora', - hh : '%d horas', - d : 'un día', - dd : '%d días', - M : 'un mes', - MM : '%d meses', - y : 'un año', - yy : '%d años' - }, - dayOfMonthOrdinalParse : /\d{1,2}º/, - ordinal : '%dº', - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); +var convert = module.exports = { + rgb: {channels: 3, labels: 'rgb'}, + hsl: {channels: 3, labels: 'hsl'}, + hsv: {channels: 3, labels: 'hsv'}, + hwb: {channels: 3, labels: 'hwb'}, + cmyk: {channels: 4, labels: 'cmyk'}, + xyz: {channels: 3, labels: 'xyz'}, + lab: {channels: 3, labels: 'lab'}, + lch: {channels: 3, labels: 'lch'}, + hex: {channels: 1, labels: ['hex']}, + keyword: {channels: 1, labels: ['keyword']}, + ansi16: {channels: 1, labels: ['ansi16']}, + ansi256: {channels: 1, labels: ['ansi256']}, + hcg: {channels: 3, labels: ['h', 'c', 'g']}, + apple: {channels: 3, labels: ['r16', 'g16', 'b16']}, + gray: {channels: 1, labels: ['gray']} +}; -return esUs; +// hide .channels and .labels properties +for (var model in convert) { + if (convert.hasOwnProperty(model)) { + if (!('channels' in convert[model])) { + throw new Error('missing channels property: ' + model); + } -}))); + if (!('labels' in convert[model])) { + throw new Error('missing channel labels property: ' + model); + } + if (convert[model].labels.length !== convert[model].channels) { + throw new Error('channel and label counts mismatch: ' + model); + } -/***/ }), -/* 133 */ -/***/ (function(module, exports, __webpack_require__) { + var channels = convert[model].channels; + var labels = convert[model].labels; + delete convert[model].channels; + delete convert[model].labels; + Object.defineProperty(convert[model], 'channels', {value: channels}); + Object.defineProperty(convert[model], 'labels', {value: labels}); + } +} -//! moment.js locale configuration -//! locale : Estonian [et] -//! author : Henry Kehlmann : https://github.com/madhenry -//! improvements : Illimar Tambek : https://github.com/ragulka - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'], - 'ss': [number + 'sekundi', number + 'sekundit'], - 'm' : ['ühe minuti', 'üks minut'], - 'mm': [number + ' minuti', number + ' minutit'], - 'h' : ['ühe tunni', 'tund aega', 'üks tund'], - 'hh': [number + ' tunni', number + ' tundi'], - 'd' : ['ühe päeva', 'üks päev'], - 'M' : ['kuu aja', 'kuu aega', 'üks kuu'], - 'MM': [number + ' kuu', number + ' kuud'], - 'y' : ['ühe aasta', 'aasta', 'üks aasta'], - 'yy': [number + ' aasta', number + ' aastat'] - }; - if (withoutSuffix) { - return format[key][2] ? format[key][2] : format[key][1]; - } - return isFuture ? format[key][0] : format[key][1]; -} - -var et = moment.defineLocale('et', { - months : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'), - monthsShort : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'), - weekdays : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'), - weekdaysShort : 'P_E_T_K_N_R_L'.split('_'), - weekdaysMin : 'P_E_T_K_N_R_L'.split('_'), - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY H:mm', - LLLL : 'dddd, D. MMMM YYYY H:mm' - }, - calendar : { - sameDay : '[Täna,] LT', - nextDay : '[Homme,] LT', - nextWeek : '[Järgmine] dddd LT', - lastDay : '[Eile,] LT', - lastWeek : '[Eelmine] dddd LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s pärast', - past : '%s tagasi', - s : processRelativeTime, - ss : processRelativeTime, - m : processRelativeTime, - mm : processRelativeTime, - h : processRelativeTime, - hh : processRelativeTime, - d : processRelativeTime, - dd : '%d päeva', - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +convert.rgb.hsl = function (rgb) { + var r = rgb[0] / 255; + var g = rgb[1] / 255; + var b = rgb[2] / 255; + var min = Math.min(r, g, b); + var max = Math.max(r, g, b); + var delta = max - min; + var h; + var s; + var l; -return et; + if (max === min) { + h = 0; + } else if (r === max) { + h = (g - b) / delta; + } else if (g === max) { + h = 2 + (b - r) / delta; + } else if (b === max) { + h = 4 + (r - g) / delta; + } -}))); + h = Math.min(h * 60, 360); + if (h < 0) { + h += 360; + } -/***/ }), -/* 134 */ -/***/ (function(module, exports, __webpack_require__) { + l = (min + max) / 2; -//! moment.js locale configuration -//! locale : Basque [eu] -//! author : Eneko Illarramendi : https://github.com/eillarra - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var eu = moment.defineLocale('eu', { - months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'), - monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'), - monthsParseExact : true, - weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'), - weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'), - weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY-MM-DD', - LL : 'YYYY[ko] MMMM[ren] D[a]', - LLL : 'YYYY[ko] MMMM[ren] D[a] HH:mm', - LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] HH:mm', - l : 'YYYY-M-D', - ll : 'YYYY[ko] MMM D[a]', - lll : 'YYYY[ko] MMM D[a] HH:mm', - llll : 'ddd, YYYY[ko] MMM D[a] HH:mm' - }, - calendar : { - sameDay : '[gaur] LT[etan]', - nextDay : '[bihar] LT[etan]', - nextWeek : 'dddd LT[etan]', - lastDay : '[atzo] LT[etan]', - lastWeek : '[aurreko] dddd LT[etan]', - sameElse : 'L' - }, - relativeTime : { - future : '%s barru', - past : 'duela %s', - s : 'segundo batzuk', - ss : '%d segundo', - m : 'minutu bat', - mm : '%d minutu', - h : 'ordu bat', - hh : '%d ordu', - d : 'egun bat', - dd : '%d egun', - M : 'hilabete bat', - MM : '%d hilabete', - y : 'urte bat', - yy : '%d urte' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + if (max === min) { + s = 0; + } else if (l <= 0.5) { + s = delta / (max + min); + } else { + s = delta / (2 - max - min); + } -return eu; + return [h, s * 100, l * 100]; +}; -}))); +convert.rgb.hsv = function (rgb) { + var r = rgb[0]; + var g = rgb[1]; + var b = rgb[2]; + var min = Math.min(r, g, b); + var max = Math.max(r, g, b); + var delta = max - min; + var h; + var s; + var v; + if (max === 0) { + s = 0; + } else { + s = (delta / max * 1000) / 10; + } -/***/ }), -/* 135 */ -/***/ (function(module, exports, __webpack_require__) { + if (max === min) { + h = 0; + } else if (r === max) { + h = (g - b) / delta; + } else if (g === max) { + h = 2 + (b - r) / delta; + } else if (b === max) { + h = 4 + (r - g) / delta; + } -//! moment.js locale configuration -//! locale : Persian [fa] -//! author : Ebrahim Byagowi : https://github.com/ebraminio - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '۱', - '2': '۲', - '3': '۳', - '4': '۴', - '5': '۵', - '6': '۶', - '7': '۷', - '8': '۸', - '9': '۹', - '0': '۰' -}; -var numberMap = { - '۱': '1', - '۲': '2', - '۳': '3', - '۴': '4', - '۵': '5', - '۶': '6', - '۷': '7', - '۸': '8', - '۹': '9', - '۰': '0' -}; + h = Math.min(h * 60, 360); -var fa = moment.defineLocale('fa', { - months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'), - monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'), - weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'), - weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'), - weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - meridiemParse: /قبل از ظهر|بعد از ظهر/, - isPM: function (input) { - return /بعد از ظهر/.test(input); - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'قبل از ظهر'; - } else { - return 'بعد از ظهر'; - } - }, - calendar : { - sameDay : '[امروز ساعت] LT', - nextDay : '[فردا ساعت] LT', - nextWeek : 'dddd [ساعت] LT', - lastDay : '[دیروز ساعت] LT', - lastWeek : 'dddd [پیش] [ساعت] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'در %s', - past : '%s پیش', - s : 'چند ثانیه', - ss : 'ثانیه d%', - m : 'یک دقیقه', - mm : '%d دقیقه', - h : 'یک ساعت', - hh : '%d ساعت', - d : 'یک روز', - dd : '%d روز', - M : 'یک ماه', - MM : '%d ماه', - y : 'یک سال', - yy : '%d سال' - }, - preparse: function (string) { - return string.replace(/[۰-۹]/g, function (match) { - return numberMap[match]; - }).replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }).replace(/,/g, '،'); - }, - dayOfMonthOrdinalParse: /\d{1,2}م/, - ordinal : '%dم', - week : { - dow : 6, // Saturday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); + if (h < 0) { + h += 360; + } -return fa; + v = ((max / 255) * 1000) / 10; -}))); + return [h, s, v]; +}; +convert.rgb.hwb = function (rgb) { + var r = rgb[0]; + var g = rgb[1]; + var b = rgb[2]; + var h = convert.rgb.hsl(rgb)[0]; + var w = 1 / 255 * Math.min(r, Math.min(g, b)); -/***/ }), -/* 136 */ -/***/ (function(module, exports, __webpack_require__) { + b = 1 - 1 / 255 * Math.max(r, Math.max(g, b)); -//! moment.js locale configuration -//! locale : Finnish [fi] -//! author : Tarmo Aidantausta : https://github.com/bleadof - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '); -var numbersFuture = [ - 'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden', - numbersPast[7], numbersPast[8], numbersPast[9] - ]; -function translate(number, withoutSuffix, key, isFuture) { - var result = ''; - switch (key) { - case 's': - return isFuture ? 'muutaman sekunnin' : 'muutama sekunti'; - case 'ss': - return isFuture ? 'sekunnin' : 'sekuntia'; - case 'm': - return isFuture ? 'minuutin' : 'minuutti'; - case 'mm': - result = isFuture ? 'minuutin' : 'minuuttia'; - break; - case 'h': - return isFuture ? 'tunnin' : 'tunti'; - case 'hh': - result = isFuture ? 'tunnin' : 'tuntia'; - break; - case 'd': - return isFuture ? 'päivän' : 'päivä'; - case 'dd': - result = isFuture ? 'päivän' : 'päivää'; - break; - case 'M': - return isFuture ? 'kuukauden' : 'kuukausi'; - case 'MM': - result = isFuture ? 'kuukauden' : 'kuukautta'; - break; - case 'y': - return isFuture ? 'vuoden' : 'vuosi'; - case 'yy': - result = isFuture ? 'vuoden' : 'vuotta'; - break; - } - result = verbalNumber(number, isFuture) + ' ' + result; - return result; -} -function verbalNumber(number, isFuture) { - return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number; -} - -var fi = moment.defineLocale('fi', { - months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'), - monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'), - weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'), - weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'), - weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'), - longDateFormat : { - LT : 'HH.mm', - LTS : 'HH.mm.ss', - L : 'DD.MM.YYYY', - LL : 'Do MMMM[ta] YYYY', - LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm', - LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm', - l : 'D.M.YYYY', - ll : 'Do MMM YYYY', - lll : 'Do MMM YYYY, [klo] HH.mm', - llll : 'ddd, Do MMM YYYY, [klo] HH.mm' - }, - calendar : { - sameDay : '[tänään] [klo] LT', - nextDay : '[huomenna] [klo] LT', - nextWeek : 'dddd [klo] LT', - lastDay : '[eilen] [klo] LT', - lastWeek : '[viime] dddd[na] [klo] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s päästä', - past : '%s sitten', - s : translate, - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : translate, - dd : translate, - M : translate, - MM : translate, - y : translate, - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + return [h, w * 100, b * 100]; +}; -return fi; +convert.rgb.cmyk = function (rgb) { + var r = rgb[0] / 255; + var g = rgb[1] / 255; + var b = rgb[2] / 255; + var c; + var m; + var y; + var k; -}))); + k = Math.min(1 - r, 1 - g, 1 - b); + c = (1 - r - k) / (1 - k) || 0; + m = (1 - g - k) / (1 - k) || 0; + y = (1 - b - k) / (1 - k) || 0; + return [c * 100, m * 100, y * 100, k * 100]; +}; -/***/ }), -/* 137 */ -/***/ (function(module, exports, __webpack_require__) { +/** + * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance + * */ +function comparativeDistance(x, y) { + return ( + Math.pow(x[0] - y[0], 2) + + Math.pow(x[1] - y[1], 2) + + Math.pow(x[2] - y[2], 2) + ); +} -//! moment.js locale configuration -//! locale : Faroese [fo] -//! author : Ragnar Johannesen : https://github.com/ragnar123 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var fo = moment.defineLocale('fo', { - months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'), - monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'), - weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'), - weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'), - weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D. MMMM, YYYY HH:mm' - }, - calendar : { - sameDay : '[Í dag kl.] LT', - nextDay : '[Í morgin kl.] LT', - nextWeek : 'dddd [kl.] LT', - lastDay : '[Í gjár kl.] LT', - lastWeek : '[síðstu] dddd [kl] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'um %s', - past : '%s síðani', - s : 'fá sekund', - ss : '%d sekundir', - m : 'ein minutt', - mm : '%d minuttir', - h : 'ein tími', - hh : '%d tímar', - d : 'ein dagur', - dd : '%d dagar', - M : 'ein mánaði', - MM : '%d mánaðir', - y : 'eitt ár', - yy : '%d ár' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +convert.rgb.keyword = function (rgb) { + var reversed = reverseKeywords[rgb]; + if (reversed) { + return reversed; + } -return fo; + var currentClosestDistance = Infinity; + var currentClosestKeyword; -}))); + for (var keyword in cssKeywords) { + if (cssKeywords.hasOwnProperty(keyword)) { + var value = cssKeywords[keyword]; + // Compute comparative distance + var distance = comparativeDistance(rgb, value); -/***/ }), -/* 138 */ -/***/ (function(module, exports, __webpack_require__) { + // Check if its less, if so set as closest + if (distance < currentClosestDistance) { + currentClosestDistance = distance; + currentClosestKeyword = keyword; + } + } + } -//! moment.js locale configuration -//! locale : French [fr] -//! author : John Fischer : https://github.com/jfroffice - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var fr = moment.defineLocale('fr', { - months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'), - monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'), - monthsParseExact : true, - weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'), - weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'), - weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Aujourd’hui à] LT', - nextDay : '[Demain à] LT', - nextWeek : 'dddd [à] LT', - lastDay : '[Hier à] LT', - lastWeek : 'dddd [dernier à] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'dans %s', - past : 'il y a %s', - s : 'quelques secondes', - ss : '%d secondes', - m : 'une minute', - mm : '%d minutes', - h : 'une heure', - hh : '%d heures', - d : 'un jour', - dd : '%d jours', - M : 'un mois', - MM : '%d mois', - y : 'un an', - yy : '%d ans' - }, - dayOfMonthOrdinalParse: /\d{1,2}(er|)/, - ordinal : function (number, period) { - switch (period) { - // TODO: Return 'e' when day of month > 1. Move this case inside - // block for masculine words below. - // See https://github.com/moment/moment/issues/3375 - case 'D': - return number + (number === 1 ? 'er' : ''); - - // Words with masculine grammatical gender: mois, trimestre, jour - default: - case 'M': - case 'Q': - case 'DDD': - case 'd': - return number + (number === 1 ? 'er' : 'e'); + return currentClosestKeyword; +}; - // Words with feminine grammatical gender: semaine - case 'w': - case 'W': - return number + (number === 1 ? 're' : 'e'); - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +convert.keyword.rgb = function (keyword) { + return cssKeywords[keyword]; +}; -return fr; +convert.rgb.xyz = function (rgb) { + var r = rgb[0] / 255; + var g = rgb[1] / 255; + var b = rgb[2] / 255; -}))); + // assume sRGB + r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92); + g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92); + b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92); + var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805); + var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722); + var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505); -/***/ }), -/* 139 */ -/***/ (function(module, exports, __webpack_require__) { + return [x * 100, y * 100, z * 100]; +}; -//! moment.js locale configuration -//! locale : French (Canada) [fr-ca] -//! author : Jonathan Abourbih : https://github.com/jonbca - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var frCa = moment.defineLocale('fr-ca', { - months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'), - monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'), - monthsParseExact : true, - weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'), - weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'), - weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY-MM-DD', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Aujourd’hui à] LT', - nextDay : '[Demain à] LT', - nextWeek : 'dddd [à] LT', - lastDay : '[Hier à] LT', - lastWeek : 'dddd [dernier à] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'dans %s', - past : 'il y a %s', - s : 'quelques secondes', - ss : '%d secondes', - m : 'une minute', - mm : '%d minutes', - h : 'une heure', - hh : '%d heures', - d : 'un jour', - dd : '%d jours', - M : 'un mois', - MM : '%d mois', - y : 'un an', - yy : '%d ans' - }, - dayOfMonthOrdinalParse: /\d{1,2}(er|e)/, - ordinal : function (number, period) { - switch (period) { - // Words with masculine grammatical gender: mois, trimestre, jour - default: - case 'M': - case 'Q': - case 'D': - case 'DDD': - case 'd': - return number + (number === 1 ? 'er' : 'e'); +convert.rgb.lab = function (rgb) { + var xyz = convert.rgb.xyz(rgb); + var x = xyz[0]; + var y = xyz[1]; + var z = xyz[2]; + var l; + var a; + var b; - // Words with feminine grammatical gender: semaine - case 'w': - case 'W': - return number + (number === 1 ? 're' : 'e'); - } - } -}); + x /= 95.047; + y /= 100; + z /= 108.883; -return frCa; + x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116); + y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116); + z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116); -}))); + l = (116 * y) - 16; + a = 500 * (x - y); + b = 200 * (y - z); + return [l, a, b]; +}; -/***/ }), -/* 140 */ -/***/ (function(module, exports, __webpack_require__) { +convert.hsl.rgb = function (hsl) { + var h = hsl[0] / 360; + var s = hsl[1] / 100; + var l = hsl[2] / 100; + var t1; + var t2; + var t3; + var rgb; + var val; -//! moment.js locale configuration -//! locale : French (Switzerland) [fr-ch] -//! author : Gaspard Bucher : https://github.com/gaspard - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var frCh = moment.defineLocale('fr-ch', { - months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'), - monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'), - monthsParseExact : true, - weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'), - weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'), - weekdaysMin : 'di_lu_ma_me_je_ve_sa'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Aujourd’hui à] LT', - nextDay : '[Demain à] LT', - nextWeek : 'dddd [à] LT', - lastDay : '[Hier à] LT', - lastWeek : 'dddd [dernier à] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'dans %s', - past : 'il y a %s', - s : 'quelques secondes', - ss : '%d secondes', - m : 'une minute', - mm : '%d minutes', - h : 'une heure', - hh : '%d heures', - d : 'un jour', - dd : '%d jours', - M : 'un mois', - MM : '%d mois', - y : 'un an', - yy : '%d ans' - }, - dayOfMonthOrdinalParse: /\d{1,2}(er|e)/, - ordinal : function (number, period) { - switch (period) { - // Words with masculine grammatical gender: mois, trimestre, jour - default: - case 'M': - case 'Q': - case 'D': - case 'DDD': - case 'd': - return number + (number === 1 ? 'er' : 'e'); - - // Words with feminine grammatical gender: semaine - case 'w': - case 'W': - return number + (number === 1 ? 're' : 'e'); - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + if (s === 0) { + val = l * 255; + return [val, val, val]; + } -return frCh; + if (l < 0.5) { + t2 = l * (1 + s); + } else { + t2 = l + s - l * s; + } -}))); + t1 = 2 * l - t2; + rgb = [0, 0, 0]; + for (var i = 0; i < 3; i++) { + t3 = h + 1 / 3 * -(i - 1); + if (t3 < 0) { + t3++; + } + if (t3 > 1) { + t3--; + } -/***/ }), -/* 141 */ -/***/ (function(module, exports, __webpack_require__) { + if (6 * t3 < 1) { + val = t1 + (t2 - t1) * 6 * t3; + } else if (2 * t3 < 1) { + val = t2; + } else if (3 * t3 < 2) { + val = t1 + (t2 - t1) * (2 / 3 - t3) * 6; + } else { + val = t1; + } -//! moment.js locale configuration -//! locale : Frisian [fy] -//! author : Robin van der Vliet : https://github.com/robin0van0der0v + rgb[i] = val * 255; + } -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; + return rgb; +}; +convert.hsl.hsv = function (hsl) { + var h = hsl[0]; + var s = hsl[1] / 100; + var l = hsl[2] / 100; + var smin = s; + var lmin = Math.max(l, 0.01); + var sv; + var v; -var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'); -var monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'); + l *= 2; + s *= (l <= 1) ? l : 2 - l; + smin *= lmin <= 1 ? lmin : 2 - lmin; + v = (l + s) / 2; + sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s); -var fy = moment.defineLocale('fy', { - months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'), - monthsShort : function (m, format) { - if (!m) { - return monthsShortWithDots; - } else if (/-MMM-/.test(format)) { - return monthsShortWithoutDots[m.month()]; - } else { - return monthsShortWithDots[m.month()]; - } - }, - monthsParseExact : true, - weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'), - weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'), - weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD-MM-YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[hjoed om] LT', - nextDay: '[moarn om] LT', - nextWeek: 'dddd [om] LT', - lastDay: '[juster om] LT', - lastWeek: '[ôfrûne] dddd [om] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'oer %s', - past : '%s lyn', - s : 'in pear sekonden', - ss : '%d sekonden', - m : 'ien minút', - mm : '%d minuten', - h : 'ien oere', - hh : '%d oeren', - d : 'ien dei', - dd : '%d dagen', - M : 'ien moanne', - MM : '%d moannen', - y : 'ien jier', - yy : '%d jierren' - }, - dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, - ordinal : function (number) { - return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + return [h, sv * 100, v * 100]; +}; -return fy; +convert.hsv.rgb = function (hsv) { + var h = hsv[0] / 60; + var s = hsv[1] / 100; + var v = hsv[2] / 100; + var hi = Math.floor(h) % 6; -}))); + var f = h - Math.floor(h); + var p = 255 * v * (1 - s); + var q = 255 * v * (1 - (s * f)); + var t = 255 * v * (1 - (s * (1 - f))); + v *= 255; + switch (hi) { + case 0: + return [v, t, p]; + case 1: + return [q, v, p]; + case 2: + return [p, v, t]; + case 3: + return [p, q, v]; + case 4: + return [t, p, v]; + case 5: + return [v, p, q]; + } +}; -/***/ }), -/* 142 */ -/***/ (function(module, exports, __webpack_require__) { +convert.hsv.hsl = function (hsv) { + var h = hsv[0]; + var s = hsv[1] / 100; + var v = hsv[2] / 100; + var vmin = Math.max(v, 0.01); + var lmin; + var sl; + var l; -//! moment.js locale configuration -//! locale : Scottish Gaelic [gd] -//! author : Jon Ashdown : https://github.com/jonashdown + l = (2 - s) * v; + lmin = (2 - s) * vmin; + sl = s * vmin; + sl /= (lmin <= 1) ? lmin : 2 - lmin; + sl = sl || 0; + l /= 2; -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; + return [h, sl * 100, l * 100]; +}; +// http://dev.w3.org/csswg/css-color/#hwb-to-rgb +convert.hwb.rgb = function (hwb) { + var h = hwb[0] / 360; + var wh = hwb[1] / 100; + var bl = hwb[2] / 100; + var ratio = wh + bl; + var i; + var v; + var f; + var n; -var months = [ - 'Am Faoilleach', 'An Gearran', 'Am Màrt', 'An Giblean', 'An Cèitean', 'An t-Ògmhios', 'An t-Iuchar', 'An Lùnastal', 'An t-Sultain', 'An Dàmhair', 'An t-Samhain', 'An Dùbhlachd' -]; + // wh + bl cant be > 1 + if (ratio > 1) { + wh /= ratio; + bl /= ratio; + } -var monthsShort = ['Faoi', 'Gear', 'Màrt', 'Gibl', 'Cèit', 'Ògmh', 'Iuch', 'Lùn', 'Sult', 'Dàmh', 'Samh', 'Dùbh']; + i = Math.floor(6 * h); + v = 1 - bl; + f = 6 * h - i; -var weekdays = ['Didòmhnaich', 'Diluain', 'Dimàirt', 'Diciadain', 'Diardaoin', 'Dihaoine', 'Disathairne']; + if ((i & 0x01) !== 0) { + f = 1 - f; + } -var weekdaysShort = ['Did', 'Dil', 'Dim', 'Dic', 'Dia', 'Dih', 'Dis']; + n = wh + f * (v - wh); // linear interpolation -var weekdaysMin = ['Dò', 'Lu', 'Mà', 'Ci', 'Ar', 'Ha', 'Sa']; + var r; + var g; + var b; + switch (i) { + default: + case 6: + case 0: r = v; g = n; b = wh; break; + case 1: r = n; g = v; b = wh; break; + case 2: r = wh; g = v; b = n; break; + case 3: r = wh; g = n; b = v; break; + case 4: r = n; g = wh; b = v; break; + case 5: r = v; g = wh; b = n; break; + } -var gd = moment.defineLocale('gd', { - months : months, - monthsShort : monthsShort, - monthsParseExact : true, - weekdays : weekdays, - weekdaysShort : weekdaysShort, - weekdaysMin : weekdaysMin, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[An-diugh aig] LT', - nextDay : '[A-màireach aig] LT', - nextWeek : 'dddd [aig] LT', - lastDay : '[An-dè aig] LT', - lastWeek : 'dddd [seo chaidh] [aig] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'ann an %s', - past : 'bho chionn %s', - s : 'beagan diogan', - ss : '%d diogan', - m : 'mionaid', - mm : '%d mionaidean', - h : 'uair', - hh : '%d uairean', - d : 'latha', - dd : '%d latha', - M : 'mìos', - MM : '%d mìosan', - y : 'bliadhna', - yy : '%d bliadhna' - }, - dayOfMonthOrdinalParse : /\d{1,2}(d|na|mh)/, - ordinal : function (number) { - var output = number === 1 ? 'd' : number % 10 === 2 ? 'na' : 'mh'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + return [r * 255, g * 255, b * 255]; +}; -return gd; +convert.cmyk.rgb = function (cmyk) { + var c = cmyk[0] / 100; + var m = cmyk[1] / 100; + var y = cmyk[2] / 100; + var k = cmyk[3] / 100; + var r; + var g; + var b; -}))); + r = 1 - Math.min(1, c * (1 - k) + k); + g = 1 - Math.min(1, m * (1 - k) + k); + b = 1 - Math.min(1, y * (1 - k) + k); + return [r * 255, g * 255, b * 255]; +}; -/***/ }), -/* 143 */ -/***/ (function(module, exports, __webpack_require__) { +convert.xyz.rgb = function (xyz) { + var x = xyz[0] / 100; + var y = xyz[1] / 100; + var z = xyz[2] / 100; + var r; + var g; + var b; -//! moment.js locale configuration -//! locale : Galician [gl] -//! author : Juan G. Hurtado : https://github.com/juanghurtado - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var gl = moment.defineLocale('gl', { - months : 'xaneiro_febreiro_marzo_abril_maio_xuño_xullo_agosto_setembro_outubro_novembro_decembro'.split('_'), - monthsShort : 'xan._feb._mar._abr._mai._xuñ._xul._ago._set._out._nov._dec.'.split('_'), - monthsParseExact: true, - weekdays : 'domingo_luns_martes_mércores_xoves_venres_sábado'.split('_'), - weekdaysShort : 'dom._lun._mar._mér._xov._ven._sáb.'.split('_'), - weekdaysMin : 'do_lu_ma_mé_xo_ve_sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY H:mm', - LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm' - }, - calendar : { - sameDay : function () { - return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT'; - }, - nextDay : function () { - return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT'; - }, - nextWeek : function () { - return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT'; - }, - lastDay : function () { - return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT'; - }, - lastWeek : function () { - return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT'; - }, - sameElse : 'L' - }, - relativeTime : { - future : function (str) { - if (str.indexOf('un') === 0) { - return 'n' + str; - } - return 'en ' + str; - }, - past : 'hai %s', - s : 'uns segundos', - ss : '%d segundos', - m : 'un minuto', - mm : '%d minutos', - h : 'unha hora', - hh : '%d horas', - d : 'un día', - dd : '%d días', - M : 'un mes', - MM : '%d meses', - y : 'un ano', - yy : '%d anos' - }, - dayOfMonthOrdinalParse : /\d{1,2}º/, - ordinal : '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986); + g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415); + b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570); -return gl; + // assume sRGB + r = r > 0.0031308 + ? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055) + : r * 12.92; -}))); + g = g > 0.0031308 + ? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055) + : g * 12.92; + b = b > 0.0031308 + ? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055) + : b * 12.92; -/***/ }), -/* 144 */ -/***/ (function(module, exports, __webpack_require__) { + r = Math.min(Math.max(0, r), 1); + g = Math.min(Math.max(0, g), 1); + b = Math.min(Math.max(0, b), 1); -//! moment.js locale configuration -//! locale : Konkani Latin script [gom-latn] -//! author : The Discoverer : https://github.com/WikiDiscoverer - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 's': ['thodde secondanim', 'thodde second'], - 'ss': [number + ' secondanim', number + ' second'], - 'm': ['eka mintan', 'ek minute'], - 'mm': [number + ' mintanim', number + ' mintam'], - 'h': ['eka horan', 'ek hor'], - 'hh': [number + ' horanim', number + ' hor'], - 'd': ['eka disan', 'ek dis'], - 'dd': [number + ' disanim', number + ' dis'], - 'M': ['eka mhoinean', 'ek mhoino'], - 'MM': [number + ' mhoineanim', number + ' mhoine'], - 'y': ['eka vorsan', 'ek voros'], - 'yy': [number + ' vorsanim', number + ' vorsam'] - }; - return withoutSuffix ? format[key][0] : format[key][1]; -} - -var gomLatn = moment.defineLocale('gom-latn', { - months : 'Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr'.split('_'), - monthsShort : 'Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.'.split('_'), - monthsParseExact : true, - weekdays : 'Aitar_Somar_Mongllar_Budvar_Brestar_Sukrar_Son\'var'.split('_'), - weekdaysShort : 'Ait._Som._Mon._Bud._Bre._Suk._Son.'.split('_'), - weekdaysMin : 'Ai_Sm_Mo_Bu_Br_Su_Sn'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'A h:mm [vazta]', - LTS : 'A h:mm:ss [vazta]', - L : 'DD-MM-YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY A h:mm [vazta]', - LLLL : 'dddd, MMMM[achea] Do, YYYY, A h:mm [vazta]', - llll: 'ddd, D MMM YYYY, A h:mm [vazta]' - }, - calendar : { - sameDay: '[Aiz] LT', - nextDay: '[Faleam] LT', - nextWeek: '[Ieta to] dddd[,] LT', - lastDay: '[Kal] LT', - lastWeek: '[Fatlo] dddd[,] LT', - sameElse: 'L' - }, - relativeTime : { - future : '%s', - past : '%s adim', - s : processRelativeTime, - ss : processRelativeTime, - m : processRelativeTime, - mm : processRelativeTime, - h : processRelativeTime, - hh : processRelativeTime, - d : processRelativeTime, - dd : processRelativeTime, - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse : /\d{1,2}(er)/, - ordinal : function (number, period) { - switch (period) { - // the ordinal 'er' only applies to day of the month - case 'D': - return number + 'er'; - default: - case 'M': - case 'Q': - case 'DDD': - case 'd': - case 'w': - case 'W': - return number; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - }, - meridiemParse: /rati|sokalli|donparam|sanje/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'rati') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'sokalli') { - return hour; - } else if (meridiem === 'donparam') { - return hour > 12 ? hour : hour + 12; - } else if (meridiem === 'sanje') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'rati'; - } else if (hour < 12) { - return 'sokalli'; - } else if (hour < 16) { - return 'donparam'; - } else if (hour < 20) { - return 'sanje'; - } else { - return 'rati'; - } - } -}); + return [r * 255, g * 255, b * 255]; +}; -return gomLatn; +convert.xyz.lab = function (xyz) { + var x = xyz[0]; + var y = xyz[1]; + var z = xyz[2]; + var l; + var a; + var b; -}))); + x /= 95.047; + y /= 100; + z /= 108.883; + x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116); + y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116); + z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116); -/***/ }), -/* 145 */ -/***/ (function(module, exports, __webpack_require__) { + l = (116 * y) - 16; + a = 500 * (x - y); + b = 200 * (y - z); -//! moment.js locale configuration -//! locale : Gujarati [gu] -//! author : Kaushik Thanki : https://github.com/Kaushik1987 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '૧', - '2': '૨', - '3': '૩', - '4': '૪', - '5': '૫', - '6': '૬', - '7': '૭', - '8': '૮', - '9': '૯', - '0': '૦' - }; -var numberMap = { - '૧': '1', - '૨': '2', - '૩': '3', - '૪': '4', - '૫': '5', - '૬': '6', - '૭': '7', - '૮': '8', - '૯': '9', - '૦': '0' - }; - -var gu = moment.defineLocale('gu', { - months: 'જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર'.split('_'), - monthsShort: 'જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.'.split('_'), - monthsParseExact: true, - weekdays: 'રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર'.split('_'), - weekdaysShort: 'રવિ_સોમ_મંગળ_બુધ્_ગુરુ_શુક્ર_શનિ'.split('_'), - weekdaysMin: 'ર_સો_મં_બુ_ગુ_શુ_શ'.split('_'), - longDateFormat: { - LT: 'A h:mm વાગ્યે', - LTS: 'A h:mm:ss વાગ્યે', - L: 'DD/MM/YYYY', - LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY, A h:mm વાગ્યે', - LLLL: 'dddd, D MMMM YYYY, A h:mm વાગ્યે' - }, - calendar: { - sameDay: '[આજ] LT', - nextDay: '[કાલે] LT', - nextWeek: 'dddd, LT', - lastDay: '[ગઇકાલે] LT', - lastWeek: '[પાછલા] dddd, LT', - sameElse: 'L' - }, - relativeTime: { - future: '%s મા', - past: '%s પેહલા', - s: 'અમુક પળો', - ss: '%d સેકંડ', - m: 'એક મિનિટ', - mm: '%d મિનિટ', - h: 'એક કલાક', - hh: '%d કલાક', - d: 'એક દિવસ', - dd: '%d દિવસ', - M: 'એક મહિનો', - MM: '%d મહિનો', - y: 'એક વર્ષ', - yy: '%d વર્ષ' - }, - preparse: function (string) { - return string.replace(/[૧૨૩૪૫૬૭૮૯૦]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - // Gujarati notation for meridiems are quite fuzzy in practice. While there exists - // a rigid notion of a 'Pahar' it is not used as rigidly in modern Gujarati. - meridiemParse: /રાત|બપોર|સવાર|સાંજ/, - meridiemHour: function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'રાત') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'સવાર') { - return hour; - } else if (meridiem === 'બપોર') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'સાંજ') { - return hour + 12; - } - }, - meridiem: function (hour, minute, isLower) { - if (hour < 4) { - return 'રાત'; - } else if (hour < 10) { - return 'સવાર'; - } else if (hour < 17) { - return 'બપોર'; - } else if (hour < 20) { - return 'સાંજ'; - } else { - return 'રાત'; - } - }, - week: { - dow: 0, // Sunday is the first day of the week. - doy: 6 // The week that contains Jan 1st is the first week of the year. - } -}); + return [l, a, b]; +}; -return gu; +convert.lab.xyz = function (lab) { + var l = lab[0]; + var a = lab[1]; + var b = lab[2]; + var x; + var y; + var z; -}))); + y = (l + 16) / 116; + x = a / 500 + y; + z = y - b / 200; + var y2 = Math.pow(y, 3); + var x2 = Math.pow(x, 3); + var z2 = Math.pow(z, 3); + y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787; + x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787; + z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787; -/***/ }), -/* 146 */ -/***/ (function(module, exports, __webpack_require__) { + x *= 95.047; + y *= 100; + z *= 108.883; -//! moment.js locale configuration -//! locale : Hebrew [he] -//! author : Tomer Cohen : https://github.com/tomer -//! author : Moshe Simantov : https://github.com/DevelopmentIL -//! author : Tal Ater : https://github.com/TalAter - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var he = moment.defineLocale('he', { - months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'), - monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'), - weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'), - weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'), - weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D [ב]MMMM YYYY', - LLL : 'D [ב]MMMM YYYY HH:mm', - LLLL : 'dddd, D [ב]MMMM YYYY HH:mm', - l : 'D/M/YYYY', - ll : 'D MMM YYYY', - lll : 'D MMM YYYY HH:mm', - llll : 'ddd, D MMM YYYY HH:mm' - }, - calendar : { - sameDay : '[היום ב־]LT', - nextDay : '[מחר ב־]LT', - nextWeek : 'dddd [בשעה] LT', - lastDay : '[אתמול ב־]LT', - lastWeek : '[ביום] dddd [האחרון בשעה] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'בעוד %s', - past : 'לפני %s', - s : 'מספר שניות', - ss : '%d שניות', - m : 'דקה', - mm : '%d דקות', - h : 'שעה', - hh : function (number) { - if (number === 2) { - return 'שעתיים'; - } - return number + ' שעות'; - }, - d : 'יום', - dd : function (number) { - if (number === 2) { - return 'יומיים'; - } - return number + ' ימים'; - }, - M : 'חודש', - MM : function (number) { - if (number === 2) { - return 'חודשיים'; - } - return number + ' חודשים'; - }, - y : 'שנה', - yy : function (number) { - if (number === 2) { - return 'שנתיים'; - } else if (number % 10 === 0 && number !== 10) { - return number + ' שנה'; - } - return number + ' שנים'; - } - }, - meridiemParse: /אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i, - isPM : function (input) { - return /^(אחה"צ|אחרי הצהריים|בערב)$/.test(input); - }, - meridiem : function (hour, minute, isLower) { - if (hour < 5) { - return 'לפנות בוקר'; - } else if (hour < 10) { - return 'בבוקר'; - } else if (hour < 12) { - return isLower ? 'לפנה"צ' : 'לפני הצהריים'; - } else if (hour < 18) { - return isLower ? 'אחה"צ' : 'אחרי הצהריים'; - } else { - return 'בערב'; - } - } -}); + return [x, y, z]; +}; -return he; +convert.lab.lch = function (lab) { + var l = lab[0]; + var a = lab[1]; + var b = lab[2]; + var hr; + var h; + var c; -}))); + hr = Math.atan2(b, a); + h = hr * 360 / 2 / Math.PI; + if (h < 0) { + h += 360; + } -/***/ }), -/* 147 */ -/***/ (function(module, exports, __webpack_require__) { + c = Math.sqrt(a * a + b * b); -//! moment.js locale configuration -//! locale : Hindi [hi] -//! author : Mayank Singhal : https://github.com/mayanksinghal - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '१', - '2': '२', - '3': '३', - '4': '४', - '5': '५', - '6': '६', - '7': '७', - '8': '८', - '9': '९', - '0': '०' + return [l, c, h]; }; -var numberMap = { - '१': '1', - '२': '2', - '३': '3', - '४': '4', - '५': '5', - '६': '6', - '७': '7', - '८': '8', - '९': '9', - '०': '0' + +convert.lch.lab = function (lch) { + var l = lch[0]; + var c = lch[1]; + var h = lch[2]; + var a; + var b; + var hr; + + hr = h / 360 * 2 * Math.PI; + a = c * Math.cos(hr); + b = c * Math.sin(hr); + + return [l, a, b]; }; -var hi = moment.defineLocale('hi', { - months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'), - monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'), - monthsParseExact: true, - weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'), - weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'), - weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'), - longDateFormat : { - LT : 'A h:mm बजे', - LTS : 'A h:mm:ss बजे', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm बजे', - LLLL : 'dddd, D MMMM YYYY, A h:mm बजे' - }, - calendar : { - sameDay : '[आज] LT', - nextDay : '[कल] LT', - nextWeek : 'dddd, LT', - lastDay : '[कल] LT', - lastWeek : '[पिछले] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s में', - past : '%s पहले', - s : 'कुछ ही क्षण', - ss : '%d सेकंड', - m : 'एक मिनट', - mm : '%d मिनट', - h : 'एक घंटा', - hh : '%d घंटे', - d : 'एक दिन', - dd : '%d दिन', - M : 'एक महीने', - MM : '%d महीने', - y : 'एक वर्ष', - yy : '%d वर्ष' - }, - preparse: function (string) { - return string.replace(/[१२३४५६७८९०]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - // Hindi notation for meridiems are quite fuzzy in practice. While there exists - // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi. - meridiemParse: /रात|सुबह|दोपहर|शाम/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'रात') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'सुबह') { - return hour; - } else if (meridiem === 'दोपहर') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'शाम') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'रात'; - } else if (hour < 10) { - return 'सुबह'; - } else if (hour < 17) { - return 'दोपहर'; - } else if (hour < 20) { - return 'शाम'; - } else { - return 'रात'; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); +convert.rgb.ansi16 = function (args) { + var r = args[0]; + var g = args[1]; + var b = args[2]; + var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization -return hi; + value = Math.round(value / 50); -}))); + if (value === 0) { + return 30; + } + var ansi = 30 + + ((Math.round(b / 255) << 2) + | (Math.round(g / 255) << 1) + | Math.round(r / 255)); -/***/ }), -/* 148 */ -/***/ (function(module, exports, __webpack_require__) { + if (value === 2) { + ansi += 60; + } -//! moment.js locale configuration -//! locale : Croatian [hr] -//! author : Bojan Marković : https://github.com/bmarkovic - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function translate(number, withoutSuffix, key) { - var result = number + ' '; - switch (key) { - case 'ss': - if (number === 1) { - result += 'sekunda'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'sekunde'; - } else { - result += 'sekundi'; - } - return result; - case 'm': - return withoutSuffix ? 'jedna minuta' : 'jedne minute'; - case 'mm': - if (number === 1) { - result += 'minuta'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'minute'; - } else { - result += 'minuta'; - } - return result; - case 'h': - return withoutSuffix ? 'jedan sat' : 'jednog sata'; - case 'hh': - if (number === 1) { - result += 'sat'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'sata'; - } else { - result += 'sati'; - } - return result; - case 'dd': - if (number === 1) { - result += 'dan'; - } else { - result += 'dana'; - } - return result; - case 'MM': - if (number === 1) { - result += 'mjesec'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'mjeseca'; - } else { - result += 'mjeseci'; - } - return result; - case 'yy': - if (number === 1) { - result += 'godina'; - } else if (number === 2 || number === 3 || number === 4) { - result += 'godine'; - } else { - result += 'godina'; - } - return result; - } -} + return ansi; +}; -var hr = moment.defineLocale('hr', { - months : { - format: 'siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca'.split('_'), - standalone: 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_') - }, - monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'), - monthsParseExact: true, - weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'), - weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'), - weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY H:mm', - LLLL : 'dddd, D. MMMM YYYY H:mm' - }, - calendar : { - sameDay : '[danas u] LT', - nextDay : '[sutra u] LT', - nextWeek : function () { - switch (this.day()) { - case 0: - return '[u] [nedjelju] [u] LT'; - case 3: - return '[u] [srijedu] [u] LT'; - case 6: - return '[u] [subotu] [u] LT'; - case 1: - case 2: - case 4: - case 5: - return '[u] dddd [u] LT'; - } - }, - lastDay : '[jučer u] LT', - lastWeek : function () { - switch (this.day()) { - case 0: - case 3: - return '[prošlu] dddd [u] LT'; - case 6: - return '[prošle] [subote] [u] LT'; - case 1: - case 2: - case 4: - case 5: - return '[prošli] dddd [u] LT'; - } - }, - sameElse : 'L' - }, - relativeTime : { - future : 'za %s', - past : 'prije %s', - s : 'par sekundi', - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : 'dan', - dd : translate, - M : 'mjesec', - MM : translate, - y : 'godinu', - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); +convert.hsv.ansi16 = function (args) { + // optimization here; we already know the value and don't need to get + // it converted for us. + return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]); +}; -return hr; +convert.rgb.ansi256 = function (args) { + var r = args[0]; + var g = args[1]; + var b = args[2]; -}))); + // we use the extended greyscale palette here, with the exception of + // black and white. normal palette only has 4 greyscale shades. + if (r === g && g === b) { + if (r < 8) { + return 16; + } + if (r > 248) { + return 231; + } -/***/ }), -/* 149 */ -/***/ (function(module, exports, __webpack_require__) { + return Math.round(((r - 8) / 247) * 24) + 232; + } -//! moment.js locale configuration -//! locale : Hungarian [hu] -//! author : Adam Brunner : https://github.com/adambrunner - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' '); -function translate(number, withoutSuffix, key, isFuture) { - var num = number; - switch (key) { - case 's': - return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce'; - case 'ss': - return num + (isFuture || withoutSuffix) ? ' másodperc' : ' másodperce'; - case 'm': - return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce'); - case 'mm': - return num + (isFuture || withoutSuffix ? ' perc' : ' perce'); - case 'h': - return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája'); - case 'hh': - return num + (isFuture || withoutSuffix ? ' óra' : ' órája'); - case 'd': - return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja'); - case 'dd': - return num + (isFuture || withoutSuffix ? ' nap' : ' napja'); - case 'M': - return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja'); - case 'MM': - return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja'); - case 'y': - return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve'); - case 'yy': - return num + (isFuture || withoutSuffix ? ' év' : ' éve'); - } - return ''; -} -function week(isFuture) { - return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]'; -} - -var hu = moment.defineLocale('hu', { - months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'), - monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'), - weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'), - weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'), - weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'), - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'YYYY.MM.DD.', - LL : 'YYYY. MMMM D.', - LLL : 'YYYY. MMMM D. H:mm', - LLLL : 'YYYY. MMMM D., dddd H:mm' - }, - meridiemParse: /de|du/i, - isPM: function (input) { - return input.charAt(1).toLowerCase() === 'u'; - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 12) { - return isLower === true ? 'de' : 'DE'; - } else { - return isLower === true ? 'du' : 'DU'; - } - }, - calendar : { - sameDay : '[ma] LT[-kor]', - nextDay : '[holnap] LT[-kor]', - nextWeek : function () { - return week.call(this, true); - }, - lastDay : '[tegnap] LT[-kor]', - lastWeek : function () { - return week.call(this, false); - }, - sameElse : 'L' - }, - relativeTime : { - future : '%s múlva', - past : '%s', - s : translate, - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : translate, - dd : translate, - M : translate, - MM : translate, - y : translate, - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + var ansi = 16 + + (36 * Math.round(r / 255 * 5)) + + (6 * Math.round(g / 255 * 5)) + + Math.round(b / 255 * 5); -return hu; + return ansi; +}; -}))); +convert.ansi16.rgb = function (args) { + var color = args % 10; + // handle greyscale + if (color === 0 || color === 7) { + if (args > 50) { + color += 3.5; + } -/***/ }), -/* 150 */ -/***/ (function(module, exports, __webpack_require__) { + color = color / 10.5 * 255; -//! moment.js locale configuration -//! locale : Armenian [hy-am] -//! author : Armendarabyan : https://github.com/armendarabyan + return [color, color, color]; + } -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; + var mult = (~~(args > 50) + 1) * 0.5; + var r = ((color & 1) * mult) * 255; + var g = (((color >> 1) & 1) * mult) * 255; + var b = (((color >> 2) & 1) * mult) * 255; + return [r, g, b]; +}; -var hyAm = moment.defineLocale('hy-am', { - months : { - format: 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_'), - standalone: 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_') - }, - monthsShort : 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'), - weekdays : 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_'), - weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'), - weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY թ.', - LLL : 'D MMMM YYYY թ., HH:mm', - LLLL : 'dddd, D MMMM YYYY թ., HH:mm' - }, - calendar : { - sameDay: '[այսօր] LT', - nextDay: '[վաղը] LT', - lastDay: '[երեկ] LT', - nextWeek: function () { - return 'dddd [օրը ժամը] LT'; - }, - lastWeek: function () { - return '[անցած] dddd [օրը ժամը] LT'; - }, - sameElse: 'L' - }, - relativeTime : { - future : '%s հետո', - past : '%s առաջ', - s : 'մի քանի վայրկյան', - ss : '%d վայրկյան', - m : 'րոպե', - mm : '%d րոպե', - h : 'ժամ', - hh : '%d ժամ', - d : 'օր', - dd : '%d օր', - M : 'ամիս', - MM : '%d ամիս', - y : 'տարի', - yy : '%d տարի' - }, - meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/, - isPM: function (input) { - return /^(ցերեկվա|երեկոյան)$/.test(input); - }, - meridiem : function (hour) { - if (hour < 4) { - return 'գիշերվա'; - } else if (hour < 12) { - return 'առավոտվա'; - } else if (hour < 17) { - return 'ցերեկվա'; - } else { - return 'երեկոյան'; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/, - ordinal: function (number, period) { - switch (period) { - case 'DDD': - case 'w': - case 'W': - case 'DDDo': - if (number === 1) { - return number + '-ին'; - } - return number + '-րդ'; - default: - return number; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); +convert.ansi256.rgb = function (args) { + // handle greyscale + if (args >= 232) { + var c = (args - 232) * 10 + 8; + return [c, c, c]; + } -return hyAm; + args -= 16; -}))); + var rem; + var r = Math.floor(args / 36) / 5 * 255; + var g = Math.floor((rem = args % 36) / 6) / 5 * 255; + var b = (rem % 6) / 5 * 255; + return [r, g, b]; +}; -/***/ }), -/* 151 */ -/***/ (function(module, exports, __webpack_require__) { +convert.rgb.hex = function (args) { + var integer = ((Math.round(args[0]) & 0xFF) << 16) + + ((Math.round(args[1]) & 0xFF) << 8) + + (Math.round(args[2]) & 0xFF); -//! moment.js locale configuration -//! locale : Indonesian [id] -//! author : Mohammad Satrio Utomo : https://github.com/tyok -//! reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var id = moment.defineLocale('id', { - months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des'.split('_'), - weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'), - weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'), - weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'), - longDateFormat : { - LT : 'HH.mm', - LTS : 'HH.mm.ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] HH.mm', - LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' - }, - meridiemParse: /pagi|siang|sore|malam/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'pagi') { - return hour; - } else if (meridiem === 'siang') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === 'sore' || meridiem === 'malam') { - return hour + 12; - } - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 11) { - return 'pagi'; - } else if (hours < 15) { - return 'siang'; - } else if (hours < 19) { - return 'sore'; - } else { - return 'malam'; - } - }, - calendar : { - sameDay : '[Hari ini pukul] LT', - nextDay : '[Besok pukul] LT', - nextWeek : 'dddd [pukul] LT', - lastDay : '[Kemarin pukul] LT', - lastWeek : 'dddd [lalu pukul] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'dalam %s', - past : '%s yang lalu', - s : 'beberapa detik', - ss : '%d detik', - m : 'semenit', - mm : '%d menit', - h : 'sejam', - hh : '%d jam', - d : 'sehari', - dd : '%d hari', - M : 'sebulan', - MM : '%d bulan', - y : 'setahun', - yy : '%d tahun' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + var string = integer.toString(16).toUpperCase(); + return '000000'.substring(string.length) + string; +}; -return id; +convert.hex.rgb = function (args) { + var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i); + if (!match) { + return [0, 0, 0]; + } -}))); + var colorString = match[0]; + if (match[0].length === 3) { + colorString = colorString.split('').map(function (char) { + return char + char; + }).join(''); + } -/***/ }), -/* 152 */ -/***/ (function(module, exports, __webpack_require__) { + var integer = parseInt(colorString, 16); + var r = (integer >> 16) & 0xFF; + var g = (integer >> 8) & 0xFF; + var b = integer & 0xFF; -//! moment.js locale configuration -//! locale : Icelandic [is] -//! author : Hinrik Örn Sigurðsson : https://github.com/hinrik + return [r, g, b]; +}; -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +convert.rgb.hcg = function (rgb) { + var r = rgb[0] / 255; + var g = rgb[1] / 255; + var b = rgb[2] / 255; + var max = Math.max(Math.max(r, g), b); + var min = Math.min(Math.min(r, g), b); + var chroma = (max - min); + var grayscale; + var hue; + if (chroma < 1) { + grayscale = min / (1 - chroma); + } else { + grayscale = 0; + } -function plural(n) { - if (n % 100 === 11) { - return true; - } else if (n % 10 === 1) { - return false; - } - return true; -} -function translate(number, withoutSuffix, key, isFuture) { - var result = number + ' '; - switch (key) { - case 's': - return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum'; - case 'ss': - if (plural(number)) { - return result + (withoutSuffix || isFuture ? 'sekúndur' : 'sekúndum'); - } - return result + 'sekúnda'; - case 'm': - return withoutSuffix ? 'mínúta' : 'mínútu'; - case 'mm': - if (plural(number)) { - return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum'); - } else if (withoutSuffix) { - return result + 'mínúta'; - } - return result + 'mínútu'; - case 'hh': - if (plural(number)) { - return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum'); - } - return result + 'klukkustund'; - case 'd': - if (withoutSuffix) { - return 'dagur'; - } - return isFuture ? 'dag' : 'degi'; - case 'dd': - if (plural(number)) { - if (withoutSuffix) { - return result + 'dagar'; - } - return result + (isFuture ? 'daga' : 'dögum'); - } else if (withoutSuffix) { - return result + 'dagur'; - } - return result + (isFuture ? 'dag' : 'degi'); - case 'M': - if (withoutSuffix) { - return 'mánuður'; - } - return isFuture ? 'mánuð' : 'mánuði'; - case 'MM': - if (plural(number)) { - if (withoutSuffix) { - return result + 'mánuðir'; - } - return result + (isFuture ? 'mánuði' : 'mánuðum'); - } else if (withoutSuffix) { - return result + 'mánuður'; - } - return result + (isFuture ? 'mánuð' : 'mánuði'); - case 'y': - return withoutSuffix || isFuture ? 'ár' : 'ári'; - case 'yy': - if (plural(number)) { - return result + (withoutSuffix || isFuture ? 'ár' : 'árum'); - } - return result + (withoutSuffix || isFuture ? 'ár' : 'ári'); - } -} - -var is = moment.defineLocale('is', { - months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'), - monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'), - weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'), - weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'), - weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'), - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY [kl.] H:mm', - LLLL : 'dddd, D. MMMM YYYY [kl.] H:mm' - }, - calendar : { - sameDay : '[í dag kl.] LT', - nextDay : '[á morgun kl.] LT', - nextWeek : 'dddd [kl.] LT', - lastDay : '[í gær kl.] LT', - lastWeek : '[síðasta] dddd [kl.] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'eftir %s', - past : 'fyrir %s síðan', - s : translate, - ss : translate, - m : translate, - mm : translate, - h : 'klukkustund', - hh : translate, - d : translate, - dd : translate, - M : translate, - MM : translate, - y : translate, - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + if (chroma <= 0) { + hue = 0; + } else + if (max === r) { + hue = ((g - b) / chroma) % 6; + } else + if (max === g) { + hue = 2 + (b - r) / chroma; + } else { + hue = 4 + (r - g) / chroma + 4; + } -return is; + hue /= 6; + hue %= 1; -}))); + return [hue * 360, chroma * 100, grayscale * 100]; +}; +convert.hsl.hcg = function (hsl) { + var s = hsl[1] / 100; + var l = hsl[2] / 100; + var c = 1; + var f = 0; -/***/ }), -/* 153 */ -/***/ (function(module, exports, __webpack_require__) { + if (l < 0.5) { + c = 2.0 * s * l; + } else { + c = 2.0 * s * (1.0 - l); + } -//! moment.js locale configuration -//! locale : Italian [it] -//! author : Lorenzo : https://github.com/aliem -//! author: Mattia Larentis: https://github.com/nostalgiaz - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var it = moment.defineLocale('it', { - months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'), - monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'), - weekdays : 'domenica_lunedì_martedì_mercoledì_giovedì_venerdì_sabato'.split('_'), - weekdaysShort : 'dom_lun_mar_mer_gio_ven_sab'.split('_'), - weekdaysMin : 'do_lu_ma_me_gi_ve_sa'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[Oggi alle] LT', - nextDay: '[Domani alle] LT', - nextWeek: 'dddd [alle] LT', - lastDay: '[Ieri alle] LT', - lastWeek: function () { - switch (this.day()) { - case 0: - return '[la scorsa] dddd [alle] LT'; - default: - return '[lo scorso] dddd [alle] LT'; - } - }, - sameElse: 'L' - }, - relativeTime : { - future : function (s) { - return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s; - }, - past : '%s fa', - s : 'alcuni secondi', - ss : '%d secondi', - m : 'un minuto', - mm : '%d minuti', - h : 'un\'ora', - hh : '%d ore', - d : 'un giorno', - dd : '%d giorni', - M : 'un mese', - MM : '%d mesi', - y : 'un anno', - yy : '%d anni' - }, - dayOfMonthOrdinalParse : /\d{1,2}º/, - ordinal: '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + if (c < 1.0) { + f = (l - 0.5 * c) / (1.0 - c); + } -return it; + return [hsl[0], c * 100, f * 100]; +}; -}))); +convert.hsv.hcg = function (hsv) { + var s = hsv[1] / 100; + var v = hsv[2] / 100; + var c = s * v; + var f = 0; -/***/ }), -/* 154 */ -/***/ (function(module, exports, __webpack_require__) { + if (c < 1.0) { + f = (v - c) / (1 - c); + } -//! moment.js locale configuration -//! locale : Japanese [ja] -//! author : LI Long : https://github.com/baryon - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var ja = moment.defineLocale('ja', { - months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'), - monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'), - weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'), - weekdaysShort : '日_月_火_水_木_金_土'.split('_'), - weekdaysMin : '日_月_火_水_木_金_土'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY/MM/DD', - LL : 'YYYY年M月D日', - LLL : 'YYYY年M月D日 HH:mm', - LLLL : 'YYYY年M月D日 HH:mm dddd', - l : 'YYYY/MM/DD', - ll : 'YYYY年M月D日', - lll : 'YYYY年M月D日 HH:mm', - llll : 'YYYY年M月D日 HH:mm dddd' - }, - meridiemParse: /午前|午後/i, - isPM : function (input) { - return input === '午後'; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return '午前'; - } else { - return '午後'; - } - }, - calendar : { - sameDay : '[今日] LT', - nextDay : '[明日] LT', - nextWeek : '[来週]dddd LT', - lastDay : '[昨日] LT', - lastWeek : '[前週]dddd LT', - sameElse : 'L' - }, - dayOfMonthOrdinalParse : /\d{1,2}日/, - ordinal : function (number, period) { - switch (period) { - case 'd': - case 'D': - case 'DDD': - return number + '日'; - default: - return number; - } - }, - relativeTime : { - future : '%s後', - past : '%s前', - s : '数秒', - ss : '%d秒', - m : '1分', - mm : '%d分', - h : '1時間', - hh : '%d時間', - d : '1日', - dd : '%d日', - M : '1ヶ月', - MM : '%dヶ月', - y : '1年', - yy : '%d年' - } -}); + return [hsv[0], c * 100, f * 100]; +}; -return ja; +convert.hcg.rgb = function (hcg) { + var h = hcg[0] / 360; + var c = hcg[1] / 100; + var g = hcg[2] / 100; -}))); + if (c === 0.0) { + return [g * 255, g * 255, g * 255]; + } + var pure = [0, 0, 0]; + var hi = (h % 1) * 6; + var v = hi % 1; + var w = 1 - v; + var mg = 0; -/***/ }), -/* 155 */ -/***/ (function(module, exports, __webpack_require__) { + switch (Math.floor(hi)) { + case 0: + pure[0] = 1; pure[1] = v; pure[2] = 0; break; + case 1: + pure[0] = w; pure[1] = 1; pure[2] = 0; break; + case 2: + pure[0] = 0; pure[1] = 1; pure[2] = v; break; + case 3: + pure[0] = 0; pure[1] = w; pure[2] = 1; break; + case 4: + pure[0] = v; pure[1] = 0; pure[2] = 1; break; + default: + pure[0] = 1; pure[1] = 0; pure[2] = w; + } -//! moment.js locale configuration -//! locale : Javanese [jv] -//! author : Rony Lantip : https://github.com/lantip -//! reference: http://jv.wikipedia.org/wiki/Basa_Jawa - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var jv = moment.defineLocale('jv', { - months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'), - weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'), - weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'), - weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'), - longDateFormat : { - LT : 'HH.mm', - LTS : 'HH.mm.ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] HH.mm', - LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' - }, - meridiemParse: /enjing|siyang|sonten|ndalu/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'enjing') { - return hour; - } else if (meridiem === 'siyang') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === 'sonten' || meridiem === 'ndalu') { - return hour + 12; - } - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 11) { - return 'enjing'; - } else if (hours < 15) { - return 'siyang'; - } else if (hours < 19) { - return 'sonten'; - } else { - return 'ndalu'; - } - }, - calendar : { - sameDay : '[Dinten puniko pukul] LT', - nextDay : '[Mbenjang pukul] LT', - nextWeek : 'dddd [pukul] LT', - lastDay : '[Kala wingi pukul] LT', - lastWeek : 'dddd [kepengker pukul] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'wonten ing %s', - past : '%s ingkang kepengker', - s : 'sawetawis detik', - ss : '%d detik', - m : 'setunggal menit', - mm : '%d menit', - h : 'setunggal jam', - hh : '%d jam', - d : 'sedinten', - dd : '%d dinten', - M : 'sewulan', - MM : '%d wulan', - y : 'setaun', - yy : '%d taun' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + mg = (1.0 - c) * g; -return jv; + return [ + (c * pure[0] + mg) * 255, + (c * pure[1] + mg) * 255, + (c * pure[2] + mg) * 255 + ]; +}; -}))); +convert.hcg.hsv = function (hcg) { + var c = hcg[1] / 100; + var g = hcg[2] / 100; + var v = c + g * (1.0 - c); + var f = 0; -/***/ }), -/* 156 */ -/***/ (function(module, exports, __webpack_require__) { + if (v > 0.0) { + f = c / v; + } -//! moment.js locale configuration -//! locale : Georgian [ka] -//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili + return [hcg[0], f * 100, v * 100]; +}; -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +convert.hcg.hsl = function (hcg) { + var c = hcg[1] / 100; + var g = hcg[2] / 100; + var l = g * (1.0 - c) + 0.5 * c; + var s = 0; -var ka = moment.defineLocale('ka', { - months : { - standalone: 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'), - format: 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_') - }, - monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'), - weekdays : { - standalone: 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'), - format: 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_'), - isFormat: /(წინა|შემდეგ)/ - }, - weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'), - weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'), - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY h:mm A', - LLLL : 'dddd, D MMMM YYYY h:mm A' - }, - calendar : { - sameDay : '[დღეს] LT[-ზე]', - nextDay : '[ხვალ] LT[-ზე]', - lastDay : '[გუშინ] LT[-ზე]', - nextWeek : '[შემდეგ] dddd LT[-ზე]', - lastWeek : '[წინა] dddd LT-ზე', - sameElse : 'L' - }, - relativeTime : { - future : function (s) { - return (/(წამი|წუთი|საათი|წელი)/).test(s) ? - s.replace(/ი$/, 'ში') : - s + 'ში'; - }, - past : function (s) { - if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) { - return s.replace(/(ი|ე)$/, 'ის უკან'); - } - if ((/წელი/).test(s)) { - return s.replace(/წელი$/, 'წლის უკან'); - } - }, - s : 'რამდენიმე წამი', - ss : '%d წამი', - m : 'წუთი', - mm : '%d წუთი', - h : 'საათი', - hh : '%d საათი', - d : 'დღე', - dd : '%d დღე', - M : 'თვე', - MM : '%d თვე', - y : 'წელი', - yy : '%d წელი' - }, - dayOfMonthOrdinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/, - ordinal : function (number) { - if (number === 0) { - return number; - } - if (number === 1) { - return number + '-ლი'; - } - if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) { - return 'მე-' + number; - } - return number + '-ე'; - }, - week : { - dow : 1, - doy : 7 - } -}); + if (l > 0.0 && l < 0.5) { + s = c / (2 * l); + } else + if (l >= 0.5 && l < 1.0) { + s = c / (2 * (1 - l)); + } -return ka; + return [hcg[0], s * 100, l * 100]; +}; -}))); +convert.hcg.hwb = function (hcg) { + var c = hcg[1] / 100; + var g = hcg[2] / 100; + var v = c + g * (1.0 - c); + return [hcg[0], (v - c) * 100, (1 - v) * 100]; +}; +convert.hwb.hcg = function (hwb) { + var w = hwb[1] / 100; + var b = hwb[2] / 100; + var v = 1 - b; + var c = v - w; + var g = 0; -/***/ }), -/* 157 */ -/***/ (function(module, exports, __webpack_require__) { + if (c < 1) { + g = (v - c) / (1 - c); + } -//! moment.js locale configuration -//! locale : Kazakh [kk] -//! authors : Nurlan Rakhimzhanov : https://github.com/nurlan - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var suffixes = { - 0: '-ші', - 1: '-ші', - 2: '-ші', - 3: '-ші', - 4: '-ші', - 5: '-ші', - 6: '-шы', - 7: '-ші', - 8: '-ші', - 9: '-шы', - 10: '-шы', - 20: '-шы', - 30: '-шы', - 40: '-шы', - 50: '-ші', - 60: '-шы', - 70: '-ші', - 80: '-ші', - 90: '-шы', - 100: '-ші' + return [hwb[0], c * 100, g * 100]; }; -var kk = moment.defineLocale('kk', { - months : 'қаңтар_ақпан_наурыз_сәуір_мамыр_маусым_шілде_тамыз_қыркүйек_қазан_қараша_желтоқсан'.split('_'), - monthsShort : 'қаң_ақп_нау_сәу_мам_мау_шіл_там_қыр_қаз_қар_жел'.split('_'), - weekdays : 'жексенбі_дүйсенбі_сейсенбі_сәрсенбі_бейсенбі_жұма_сенбі'.split('_'), - weekdaysShort : 'жек_дүй_сей_сәр_бей_жұм_сен'.split('_'), - weekdaysMin : 'жк_дй_сй_ср_бй_жм_сн'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Бүгін сағат] LT', - nextDay : '[Ертең сағат] LT', - nextWeek : 'dddd [сағат] LT', - lastDay : '[Кеше сағат] LT', - lastWeek : '[Өткен аптаның] dddd [сағат] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s ішінде', - past : '%s бұрын', - s : 'бірнеше секунд', - ss : '%d секунд', - m : 'бір минут', - mm : '%d минут', - h : 'бір сағат', - hh : '%d сағат', - d : 'бір күн', - dd : '%d күн', - M : 'бір ай', - MM : '%d ай', - y : 'бір жыл', - yy : '%d жыл' - }, - dayOfMonthOrdinalParse: /\d{1,2}-(ші|шы)/, - ordinal : function (number) { - var a = number % 10, - b = number >= 100 ? 100 : null; - return number + (suffixes[number] || suffixes[a] || suffixes[b]); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); - -return kk; - -}))); +convert.apple.rgb = function (apple) { + return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255]; +}; +convert.rgb.apple = function (rgb) { + return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535]; +}; -/***/ }), -/* 158 */ -/***/ (function(module, exports, __webpack_require__) { +convert.gray.rgb = function (args) { + return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255]; +}; -//! moment.js locale configuration -//! locale : Cambodian [km] -//! author : Kruy Vanna : https://github.com/kruyvanna - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var km = moment.defineLocale('km', { - months: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'), - monthsShort: 'មករា_កុម្ភៈ_មីនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'), - weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'), - weekdaysShort: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'), - weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'), - longDateFormat: { - LT: 'HH:mm', - LTS : 'HH:mm:ss', - L: 'DD/MM/YYYY', - LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY HH:mm', - LLLL: 'dddd, D MMMM YYYY HH:mm' - }, - calendar: { - sameDay: '[ថ្ងៃនេះ ម៉ោង] LT', - nextDay: '[ស្អែក ម៉ោង] LT', - nextWeek: 'dddd [ម៉ោង] LT', - lastDay: '[ម្សិលមិញ ម៉ោង] LT', - lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT', - sameElse: 'L' - }, - relativeTime: { - future: '%sទៀត', - past: '%sមុន', - s: 'ប៉ុន្មានវិនាទី', - ss: '%d វិនាទី', - m: 'មួយនាទី', - mm: '%d នាទី', - h: 'មួយម៉ោង', - hh: '%d ម៉ោង', - d: 'មួយថ្ងៃ', - dd: '%d ថ្ងៃ', - M: 'មួយខែ', - MM: '%d ខែ', - y: 'មួយឆ្នាំ', - yy: '%d ឆ្នាំ' - }, - week: { - dow: 1, // Monday is the first day of the week. - doy: 4 // The week that contains Jan 4th is the first week of the year. - } -}); +convert.gray.hsl = convert.gray.hsv = function (args) { + return [0, 0, args[0]]; +}; -return km; +convert.gray.hwb = function (gray) { + return [0, 100, gray[0]]; +}; -}))); +convert.gray.cmyk = function (gray) { + return [0, 0, 0, gray[0]]; +}; +convert.gray.lab = function (gray) { + return [gray[0], 0, 0]; +}; -/***/ }), -/* 159 */ -/***/ (function(module, exports, __webpack_require__) { +convert.gray.hex = function (gray) { + var val = Math.round(gray[0] / 100 * 255) & 0xFF; + var integer = (val << 16) + (val << 8) + val; -//! moment.js locale configuration -//! locale : Kannada [kn] -//! author : Rajeev Naik : https://github.com/rajeevnaikte - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '೧', - '2': '೨', - '3': '೩', - '4': '೪', - '5': '೫', - '6': '೬', - '7': '೭', - '8': '೮', - '9': '೯', - '0': '೦' + var string = integer.toString(16).toUpperCase(); + return '000000'.substring(string.length) + string; }; -var numberMap = { - '೧': '1', - '೨': '2', - '೩': '3', - '೪': '4', - '೫': '5', - '೬': '6', - '೭': '7', - '೮': '8', - '೯': '9', - '೦': '0' + +convert.rgb.gray = function (rgb) { + var val = (rgb[0] + rgb[1] + rgb[2]) / 3; + return [val / 255 * 100]; }; -var kn = moment.defineLocale('kn', { - months : 'ಜನವರಿ_ಫೆಬ್ರವರಿ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬರ್_ಅಕ್ಟೋಬರ್_ನವೆಂಬರ್_ಡಿಸೆಂಬರ್'.split('_'), - monthsShort : 'ಜನ_ಫೆಬ್ರ_ಮಾರ್ಚ್_ಏಪ್ರಿಲ್_ಮೇ_ಜೂನ್_ಜುಲೈ_ಆಗಸ್ಟ್_ಸೆಪ್ಟೆಂಬ_ಅಕ್ಟೋಬ_ನವೆಂಬ_ಡಿಸೆಂಬ'.split('_'), - monthsParseExact: true, - weekdays : 'ಭಾನುವಾರ_ಸೋಮವಾರ_ಮಂಗಳವಾರ_ಬುಧವಾರ_ಗುರುವಾರ_ಶುಕ್ರವಾರ_ಶನಿವಾರ'.split('_'), - weekdaysShort : 'ಭಾನು_ಸೋಮ_ಮಂಗಳ_ಬುಧ_ಗುರು_ಶುಕ್ರ_ಶನಿ'.split('_'), - weekdaysMin : 'ಭಾ_ಸೋ_ಮಂ_ಬು_ಗು_ಶು_ಶ'.split('_'), - longDateFormat : { - LT : 'A h:mm', - LTS : 'A h:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm', - LLLL : 'dddd, D MMMM YYYY, A h:mm' - }, - calendar : { - sameDay : '[ಇಂದು] LT', - nextDay : '[ನಾಳೆ] LT', - nextWeek : 'dddd, LT', - lastDay : '[ನಿನ್ನೆ] LT', - lastWeek : '[ಕೊನೆಯ] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s ನಂತರ', - past : '%s ಹಿಂದೆ', - s : 'ಕೆಲವು ಕ್ಷಣಗಳು', - ss : '%d ಸೆಕೆಂಡುಗಳು', - m : 'ಒಂದು ನಿಮಿಷ', - mm : '%d ನಿಮಿಷ', - h : 'ಒಂದು ಗಂಟೆ', - hh : '%d ಗಂಟೆ', - d : 'ಒಂದು ದಿನ', - dd : '%d ದಿನ', - M : 'ಒಂದು ತಿಂಗಳು', - MM : '%d ತಿಂಗಳು', - y : 'ಒಂದು ವರ್ಷ', - yy : '%d ವರ್ಷ' - }, - preparse: function (string) { - return string.replace(/[೧೨೩೪೫೬೭೮೯೦]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - meridiemParse: /ರಾತ್ರಿ|ಬೆಳಿಗ್ಗೆ|ಮಧ್ಯಾಹ್ನ|ಸಂಜೆ/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'ರಾತ್ರಿ') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'ಬೆಳಿಗ್ಗೆ') { - return hour; - } else if (meridiem === 'ಮಧ್ಯಾಹ್ನ') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'ಸಂಜೆ') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'ರಾತ್ರಿ'; - } else if (hour < 10) { - return 'ಬೆಳಿಗ್ಗೆ'; - } else if (hour < 17) { - return 'ಮಧ್ಯಾಹ್ನ'; - } else if (hour < 20) { - return 'ಸಂಜೆ'; - } else { - return 'ರಾತ್ರಿ'; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}(ನೇ)/, - ordinal : function (number) { - return number + 'ನೇ'; - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); -return kn; +/***/ }), +/* 78 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; -}))); +module.exports = (flag, argv) => { + argv = argv || process.argv; + const prefix = flag.startsWith('-') ? '' : (flag.length === 1 ? '-' : '--'); + const pos = argv.indexOf(prefix + flag); + const terminatorPos = argv.indexOf('--'); + return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos); +}; /***/ }), -/* 160 */ +/* 79 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Korean [ko] -//! author : Kyungwook, Park : https://github.com/kyungw00k -//! author : Jeeeyul Lee - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var ko = moment.defineLocale('ko', { - months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'), - monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'), - weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'), - weekdaysShort : '일_월_화_수_목_금_토'.split('_'), - weekdaysMin : '일_월_화_수_목_금_토'.split('_'), - longDateFormat : { - LT : 'A h:mm', - LTS : 'A h:mm:ss', - L : 'YYYY.MM.DD', - LL : 'YYYY년 MMMM D일', - LLL : 'YYYY년 MMMM D일 A h:mm', - LLLL : 'YYYY년 MMMM D일 dddd A h:mm', - l : 'YYYY.MM.DD', - ll : 'YYYY년 MMMM D일', - lll : 'YYYY년 MMMM D일 A h:mm', - llll : 'YYYY년 MMMM D일 dddd A h:mm' - }, - calendar : { - sameDay : '오늘 LT', - nextDay : '내일 LT', - nextWeek : 'dddd LT', - lastDay : '어제 LT', - lastWeek : '지난주 dddd LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s 후', - past : '%s 전', - s : '몇 초', - ss : '%d초', - m : '1분', - mm : '%d분', - h : '한 시간', - hh : '%d시간', - d : '하루', - dd : '%d일', - M : '한 달', - MM : '%d달', - y : '일 년', - yy : '%d년' - }, - dayOfMonthOrdinalParse : /\d{1,2}(일|월|주)/, - ordinal : function (number, period) { - switch (period) { - case 'd': - case 'D': - case 'DDD': - return number + '일'; - case 'M': - return number + '월'; - case 'w': - case 'W': - return number + '주'; - default: - return number; - } - }, - meridiemParse : /오전|오후/, - isPM : function (token) { - return token === '오후'; - }, - meridiem : function (hour, minute, isUpper) { - return hour < 12 ? '오전' : '오후'; - } -}); - -return ko; +"use strict"; -}))); +var fs = __webpack_require__(6) -/***/ }), -/* 161 */ -/***/ (function(module, exports, __webpack_require__) { +module.exports = clone(fs) -//! moment.js locale configuration -//! locale : Kyrgyz [ky] -//! author : Chyngyz Arystan uulu : https://github.com/chyngyz - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - - -var suffixes = { - 0: '-чү', - 1: '-чи', - 2: '-чи', - 3: '-чү', - 4: '-чү', - 5: '-чи', - 6: '-чы', - 7: '-чи', - 8: '-чи', - 9: '-чу', - 10: '-чу', - 20: '-чы', - 30: '-чу', - 40: '-чы', - 50: '-чү', - 60: '-чы', - 70: '-чи', - 80: '-чи', - 90: '-чу', - 100: '-чү' -}; +function clone (obj) { + if (obj === null || typeof obj !== 'object') + return obj -var ky = moment.defineLocale('ky', { - months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'), - monthsShort : 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'), - weekdays : 'Жекшемби_Дүйшөмбү_Шейшемби_Шаршемби_Бейшемби_Жума_Ишемби'.split('_'), - weekdaysShort : 'Жек_Дүй_Шей_Шар_Бей_Жум_Ише'.split('_'), - weekdaysMin : 'Жк_Дй_Шй_Шр_Бй_Жм_Иш'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Бүгүн саат] LT', - nextDay : '[Эртең саат] LT', - nextWeek : 'dddd [саат] LT', - lastDay : '[Кече саат] LT', - lastWeek : '[Өткен аптанын] dddd [күнү] [саат] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s ичинде', - past : '%s мурун', - s : 'бирнече секунд', - ss : '%d секунд', - m : 'бир мүнөт', - mm : '%d мүнөт', - h : 'бир саат', - hh : '%d саат', - d : 'бир күн', - dd : '%d күн', - M : 'бир ай', - MM : '%d ай', - y : 'бир жыл', - yy : '%d жыл' - }, - dayOfMonthOrdinalParse: /\d{1,2}-(чи|чы|чү|чу)/, - ordinal : function (number) { - var a = number % 10, - b = number >= 100 ? 100 : null; - return number + (suffixes[number] || suffixes[a] || suffixes[b]); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + if (obj instanceof Object) + var copy = { __proto__: obj.__proto__ } + else + var copy = Object.create(null) -return ky; + Object.getOwnPropertyNames(obj).forEach(function (key) { + Object.defineProperty(copy, key, Object.getOwnPropertyDescriptor(obj, key)) + }) -}))); + return copy +} /***/ }), -/* 162 */ +/* 80 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Luxembourgish [lb] -//! author : mweimerskirch : https://github.com/mweimerskirch -//! author : David Raison : https://github.com/kwisatz - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +var path = __webpack_require__(2); +var fs = __webpack_require__(6); +var _0777 = parseInt('0777', 8); +module.exports = mkdirP.mkdirp = mkdirP.mkdirP = mkdirP; -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 'm': ['eng Minutt', 'enger Minutt'], - 'h': ['eng Stonn', 'enger Stonn'], - 'd': ['een Dag', 'engem Dag'], - 'M': ['ee Mount', 'engem Mount'], - 'y': ['ee Joer', 'engem Joer'] - }; - return withoutSuffix ? format[key][0] : format[key][1]; -} -function processFutureTime(string) { - var number = string.substr(0, string.indexOf(' ')); - if (eifelerRegelAppliesToNumber(number)) { - return 'a ' + string; +function mkdirP (p, opts, f, made) { + if (typeof opts === 'function') { + f = opts; + opts = {}; } - return 'an ' + string; -} -function processPastTime(string) { - var number = string.substr(0, string.indexOf(' ')); - if (eifelerRegelAppliesToNumber(number)) { - return 'viru ' + string; + else if (!opts || typeof opts !== 'object') { + opts = { mode: opts }; } - return 'virun ' + string; -} -/** - * Returns true if the word before the given number loses the '-n' ending. - * e.g. 'an 10 Deeg' but 'a 5 Deeg' - * - * @param number {integer} - * @returns {boolean} - */ -function eifelerRegelAppliesToNumber(number) { - number = parseInt(number, 10); - if (isNaN(number)) { - return false; + + var mode = opts.mode; + var xfs = opts.fs || fs; + + if (mode === undefined) { + mode = _0777 & (~process.umask()); } - if (number < 0) { - // Negative Number --> always true - return true; - } else if (number < 10) { - // Only 1 digit - if (4 <= number && number <= 7) { - return true; + if (!made) made = null; + + var cb = f || function () {}; + p = path.resolve(p); + + xfs.mkdir(p, mode, function (er) { + if (!er) { + made = made || p; + return cb(null, made); } - return false; - } else if (number < 100) { - // 2 digits - var lastDigit = number % 10, firstDigit = number / 10; - if (lastDigit === 0) { - return eifelerRegelAppliesToNumber(firstDigit); - } - return eifelerRegelAppliesToNumber(lastDigit); - } else if (number < 10000) { - // 3 or 4 digits --> recursively check first digit - while (number >= 10) { - number = number / 10; - } - return eifelerRegelAppliesToNumber(number); - } else { - // Anything larger than 4 digits: recursively check first n-3 digits - number = number / 1000; - return eifelerRegelAppliesToNumber(number); - } -} - -var lb = moment.defineLocale('lb', { - months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'), - monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'), - monthsParseExact : true, - weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'), - weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'), - weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'), - weekdaysParseExact : true, - longDateFormat: { - LT: 'H:mm [Auer]', - LTS: 'H:mm:ss [Auer]', - L: 'DD.MM.YYYY', - LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY H:mm [Auer]', - LLLL: 'dddd, D. MMMM YYYY H:mm [Auer]' - }, - calendar: { - sameDay: '[Haut um] LT', - sameElse: 'L', - nextDay: '[Muer um] LT', - nextWeek: 'dddd [um] LT', - lastDay: '[Gëschter um] LT', - lastWeek: function () { - // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule - switch (this.day()) { - case 2: - case 4: - return '[Leschten] dddd [um] LT'; - default: - return '[Leschte] dddd [um] LT'; - } + switch (er.code) { + case 'ENOENT': + mkdirP(path.dirname(p), opts, function (er, made) { + if (er) cb(er, made); + else mkdirP(p, opts, cb, made); + }); + break; + + // In the case of any other error, just see if there's a dir + // there already. If so, then hooray! If not, then something + // is borked. + default: + xfs.stat(p, function (er2, stat) { + // if the stat fails, then that's super weird. + // let the original error be the failure reason. + if (er2 || !stat.isDirectory()) cb(er, made) + else cb(null, made); + }); + break; } - }, - relativeTime : { - future : processFutureTime, - past : processPastTime, - s : 'e puer Sekonnen', - ss : '%d Sekonnen', - m : processRelativeTime, - mm : '%d Minutten', - h : processRelativeTime, - hh : '%d Stonnen', - d : processRelativeTime, - dd : '%d Deeg', - M : processRelativeTime, - MM : '%d Méint', - y : processRelativeTime, - yy : '%d Joer' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal: '%d.', - week: { - dow: 1, // Monday is the first day of the week. - doy: 4 // The week that contains Jan 4th is the first week of the year. + }); +} + +mkdirP.sync = function sync (p, opts, made) { + if (!opts || typeof opts !== 'object') { + opts = { mode: opts }; } -}); + + var mode = opts.mode; + var xfs = opts.fs || fs; + + if (mode === undefined) { + mode = _0777 & (~process.umask()); + } + if (!made) made = null; + + p = path.resolve(p); + + try { + xfs.mkdirSync(p, mode); + made = made || p; + } + catch (err0) { + switch (err0.code) { + case 'ENOENT' : + made = sync(path.dirname(p), opts, made); + sync(p, opts, made); + break; -return lb; + // In the case of any other error, just see if there's a dir + // there already. If so, then hooray! If not, then something + // is borked. + default: + var stat; + try { + stat = xfs.statSync(p); + } + catch (err1) { + throw err0; + } + if (!stat.isDirectory()) throw err0; + break; + } + } -}))); + return made; +}; /***/ }), -/* 163 */ +/* 81 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Lao [lo] -//! author : Ryan Hart : https://github.com/ryanhart2 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var lo = moment.defineLocale('lo', { - months : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'), - monthsShort : 'ມັງກອນ_ກຸມພາ_ມີນາ_ເມສາ_ພຶດສະພາ_ມິຖຸນາ_ກໍລະກົດ_ສິງຫາ_ກັນຍາ_ຕຸລາ_ພະຈິກ_ທັນວາ'.split('_'), - weekdays : 'ອາທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'), - weekdaysShort : 'ທິດ_ຈັນ_ອັງຄານ_ພຸດ_ພະຫັດ_ສຸກ_ເສົາ'.split('_'), - weekdaysMin : 'ທ_ຈ_ອຄ_ພ_ພຫ_ສກ_ສ'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'ວັນdddd D MMMM YYYY HH:mm' - }, - meridiemParse: /ຕອນເຊົ້າ|ຕອນແລງ/, - isPM: function (input) { - return input === 'ຕອນແລງ'; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'ຕອນເຊົ້າ'; - } else { - return 'ຕອນແລງ'; - } - }, - calendar : { - sameDay : '[ມື້ນີ້ເວລາ] LT', - nextDay : '[ມື້ອື່ນເວລາ] LT', - nextWeek : '[ວັນ]dddd[ໜ້າເວລາ] LT', - lastDay : '[ມື້ວານນີ້ເວລາ] LT', - lastWeek : '[ວັນ]dddd[ແລ້ວນີ້ເວລາ] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'ອີກ %s', - past : '%sຜ່ານມາ', - s : 'ບໍ່ເທົ່າໃດວິນາທີ', - ss : '%d ວິນາທີ' , - m : '1 ນາທີ', - mm : '%d ນາທີ', - h : '1 ຊົ່ວໂມງ', - hh : '%d ຊົ່ວໂມງ', - d : '1 ມື້', - dd : '%d ມື້', - M : '1 ເດືອນ', - MM : '%d ເດືອນ', - y : '1 ປີ', - yy : '%d ປີ' - }, - dayOfMonthOrdinalParse: /(ທີ່)\d{1,2}/, - ordinal : function (number) { - return 'ທີ່' + number; - } -}); +module.exports = realpath +realpath.realpath = realpath +realpath.sync = realpathSync +realpath.realpathSync = realpathSync +realpath.monkeypatch = monkeypatch +realpath.unmonkeypatch = unmonkeypatch -return lo; +var fs = __webpack_require__(6) +var origRealpath = fs.realpath +var origRealpathSync = fs.realpathSync -}))); +var version = process.version +var ok = /^v[0-5]\./.test(version) +var old = __webpack_require__(153) +function newError (er) { + return er && er.syscall === 'realpath' && ( + er.code === 'ELOOP' || + er.code === 'ENOMEM' || + er.code === 'ENAMETOOLONG' + ) +} -/***/ }), -/* 164 */ -/***/ (function(module, exports, __webpack_require__) { +function realpath (p, cache, cb) { + if (ok) { + return origRealpath(p, cache, cb) + } -//! moment.js locale configuration -//! locale : Lithuanian [lt] -//! author : Mindaugas Mozūras : https://github.com/mmozuras - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var units = { - 'ss' : 'sekundė_sekundžių_sekundes', - 'm' : 'minutė_minutės_minutę', - 'mm': 'minutės_minučių_minutes', - 'h' : 'valanda_valandos_valandą', - 'hh': 'valandos_valandų_valandas', - 'd' : 'diena_dienos_dieną', - 'dd': 'dienos_dienų_dienas', - 'M' : 'mėnuo_mėnesio_mėnesį', - 'MM': 'mėnesiai_mėnesių_mėnesius', - 'y' : 'metai_metų_metus', - 'yy': 'metai_metų_metus' -}; -function translateSeconds(number, withoutSuffix, key, isFuture) { - if (withoutSuffix) { - return 'kelios sekundės'; + if (typeof cache === 'function') { + cb = cache + cache = null + } + origRealpath(p, cache, function (er, result) { + if (newError(er)) { + old.realpath(p, cache, cb) } else { - return isFuture ? 'kelių sekundžių' : 'kelias sekundes'; + cb(er, result) } + }) } -function translateSingular(number, withoutSuffix, key, isFuture) { - return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]); -} -function special(number) { - return number % 10 === 0 || (number > 10 && number < 20); -} -function forms(key) { - return units[key].split('_'); -} -function translate(number, withoutSuffix, key, isFuture) { - var result = number + ' '; - if (number === 1) { - return result + translateSingular(number, withoutSuffix, key[0], isFuture); - } else if (withoutSuffix) { - return result + (special(number) ? forms(key)[1] : forms(key)[0]); + +function realpathSync (p, cache) { + if (ok) { + return origRealpathSync(p, cache) + } + + try { + return origRealpathSync(p, cache) + } catch (er) { + if (newError(er)) { + return old.realpathSync(p, cache) } else { - if (isFuture) { - return result + forms(key)[1]; - } else { - return result + (special(number) ? forms(key)[1] : forms(key)[2]); - } + throw er } + } } -var lt = moment.defineLocale('lt', { - months : { - format: 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'), - standalone: 'sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis'.split('_'), - isFormat: /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/ - }, - monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'), - weekdays : { - format: 'sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį'.split('_'), - standalone: 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_'), - isFormat: /dddd HH:mm/ - }, - weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'), - weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY-MM-DD', - LL : 'YYYY [m.] MMMM D [d.]', - LLL : 'YYYY [m.] MMMM D [d.], HH:mm [val.]', - LLLL : 'YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]', - l : 'YYYY-MM-DD', - ll : 'YYYY [m.] MMMM D [d.]', - lll : 'YYYY [m.] MMMM D [d.], HH:mm [val.]', - llll : 'YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]' - }, - calendar : { - sameDay : '[Šiandien] LT', - nextDay : '[Rytoj] LT', - nextWeek : 'dddd LT', - lastDay : '[Vakar] LT', - lastWeek : '[Praėjusį] dddd LT', - sameElse : 'L' - }, - relativeTime : { - future : 'po %s', - past : 'prieš %s', - s : translateSeconds, - ss : translate, - m : translateSingular, - mm : translate, - h : translateSingular, - hh : translate, - d : translateSingular, - dd : translate, - M : translateSingular, - MM : translate, - y : translateSingular, - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}-oji/, - ordinal : function (number) { - return number + '-oji'; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); -return lt; +function monkeypatch () { + fs.realpath = realpath + fs.realpathSync = realpathSync +} -}))); +function unmonkeypatch () { + fs.realpath = origRealpath + fs.realpathSync = origRealpathSync +} /***/ }), -/* 165 */ +/* 82 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Latvian [lv] -//! author : Kristaps Karlsons : https://github.com/skakri -//! author : Jānis Elmeris : https://github.com/JanisE - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var units = { - 'ss': 'sekundes_sekundēm_sekunde_sekundes'.split('_'), - 'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'), - 'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'), - 'h': 'stundas_stundām_stunda_stundas'.split('_'), - 'hh': 'stundas_stundām_stunda_stundas'.split('_'), - 'd': 'dienas_dienām_diena_dienas'.split('_'), - 'dd': 'dienas_dienām_diena_dienas'.split('_'), - 'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'), - 'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'), - 'y': 'gada_gadiem_gads_gadi'.split('_'), - 'yy': 'gada_gadiem_gads_gadi'.split('_') -}; -/** - * @param withoutSuffix boolean true = a length of time; false = before/after a period of time. - */ -function format(forms, number, withoutSuffix) { - if (withoutSuffix) { - // E.g. "21 minūte", "3 minūtes". - return number % 10 === 1 && number % 100 !== 11 ? forms[2] : forms[3]; - } else { - // E.g. "21 minūtes" as in "pēc 21 minūtes". - // E.g. "3 minūtēm" as in "pēc 3 minūtēm". - return number % 10 === 1 && number % 100 !== 11 ? forms[0] : forms[1]; - } -} -function relativeTimeWithPlural(number, withoutSuffix, key) { - return number + ' ' + format(units[key], number, withoutSuffix); -} -function relativeTimeWithSingular(number, withoutSuffix, key) { - return format(units[key], number, withoutSuffix); -} -function relativeSeconds(number, withoutSuffix) { - return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm'; -} - -var lv = moment.defineLocale('lv', { - months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'), - monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'), - weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'), - weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'), - weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY.', - LL : 'YYYY. [gada] D. MMMM', - LLL : 'YYYY. [gada] D. MMMM, HH:mm', - LLLL : 'YYYY. [gada] D. MMMM, dddd, HH:mm' - }, - calendar : { - sameDay : '[Šodien pulksten] LT', - nextDay : '[Rīt pulksten] LT', - nextWeek : 'dddd [pulksten] LT', - lastDay : '[Vakar pulksten] LT', - lastWeek : '[Pagājušā] dddd [pulksten] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'pēc %s', - past : 'pirms %s', - s : relativeSeconds, - ss : relativeTimeWithPlural, - m : relativeTimeWithSingular, - mm : relativeTimeWithPlural, - h : relativeTimeWithSingular, - hh : relativeTimeWithPlural, - d : relativeTimeWithSingular, - dd : relativeTimeWithPlural, - M : relativeTimeWithSingular, - MM : relativeTimeWithPlural, - y : relativeTimeWithSingular, - yy : relativeTimeWithPlural - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return lv; - -}))); +try { + var util = __webpack_require__(8); + if (typeof util.inherits !== 'function') throw ''; + module.exports = util.inherits; +} catch (e) { + module.exports = __webpack_require__(157); +} /***/ }), -/* 166 */ +/* 83 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Montenegrin [me] -//! author : Miodrag Nikač : https://github.com/miodragnikac - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var translator = { - words: { //Different grammatical cases - ss: ['sekund', 'sekunda', 'sekundi'], - m: ['jedan minut', 'jednog minuta'], - mm: ['minut', 'minuta', 'minuta'], - h: ['jedan sat', 'jednog sata'], - hh: ['sat', 'sata', 'sati'], - dd: ['dan', 'dana', 'dana'], - MM: ['mjesec', 'mjeseca', 'mjeseci'], - yy: ['godina', 'godine', 'godina'] - }, - correctGrammaticalCase: function (number, wordKey) { - return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]); - }, - translate: function (number, withoutSuffix, key) { - var wordKey = translator.words[key]; - if (key.length === 1) { - return withoutSuffix ? wordKey[0] : wordKey[1]; - } else { - return number + ' ' + translator.correctGrammaticalCase(number, wordKey); - } - } -}; +exports.alphasort = alphasort +exports.alphasorti = alphasorti +exports.setopts = setopts +exports.ownProp = ownProp +exports.makeAbs = makeAbs +exports.finish = finish +exports.mark = mark +exports.isIgnored = isIgnored +exports.childrenIgnored = childrenIgnored -var me = moment.defineLocale('me', { - months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'), - monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'), - monthsParseExact : true, - weekdays: 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'), - weekdaysShort: 'ned._pon._uto._sri._čet._pet._sub.'.split('_'), - weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'), - weekdaysParseExact : true, - longDateFormat: { - LT: 'H:mm', - LTS : 'H:mm:ss', - L: 'DD.MM.YYYY', - LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY H:mm', - LLLL: 'dddd, D. MMMM YYYY H:mm' - }, - calendar: { - sameDay: '[danas u] LT', - nextDay: '[sjutra u] LT', - - nextWeek: function () { - switch (this.day()) { - case 0: - return '[u] [nedjelju] [u] LT'; - case 3: - return '[u] [srijedu] [u] LT'; - case 6: - return '[u] [subotu] [u] LT'; - case 1: - case 2: - case 4: - case 5: - return '[u] dddd [u] LT'; - } - }, - lastDay : '[juče u] LT', - lastWeek : function () { - var lastWeekDays = [ - '[prošle] [nedjelje] [u] LT', - '[prošlog] [ponedjeljka] [u] LT', - '[prošlog] [utorka] [u] LT', - '[prošle] [srijede] [u] LT', - '[prošlog] [četvrtka] [u] LT', - '[prošlog] [petka] [u] LT', - '[prošle] [subote] [u] LT' - ]; - return lastWeekDays[this.day()]; - }, - sameElse : 'L' - }, - relativeTime : { - future : 'za %s', - past : 'prije %s', - s : 'nekoliko sekundi', - ss : translator.translate, - m : translator.translate, - mm : translator.translate, - h : translator.translate, - hh : translator.translate, - d : 'dan', - dd : translator.translate, - M : 'mjesec', - MM : translator.translate, - y : 'godinu', - yy : translator.translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); +function ownProp (obj, field) { + return Object.prototype.hasOwnProperty.call(obj, field) +} -return me; +var path = __webpack_require__(2) +var minimatch = __webpack_require__(55) +var isAbsolute = __webpack_require__(56) +var Minimatch = minimatch.Minimatch -}))); +function alphasorti (a, b) { + return a.toLowerCase().localeCompare(b.toLowerCase()) +} +function alphasort (a, b) { + return a.localeCompare(b) +} -/***/ }), -/* 167 */ -/***/ (function(module, exports, __webpack_require__) { +function setupIgnores (self, options) { + self.ignore = options.ignore || [] -//! moment.js locale configuration -//! locale : Maori [mi] -//! author : John Corrigan : https://github.com/johnideal - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var mi = moment.defineLocale('mi', { - months: 'Kohi-tāte_Hui-tanguru_Poutū-te-rangi_Paenga-whāwhā_Haratua_Pipiri_Hōngoingoi_Here-turi-kōkā_Mahuru_Whiringa-ā-nuku_Whiringa-ā-rangi_Hakihea'.split('_'), - monthsShort: 'Kohi_Hui_Pou_Pae_Hara_Pipi_Hōngoi_Here_Mahu_Whi-nu_Whi-ra_Haki'.split('_'), - monthsRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i, - monthsStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i, - monthsShortRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i, - monthsShortStrictRegex: /(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i, - weekdays: 'Rātapu_Mane_Tūrei_Wenerei_Tāite_Paraire_Hātarei'.split('_'), - weekdaysShort: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'), - weekdaysMin: 'Ta_Ma_Tū_We_Tāi_Pa_Hā'.split('_'), - longDateFormat: { - LT: 'HH:mm', - LTS: 'HH:mm:ss', - L: 'DD/MM/YYYY', - LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY [i] HH:mm', - LLLL: 'dddd, D MMMM YYYY [i] HH:mm' - }, - calendar: { - sameDay: '[i teie mahana, i] LT', - nextDay: '[apopo i] LT', - nextWeek: 'dddd [i] LT', - lastDay: '[inanahi i] LT', - lastWeek: 'dddd [whakamutunga i] LT', - sameElse: 'L' - }, - relativeTime: { - future: 'i roto i %s', - past: '%s i mua', - s: 'te hēkona ruarua', - ss: '%d hēkona', - m: 'he meneti', - mm: '%d meneti', - h: 'te haora', - hh: '%d haora', - d: 'he ra', - dd: '%d ra', - M: 'he marama', - MM: '%d marama', - y: 'he tau', - yy: '%d tau' - }, - dayOfMonthOrdinalParse: /\d{1,2}º/, - ordinal: '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + if (!Array.isArray(self.ignore)) + self.ignore = [self.ignore] -return mi; + if (self.ignore.length) { + self.ignore = self.ignore.map(ignoreMap) + } +} -}))); +// ignore patterns are always in dot:true mode. +function ignoreMap (pattern) { + var gmatcher = null + if (pattern.slice(-3) === '/**') { + var gpattern = pattern.replace(/(\/\*\*)+$/, '') + gmatcher = new Minimatch(gpattern, { dot: true }) + } + return { + matcher: new Minimatch(pattern, { dot: true }), + gmatcher: gmatcher + } +} -/***/ }), -/* 168 */ -/***/ (function(module, exports, __webpack_require__) { +function setopts (self, pattern, options) { + if (!options) + options = {} -//! moment.js locale configuration -//! locale : Macedonian [mk] -//! author : Borislav Mickov : https://github.com/B0k0 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var mk = moment.defineLocale('mk', { - months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'), - monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'), - weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'), - weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'), - weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'), - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'D.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY H:mm', - LLLL : 'dddd, D MMMM YYYY H:mm' - }, - calendar : { - sameDay : '[Денес во] LT', - nextDay : '[Утре во] LT', - nextWeek : '[Во] dddd [во] LT', - lastDay : '[Вчера во] LT', - lastWeek : function () { - switch (this.day()) { - case 0: - case 3: - case 6: - return '[Изминатата] dddd [во] LT'; - case 1: - case 2: - case 4: - case 5: - return '[Изминатиот] dddd [во] LT'; - } - }, - sameElse : 'L' - }, - relativeTime : { - future : 'после %s', - past : 'пред %s', - s : 'неколку секунди', - ss : '%d секунди', - m : 'минута', - mm : '%d минути', - h : 'час', - hh : '%d часа', - d : 'ден', - dd : '%d дена', - M : 'месец', - MM : '%d месеци', - y : 'година', - yy : '%d години' - }, - dayOfMonthOrdinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/, - ordinal : function (number) { - var lastDigit = number % 10, - last2Digits = number % 100; - if (number === 0) { - return number + '-ев'; - } else if (last2Digits === 0) { - return number + '-ен'; - } else if (last2Digits > 10 && last2Digits < 20) { - return number + '-ти'; - } else if (lastDigit === 1) { - return number + '-ви'; - } else if (lastDigit === 2) { - return number + '-ри'; - } else if (lastDigit === 7 || lastDigit === 8) { - return number + '-ми'; - } else { - return number + '-ти'; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. + // base-matching: just use globstar for that. + if (options.matchBase && -1 === pattern.indexOf("/")) { + if (options.noglobstar) { + throw new Error("base matching requires globstar") } -}); + pattern = "**/" + pattern + } -return mk; + self.silent = !!options.silent + self.pattern = pattern + self.strict = options.strict !== false + self.realpath = !!options.realpath + self.realpathCache = options.realpathCache || Object.create(null) + self.follow = !!options.follow + self.dot = !!options.dot + self.mark = !!options.mark + self.nodir = !!options.nodir + if (self.nodir) + self.mark = true + self.sync = !!options.sync + self.nounique = !!options.nounique + self.nonull = !!options.nonull + self.nosort = !!options.nosort + self.nocase = !!options.nocase + self.stat = !!options.stat + self.noprocess = !!options.noprocess + self.absolute = !!options.absolute -}))); + self.maxLength = options.maxLength || Infinity + self.cache = options.cache || Object.create(null) + self.statCache = options.statCache || Object.create(null) + self.symlinks = options.symlinks || Object.create(null) + setupIgnores(self, options) -/***/ }), -/* 169 */ -/***/ (function(module, exports, __webpack_require__) { + self.changedCwd = false + var cwd = process.cwd() + if (!ownProp(options, "cwd")) + self.cwd = cwd + else { + self.cwd = path.resolve(options.cwd) + self.changedCwd = self.cwd !== cwd + } -//! moment.js locale configuration -//! locale : Malayalam [ml] -//! author : Floyd Pink : https://github.com/floydpink - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var ml = moment.defineLocale('ml', { - months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'), - monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'), - monthsParseExact : true, - weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'), - weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'), - weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'), - longDateFormat : { - LT : 'A h:mm -നു', - LTS : 'A h:mm:ss -നു', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm -നു', - LLLL : 'dddd, D MMMM YYYY, A h:mm -നു' - }, - calendar : { - sameDay : '[ഇന്ന്] LT', - nextDay : '[നാളെ] LT', - nextWeek : 'dddd, LT', - lastDay : '[ഇന്നലെ] LT', - lastWeek : '[കഴിഞ്ഞ] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s കഴിഞ്ഞ്', - past : '%s മുൻപ്', - s : 'അൽപ നിമിഷങ്ങൾ', - ss : '%d സെക്കൻഡ്', - m : 'ഒരു മിനിറ്റ്', - mm : '%d മിനിറ്റ്', - h : 'ഒരു മണിക്കൂർ', - hh : '%d മണിക്കൂർ', - d : 'ഒരു ദിവസം', - dd : '%d ദിവസം', - M : 'ഒരു മാസം', - MM : '%d മാസം', - y : 'ഒരു വർഷം', - yy : '%d വർഷം' - }, - meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if ((meridiem === 'രാത്രി' && hour >= 4) || - meridiem === 'ഉച്ച കഴിഞ്ഞ്' || - meridiem === 'വൈകുന്നേരം') { - return hour + 12; - } else { - return hour; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'രാത്രി'; - } else if (hour < 12) { - return 'രാവിലെ'; - } else if (hour < 17) { - return 'ഉച്ച കഴിഞ്ഞ്'; - } else if (hour < 20) { - return 'വൈകുന്നേരം'; - } else { - return 'രാത്രി'; - } - } -}); + self.root = options.root || path.resolve(self.cwd, "/") + self.root = path.resolve(self.root) + if (process.platform === "win32") + self.root = self.root.replace(/\\/g, "/") -return ml; + // TODO: is an absolute `cwd` supposed to be resolved against `root`? + // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test') + self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd) + if (process.platform === "win32") + self.cwdAbs = self.cwdAbs.replace(/\\/g, "/") + self.nomount = !!options.nomount -}))); + // disable comments and negation in Minimatch. + // Note that they are not supported in Glob itself anyway. + options.nonegate = true + options.nocomment = true + self.minimatch = new Minimatch(pattern, options) + self.options = self.minimatch.options +} -/***/ }), -/* 170 */ -/***/ (function(module, exports, __webpack_require__) { +function finish (self) { + var nou = self.nounique + var all = nou ? [] : Object.create(null) -//! moment.js locale configuration -//! locale : Marathi [mr] -//! author : Harshad Kale : https://github.com/kalehv -//! author : Vivek Athalye : https://github.com/vnathalye - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '१', - '2': '२', - '3': '३', - '4': '४', - '5': '५', - '6': '६', - '7': '७', - '8': '८', - '9': '९', - '0': '०' -}; -var numberMap = { - '१': '1', - '२': '2', - '३': '3', - '४': '4', - '५': '5', - '६': '6', - '७': '7', - '८': '8', - '९': '9', - '०': '0' -}; + for (var i = 0, l = self.matches.length; i < l; i ++) { + var matches = self.matches[i] + if (!matches || Object.keys(matches).length === 0) { + if (self.nonull) { + // do like the shell, and spit out the literal glob + var literal = self.minimatch.globSet[i] + if (nou) + all.push(literal) + else + all[literal] = true + } + } else { + // had matches + var m = Object.keys(matches) + if (nou) + all.push.apply(all, m) + else + m.forEach(function (m) { + all[m] = true + }) + } + } -function relativeTimeMr(number, withoutSuffix, string, isFuture) -{ - var output = ''; - if (withoutSuffix) { - switch (string) { - case 's': output = 'काही सेकंद'; break; - case 'ss': output = '%d सेकंद'; break; - case 'm': output = 'एक मिनिट'; break; - case 'mm': output = '%d मिनिटे'; break; - case 'h': output = 'एक तास'; break; - case 'hh': output = '%d तास'; break; - case 'd': output = 'एक दिवस'; break; - case 'dd': output = '%d दिवस'; break; - case 'M': output = 'एक महिना'; break; - case 'MM': output = '%d महिने'; break; - case 'y': output = 'एक वर्ष'; break; - case 'yy': output = '%d वर्षे'; break; - } + if (!nou) + all = Object.keys(all) + + if (!self.nosort) + all = all.sort(self.nocase ? alphasorti : alphasort) + + // at *some* point we statted all of these + if (self.mark) { + for (var i = 0; i < all.length; i++) { + all[i] = self._mark(all[i]) } - else { - switch (string) { - case 's': output = 'काही सेकंदां'; break; - case 'ss': output = '%d सेकंदां'; break; - case 'm': output = 'एका मिनिटा'; break; - case 'mm': output = '%d मिनिटां'; break; - case 'h': output = 'एका तासा'; break; - case 'hh': output = '%d तासां'; break; - case 'd': output = 'एका दिवसा'; break; - case 'dd': output = '%d दिवसां'; break; - case 'M': output = 'एका महिन्या'; break; - case 'MM': output = '%d महिन्यां'; break; - case 'y': output = 'एका वर्षा'; break; - case 'yy': output = '%d वर्षां'; break; - } - } - return output.replace(/%d/i, number); -} - -var mr = moment.defineLocale('mr', { - months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'), - monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'), - monthsParseExact : true, - weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'), - weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'), - weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'), - longDateFormat : { - LT : 'A h:mm वाजता', - LTS : 'A h:mm:ss वाजता', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm वाजता', - LLLL : 'dddd, D MMMM YYYY, A h:mm वाजता' - }, - calendar : { - sameDay : '[आज] LT', - nextDay : '[उद्या] LT', - nextWeek : 'dddd, LT', - lastDay : '[काल] LT', - lastWeek: '[मागील] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future: '%sमध्ये', - past: '%sपूर्वी', - s: relativeTimeMr, - ss: relativeTimeMr, - m: relativeTimeMr, - mm: relativeTimeMr, - h: relativeTimeMr, - hh: relativeTimeMr, - d: relativeTimeMr, - dd: relativeTimeMr, - M: relativeTimeMr, - MM: relativeTimeMr, - y: relativeTimeMr, - yy: relativeTimeMr - }, - preparse: function (string) { - return string.replace(/[१२३४५६७८९०]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'रात्री') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'सकाळी') { - return hour; - } else if (meridiem === 'दुपारी') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'सायंकाळी') { - return hour + 12; - } - }, - meridiem: function (hour, minute, isLower) { - if (hour < 4) { - return 'रात्री'; - } else if (hour < 10) { - return 'सकाळी'; - } else if (hour < 17) { - return 'दुपारी'; - } else if (hour < 20) { - return 'सायंकाळी'; - } else { - return 'रात्री'; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. + if (self.nodir) { + all = all.filter(function (e) { + var notDir = !(/\/$/.test(e)) + var c = self.cache[e] || self.cache[makeAbs(self, e)] + if (notDir && c) + notDir = c !== 'DIR' && !Array.isArray(c) + return notDir + }) } -}); + } -return mr; + if (self.ignore.length) + all = all.filter(function(m) { + return !isIgnored(self, m) + }) -}))); + self.found = all +} +function mark (self, p) { + var abs = makeAbs(self, p) + var c = self.cache[abs] + var m = p + if (c) { + var isDir = c === 'DIR' || Array.isArray(c) + var slash = p.slice(-1) === '/' -/***/ }), -/* 171 */ -/***/ (function(module, exports, __webpack_require__) { + if (isDir && !slash) + m += '/' + else if (!isDir && slash) + m = m.slice(0, -1) -//! moment.js locale configuration -//! locale : Malay [ms] -//! author : Weldan Jamili : https://github.com/weldan - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var ms = moment.defineLocale('ms', { - months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'), - monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'), - weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'), - weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'), - weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'), - longDateFormat : { - LT : 'HH.mm', - LTS : 'HH.mm.ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] HH.mm', - LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' - }, - meridiemParse: /pagi|tengahari|petang|malam/, - meridiemHour: function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'pagi') { - return hour; - } else if (meridiem === 'tengahari') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === 'petang' || meridiem === 'malam') { - return hour + 12; - } - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 11) { - return 'pagi'; - } else if (hours < 15) { - return 'tengahari'; - } else if (hours < 19) { - return 'petang'; - } else { - return 'malam'; - } - }, - calendar : { - sameDay : '[Hari ini pukul] LT', - nextDay : '[Esok pukul] LT', - nextWeek : 'dddd [pukul] LT', - lastDay : '[Kelmarin pukul] LT', - lastWeek : 'dddd [lepas pukul] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'dalam %s', - past : '%s yang lepas', - s : 'beberapa saat', - ss : '%d saat', - m : 'seminit', - mm : '%d minit', - h : 'sejam', - hh : '%d jam', - d : 'sehari', - dd : '%d hari', - M : 'sebulan', - MM : '%d bulan', - y : 'setahun', - yy : '%d tahun' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. + if (m !== p) { + var mabs = makeAbs(self, m) + self.statCache[mabs] = self.statCache[abs] + self.cache[mabs] = self.cache[abs] } -}); + } + + return m +} + +// lotta situps... +function makeAbs (self, f) { + var abs = f + if (f.charAt(0) === '/') { + abs = path.join(self.root, f) + } else if (isAbsolute(f) || f === '') { + abs = f + } else if (self.changedCwd) { + abs = path.resolve(self.cwd, f) + } else { + abs = path.resolve(f) + } -return ms; + if (process.platform === 'win32') + abs = abs.replace(/\\/g, '/') -}))); + return abs +} -/***/ }), -/* 172 */ -/***/ (function(module, exports, __webpack_require__) { +// Return true, if pattern ends with globstar '**', for the accompanying parent directory. +// Ex:- If node_modules/** is the pattern, add 'node_modules' to ignore list along with it's contents +function isIgnored (self, path) { + if (!self.ignore.length) + return false -//! moment.js locale configuration -//! locale : Malay [ms-my] -//! note : DEPRECATED, the correct one is [ms] -//! author : Weldan Jamili : https://github.com/weldan - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var msMy = moment.defineLocale('ms-my', { - months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'), - monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'), - weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'), - weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'), - weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'), - longDateFormat : { - LT : 'HH.mm', - LTS : 'HH.mm.ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [pukul] HH.mm', - LLLL : 'dddd, D MMMM YYYY [pukul] HH.mm' - }, - meridiemParse: /pagi|tengahari|petang|malam/, - meridiemHour: function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'pagi') { - return hour; - } else if (meridiem === 'tengahari') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === 'petang' || meridiem === 'malam') { - return hour + 12; - } - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 11) { - return 'pagi'; - } else if (hours < 15) { - return 'tengahari'; - } else if (hours < 19) { - return 'petang'; - } else { - return 'malam'; - } - }, - calendar : { - sameDay : '[Hari ini pukul] LT', - nextDay : '[Esok pukul] LT', - nextWeek : 'dddd [pukul] LT', - lastDay : '[Kelmarin pukul] LT', - lastWeek : 'dddd [lepas pukul] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'dalam %s', - past : '%s yang lepas', - s : 'beberapa saat', - ss : '%d saat', - m : 'seminit', - mm : '%d minit', - h : 'sejam', - hh : '%d jam', - d : 'sehari', - dd : '%d hari', - M : 'sebulan', - MM : '%d bulan', - y : 'setahun', - yy : '%d tahun' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + return self.ignore.some(function(item) { + return item.matcher.match(path) || !!(item.gmatcher && item.gmatcher.match(path)) + }) +} -return msMy; +function childrenIgnored (self, path) { + if (!self.ignore.length) + return false -}))); + return self.ignore.some(function(item) { + return !!(item.gmatcher && item.gmatcher.match(path)) + }) +} /***/ }), -/* 173 */ -/***/ (function(module, exports, __webpack_require__) { +/* 84 */ +/***/ (function(module, exports) { -//! moment.js locale configuration -//! locale : Maltese (Malta) [mt] -//! author : Alessandro Maruccia : https://github.com/alesma - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var mt = moment.defineLocale('mt', { - months : 'Jannar_Frar_Marzu_April_Mejju_Ġunju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Diċembru'.split('_'), - monthsShort : 'Jan_Fra_Mar_Apr_Mej_Ġun_Lul_Aww_Set_Ott_Nov_Diċ'.split('_'), - weekdays : 'Il-Ħadd_It-Tnejn_It-Tlieta_L-Erbgħa_Il-Ħamis_Il-Ġimgħa_Is-Sibt'.split('_'), - weekdaysShort : 'Ħad_Tne_Tli_Erb_Ħam_Ġim_Sib'.split('_'), - weekdaysMin : 'Ħa_Tn_Tl_Er_Ħa_Ġi_Si'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Illum fil-]LT', - nextDay : '[Għada fil-]LT', - nextWeek : 'dddd [fil-]LT', - lastDay : '[Il-bieraħ fil-]LT', - lastWeek : 'dddd [li għadda] [fil-]LT', - sameElse : 'L' - }, - relativeTime : { - future : 'f’ %s', - past : '%s ilu', - s : 'ftit sekondi', - ss : '%d sekondi', - m : 'minuta', - mm : '%d minuti', - h : 'siegħa', - hh : '%d siegħat', - d : 'ġurnata', - dd : '%d ġranet', - M : 'xahar', - MM : '%d xhur', - y : 'sena', - yy : '%d sni' - }, - dayOfMonthOrdinalParse : /\d{1,2}º/, - ordinal: '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +// Returns a wrapper function that returns a wrapped callback +// The wrapper function should do some stuff, and return a +// presumably different callback function. +// This makes sure that own properties are retained, so that +// decorations and such are not lost along the way. +module.exports = wrappy +function wrappy (fn, cb) { + if (fn && cb) return wrappy(fn)(cb) -return mt; + if (typeof fn !== 'function') + throw new TypeError('need wrapper function') + + Object.keys(fn).forEach(function (k) { + wrapper[k] = fn[k] + }) + + return wrapper -}))); + function wrapper() { + var args = new Array(arguments.length) + for (var i = 0; i < args.length; i++) { + args[i] = arguments[i] + } + var ret = fn.apply(this, args) + var cb = args[args.length-1] + if (typeof ret === 'function' && ret !== cb) { + Object.keys(cb).forEach(function (k) { + ret[k] = cb[k] + }) + } + return ret + } +} /***/ }), -/* 174 */ +/* 85 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Burmese [my] -//! author : Squar team, mysquar.com -//! author : David Rossellat : https://github.com/gholadr -//! author : Tin Aung Lin : https://github.com/thanyawzinmin - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '၁', - '2': '၂', - '3': '၃', - '4': '၄', - '5': '၅', - '6': '၆', - '7': '၇', - '8': '၈', - '9': '၉', - '0': '၀' -}; -var numberMap = { - '၁': '1', - '၂': '2', - '၃': '3', - '၄': '4', - '၅': '5', - '၆': '6', - '၇': '7', - '၈': '8', - '၉': '9', - '၀': '0' -}; +var wrappy = __webpack_require__(84) +module.exports = wrappy(once) +module.exports.strict = wrappy(onceStrict) -var my = moment.defineLocale('my', { - months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'), - monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'), - weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'), - weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'), - weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'), - - longDateFormat: { - LT: 'HH:mm', - LTS: 'HH:mm:ss', - L: 'DD/MM/YYYY', - LL: 'D MMMM YYYY', - LLL: 'D MMMM YYYY HH:mm', - LLLL: 'dddd D MMMM YYYY HH:mm' - }, - calendar: { - sameDay: '[ယနေ.] LT [မှာ]', - nextDay: '[မနက်ဖြန်] LT [မှာ]', - nextWeek: 'dddd LT [မှာ]', - lastDay: '[မနေ.က] LT [မှာ]', - lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]', - sameElse: 'L' - }, - relativeTime: { - future: 'လာမည့် %s မှာ', - past: 'လွန်ခဲ့သော %s က', - s: 'စက္ကန်.အနည်းငယ်', - ss : '%d စက္ကန့်', - m: 'တစ်မိနစ်', - mm: '%d မိနစ်', - h: 'တစ်နာရီ', - hh: '%d နာရီ', - d: 'တစ်ရက်', - dd: '%d ရက်', - M: 'တစ်လ', - MM: '%d လ', - y: 'တစ်နှစ်', - yy: '%d နှစ်' - }, - preparse: function (string) { - return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) { - return numberMap[match]; - }); +once.proto = once(function () { + Object.defineProperty(Function.prototype, 'once', { + value: function () { + return once(this) }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); + configurable: true + }) + + Object.defineProperty(Function.prototype, 'onceStrict', { + value: function () { + return onceStrict(this) }, - week: { - dow: 1, // Monday is the first day of the week. - doy: 4 // The week that contains Jan 1st is the first week of the year. - } -}); + configurable: true + }) +}) -return my; +function once (fn) { + var f = function () { + if (f.called) return f.value + f.called = true + return f.value = fn.apply(this, arguments) + } + f.called = false + return f +} -}))); +function onceStrict (fn) { + var f = function () { + if (f.called) + throw new Error(f.onceError) + f.called = true + return f.value = fn.apply(this, arguments) + } + var name = fn.name || 'Function wrapped with `once`' + f.onceError = name + " shouldn't be called more than once" + f.called = false + return f +} /***/ }), -/* 175 */ +/* 86 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Norwegian Bokmål [nb] -//! authors : Espen Hovlandsdal : https://github.com/rexxars -//! Sigurd Gartmann : https://github.com/sigurdga - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var nb = moment.defineLocale('nb', { - months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'), - monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'), - monthsParseExact : true, - weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'), - weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'), - weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY [kl.] HH:mm', - LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm' - }, - calendar : { - sameDay: '[i dag kl.] LT', - nextDay: '[i morgen kl.] LT', - nextWeek: 'dddd [kl.] LT', - lastDay: '[i går kl.] LT', - lastWeek: '[forrige] dddd [kl.] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'om %s', - past : '%s siden', - s : 'noen sekunder', - ss : '%d sekunder', - m : 'ett minutt', - mm : '%d minutter', - h : 'en time', - hh : '%d timer', - d : 'en dag', - dd : '%d dager', - M : 'en måned', - MM : '%d måneder', - y : 'ett år', - yy : '%d år' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return nb; +"use strict"; -}))); +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.Project = undefined; -/***/ }), -/* 176 */ -/***/ (function(module, exports, __webpack_require__) { +var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; /* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ -//! moment.js locale configuration -//! locale : Nepalese [ne] -//! author : suvash : https://github.com/suvash - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '१', - '2': '२', - '3': '३', - '4': '४', - '5': '५', - '6': '६', - '7': '७', - '8': '८', - '9': '९', - '0': '०' -}; -var numberMap = { - '१': '1', - '२': '2', - '३': '3', - '४': '4', - '५': '5', - '६': '6', - '७': '7', - '८': '8', - '९': '9', - '०': '0' -}; -var ne = moment.defineLocale('ne', { - months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'), - monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'), - monthsParseExact : true, - weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'), - weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'), - weekdaysMin : 'आ._सो._मं._बु._बि._शु._श.'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'Aको h:mm बजे', - LTS : 'Aको h:mm:ss बजे', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, Aको h:mm बजे', - LLLL : 'dddd, D MMMM YYYY, Aको h:mm बजे' - }, - preparse: function (string) { - return string.replace(/[१२३४५६७८९०]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - meridiemParse: /राति|बिहान|दिउँसो|साँझ/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'राति') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'बिहान') { - return hour; - } else if (meridiem === 'दिउँसो') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'साँझ') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 3) { - return 'राति'; - } else if (hour < 12) { - return 'बिहान'; - } else if (hour < 16) { - return 'दिउँसो'; - } else if (hour < 20) { - return 'साँझ'; - } else { - return 'राति'; - } - }, - calendar : { - sameDay : '[आज] LT', - nextDay : '[भोलि] LT', - nextWeek : '[आउँदो] dddd[,] LT', - lastDay : '[हिजो] LT', - lastWeek : '[गएको] dddd[,] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%sमा', - past : '%s अगाडि', - s : 'केही क्षण', - ss : '%d सेकेण्ड', - m : 'एक मिनेट', - mm : '%d मिनेट', - h : 'एक घण्टा', - hh : '%d घण्टा', - d : 'एक दिन', - dd : '%d दिन', - M : 'एक महिना', - MM : '%d महिना', - y : 'एक बर्ष', - yy : '%d बर्ष' - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); +var _chalk = __webpack_require__(17); -return ne; +var _chalk2 = _interopRequireDefault(_chalk); -}))); +var _path = __webpack_require__(2); +var _util = __webpack_require__(8); -/***/ }), -/* 177 */ -/***/ (function(module, exports, __webpack_require__) { +var _errors = __webpack_require__(57); -//! moment.js locale configuration -//! locale : Dutch [nl] -//! author : Joris Röling : https://github.com/jorisroling -//! author : Jacob Middag : https://github.com/middagj +var _log = __webpack_require__(19); -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +var _package_json = __webpack_require__(41); +var _scripts = __webpack_require__(194); -var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'); -var monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_'); +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i]; -var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i; +function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } -var nl = moment.defineLocale('nl', { - months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'), - monthsShort : function (m, format) { - if (!m) { - return monthsShortWithDots; - } else if (/-MMM-/.test(format)) { - return monthsShortWithoutDots[m.month()]; +class Project { + constructor(packageJson, projectPath) { + this.isWorkspaceRoot = false; + this.isWorkspaceProject = false; + this.json = Object.freeze(packageJson); + this.path = projectPath; + this.packageJsonLocation = (0, _path.resolve)(this.path, 'package.json'); + this.nodeModulesLocation = (0, _path.resolve)(this.path, 'node_modules'); + this.optimizeLocation = (0, _path.resolve)(this.path, 'optimize'); + this.targetLocation = (0, _path.resolve)(this.path, 'target'); + this.productionDependencies = this.json.dependencies || {}; + this.devDependencies = this.json.devDependencies || {}; + this.allDependencies = _extends({}, this.devDependencies, this.productionDependencies); + this.isWorkspaceRoot = this.json.hasOwnProperty('workspaces'); + this.scripts = this.json.scripts || {}; + } + static fromPath(path) { + return _asyncToGenerator(function* () { + const pkgJson = yield (0, _package_json.readPackageJson)(path); + return new Project(pkgJson, path); + })(); + } + get name() { + return this.json.name; + } + ensureValidProjectDependency(project, dependentProjectIsInWorkspace) { + const versionInPackageJson = this.allDependencies[project.name]; + let expectedVersionInPackageJson; + if (dependentProjectIsInWorkspace) { + expectedVersionInPackageJson = project.json.version; } else { - return monthsShortWithDots[m.month()]; + const relativePathToProject = normalizePath((0, _path.relative)(this.path, project.path)); + expectedVersionInPackageJson = `link:${relativePathToProject}`; } - }, - - monthsRegex: monthsRegex, - monthsShortRegex: monthsRegex, - monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i, - monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i, - - monthsParse : monthsParse, - longMonthsParse : monthsParse, - shortMonthsParse : monthsParse, - - weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'), - weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'), - weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD-MM-YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[vandaag om] LT', - nextDay: '[morgen om] LT', - nextWeek: 'dddd [om] LT', - lastDay: '[gisteren om] LT', - lastWeek: '[afgelopen] dddd [om] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'over %s', - past : '%s geleden', - s : 'een paar seconden', - ss : '%d seconden', - m : 'één minuut', - mm : '%d minuten', - h : 'één uur', - hh : '%d uur', - d : 'één dag', - dd : '%d dagen', - M : 'één maand', - MM : '%d maanden', - y : 'één jaar', - yy : '%d jaar' - }, - dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, - ordinal : function (number) { - return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. + // No issues! + if (versionInPackageJson === expectedVersionInPackageJson) { + return; + } + let problemMsg; + if ((0, _package_json.isLinkDependency)(versionInPackageJson) && dependentProjectIsInWorkspace) { + problemMsg = `but should be using a workspace`; + } else if ((0, _package_json.isLinkDependency)(versionInPackageJson)) { + problemMsg = `using 'link:', but the path is wrong`; + } else { + problemMsg = `but it's not using the local package`; + } + throw new _errors.CliError(`[${this.name}] depends on [${project.name}] ${problemMsg}. Update its package.json to the expected value below.`, { + actual: `"${project.name}": "${versionInPackageJson}"`, + expected: `"${project.name}": "${expectedVersionInPackageJson}"`, + package: `${this.name} (${this.packageJsonLocation})` + }); } -}); + getBuildConfig() { + return this.json.kibana && this.json.kibana.build || {}; + } + /** + * Returns the directory that should be copied into the Kibana build artifact. + * This config can be specified to only include the project's build artifacts + * instead of everything located in the project directory. + */ + getIntermediateBuildDirectory() { + return (0, _path.resolve)(this.path, this.getBuildConfig().intermediateBuildDirectory || '.'); + } + hasScript(name) { + return name in this.scripts; + } + getExecutables() { + const raw = this.json.bin; + if (!raw) { + return {}; + } + if (typeof raw === 'string') { + return { + [this.name]: (0, _path.resolve)(this.path, raw) + }; + } + if (typeof raw === 'object') { + const binsConfig = {}; + for (const binName of Object.keys(raw)) { + binsConfig[binName] = (0, _path.resolve)(this.path, raw[binName]); + } + return binsConfig; + } + throw new _errors.CliError(`[${this.name}] has an invalid "bin" field in its package.json, ` + `expected an object or a string`, { + binConfig: (0, _util.inspect)(raw), + package: `${this.name} (${this.packageJsonLocation})` + }); + } + runScript(scriptName, args = []) { + var _this = this; -return nl; + return _asyncToGenerator(function* () { + _log.log.write(_chalk2.default.bold(`\n\nRunning script [${_chalk2.default.green(scriptName)}] in [${_chalk2.default.green(_this.name)}]:\n`)); + return (0, _scripts.runScriptInPackage)(scriptName, args, _this); + })(); + } + runScriptStreaming(scriptName, args = []) { + return (0, _scripts.runScriptInPackageStreaming)(scriptName, args, this); + } + hasDependencies() { + return Object.keys(this.allDependencies).length > 0; + } + installDependencies({ extraArgs }) { + var _this2 = this; -}))); + return _asyncToGenerator(function* () { + _log.log.write(_chalk2.default.bold(`\n\nInstalling dependencies in [${_chalk2.default.green(_this2.name)}]:\n`)); + return (0, _scripts.installInDir)(_this2.path, extraArgs); + })(); + } +} +exports.Project = Project; // We normalize all path separators to `/` in generated files +function normalizePath(path) { + return path.replace(/[\\\/]+/g, '/'); +} /***/ }), -/* 178 */ +/* 87 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Dutch (Belgium) [nl-be] -//! author : Joris Röling : https://github.com/jorisroling -//! author : Jacob Middag : https://github.com/middagj - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +module.exports = normalize +var fixer = __webpack_require__(170) +normalize.fixer = fixer -var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'); -var monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_'); +var makeWarning = __webpack_require__(183) -var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i]; -var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i; +var fieldsToFix = ['name','version','description','repository','modules','scripts' + ,'files','bin','man','bugs','keywords','readme','homepage','license'] +var otherThingsToFix = ['dependencies','people', 'typos'] -var nlBe = moment.defineLocale('nl-be', { - months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'), - monthsShort : function (m, format) { - if (!m) { - return monthsShortWithDots; - } else if (/-MMM-/.test(format)) { - return monthsShortWithoutDots[m.month()]; - } else { - return monthsShortWithDots[m.month()]; - } - }, +var thingsToFix = fieldsToFix.map(function(fieldName) { + return ucFirst(fieldName) + "Field" +}) +// two ways to do this in CoffeeScript on only one line, sub-70 chars: +// thingsToFix = fieldsToFix.map (name) -> ucFirst(name) + "Field" +// thingsToFix = (ucFirst(name) + "Field" for name in fieldsToFix) +thingsToFix = thingsToFix.concat(otherThingsToFix) - monthsRegex: monthsRegex, - monthsShortRegex: monthsRegex, - monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i, - monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i, - - monthsParse : monthsParse, - longMonthsParse : monthsParse, - shortMonthsParse : monthsParse, - - weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'), - weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'), - weekdaysMin : 'zo_ma_di_wo_do_vr_za'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[vandaag om] LT', - nextDay: '[morgen om] LT', - nextWeek: 'dddd [om] LT', - lastDay: '[gisteren om] LT', - lastWeek: '[afgelopen] dddd [om] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'over %s', - past : '%s geleden', - s : 'een paar seconden', - ss : '%d seconden', - m : 'één minuut', - mm : '%d minuten', - h : 'één uur', - hh : '%d uur', - d : 'één dag', - dd : '%d dagen', - M : 'één maand', - MM : '%d maanden', - y : 'één jaar', - yy : '%d jaar' - }, - dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/, - ordinal : function (number) { - return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +function normalize (data, warn, strict) { + if(warn === true) warn = null, strict = true + if(!strict) strict = false + if(!warn || data.private) warn = function(msg) { /* noop */ } -return nlBe; + if (data.scripts && + data.scripts.install === "node-gyp rebuild" && + !data.scripts.preinstall) { + data.gypfile = true + } + fixer.warn = function() { warn(makeWarning.apply(null, arguments)) } + thingsToFix.forEach(function(thingName) { + fixer["fix" + ucFirst(thingName)](data, strict) + }) + data._id = data.name + "@" + data.version +} -}))); +function ucFirst (string) { + return string.charAt(0).toUpperCase() + string.slice(1); +} /***/ }), -/* 179 */ -/***/ (function(module, exports, __webpack_require__) { - -//! moment.js locale configuration -//! locale : Nynorsk [nn] -//! author : https://github.com/mechuwind - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var nn = moment.defineLocale('nn', { - months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'), - monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'), - weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'), - weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'), - weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY [kl.] H:mm', - LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm' - }, - calendar : { - sameDay: '[I dag klokka] LT', - nextDay: '[I morgon klokka] LT', - nextWeek: 'dddd [klokka] LT', - lastDay: '[I går klokka] LT', - lastWeek: '[Føregåande] dddd [klokka] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'om %s', - past : '%s sidan', - s : 'nokre sekund', - ss : '%d sekund', - m : 'eit minutt', - mm : '%d minutt', - h : 'ein time', - hh : '%d timar', - d : 'ein dag', - dd : '%d dagar', - M : 'ein månad', - MM : '%d månader', - y : 'eit år', - yy : '%d år' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return nn; - -}))); +/* 88 */ +/***/ (function(module, exports) { +module.exports = require("url"); /***/ }), -/* 180 */ +/* 89 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Punjabi (India) [pa-in] -//! author : Harpreet Singh : https://github.com/harpreetkhalsagtbit - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '੧', - '2': '੨', - '3': '੩', - '4': '੪', - '5': '੫', - '6': '੬', - '7': '੭', - '8': '੮', - '9': '੯', - '0': '੦' -}; -var numberMap = { - '੧': '1', - '੨': '2', - '੩': '3', - '੪': '4', - '੫': '5', - '੬': '6', - '੭': '7', - '੮': '8', - '੯': '9', - '੦': '0' -}; +"use strict"; -var paIn = moment.defineLocale('pa-in', { - // There are months name as per Nanakshahi Calender but they are not used as rigidly in modern Punjabi. - months : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'), - monthsShort : 'ਜਨਵਰੀ_ਫ਼ਰਵਰੀ_ਮਾਰਚ_ਅਪ੍ਰੈਲ_ਮਈ_ਜੂਨ_ਜੁਲਾਈ_ਅਗਸਤ_ਸਤੰਬਰ_ਅਕਤੂਬਰ_ਨਵੰਬਰ_ਦਸੰਬਰ'.split('_'), - weekdays : 'ਐਤਵਾਰ_ਸੋਮਵਾਰ_ਮੰਗਲਵਾਰ_ਬੁਧਵਾਰ_ਵੀਰਵਾਰ_ਸ਼ੁੱਕਰਵਾਰ_ਸ਼ਨੀਚਰਵਾਰ'.split('_'), - weekdaysShort : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'), - weekdaysMin : 'ਐਤ_ਸੋਮ_ਮੰਗਲ_ਬੁਧ_ਵੀਰ_ਸ਼ੁਕਰ_ਸ਼ਨੀ'.split('_'), - longDateFormat : { - LT : 'A h:mm ਵਜੇ', - LTS : 'A h:mm:ss ਵਜੇ', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm ਵਜੇ', - LLLL : 'dddd, D MMMM YYYY, A h:mm ਵਜੇ' - }, - calendar : { - sameDay : '[ਅਜ] LT', - nextDay : '[ਕਲ] LT', - nextWeek : 'dddd, LT', - lastDay : '[ਕਲ] LT', - lastWeek : '[ਪਿਛਲੇ] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s ਵਿੱਚ', - past : '%s ਪਿਛਲੇ', - s : 'ਕੁਝ ਸਕਿੰਟ', - ss : '%d ਸਕਿੰਟ', - m : 'ਇਕ ਮਿੰਟ', - mm : '%d ਮਿੰਟ', - h : 'ਇੱਕ ਘੰਟਾ', - hh : '%d ਘੰਟੇ', - d : 'ਇੱਕ ਦਿਨ', - dd : '%d ਦਿਨ', - M : 'ਇੱਕ ਮਹੀਨਾ', - MM : '%d ਮਹੀਨੇ', - y : 'ਇੱਕ ਸਾਲ', - yy : '%d ਸਾਲ' - }, - preparse: function (string) { - return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - // Punjabi notation for meridiems are quite fuzzy in practice. While there exists - // a rigid notion of a 'Pahar' it is not used as rigidly in modern Punjabi. - meridiemParse: /ਰਾਤ|ਸਵੇਰ|ਦੁਪਹਿਰ|ਸ਼ਾਮ/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'ਰਾਤ') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'ਸਵੇਰ') { - return hour; - } else if (meridiem === 'ਦੁਪਹਿਰ') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'ਸ਼ਾਮ') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'ਰਾਤ'; - } else if (hour < 10) { - return 'ਸਵੇਰ'; - } else if (hour < 17) { - return 'ਦੁਪਹਿਰ'; - } else if (hour < 20) { - return 'ਸ਼ਾਮ'; - } else { - return 'ਰਾਤ'; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } -}); -return paIn; +var gitHosts = module.exports = { + github: { + // First two are insecure and generally shouldn't be used any more, but + // they are still supported. + 'protocols': [ 'git', 'http', 'git+ssh', 'git+https', 'ssh', 'https' ], + 'domain': 'github.com', + 'treepath': 'tree', + 'filetemplate': 'https://{auth@}raw.githubusercontent.com/{user}/{project}/{committish}/{path}', + 'bugstemplate': 'https://{domain}/{user}/{project}/issues', + 'gittemplate': 'git://{auth@}{domain}/{user}/{project}.git{#committish}', + 'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz' + }, + bitbucket: { + 'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ], + 'domain': 'bitbucket.org', + 'treepath': 'src', + 'tarballtemplate': 'https://{domain}/{user}/{project}/get/{committish}.tar.gz' + }, + gitlab: { + 'protocols': [ 'git+ssh', 'git+https', 'ssh', 'https' ], + 'domain': 'gitlab.com', + 'treepath': 'tree', + 'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#README', + 'bugstemplate': 'https://{domain}/{user}/{project}/issues', + 'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}' + }, + gist: { + 'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ], + 'domain': 'gist.github.com', + 'pathmatch': /^[/](?:([^/]+)[/])?([a-z0-9]+)(?:[.]git)?$/, + 'filetemplate': 'https://gist.githubusercontent.com/{user}/{project}/raw{/committish}/{path}', + 'bugstemplate': 'https://{domain}/{project}', + 'gittemplate': 'git://{domain}/{project}.git{#committish}', + 'sshtemplate': 'git@{domain}:/{project}.git{#committish}', + 'sshurltemplate': 'git+ssh://git@{domain}/{project}.git{#committish}', + 'browsetemplate': 'https://{domain}/{project}{/committish}', + 'docstemplate': 'https://{domain}/{project}{/committish}', + 'httpstemplate': 'git+https://{domain}/{project}.git{#committish}', + 'shortcuttemplate': '{type}:{project}{#committish}', + 'pathtemplate': '{project}{#committish}', + 'tarballtemplate': 'https://{domain}/{user}/{project}/archive/{committish}.tar.gz' + } +} + +var gitHostDefaults = { + 'sshtemplate': 'git@{domain}:{user}/{project}.git{#committish}', + 'sshurltemplate': 'git+ssh://git@{domain}/{user}/{project}.git{#committish}', + 'browsetemplate': 'https://{domain}/{user}/{project}{/tree/committish}', + 'docstemplate': 'https://{domain}/{user}/{project}{/tree/committish}#readme', + 'httpstemplate': 'git+https://{auth@}{domain}/{user}/{project}.git{#committish}', + 'filetemplate': 'https://{domain}/{user}/{project}/raw/{committish}/{path}', + 'shortcuttemplate': '{type}:{user}/{project}{#committish}', + 'pathtemplate': '{user}/{project}{#committish}', + 'pathmatch': /^[/]([^/]+)[/]([^/]+?)(?:[.]git|[/])?$/ +} -}))); +Object.keys(gitHosts).forEach(function (name) { + Object.keys(gitHostDefaults).forEach(function (key) { + if (gitHosts[name][key]) return + gitHosts[name][key] = gitHostDefaults[key] + }) + gitHosts[name].protocols_re = RegExp('^(' + + gitHosts[name].protocols.map(function (protocol) { + return protocol.replace(/([\\+*{}()[\]$^|])/g, '\\$1') + }).join('|') + '):$') +}) /***/ }), -/* 181 */ +/* 90 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Polish [pl] -//! author : Rafal Hirsz : https://github.com/evoL - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'); -var monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_'); -function plural(n) { - return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1); -} -function translate(number, withoutSuffix, key) { - var result = number + ' '; - switch (key) { - case 'ss': - return result + (plural(number) ? 'sekundy' : 'sekund'); - case 'm': - return withoutSuffix ? 'minuta' : 'minutę'; - case 'mm': - return result + (plural(number) ? 'minuty' : 'minut'); - case 'h': - return withoutSuffix ? 'godzina' : 'godzinę'; - case 'hh': - return result + (plural(number) ? 'godziny' : 'godzin'); - case 'MM': - return result + (plural(number) ? 'miesiące' : 'miesięcy'); - case 'yy': - return result + (plural(number) ? 'lata' : 'lat'); - } -} - -var pl = moment.defineLocale('pl', { - months : function (momentToFormat, format) { - if (!momentToFormat) { - return monthsNominative; - } else if (format === '') { - // Hack: if format empty we know this is used to generate - // RegExp by moment. Give then back both valid forms of months - // in RegExp ready format. - return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')'; - } else if (/D MMMM/.test(format)) { - return monthsSubjective[momentToFormat.month()]; - } else { - return monthsNominative[momentToFormat.month()]; - } - }, - monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'), - weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'), - weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'), - weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[Dziś o] LT', - nextDay: '[Jutro o] LT', - nextWeek: function () { - switch (this.day()) { - case 0: - return '[W niedzielę o] LT'; - - case 2: - return '[We wtorek o] LT'; - - case 3: - return '[W środę o] LT'; - - case 6: - return '[W sobotę o] LT'; - - default: - return '[W] dddd [o] LT'; - } - }, - lastDay: '[Wczoraj o] LT', - lastWeek: function () { - switch (this.day()) { - case 0: - return '[W zeszłą niedzielę o] LT'; - case 3: - return '[W zeszłą środę o] LT'; - case 6: - return '[W zeszłą sobotę o] LT'; - default: - return '[W zeszły] dddd [o] LT'; - } - }, - sameElse: 'L' - }, - relativeTime : { - future : 'za %s', - past : '%s temu', - s : 'kilka sekund', - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : '1 dzień', - dd : '%d dni', - M : 'miesiąc', - MM : translate, - y : 'rok', - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return pl; +"use strict"; -}))); +const isPlainObj = __webpack_require__(190); +module.exports = (obj, opts) => { + if (!isPlainObj(obj)) { + throw new TypeError('Expected a plain object'); + } -/***/ }), -/* 182 */ -/***/ (function(module, exports, __webpack_require__) { + opts = opts || {}; -//! moment.js locale configuration -//! locale : Portuguese [pt] -//! author : Jefferson : https://github.com/jalex79 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var pt = moment.defineLocale('pt', { - months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'), - monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'), - weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'), - weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'), - weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY HH:mm', - LLLL : 'dddd, D [de] MMMM [de] YYYY HH:mm' - }, - calendar : { - sameDay: '[Hoje às] LT', - nextDay: '[Amanhã às] LT', - nextWeek: 'dddd [às] LT', - lastDay: '[Ontem às] LT', - lastWeek: function () { - return (this.day() === 0 || this.day() === 6) ? - '[Último] dddd [às] LT' : // Saturday + Sunday - '[Última] dddd [às] LT'; // Monday - Friday - }, - sameElse: 'L' - }, - relativeTime : { - future : 'em %s', - past : 'há %s', - s : 'segundos', - ss : '%d segundos', - m : 'um minuto', - mm : '%d minutos', - h : 'uma hora', - hh : '%d horas', - d : 'um dia', - dd : '%d dias', - M : 'um mês', - MM : '%d meses', - y : 'um ano', - yy : '%d anos' - }, - dayOfMonthOrdinalParse: /\d{1,2}º/, - ordinal : '%dº', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + // DEPRECATED + if (typeof opts === 'function') { + throw new TypeError('Specify the compare function as an option instead'); + } -return pt; + const deep = opts.deep; + const seenInput = []; + const seenOutput = []; -}))); + const sortKeys = x => { + const seenIndex = seenInput.indexOf(x); + if (seenIndex !== -1) { + return seenOutput[seenIndex]; + } -/***/ }), -/* 183 */ -/***/ (function(module, exports, __webpack_require__) { + const ret = {}; + const keys = Object.keys(x).sort(opts.compare); -//! moment.js locale configuration -//! locale : Portuguese (Brazil) [pt-br] -//! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var ptBr = moment.defineLocale('pt-br', { - months : 'janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro'.split('_'), - monthsShort : 'jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez'.split('_'), - weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'), - weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'), - weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D [de] MMMM [de] YYYY', - LLL : 'D [de] MMMM [de] YYYY [às] HH:mm', - LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm' - }, - calendar : { - sameDay: '[Hoje às] LT', - nextDay: '[Amanhã às] LT', - nextWeek: 'dddd [às] LT', - lastDay: '[Ontem às] LT', - lastWeek: function () { - return (this.day() === 0 || this.day() === 6) ? - '[Último] dddd [às] LT' : // Saturday + Sunday - '[Última] dddd [às] LT'; // Monday - Friday - }, - sameElse: 'L' - }, - relativeTime : { - future : 'em %s', - past : '%s atrás', - s : 'poucos segundos', - ss : '%d segundos', - m : 'um minuto', - mm : '%d minutos', - h : 'uma hora', - hh : '%d horas', - d : 'um dia', - dd : '%d dias', - M : 'um mês', - MM : '%d meses', - y : 'um ano', - yy : '%d anos' - }, - dayOfMonthOrdinalParse: /\d{1,2}º/, - ordinal : '%dº' -}); + seenInput.push(x); + seenOutput.push(ret); -return ptBr; + for (let i = 0; i < keys.length; i++) { + const key = keys[i]; + const val = x[key]; -}))); + if (deep && Array.isArray(val)) { + const retArr = []; + for (let j = 0; j < val.length; j++) { + retArr[j] = isPlainObj(val[j]) ? sortKeys(val[j]) : val[j]; + } -/***/ }), -/* 184 */ -/***/ (function(module, exports, __webpack_require__) { + ret[key] = retArr; + continue; + } -//! moment.js locale configuration -//! locale : Romanian [ro] -//! author : Vlad Gurdiga : https://github.com/gurdiga -//! author : Valentin Agachi : https://github.com/avaly - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function relativeTimeWithPlural(number, withoutSuffix, key) { - var format = { - 'ss': 'secunde', - 'mm': 'minute', - 'hh': 'ore', - 'dd': 'zile', - 'MM': 'luni', - 'yy': 'ani' - }, - separator = ' '; - if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) { - separator = ' de '; - } - return number + separator + format[key]; -} - -var ro = moment.defineLocale('ro', { - months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'), - monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'), - monthsParseExact: true, - weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'), - weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'), - weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'), - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY H:mm', - LLLL : 'dddd, D MMMM YYYY H:mm' - }, - calendar : { - sameDay: '[azi la] LT', - nextDay: '[mâine la] LT', - nextWeek: 'dddd [la] LT', - lastDay: '[ieri la] LT', - lastWeek: '[fosta] dddd [la] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'peste %s', - past : '%s în urmă', - s : 'câteva secunde', - ss : relativeTimeWithPlural, - m : 'un minut', - mm : relativeTimeWithPlural, - h : 'o oră', - hh : relativeTimeWithPlural, - d : 'o zi', - dd : relativeTimeWithPlural, - M : 'o lună', - MM : relativeTimeWithPlural, - y : 'un an', - yy : relativeTimeWithPlural - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + ret[key] = deep && isPlainObj(val) ? sortKeys(val) : val; + } -return ro; + return ret; + }; -}))); + return sortKeys(obj); +}; /***/ }), -/* 185 */ +/* 91 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Russian [ru] -//! author : Viktorminator : https://github.com/Viktorminator -//! Author : Menelion Elensúle : https://github.com/Oire -//! author : Коренберг Марк : https://github.com/socketpair +"use strict"; -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; +const fs = __webpack_require__(6); +const path = __webpack_require__(2); +const pify = __webpack_require__(191); +const defaults = { + mode: 0o777 & (~process.umask()), + fs +}; -function plural(word, num) { - var forms = word.split('_'); - return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]); -} -function relativeTimeWithPlural(number, withoutSuffix, key) { - var format = { - 'ss': withoutSuffix ? 'секунда_секунды_секунд' : 'секунду_секунды_секунд', - 'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут', - 'hh': 'час_часа_часов', - 'dd': 'день_дня_дней', - 'MM': 'месяц_месяца_месяцев', - 'yy': 'год_года_лет' - }; - if (key === 'm') { - return withoutSuffix ? 'минута' : 'минуту'; - } - else { - return number + ' ' + plural(format[key], +number); - } -} -var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i]; +// https://github.com/nodejs/node/issues/8987 +// https://github.com/libuv/libuv/pull/1088 +const checkPath = pth => { + if (process.platform === 'win32') { + const pathHasInvalidWinCharacters = /[<>:"|?*]/.test(pth.replace(path.parse(pth).root, '')); -// http://new.gramota.ru/spravka/rules/139-prop : § 103 -// Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637 -// CLDR data: http://www.unicode.org/cldr/charts/28/summary/ru.html#1753 -var ru = moment.defineLocale('ru', { - months : { - format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'), - standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_') - }, - monthsShort : { - // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ? - format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'), - standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_') - }, - weekdays : { - standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'), - format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'), - isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/ - }, - weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'), - weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'), - monthsParse : monthsParse, - longMonthsParse : monthsParse, - shortMonthsParse : monthsParse, - - // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки - monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i, - - // копия предыдущего - monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i, - - // полные названия с падежами - monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i, - - // Выражение, которое соотвествует только сокращённым формам - monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY г.', - LLL : 'D MMMM YYYY г., H:mm', - LLLL : 'dddd, D MMMM YYYY г., H:mm' - }, - calendar : { - sameDay: '[Сегодня в] LT', - nextDay: '[Завтра в] LT', - lastDay: '[Вчера в] LT', - nextWeek: function (now) { - if (now.week() !== this.week()) { - switch (this.day()) { - case 0: - return '[В следующее] dddd [в] LT'; - case 1: - case 2: - case 4: - return '[В следующий] dddd [в] LT'; - case 3: - case 5: - case 6: - return '[В следующую] dddd [в] LT'; - } - } else { - if (this.day() === 2) { - return '[Во] dddd [в] LT'; - } else { - return '[В] dddd [в] LT'; - } - } - }, - lastWeek: function (now) { - if (now.week() !== this.week()) { - switch (this.day()) { - case 0: - return '[В прошлое] dddd [в] LT'; - case 1: - case 2: - case 4: - return '[В прошлый] dddd [в] LT'; - case 3: - case 5: - case 6: - return '[В прошлую] dddd [в] LT'; - } - } else { - if (this.day() === 2) { - return '[Во] dddd [в] LT'; - } else { - return '[В] dddd [в] LT'; - } - } - }, - sameElse: 'L' - }, - relativeTime : { - future : 'через %s', - past : '%s назад', - s : 'несколько секунд', - ss : relativeTimeWithPlural, - m : relativeTimeWithPlural, - mm : relativeTimeWithPlural, - h : 'час', - hh : relativeTimeWithPlural, - d : 'день', - dd : relativeTimeWithPlural, - M : 'месяц', - MM : relativeTimeWithPlural, - y : 'год', - yy : relativeTimeWithPlural - }, - meridiemParse: /ночи|утра|дня|вечера/i, - isPM : function (input) { - return /^(дня|вечера)$/.test(input); - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'ночи'; - } else if (hour < 12) { - return 'утра'; - } else if (hour < 17) { - return 'дня'; - } else { - return 'вечера'; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/, - ordinal: function (number, period) { - switch (period) { - case 'M': - case 'd': - case 'DDD': - return number + '-й'; - case 'D': - return number + '-го'; - case 'w': - case 'W': - return number + '-я'; - default: - return number; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + if (pathHasInvalidWinCharacters) { + const err = new Error(`Path contains invalid characters: ${pth}`); + err.code = 'EINVAL'; + throw err; + } + } +}; -return ru; +module.exports = (input, opts) => Promise.resolve().then(() => { + checkPath(input); + opts = Object.assign({}, defaults, opts); -}))); + const mkdir = pify(opts.fs.mkdir); + const stat = pify(opts.fs.stat); + const make = pth => { + return mkdir(pth, opts.mode) + .then(() => pth) + .catch(err => { + if (err.code === 'ENOENT') { + if (err.message.includes('null bytes') || path.dirname(pth) === pth) { + throw err; + } -/***/ }), -/* 186 */ -/***/ (function(module, exports, __webpack_require__) { + return make(path.dirname(pth)).then(() => make(pth)); + } -//! moment.js locale configuration -//! locale : Sindhi [sd] -//! author : Narain Sagar : https://github.com/narainsagar - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var months = [ - 'جنوري', - 'فيبروري', - 'مارچ', - 'اپريل', - 'مئي', - 'جون', - 'جولاءِ', - 'آگسٽ', - 'سيپٽمبر', - 'آڪٽوبر', - 'نومبر', - 'ڊسمبر' -]; -var days = [ - 'آچر', - 'سومر', - 'اڱارو', - 'اربع', - 'خميس', - 'جمع', - 'ڇنڇر' -]; + return stat(pth) + .then(stats => stats.isDirectory() ? pth : Promise.reject()) + .catch(() => { + throw err; + }); + }); + }; -var sd = moment.defineLocale('sd', { - months : months, - monthsShort : months, - weekdays : days, - weekdaysShort : days, - weekdaysMin : days, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd، D MMMM YYYY HH:mm' - }, - meridiemParse: /صبح|شام/, - isPM : function (input) { - return 'شام' === input; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'صبح'; - } - return 'شام'; - }, - calendar : { - sameDay : '[اڄ] LT', - nextDay : '[سڀاڻي] LT', - nextWeek : 'dddd [اڳين هفتي تي] LT', - lastDay : '[ڪالهه] LT', - lastWeek : '[گزريل هفتي] dddd [تي] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s پوء', - past : '%s اڳ', - s : 'چند سيڪنڊ', - ss : '%d سيڪنڊ', - m : 'هڪ منٽ', - mm : '%d منٽ', - h : 'هڪ ڪلاڪ', - hh : '%d ڪلاڪ', - d : 'هڪ ڏينهن', - dd : '%d ڏينهن', - M : 'هڪ مهينو', - MM : '%d مهينا', - y : 'هڪ سال', - yy : '%d سال' - }, - preparse: function (string) { - return string.replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/,/g, '،'); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } + return make(path.resolve(input)); }); -return sd; - -}))); +module.exports.sync = (input, opts) => { + checkPath(input); + opts = Object.assign({}, defaults, opts); + const make = pth => { + try { + opts.fs.mkdirSync(pth, opts.mode); + } catch (err) { + if (err.code === 'ENOENT') { + if (err.message.includes('null bytes') || path.dirname(pth) === pth) { + throw err; + } -/***/ }), -/* 187 */ -/***/ (function(module, exports, __webpack_require__) { + make(path.dirname(pth)); + return make(pth); + } -//! moment.js locale configuration -//! locale : Northern Sami [se] -//! authors : Bård Rolstad Henriksen : https://github.com/karamell - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - - -var se = moment.defineLocale('se', { - months : 'ođđajagemánnu_guovvamánnu_njukčamánnu_cuoŋománnu_miessemánnu_geassemánnu_suoidnemánnu_borgemánnu_čakčamánnu_golggotmánnu_skábmamánnu_juovlamánnu'.split('_'), - monthsShort : 'ođđj_guov_njuk_cuo_mies_geas_suoi_borg_čakč_golg_skáb_juov'.split('_'), - weekdays : 'sotnabeaivi_vuossárga_maŋŋebárga_gaskavahkku_duorastat_bearjadat_lávvardat'.split('_'), - weekdaysShort : 'sotn_vuos_maŋ_gask_duor_bear_láv'.split('_'), - weekdaysMin : 's_v_m_g_d_b_L'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'MMMM D. [b.] YYYY', - LLL : 'MMMM D. [b.] YYYY [ti.] HH:mm', - LLLL : 'dddd, MMMM D. [b.] YYYY [ti.] HH:mm' - }, - calendar : { - sameDay: '[otne ti] LT', - nextDay: '[ihttin ti] LT', - nextWeek: 'dddd [ti] LT', - lastDay: '[ikte ti] LT', - lastWeek: '[ovddit] dddd [ti] LT', - sameElse: 'L' - }, - relativeTime : { - future : '%s geažes', - past : 'maŋit %s', - s : 'moadde sekunddat', - ss: '%d sekunddat', - m : 'okta minuhta', - mm : '%d minuhtat', - h : 'okta diimmu', - hh : '%d diimmut', - d : 'okta beaivi', - dd : '%d beaivvit', - M : 'okta mánnu', - MM : '%d mánut', - y : 'okta jahki', - yy : '%d jagit' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + try { + if (!opts.fs.statSync(pth).isDirectory()) { + throw new Error('The path is not a directory'); + } + } catch (_) { + throw err; + } + } -return se; + return pth; + }; -}))); + return make(path.resolve(input)); +}; /***/ }), -/* 188 */ +/* 92 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Sinhalese [si] -//! author : Sampath Sitinamaluwa : https://github.com/sampathsris - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -/*jshint -W100*/ -var si = moment.defineLocale('si', { - months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'), - monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'), - weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'), - weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'), - weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'a h:mm', - LTS : 'a h:mm:ss', - L : 'YYYY/MM/DD', - LL : 'YYYY MMMM D', - LLL : 'YYYY MMMM D, a h:mm', - LLLL : 'YYYY MMMM D [වැනි] dddd, a h:mm:ss' - }, - calendar : { - sameDay : '[අද] LT[ට]', - nextDay : '[හෙට] LT[ට]', - nextWeek : 'dddd LT[ට]', - lastDay : '[ඊයේ] LT[ට]', - lastWeek : '[පසුගිය] dddd LT[ට]', - sameElse : 'L' - }, - relativeTime : { - future : '%sකින්', - past : '%sකට පෙර', - s : 'තත්පර කිහිපය', - ss : 'තත්පර %d', - m : 'මිනිත්තුව', - mm : 'මිනිත්තු %d', - h : 'පැය', - hh : 'පැය %d', - d : 'දිනය', - dd : 'දින %d', - M : 'මාසය', - MM : 'මාස %d', - y : 'වසර', - yy : 'වසර %d' - }, - dayOfMonthOrdinalParse: /\d{1,2} වැනි/, - ordinal : function (number) { - return number + ' වැනි'; - }, - meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./, - isPM : function (input) { - return input === 'ප.ව.' || input === 'පස් වරු'; - }, - meridiem : function (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'ප.ව.' : 'පස් වරු'; - } else { - return isLower ? 'පෙ.ව.' : 'පෙර වරු'; - } - } -}); +"use strict"; -return si; -}))); +var path = __webpack_require__(2); +var which = __webpack_require__(199); +var LRU = __webpack_require__(93); +var commandCache = new LRU({ max: 50, maxAge: 30 * 1000 }); // Cache just for 30sec -/***/ }), -/* 189 */ -/***/ (function(module, exports, __webpack_require__) { +function resolveCommand(command, noExtension) { + var resolved; -//! moment.js locale configuration -//! locale : Slovak [sk] -//! author : Martin Minka : https://github.com/k2s -//! based on work of petrbela : https://github.com/petrbela - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'); -var monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_'); -function plural(n) { - return (n > 1) && (n < 5); -} -function translate(number, withoutSuffix, key, isFuture) { - var result = number + ' '; - switch (key) { - case 's': // a few seconds / in a few seconds / a few seconds ago - return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami'; - case 'ss': // 9 seconds / in 9 seconds / 9 seconds ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'sekundy' : 'sekúnd'); - } else { - return result + 'sekundami'; - } - break; - case 'm': // a minute / in a minute / a minute ago - return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou'); - case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'minúty' : 'minút'); - } else { - return result + 'minútami'; - } - break; - case 'h': // an hour / in an hour / an hour ago - return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou'); - case 'hh': // 9 hours / in 9 hours / 9 hours ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'hodiny' : 'hodín'); - } else { - return result + 'hodinami'; - } - break; - case 'd': // a day / in a day / a day ago - return (withoutSuffix || isFuture) ? 'deň' : 'dňom'; - case 'dd': // 9 days / in 9 days / 9 days ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'dni' : 'dní'); - } else { - return result + 'dňami'; - } - break; - case 'M': // a month / in a month / a month ago - return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom'; - case 'MM': // 9 months / in 9 months / 9 months ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'mesiace' : 'mesiacov'); - } else { - return result + 'mesiacmi'; - } - break; - case 'y': // a year / in a year / a year ago - return (withoutSuffix || isFuture) ? 'rok' : 'rokom'; - case 'yy': // 9 years / in 9 years / 9 years ago - if (withoutSuffix || isFuture) { - return result + (plural(number) ? 'roky' : 'rokov'); - } else { - return result + 'rokmi'; - } - break; - } -} + noExtension = !!noExtension; + resolved = commandCache.get(command + '!' + noExtension); -var sk = moment.defineLocale('sk', { - months : months, - monthsShort : monthsShort, - weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'), - weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'), - weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'), - longDateFormat : { - LT: 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY H:mm', - LLLL : 'dddd D. MMMM YYYY H:mm' - }, - calendar : { - sameDay: '[dnes o] LT', - nextDay: '[zajtra o] LT', - nextWeek: function () { - switch (this.day()) { - case 0: - return '[v nedeľu o] LT'; - case 1: - case 2: - return '[v] dddd [o] LT'; - case 3: - return '[v stredu o] LT'; - case 4: - return '[vo štvrtok o] LT'; - case 5: - return '[v piatok o] LT'; - case 6: - return '[v sobotu o] LT'; - } - }, - lastDay: '[včera o] LT', - lastWeek: function () { - switch (this.day()) { - case 0: - return '[minulú nedeľu o] LT'; - case 1: - case 2: - return '[minulý] dddd [o] LT'; - case 3: - return '[minulú stredu o] LT'; - case 4: - case 5: - return '[minulý] dddd [o] LT'; - case 6: - return '[minulú sobotu o] LT'; - } - }, - sameElse: 'L' - }, - relativeTime : { - future : 'za %s', - past : 'pred %s', - s : translate, - ss : translate, - m : translate, - mm : translate, - h : translate, - hh : translate, - d : translate, - dd : translate, - M : translate, - MM : translate, - y : translate, - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. + // Check if its resolved in the cache + if (commandCache.has(command)) { + return commandCache.get(command); } -}); -return sk; + try { + resolved = !noExtension ? + which.sync(command) : + which.sync(command, { pathExt: path.delimiter + (process.env.PATHEXT || '') }); + } catch (e) { /* empty */ } + + commandCache.set(command + '!' + noExtension, resolved); + + return resolved; +} -}))); +module.exports = resolveCommand; /***/ }), -/* 190 */ +/* 93 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Slovenian [sl] -//! author : Robert Sedovšek : https://github.com/sedovsek - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var result = number + ' '; - switch (key) { - case 's': - return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami'; - case 'ss': - if (number === 1) { - result += withoutSuffix ? 'sekundo' : 'sekundi'; - } else if (number === 2) { - result += withoutSuffix || isFuture ? 'sekundi' : 'sekundah'; - } else if (number < 5) { - result += withoutSuffix || isFuture ? 'sekunde' : 'sekundah'; - } else { - result += withoutSuffix || isFuture ? 'sekund' : 'sekund'; - } - return result; - case 'm': - return withoutSuffix ? 'ena minuta' : 'eno minuto'; - case 'mm': - if (number === 1) { - result += withoutSuffix ? 'minuta' : 'minuto'; - } else if (number === 2) { - result += withoutSuffix || isFuture ? 'minuti' : 'minutama'; - } else if (number < 5) { - result += withoutSuffix || isFuture ? 'minute' : 'minutami'; - } else { - result += withoutSuffix || isFuture ? 'minut' : 'minutami'; - } - return result; - case 'h': - return withoutSuffix ? 'ena ura' : 'eno uro'; - case 'hh': - if (number === 1) { - result += withoutSuffix ? 'ura' : 'uro'; - } else if (number === 2) { - result += withoutSuffix || isFuture ? 'uri' : 'urama'; - } else if (number < 5) { - result += withoutSuffix || isFuture ? 'ure' : 'urami'; - } else { - result += withoutSuffix || isFuture ? 'ur' : 'urami'; - } - return result; - case 'd': - return withoutSuffix || isFuture ? 'en dan' : 'enim dnem'; - case 'dd': - if (number === 1) { - result += withoutSuffix || isFuture ? 'dan' : 'dnem'; - } else if (number === 2) { - result += withoutSuffix || isFuture ? 'dni' : 'dnevoma'; - } else { - result += withoutSuffix || isFuture ? 'dni' : 'dnevi'; - } - return result; - case 'M': - return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem'; - case 'MM': - if (number === 1) { - result += withoutSuffix || isFuture ? 'mesec' : 'mesecem'; - } else if (number === 2) { - result += withoutSuffix || isFuture ? 'meseca' : 'mesecema'; - } else if (number < 5) { - result += withoutSuffix || isFuture ? 'mesece' : 'meseci'; - } else { - result += withoutSuffix || isFuture ? 'mesecev' : 'meseci'; - } - return result; - case 'y': - return withoutSuffix || isFuture ? 'eno leto' : 'enim letom'; - case 'yy': - if (number === 1) { - result += withoutSuffix || isFuture ? 'leto' : 'letom'; - } else if (number === 2) { - result += withoutSuffix || isFuture ? 'leti' : 'letoma'; - } else if (number < 5) { - result += withoutSuffix || isFuture ? 'leta' : 'leti'; - } else { - result += withoutSuffix || isFuture ? 'let' : 'leti'; - } - return result; - } -} - -var sl = moment.defineLocale('sl', { - months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'), - monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'), - monthsParseExact: true, - weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'), - weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'), - weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM YYYY', - LLL : 'D. MMMM YYYY H:mm', - LLLL : 'dddd, D. MMMM YYYY H:mm' - }, - calendar : { - sameDay : '[danes ob] LT', - nextDay : '[jutri ob] LT', - - nextWeek : function () { - switch (this.day()) { - case 0: - return '[v] [nedeljo] [ob] LT'; - case 3: - return '[v] [sredo] [ob] LT'; - case 6: - return '[v] [soboto] [ob] LT'; - case 1: - case 2: - case 4: - case 5: - return '[v] dddd [ob] LT'; - } - }, - lastDay : '[včeraj ob] LT', - lastWeek : function () { - switch (this.day()) { - case 0: - return '[prejšnjo] [nedeljo] [ob] LT'; - case 3: - return '[prejšnjo] [sredo] [ob] LT'; - case 6: - return '[prejšnjo] [soboto] [ob] LT'; - case 1: - case 2: - case 4: - case 5: - return '[prejšnji] dddd [ob] LT'; - } - }, - sameElse : 'L' - }, - relativeTime : { - future : 'čez %s', - past : 'pred %s', - s : processRelativeTime, - ss : processRelativeTime, - m : processRelativeTime, - mm : processRelativeTime, - h : processRelativeTime, - hh : processRelativeTime, - d : processRelativeTime, - dd : processRelativeTime, - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); +"use strict"; -return sl; -}))); +module.exports = LRUCache +// This will be a proper iterable 'Map' in engines that support it, +// or a fakey-fake PseudoMap in older versions. +var Map = __webpack_require__(203) +var util = __webpack_require__(8) -/***/ }), -/* 191 */ -/***/ (function(module, exports, __webpack_require__) { +// A linked list to keep track of recently-used-ness +var Yallist = __webpack_require__(205) -//! moment.js locale configuration -//! locale : Albanian [sq] -//! author : Flakërim Ismani : https://github.com/flakerimi -//! author : Menelion Elensúle : https://github.com/Oire -//! author : Oerd Cukalla : https://github.com/oerd - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var sq = moment.defineLocale('sq', { - months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'), - monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'), - weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'), - weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'), - weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'), - weekdaysParseExact : true, - meridiemParse: /PD|MD/, - isPM: function (input) { - return input.charAt(0) === 'M'; - }, - meridiem : function (hours, minutes, isLower) { - return hours < 12 ? 'PD' : 'MD'; - }, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[Sot në] LT', - nextDay : '[Nesër në] LT', - nextWeek : 'dddd [në] LT', - lastDay : '[Dje në] LT', - lastWeek : 'dddd [e kaluar në] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'në %s', - past : '%s më parë', - s : 'disa sekonda', - ss : '%d sekonda', - m : 'një minutë', - mm : '%d minuta', - h : 'një orë', - hh : '%d orë', - d : 'një ditë', - dd : '%d ditë', - M : 'një muaj', - MM : '%d muaj', - y : 'një vit', - yy : '%d vite' - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); +// use symbols if possible, otherwise just _props +var hasSymbol = typeof Symbol === 'function' +var makeSymbol +if (hasSymbol) { + makeSymbol = function (key) { + return Symbol.for(key) + } +} else { + makeSymbol = function (key) { + return '_' + key + } +} -return sq; +var MAX = makeSymbol('max') +var LENGTH = makeSymbol('length') +var LENGTH_CALCULATOR = makeSymbol('lengthCalculator') +var ALLOW_STALE = makeSymbol('allowStale') +var MAX_AGE = makeSymbol('maxAge') +var DISPOSE = makeSymbol('dispose') +var NO_DISPOSE_ON_SET = makeSymbol('noDisposeOnSet') +var LRU_LIST = makeSymbol('lruList') +var CACHE = makeSymbol('cache') -}))); +function naiveLength () { return 1 } +// lruList is a yallist where the head is the youngest +// item, and the tail is the oldest. the list contains the Hit +// objects as the entries. +// Each Hit object has a reference to its Yallist.Node. This +// never changes. +// +// cache is a Map (or PseudoMap) that matches the keys to +// the Yallist.Node object. +function LRUCache (options) { + if (!(this instanceof LRUCache)) { + return new LRUCache(options) + } -/***/ }), -/* 192 */ -/***/ (function(module, exports, __webpack_require__) { + if (typeof options === 'number') { + options = { max: options } + } -//! moment.js locale configuration -//! locale : Serbian [sr] -//! author : Milan Janačković : https://github.com/milan-j - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var translator = { - words: { //Different grammatical cases - ss: ['sekunda', 'sekunde', 'sekundi'], - m: ['jedan minut', 'jedne minute'], - mm: ['minut', 'minute', 'minuta'], - h: ['jedan sat', 'jednog sata'], - hh: ['sat', 'sata', 'sati'], - dd: ['dan', 'dana', 'dana'], - MM: ['mesec', 'meseca', 'meseci'], - yy: ['godina', 'godine', 'godina'] - }, - correctGrammaticalCase: function (number, wordKey) { - return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]); - }, - translate: function (number, withoutSuffix, key) { - var wordKey = translator.words[key]; - if (key.length === 1) { - return withoutSuffix ? wordKey[0] : wordKey[1]; - } else { - return number + ' ' + translator.correctGrammaticalCase(number, wordKey); - } - } -}; + if (!options) { + options = {} + } -var sr = moment.defineLocale('sr', { - months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'), - monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'), - monthsParseExact: true, - weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'), - weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'), - weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'), - weekdaysParseExact : true, - longDateFormat: { - LT: 'H:mm', - LTS : 'H:mm:ss', - L: 'DD.MM.YYYY', - LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY H:mm', - LLLL: 'dddd, D. MMMM YYYY H:mm' - }, - calendar: { - sameDay: '[danas u] LT', - nextDay: '[sutra u] LT', - nextWeek: function () { - switch (this.day()) { - case 0: - return '[u] [nedelju] [u] LT'; - case 3: - return '[u] [sredu] [u] LT'; - case 6: - return '[u] [subotu] [u] LT'; - case 1: - case 2: - case 4: - case 5: - return '[u] dddd [u] LT'; - } - }, - lastDay : '[juče u] LT', - lastWeek : function () { - var lastWeekDays = [ - '[prošle] [nedelje] [u] LT', - '[prošlog] [ponedeljka] [u] LT', - '[prošlog] [utorka] [u] LT', - '[prošle] [srede] [u] LT', - '[prošlog] [četvrtka] [u] LT', - '[prošlog] [petka] [u] LT', - '[prošle] [subote] [u] LT' - ]; - return lastWeekDays[this.day()]; - }, - sameElse : 'L' - }, - relativeTime : { - future : 'za %s', - past : 'pre %s', - s : 'nekoliko sekundi', - ss : translator.translate, - m : translator.translate, - mm : translator.translate, - h : translator.translate, - hh : translator.translate, - d : 'dan', - dd : translator.translate, - M : 'mesec', - MM : translator.translate, - y : 'godinu', - yy : translator.translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); + var max = this[MAX] = options.max + // Kind of weird to have a default max of Infinity, but oh well. + if (!max || + !(typeof max === 'number') || + max <= 0) { + this[MAX] = Infinity + } -return sr; + var lc = options.length || naiveLength + if (typeof lc !== 'function') { + lc = naiveLength + } + this[LENGTH_CALCULATOR] = lc -}))); + this[ALLOW_STALE] = options.stale || false + this[MAX_AGE] = options.maxAge || 0 + this[DISPOSE] = options.dispose + this[NO_DISPOSE_ON_SET] = options.noDisposeOnSet || false + this.reset() +} +// resize the cache when the max changes. +Object.defineProperty(LRUCache.prototype, 'max', { + set: function (mL) { + if (!mL || !(typeof mL === 'number') || mL <= 0) { + mL = Infinity + } + this[MAX] = mL + trim(this) + }, + get: function () { + return this[MAX] + }, + enumerable: true +}) -/***/ }), -/* 193 */ -/***/ (function(module, exports, __webpack_require__) { +Object.defineProperty(LRUCache.prototype, 'allowStale', { + set: function (allowStale) { + this[ALLOW_STALE] = !!allowStale + }, + get: function () { + return this[ALLOW_STALE] + }, + enumerable: true +}) -//! moment.js locale configuration -//! locale : Serbian Cyrillic [sr-cyrl] -//! author : Milan Janačković : https://github.com/milan-j - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var translator = { - words: { //Different grammatical cases - ss: ['секунда', 'секунде', 'секунди'], - m: ['један минут', 'једне минуте'], - mm: ['минут', 'минуте', 'минута'], - h: ['један сат', 'једног сата'], - hh: ['сат', 'сата', 'сати'], - dd: ['дан', 'дана', 'дана'], - MM: ['месец', 'месеца', 'месеци'], - yy: ['година', 'године', 'година'] - }, - correctGrammaticalCase: function (number, wordKey) { - return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]); - }, - translate: function (number, withoutSuffix, key) { - var wordKey = translator.words[key]; - if (key.length === 1) { - return withoutSuffix ? wordKey[0] : wordKey[1]; - } else { - return number + ' ' + translator.correctGrammaticalCase(number, wordKey); - } +Object.defineProperty(LRUCache.prototype, 'maxAge', { + set: function (mA) { + if (!mA || !(typeof mA === 'number') || mA < 0) { + mA = 0 } -}; + this[MAX_AGE] = mA + trim(this) + }, + get: function () { + return this[MAX_AGE] + }, + enumerable: true +}) -var srCyrl = moment.defineLocale('sr-cyrl', { - months: 'јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар'.split('_'), - monthsShort: 'јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.'.split('_'), - monthsParseExact: true, - weekdays: 'недеља_понедељак_уторак_среда_четвртак_петак_субота'.split('_'), - weekdaysShort: 'нед._пон._уто._сре._чет._пет._суб.'.split('_'), - weekdaysMin: 'не_по_ут_ср_че_пе_су'.split('_'), - weekdaysParseExact : true, - longDateFormat: { - LT: 'H:mm', - LTS : 'H:mm:ss', - L: 'DD.MM.YYYY', - LL: 'D. MMMM YYYY', - LLL: 'D. MMMM YYYY H:mm', - LLLL: 'dddd, D. MMMM YYYY H:mm' - }, - calendar: { - sameDay: '[данас у] LT', - nextDay: '[сутра у] LT', - nextWeek: function () { - switch (this.day()) { - case 0: - return '[у] [недељу] [у] LT'; - case 3: - return '[у] [среду] [у] LT'; - case 6: - return '[у] [суботу] [у] LT'; - case 1: - case 2: - case 4: - case 5: - return '[у] dddd [у] LT'; - } - }, - lastDay : '[јуче у] LT', - lastWeek : function () { - var lastWeekDays = [ - '[прошле] [недеље] [у] LT', - '[прошлог] [понедељка] [у] LT', - '[прошлог] [уторка] [у] LT', - '[прошле] [среде] [у] LT', - '[прошлог] [четвртка] [у] LT', - '[прошлог] [петка] [у] LT', - '[прошле] [суботе] [у] LT' - ]; - return lastWeekDays[this.day()]; - }, - sameElse : 'L' - }, - relativeTime : { - future : 'за %s', - past : 'пре %s', - s : 'неколико секунди', - ss : translator.translate, - m : translator.translate, - mm : translator.translate, - h : translator.translate, - hh : translator.translate, - d : 'дан', - dd : translator.translate, - M : 'месец', - MM : translator.translate, - y : 'годину', - yy : translator.translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. +// resize the cache when the lengthCalculator changes. +Object.defineProperty(LRUCache.prototype, 'lengthCalculator', { + set: function (lC) { + if (typeof lC !== 'function') { + lC = naiveLength } -}); - -return srCyrl; + if (lC !== this[LENGTH_CALCULATOR]) { + this[LENGTH_CALCULATOR] = lC + this[LENGTH] = 0 + this[LRU_LIST].forEach(function (hit) { + hit.length = this[LENGTH_CALCULATOR](hit.value, hit.key) + this[LENGTH] += hit.length + }, this) + } + trim(this) + }, + get: function () { return this[LENGTH_CALCULATOR] }, + enumerable: true +}) -}))); +Object.defineProperty(LRUCache.prototype, 'length', { + get: function () { return this[LENGTH] }, + enumerable: true +}) +Object.defineProperty(LRUCache.prototype, 'itemCount', { + get: function () { return this[LRU_LIST].length }, + enumerable: true +}) -/***/ }), -/* 194 */ -/***/ (function(module, exports, __webpack_require__) { +LRUCache.prototype.rforEach = function (fn, thisp) { + thisp = thisp || this + for (var walker = this[LRU_LIST].tail; walker !== null;) { + var prev = walker.prev + forEachStep(this, fn, walker, thisp) + walker = prev + } +} -//! moment.js locale configuration -//! locale : siSwati [ss] -//! author : Nicolai Davies : https://github.com/nicolaidavies - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - - -var ss = moment.defineLocale('ss', { - months : "Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split('_'), - monthsShort : 'Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo'.split('_'), - weekdays : 'Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo'.split('_'), - weekdaysShort : 'Lis_Umb_Lsb_Les_Lsi_Lsh_Umg'.split('_'), - weekdaysMin : 'Li_Us_Lb_Lt_Ls_Lh_Ug'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY h:mm A', - LLLL : 'dddd, D MMMM YYYY h:mm A' - }, - calendar : { - sameDay : '[Namuhla nga] LT', - nextDay : '[Kusasa nga] LT', - nextWeek : 'dddd [nga] LT', - lastDay : '[Itolo nga] LT', - lastWeek : 'dddd [leliphelile] [nga] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'nga %s', - past : 'wenteka nga %s', - s : 'emizuzwana lomcane', - ss : '%d mzuzwana', - m : 'umzuzu', - mm : '%d emizuzu', - h : 'lihora', - hh : '%d emahora', - d : 'lilanga', - dd : '%d emalanga', - M : 'inyanga', - MM : '%d tinyanga', - y : 'umnyaka', - yy : '%d iminyaka' - }, - meridiemParse: /ekuseni|emini|entsambama|ebusuku/, - meridiem : function (hours, minutes, isLower) { - if (hours < 11) { - return 'ekuseni'; - } else if (hours < 15) { - return 'emini'; - } else if (hours < 19) { - return 'entsambama'; - } else { - return 'ebusuku'; - } - }, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'ekuseni') { - return hour; - } else if (meridiem === 'emini') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === 'entsambama' || meridiem === 'ebusuku') { - if (hour === 0) { - return 0; - } - return hour + 12; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}/, - ordinal : '%d', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. +function forEachStep (self, fn, node, thisp) { + var hit = node.value + if (isStale(self, hit)) { + del(self, node) + if (!self[ALLOW_STALE]) { + hit = undefined } -}); + } + if (hit) { + fn.call(thisp, hit.value, hit.key, self) + } +} + +LRUCache.prototype.forEach = function (fn, thisp) { + thisp = thisp || this + for (var walker = this[LRU_LIST].head; walker !== null;) { + var next = walker.next + forEachStep(this, fn, walker, thisp) + walker = next + } +} -return ss; +LRUCache.prototype.keys = function () { + return this[LRU_LIST].toArray().map(function (k) { + return k.key + }, this) +} -}))); +LRUCache.prototype.values = function () { + return this[LRU_LIST].toArray().map(function (k) { + return k.value + }, this) +} +LRUCache.prototype.reset = function () { + if (this[DISPOSE] && + this[LRU_LIST] && + this[LRU_LIST].length) { + this[LRU_LIST].forEach(function (hit) { + this[DISPOSE](hit.key, hit.value) + }, this) + } -/***/ }), -/* 195 */ -/***/ (function(module, exports, __webpack_require__) { + this[CACHE] = new Map() // hash of items by key + this[LRU_LIST] = new Yallist() // list of items in order of use recency + this[LENGTH] = 0 // length of items in the list +} -//! moment.js locale configuration -//! locale : Swedish [sv] -//! author : Jens Alm : https://github.com/ulmus - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var sv = moment.defineLocale('sv', { - months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'), - monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'), - weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'), - weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'), - weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY-MM-DD', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY [kl.] HH:mm', - LLLL : 'dddd D MMMM YYYY [kl.] HH:mm', - lll : 'D MMM YYYY HH:mm', - llll : 'ddd D MMM YYYY HH:mm' - }, - calendar : { - sameDay: '[Idag] LT', - nextDay: '[Imorgon] LT', - lastDay: '[Igår] LT', - nextWeek: '[På] dddd LT', - lastWeek: '[I] dddd[s] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'om %s', - past : 'för %s sedan', - s : 'några sekunder', - ss : '%d sekunder', - m : 'en minut', - mm : '%d minuter', - h : 'en timme', - hh : '%d timmar', - d : 'en dag', - dd : '%d dagar', - M : 'en månad', - MM : '%d månader', - y : 'ett år', - yy : '%d år' - }, - dayOfMonthOrdinalParse: /\d{1,2}(e|a)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'e' : - (b === 1) ? 'a' : - (b === 2) ? 'a' : - (b === 3) ? 'e' : 'e'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. +LRUCache.prototype.dump = function () { + return this[LRU_LIST].map(function (hit) { + if (!isStale(this, hit)) { + return { + k: hit.key, + v: hit.value, + e: hit.now + (hit.maxAge || 0) + } } -}); + }, this).toArray().filter(function (h) { + return h + }) +} -return sv; +LRUCache.prototype.dumpLru = function () { + return this[LRU_LIST] +} -}))); +LRUCache.prototype.inspect = function (n, opts) { + var str = 'LRUCache {' + var extras = false + var as = this[ALLOW_STALE] + if (as) { + str += '\n allowStale: true' + extras = true + } -/***/ }), -/* 196 */ -/***/ (function(module, exports, __webpack_require__) { + var max = this[MAX] + if (max && max !== Infinity) { + if (extras) { + str += ',' + } + str += '\n max: ' + util.inspect(max, opts) + extras = true + } -//! moment.js locale configuration -//! locale : Swahili [sw] -//! author : Fahad Kassim : https://github.com/fadsel - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var sw = moment.defineLocale('sw', { - months : 'Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba'.split('_'), - monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des'.split('_'), - weekdays : 'Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi'.split('_'), - weekdaysShort : 'Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos'.split('_'), - weekdaysMin : 'J2_J3_J4_J5_Al_Ij_J1'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[leo saa] LT', - nextDay : '[kesho saa] LT', - nextWeek : '[wiki ijayo] dddd [saat] LT', - lastDay : '[jana] LT', - lastWeek : '[wiki iliyopita] dddd [saat] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s baadaye', - past : 'tokea %s', - s : 'hivi punde', - ss : 'sekunde %d', - m : 'dakika moja', - mm : 'dakika %d', - h : 'saa limoja', - hh : 'masaa %d', - d : 'siku moja', - dd : 'masiku %d', - M : 'mwezi mmoja', - MM : 'miezi %d', - y : 'mwaka mmoja', - yy : 'miaka %d' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. + var maxAge = this[MAX_AGE] + if (maxAge) { + if (extras) { + str += ',' } -}); + str += '\n maxAge: ' + util.inspect(maxAge, opts) + extras = true + } + + var lc = this[LENGTH_CALCULATOR] + if (lc && lc !== naiveLength) { + if (extras) { + str += ',' + } + str += '\n length: ' + util.inspect(this[LENGTH], opts) + extras = true + } -return sw; + var didFirst = false + this[LRU_LIST].forEach(function (item) { + if (didFirst) { + str += ',\n ' + } else { + if (extras) { + str += ',\n' + } + didFirst = true + str += '\n ' + } + var key = util.inspect(item.key).split('\n').join('\n ') + var val = { value: item.value } + if (item.maxAge !== maxAge) { + val.maxAge = item.maxAge + } + if (lc !== naiveLength) { + val.length = item.length + } + if (isStale(this, item)) { + val.stale = true + } -}))); + val = util.inspect(val, opts).split('\n').join('\n ') + str += key + ' => ' + val + }) + if (didFirst || extras) { + str += '\n' + } + str += '}' -/***/ }), -/* 197 */ -/***/ (function(module, exports, __webpack_require__) { + return str +} -//! moment.js locale configuration -//! locale : Tamil [ta] -//! author : Arjunkumar Krishnamoorthy : https://github.com/tk120404 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var symbolMap = { - '1': '௧', - '2': '௨', - '3': '௩', - '4': '௪', - '5': '௫', - '6': '௬', - '7': '௭', - '8': '௮', - '9': '௯', - '0': '௦' -}; -var numberMap = { - '௧': '1', - '௨': '2', - '௩': '3', - '௪': '4', - '௫': '5', - '௬': '6', - '௭': '7', - '௮': '8', - '௯': '9', - '௦': '0' -}; +LRUCache.prototype.set = function (key, value, maxAge) { + maxAge = maxAge || this[MAX_AGE] -var ta = moment.defineLocale('ta', { - months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'), - monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'), - weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'), - weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'), - weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, HH:mm', - LLLL : 'dddd, D MMMM YYYY, HH:mm' - }, - calendar : { - sameDay : '[இன்று] LT', - nextDay : '[நாளை] LT', - nextWeek : 'dddd, LT', - lastDay : '[நேற்று] LT', - lastWeek : '[கடந்த வாரம்] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s இல்', - past : '%s முன்', - s : 'ஒரு சில விநாடிகள்', - ss : '%d விநாடிகள்', - m : 'ஒரு நிமிடம்', - mm : '%d நிமிடங்கள்', - h : 'ஒரு மணி நேரம்', - hh : '%d மணி நேரம்', - d : 'ஒரு நாள்', - dd : '%d நாட்கள்', - M : 'ஒரு மாதம்', - MM : '%d மாதங்கள்', - y : 'ஒரு வருடம்', - yy : '%d ஆண்டுகள்' - }, - dayOfMonthOrdinalParse: /\d{1,2}வது/, - ordinal : function (number) { - return number + 'வது'; - }, - preparse: function (string) { - return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) { - return numberMap[match]; - }); - }, - postformat: function (string) { - return string.replace(/\d/g, function (match) { - return symbolMap[match]; - }); - }, - // refer http://ta.wikipedia.org/s/1er1 - meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/, - meridiem : function (hour, minute, isLower) { - if (hour < 2) { - return ' யாமம்'; - } else if (hour < 6) { - return ' வைகறை'; // வைகறை - } else if (hour < 10) { - return ' காலை'; // காலை - } else if (hour < 14) { - return ' நண்பகல்'; // நண்பகல் - } else if (hour < 18) { - return ' எற்பாடு'; // எற்பாடு - } else if (hour < 22) { - return ' மாலை'; // மாலை - } else { - return ' யாமம்'; - } - }, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'யாமம்') { - return hour < 2 ? hour : hour + 12; - } else if (meridiem === 'வைகறை' || meridiem === 'காலை') { - return hour; - } else if (meridiem === 'நண்பகல்') { - return hour >= 10 ? hour : hour + 12; - } else { - return hour + 12; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. + var now = maxAge ? Date.now() : 0 + var len = this[LENGTH_CALCULATOR](value, key) + + if (this[CACHE].has(key)) { + if (len > this[MAX]) { + del(this, this[CACHE].get(key)) + return false } -}); -return ta; + var node = this[CACHE].get(key) + var item = node.value -}))); + // dispose of the old one before overwriting + // split out into 2 ifs for better coverage tracking + if (this[DISPOSE]) { + if (!this[NO_DISPOSE_ON_SET]) { + this[DISPOSE](key, item.value) + } + } + item.now = now + item.maxAge = maxAge + item.value = value + this[LENGTH] += len - item.length + item.length = len + this.get(key) + trim(this) + return true + } -/***/ }), -/* 198 */ -/***/ (function(module, exports, __webpack_require__) { + var hit = new Entry(key, value, len, now, maxAge) -//! moment.js locale configuration -//! locale : Telugu [te] -//! author : Krishna Chaitanya Thota : https://github.com/kcthota - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var te = moment.defineLocale('te', { - months : 'జనవరి_ఫిబ్రవరి_మార్చి_ఏప్రిల్_మే_జూన్_జూలై_ఆగస్టు_సెప్టెంబర్_అక్టోబర్_నవంబర్_డిసెంబర్'.split('_'), - monthsShort : 'జన._ఫిబ్ర._మార్చి_ఏప్రి._మే_జూన్_జూలై_ఆగ._సెప్._అక్టో._నవ._డిసె.'.split('_'), - monthsParseExact : true, - weekdays : 'ఆదివారం_సోమవారం_మంగళవారం_బుధవారం_గురువారం_శుక్రవారం_శనివారం'.split('_'), - weekdaysShort : 'ఆది_సోమ_మంగళ_బుధ_గురు_శుక్ర_శని'.split('_'), - weekdaysMin : 'ఆ_సో_మం_బు_గు_శు_శ'.split('_'), - longDateFormat : { - LT : 'A h:mm', - LTS : 'A h:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY, A h:mm', - LLLL : 'dddd, D MMMM YYYY, A h:mm' - }, - calendar : { - sameDay : '[నేడు] LT', - nextDay : '[రేపు] LT', - nextWeek : 'dddd, LT', - lastDay : '[నిన్న] LT', - lastWeek : '[గత] dddd, LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s లో', - past : '%s క్రితం', - s : 'కొన్ని క్షణాలు', - ss : '%d సెకన్లు', - m : 'ఒక నిమిషం', - mm : '%d నిమిషాలు', - h : 'ఒక గంట', - hh : '%d గంటలు', - d : 'ఒక రోజు', - dd : '%d రోజులు', - M : 'ఒక నెల', - MM : '%d నెలలు', - y : 'ఒక సంవత్సరం', - yy : '%d సంవత్సరాలు' - }, - dayOfMonthOrdinalParse : /\d{1,2}వ/, - ordinal : '%dవ', - meridiemParse: /రాత్రి|ఉదయం|మధ్యాహ్నం|సాయంత్రం/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === 'రాత్రి') { - return hour < 4 ? hour : hour + 12; - } else if (meridiem === 'ఉదయం') { - return hour; - } else if (meridiem === 'మధ్యాహ్నం') { - return hour >= 10 ? hour : hour + 12; - } else if (meridiem === 'సాయంత్రం') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'రాత్రి'; - } else if (hour < 10) { - return 'ఉదయం'; - } else if (hour < 17) { - return 'మధ్యాహ్నం'; - } else if (hour < 20) { - return 'సాయంత్రం'; - } else { - return 'రాత్రి'; - } - }, - week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. + // oversized objects fall out of cache automatically. + if (hit.length > this[MAX]) { + if (this[DISPOSE]) { + this[DISPOSE](key, value) } -}); + return false + } -return te; + this[LENGTH] += hit.length + this[LRU_LIST].unshift(hit) + this[CACHE].set(key, this[LRU_LIST].head) + trim(this) + return true +} -}))); +LRUCache.prototype.has = function (key) { + if (!this[CACHE].has(key)) return false + var hit = this[CACHE].get(key).value + if (isStale(this, hit)) { + return false + } + return true +} +LRUCache.prototype.get = function (key) { + return get(this, key, true) +} -/***/ }), -/* 199 */ -/***/ (function(module, exports, __webpack_require__) { +LRUCache.prototype.peek = function (key) { + return get(this, key, false) +} + +LRUCache.prototype.pop = function () { + var node = this[LRU_LIST].tail + if (!node) return null + del(this, node) + return node.value +} + +LRUCache.prototype.del = function (key) { + del(this, this[CACHE].get(key)) +} + +LRUCache.prototype.load = function (arr) { + // reset the cache + this.reset() + + var now = Date.now() + // A previous serialized cache has the most recent items first + for (var l = arr.length - 1; l >= 0; l--) { + var hit = arr[l] + var expiresAt = hit.e || 0 + if (expiresAt === 0) { + // the item was created without expiration in a non aged cache + this.set(hit.k, hit.v) + } else { + var maxAge = expiresAt - now + // dont add already expired items + if (maxAge > 0) { + this.set(hit.k, hit.v, maxAge) + } + } + } +} + +LRUCache.prototype.prune = function () { + var self = this + this[CACHE].forEach(function (value, key) { + get(self, key, false) + }) +} + +function get (self, key, doUse) { + var node = self[CACHE].get(key) + if (node) { + var hit = node.value + if (isStale(self, hit)) { + del(self, node) + if (!self[ALLOW_STALE]) hit = undefined + } else { + if (doUse) { + self[LRU_LIST].unshiftNode(node) + } + } + if (hit) hit = hit.value + } + return hit +} + +function isStale (self, hit) { + if (!hit || (!hit.maxAge && !self[MAX_AGE])) { + return false + } + var stale = false + var diff = Date.now() - hit.now + if (hit.maxAge) { + stale = diff > hit.maxAge + } else { + stale = self[MAX_AGE] && (diff > self[MAX_AGE]) + } + return stale +} -//! moment.js locale configuration -//! locale : Tetun Dili (East Timor) [tet] -//! author : Joshua Brooks : https://github.com/joshbrooks -//! author : Onorio De J. Afonso : https://github.com/marobo - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var tet = moment.defineLocale('tet', { - months : 'Janeiru_Fevereiru_Marsu_Abril_Maiu_Juniu_Juliu_Augustu_Setembru_Outubru_Novembru_Dezembru'.split('_'), - monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Aug_Set_Out_Nov_Dez'.split('_'), - weekdays : 'Domingu_Segunda_Tersa_Kuarta_Kinta_Sexta_Sabadu'.split('_'), - weekdaysShort : 'Dom_Seg_Ters_Kua_Kint_Sext_Sab'.split('_'), - weekdaysMin : 'Do_Seg_Te_Ku_Ki_Sex_Sa'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[Ohin iha] LT', - nextDay: '[Aban iha] LT', - nextWeek: 'dddd [iha] LT', - lastDay: '[Horiseik iha] LT', - lastWeek: 'dddd [semana kotuk] [iha] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'iha %s', - past : '%s liuba', - s : 'minutu balun', - ss : 'minutu %d', - m : 'minutu ida', - mm : 'minutus %d', - h : 'horas ida', - hh : 'horas %d', - d : 'loron ida', - dd : 'loron %d', - M : 'fulan ida', - MM : 'fulan %d', - y : 'tinan ida', - yy : 'tinan %d' - }, - dayOfMonthOrdinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. +function trim (self) { + if (self[LENGTH] > self[MAX]) { + for (var walker = self[LRU_LIST].tail; + self[LENGTH] > self[MAX] && walker !== null;) { + // We know that we're about to delete this one, and also + // what the next least recently used key will be, so just + // go ahead and set it now. + var prev = walker.prev + del(self, walker) + walker = prev } -}); + } +} -return tet; +function del (self, node) { + if (node) { + var hit = node.value + if (self[DISPOSE]) { + self[DISPOSE](hit.key, hit.value) + } + self[LENGTH] -= hit.length + self[CACHE].delete(hit.key) + self[LRU_LIST].removeNode(node) + } +} -}))); +// classy, since V8 prefers predictable objects. +function Entry (key, value, length, now, maxAge) { + this.key = key + this.value = value + this.length = length + this.now = now + this.maxAge = maxAge || 0 +} /***/ }), -/* 200 */ +/* 94 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Thai [th] -//! author : Kridsada Thanabulpong : https://github.com/sirn - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var th = moment.defineLocale('th', { - months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'), - monthsShort : 'ม.ค._ก.พ._มี.ค._เม.ย._พ.ค._มิ.ย._ก.ค._ส.ค._ก.ย._ต.ค._พ.ย._ธ.ค.'.split('_'), - monthsParseExact: true, - weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'), - weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference - weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'H:mm', - LTS : 'H:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY เวลา H:mm', - LLLL : 'วันddddที่ D MMMM YYYY เวลา H:mm' - }, - meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/, - isPM: function (input) { - return input === 'หลังเที่ยง'; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'ก่อนเที่ยง'; - } else { - return 'หลังเที่ยง'; - } - }, - calendar : { - sameDay : '[วันนี้ เวลา] LT', - nextDay : '[พรุ่งนี้ เวลา] LT', - nextWeek : 'dddd[หน้า เวลา] LT', - lastDay : '[เมื่อวานนี้ เวลา] LT', - lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'อีก %s', - past : '%sที่แล้ว', - s : 'ไม่กี่วินาที', - ss : '%d วินาที', - m : '1 นาที', - mm : '%d นาที', - h : '1 ชั่วโมง', - hh : '%d ชั่วโมง', - d : '1 วัน', - dd : '%d วัน', - M : '1 เดือน', - MM : '%d เดือน', - y : '1 ปี', - yy : '%d ปี' - } -}); +"use strict"; + -return th; +function escapeArgument(arg, quote) { + // Convert to string + arg = '' + arg; -}))); + // If we are not going to quote the argument, + // escape shell metacharacters, including double and single quotes: + if (!quote) { + arg = arg.replace(/([()%!^<>&|;,"'\s])/g, '^$1'); + } else { + // Sequence of backslashes followed by a double quote: + // double up all the backslashes and escape the double quote + arg = arg.replace(/(\\*)"/g, '$1$1\\"'); + // Sequence of backslashes followed by the end of the string + // (which will become a double quote later): + // double up all the backslashes + arg = arg.replace(/(\\*)$/, '$1$1'); -/***/ }), -/* 201 */ -/***/ (function(module, exports, __webpack_require__) { + // All other backslashes occur literally -//! moment.js locale configuration -//! locale : Tagalog (Philippines) [tl-ph] -//! author : Dan Hagman : https://github.com/hagmandan - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var tlPh = moment.defineLocale('tl-ph', { - months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'), - monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'), - weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'), - weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'), - weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'MM/D/YYYY', - LL : 'MMMM D, YYYY', - LLL : 'MMMM D, YYYY HH:mm', - LLLL : 'dddd, MMMM DD, YYYY HH:mm' - }, - calendar : { - sameDay: 'LT [ngayong araw]', - nextDay: '[Bukas ng] LT', - nextWeek: 'LT [sa susunod na] dddd', - lastDay: 'LT [kahapon]', - lastWeek: 'LT [noong nakaraang] dddd', - sameElse: 'L' - }, - relativeTime : { - future : 'sa loob ng %s', - past : '%s ang nakalipas', - s : 'ilang segundo', - ss : '%d segundo', - m : 'isang minuto', - mm : '%d minuto', - h : 'isang oras', - hh : '%d oras', - d : 'isang araw', - dd : '%d araw', - M : 'isang buwan', - MM : '%d buwan', - y : 'isang taon', - yy : '%d taon' - }, - dayOfMonthOrdinalParse: /\d{1,2}/, - ordinal : function (number) { - return number; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. + // Quote the whole thing: + arg = '"' + arg + '"'; } -}); -return tlPh; + return arg; +} -}))); +module.exports = escapeArgument; /***/ }), -/* 202 */ +/* 95 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Klingon [tlh] -//! author : Dominika Kruk : https://github.com/amaranthrose - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var numbersNouns = 'pagh_wa’_cha’_wej_loS_vagh_jav_Soch_chorgh_Hut'.split('_'); - -function translateFuture(output) { - var time = output; - time = (output.indexOf('jaj') !== -1) ? - time.slice(0, -3) + 'leS' : - (output.indexOf('jar') !== -1) ? - time.slice(0, -3) + 'waQ' : - (output.indexOf('DIS') !== -1) ? - time.slice(0, -3) + 'nem' : - time + ' pIq'; - return time; -} - -function translatePast(output) { - var time = output; - time = (output.indexOf('jaj') !== -1) ? - time.slice(0, -3) + 'Hu’' : - (output.indexOf('jar') !== -1) ? - time.slice(0, -3) + 'wen' : - (output.indexOf('DIS') !== -1) ? - time.slice(0, -3) + 'ben' : - time + ' ret'; - return time; -} - -function translate(number, withoutSuffix, string, isFuture) { - var numberNoun = numberAsNoun(number); - switch (string) { - case 'ss': - return numberNoun + ' lup'; - case 'mm': - return numberNoun + ' tup'; - case 'hh': - return numberNoun + ' rep'; - case 'dd': - return numberNoun + ' jaj'; - case 'MM': - return numberNoun + ' jar'; - case 'yy': - return numberNoun + ' DIS'; - } -} - -function numberAsNoun(number) { - var hundred = Math.floor((number % 1000) / 100), - ten = Math.floor((number % 100) / 10), - one = number % 10, - word = ''; - if (hundred > 0) { - word += numbersNouns[hundred] + 'vatlh'; - } - if (ten > 0) { - word += ((word !== '') ? ' ' : '') + numbersNouns[ten] + 'maH'; - } - if (one > 0) { - word += ((word !== '') ? ' ' : '') + numbersNouns[one]; - } - return (word === '') ? 'pagh' : word; -} - -var tlh = moment.defineLocale('tlh', { - months : 'tera’ jar wa’_tera’ jar cha’_tera’ jar wej_tera’ jar loS_tera’ jar vagh_tera’ jar jav_tera’ jar Soch_tera’ jar chorgh_tera’ jar Hut_tera’ jar wa’maH_tera’ jar wa’maH wa’_tera’ jar wa’maH cha’'.split('_'), - monthsShort : 'jar wa’_jar cha’_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa’maH_jar wa’maH wa’_jar wa’maH cha’'.split('_'), - monthsParseExact : true, - weekdays : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'), - weekdaysShort : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'), - weekdaysMin : 'lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[DaHjaj] LT', - nextDay: '[wa’leS] LT', - nextWeek: 'LLL', - lastDay: '[wa’Hu’] LT', - lastWeek: 'LLL', - sameElse: 'L' - }, - relativeTime : { - future : translateFuture, - past : translatePast, - s : 'puS lup', - ss : translate, - m : 'wa’ tup', - mm : translate, - h : 'wa’ rep', - hh : translate, - d : 'wa’ jaj', - dd : translate, - M : 'wa’ jar', - MM : translate, - y : 'wa’ DIS', - yy : translate - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return tlh; - -}))); +"use strict"; +const chalk = __webpack_require__(222); -/***/ }), -/* 203 */ -/***/ (function(module, exports, __webpack_require__) { +const isSupported = process.platform !== 'win32' || process.env.CI || process.env.TERM === 'xterm-256color'; -//! moment.js locale configuration -//! locale : Turkish [tr] -//! authors : Erhan Gundogan : https://github.com/erhangundogan, -//! Burak Yiğit Kaya: https://github.com/BYK - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var suffixes = { - 1: '\'inci', - 5: '\'inci', - 8: '\'inci', - 70: '\'inci', - 80: '\'inci', - 2: '\'nci', - 7: '\'nci', - 20: '\'nci', - 50: '\'nci', - 3: '\'üncü', - 4: '\'üncü', - 100: '\'üncü', - 6: '\'ncı', - 9: '\'uncu', - 10: '\'uncu', - 30: '\'uncu', - 60: '\'ıncı', - 90: '\'ıncı' +const main = { + info: chalk.blue('ℹ'), + success: chalk.green('✔'), + warning: chalk.yellow('⚠'), + error: chalk.red('✖') }; -var tr = moment.defineLocale('tr', { - months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'), - monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'), - weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'), - weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'), - weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[bugün saat] LT', - nextDay : '[yarın saat] LT', - nextWeek : '[gelecek] dddd [saat] LT', - lastDay : '[dün] LT', - lastWeek : '[geçen] dddd [saat] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s sonra', - past : '%s önce', - s : 'birkaç saniye', - ss : '%d saniye', - m : 'bir dakika', - mm : '%d dakika', - h : 'bir saat', - hh : '%d saat', - d : 'bir gün', - dd : '%d gün', - M : 'bir ay', - MM : '%d ay', - y : 'bir yıl', - yy : '%d yıl' - }, - dayOfMonthOrdinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/, - ordinal : function (number) { - if (number === 0) { // special case for zero - return number + '\'ıncı'; - } - var a = number % 10, - b = number % 100 - a, - c = number >= 100 ? 100 : null; - return number + (suffixes[a] || suffixes[b] || suffixes[c]); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); - -return tr; +const fallbacks = { + info: chalk.blue('i'), + success: chalk.green('√'), + warning: chalk.yellow('‼'), + error: chalk.red('×') +}; -}))); +module.exports = isSupported ? main : fallbacks; /***/ }), -/* 204 */ +/* 96 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Talossan [tzl] -//! author : Robin van der Vliet : https://github.com/robin0van0der0v -//! author : Iustì Canun - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -// After the year there should be a slash and the amount of years since December 26, 1979 in Roman numerals. -// This is currently too difficult (maybe even impossible) to add. -var tzl = moment.defineLocale('tzl', { - months : 'Januar_Fevraglh_Març_Avrïu_Mai_Gün_Julia_Guscht_Setemvar_Listopäts_Noemvar_Zecemvar'.split('_'), - monthsShort : 'Jan_Fev_Mar_Avr_Mai_Gün_Jul_Gus_Set_Lis_Noe_Zec'.split('_'), - weekdays : 'Súladi_Lúneçi_Maitzi_Márcuri_Xhúadi_Viénerçi_Sáturi'.split('_'), - weekdaysShort : 'Súl_Lún_Mai_Már_Xhú_Vié_Sát'.split('_'), - weekdaysMin : 'Sú_Lú_Ma_Má_Xh_Vi_Sá'.split('_'), - longDateFormat : { - LT : 'HH.mm', - LTS : 'HH.mm.ss', - L : 'DD.MM.YYYY', - LL : 'D. MMMM [dallas] YYYY', - LLL : 'D. MMMM [dallas] YYYY HH.mm', - LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm' - }, - meridiemParse: /d\'o|d\'a/i, - isPM : function (input) { - return 'd\'o' === input.toLowerCase(); - }, - meridiem : function (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'd\'o' : 'D\'O'; - } else { - return isLower ? 'd\'a' : 'D\'A'; - } - }, - calendar : { - sameDay : '[oxhi à] LT', - nextDay : '[demà à] LT', - nextWeek : 'dddd [à] LT', - lastDay : '[ieiri à] LT', - lastWeek : '[sür el] dddd [lasteu à] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'osprei %s', - past : 'ja%s', - s : processRelativeTime, - ss : processRelativeTime, - m : processRelativeTime, - mm : processRelativeTime, - h : processRelativeTime, - hh : processRelativeTime, - d : processRelativeTime, - dd : processRelativeTime, - M : processRelativeTime, - MM : processRelativeTime, - y : processRelativeTime, - yy : processRelativeTime - }, - dayOfMonthOrdinalParse: /\d{1,2}\./, - ordinal : '%d.', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -function processRelativeTime(number, withoutSuffix, key, isFuture) { - var format = { - 's': ['viensas secunds', '\'iensas secunds'], - 'ss': [number + ' secunds', '' + number + ' secunds'], - 'm': ['\'n míut', '\'iens míut'], - 'mm': [number + ' míuts', '' + number + ' míuts'], - 'h': ['\'n þora', '\'iensa þora'], - 'hh': [number + ' þoras', '' + number + ' þoras'], - 'd': ['\'n ziua', '\'iensa ziua'], - 'dd': [number + ' ziuas', '' + number + ' ziuas'], - 'M': ['\'n mes', '\'iens mes'], - 'MM': [number + ' mesen', '' + number + ' mesen'], - 'y': ['\'n ar', '\'iens ar'], - 'yy': [number + ' ars', '' + number + ' ars'] - }; - return isFuture ? format[key][0] : (withoutSuffix ? format[key][0] : format[key][1]); -} - -return tzl; - -}))); +"use strict"; +// Copyright IBM Corp. 2014,2018. All Rights Reserved. +// Node module: strong-log-transformer +// This file is licensed under the Apache License 2.0. +// License text available at https://opensource.org/licenses/Apache-2.0 -/***/ }), -/* 205 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Central Atlas Tamazight [tzm] -//! author : Abdel Said : https://github.com/abdelsaid - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var tzm = moment.defineLocale('tzm', { - months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'), - monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'), - weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'), - weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'), - weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS: 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[ⴰⵙⴷⵅ ⴴ] LT', - nextDay: '[ⴰⵙⴽⴰ ⴴ] LT', - nextWeek: 'dddd [ⴴ] LT', - lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT', - lastWeek: 'dddd [ⴴ] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s', - past : 'ⵢⴰⵏ %s', - s : 'ⵉⵎⵉⴽ', - ss : '%d ⵉⵎⵉⴽ', - m : 'ⵎⵉⵏⵓⴺ', - mm : '%d ⵎⵉⵏⵓⴺ', - h : 'ⵙⴰⵄⴰ', - hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ', - d : 'ⴰⵙⵙ', - dd : '%d oⵙⵙⴰⵏ', - M : 'ⴰⵢoⵓⵔ', - MM : '%d ⵉⵢⵢⵉⵔⵏ', - y : 'ⴰⵙⴳⴰⵙ', - yy : '%d ⵉⵙⴳⴰⵙⵏ' - }, - week : { - dow : 6, // Saturday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); +var stream = __webpack_require__(21); +var util = __webpack_require__(8); +var fs = __webpack_require__(6); -return tzm; +var byline = __webpack_require__(228); +var through = __webpack_require__(230); +var duplexer = __webpack_require__(231); -}))); +module.exports = Logger; +Logger.DEFAULTS = { + format: 'text', + tag: '', + mergeMultiline: false, + timeStamp: false, +}; -/***/ }), -/* 206 */ -/***/ (function(module, exports, __webpack_require__) { +var formatters = { + text: textFormatter, + json: jsonFormatter, +} -//! moment.js locale configuration -//! locale : Central Atlas Tamazight Latin [tzm-latn] -//! author : Abdel Said : https://github.com/abdelsaid - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var tzmLatn = moment.defineLocale('tzm-latn', { - months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'), - monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'), - weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'), - weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'), - weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd D MMMM YYYY HH:mm' - }, - calendar : { - sameDay: '[asdkh g] LT', - nextDay: '[aska g] LT', - nextWeek: 'dddd [g] LT', - lastDay: '[assant g] LT', - lastWeek: 'dddd [g] LT', - sameElse: 'L' - }, - relativeTime : { - future : 'dadkh s yan %s', - past : 'yan %s', - s : 'imik', - ss : '%d imik', - m : 'minuḍ', - mm : '%d minuḍ', - h : 'saɛa', - hh : '%d tassaɛin', - d : 'ass', - dd : '%d ossan', - M : 'ayowr', - MM : '%d iyyirn', - y : 'asgas', - yy : '%d isgasn' - }, - week : { - dow : 6, // Saturday is the first day of the week. - doy : 12 // The week that contains Jan 1st is the first week of the year. - } -}); +function Logger(options) { + var defaults = JSON.parse(JSON.stringify(Logger.DEFAULTS)); + options = util._extend(defaults, options || {}); + var catcher = new byline.LineStream; + var emitter = catcher; + var transforms = [ + objectifier(), + ]; -return tzmLatn; + if (options.tag) { + transforms.push(staticTagger(options.tag)); + } -}))); + if (options.mergeMultiline) { + transforms.push(lineMerger()); + } + // TODO + // if (options.pidStamp) { + // transforms.push(pidStamper(options.pid)); + // } -/***/ }), -/* 207 */ -/***/ (function(module, exports, __webpack_require__) { + // TODO + // if (options.workerStamp) { + // transforms.push(workerStamper(options.worker)); + // } -//! moment.js locale configuration -//! locale : Ukrainian [uk] -//! author : zemlanin : https://github.com/zemlanin -//! Author : Menelion Elensúle : https://github.com/Oire + transforms.push(formatters[options.format](options)); -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; + // restore line endings that were removed by byline + transforms.push(reLiner()); + for (var t in transforms) { + emitter = emitter.pipe(transforms[t]); + } -function plural(word, num) { - var forms = word.split('_'); - return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]); -} -function relativeTimeWithPlural(number, withoutSuffix, key) { - var format = { - 'ss': withoutSuffix ? 'секунда_секунди_секунд' : 'секунду_секунди_секунд', - 'mm': withoutSuffix ? 'хвилина_хвилини_хвилин' : 'хвилину_хвилини_хвилин', - 'hh': withoutSuffix ? 'година_години_годин' : 'годину_години_годин', - 'dd': 'день_дні_днів', - 'MM': 'місяць_місяці_місяців', - 'yy': 'рік_роки_років' - }; - if (key === 'm') { - return withoutSuffix ? 'хвилина' : 'хвилину'; - } - else if (key === 'h') { - return withoutSuffix ? 'година' : 'годину'; - } - else { - return number + ' ' + plural(format[key], +number); - } + return duplexer(catcher, emitter); } -function weekdaysCaseReplace(m, format) { - var weekdays = { - 'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'), - 'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'), - 'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_') - }; - if (!m) { - return weekdays['nominative']; - } +function reLiner() { + return through(appendNewline); - var nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ? - 'accusative' : - ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ? - 'genitive' : - 'nominative'); - return weekdays[nounCase][m.day()]; -} -function processHoursFunction(str) { - return function () { - return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT'; - }; + function appendNewline(line) { + this.emit('data', line + '\n'); + } } -var uk = moment.defineLocale('uk', { - months : { - 'format': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_'), - 'standalone': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_') - }, - monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'), - weekdays : weekdaysCaseReplace, - weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'), - weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD.MM.YYYY', - LL : 'D MMMM YYYY р.', - LLL : 'D MMMM YYYY р., HH:mm', - LLLL : 'dddd, D MMMM YYYY р., HH:mm' - }, - calendar : { - sameDay: processHoursFunction('[Сьогодні '), - nextDay: processHoursFunction('[Завтра '), - lastDay: processHoursFunction('[Вчора '), - nextWeek: processHoursFunction('[У] dddd ['), - lastWeek: function () { - switch (this.day()) { - case 0: - case 3: - case 5: - case 6: - return processHoursFunction('[Минулої] dddd [').call(this); - case 1: - case 2: - case 4: - return processHoursFunction('[Минулого] dddd [').call(this); - } - }, - sameElse: 'L' - }, - relativeTime : { - future : 'за %s', - past : '%s тому', - s : 'декілька секунд', - ss : relativeTimeWithPlural, - m : relativeTimeWithPlural, - mm : relativeTimeWithPlural, - h : 'годину', - hh : relativeTimeWithPlural, - d : 'день', - dd : relativeTimeWithPlural, - M : 'місяць', - MM : relativeTimeWithPlural, - y : 'рік', - yy : relativeTimeWithPlural - }, - // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason - meridiemParse: /ночі|ранку|дня|вечора/, - isPM: function (input) { - return /^(дня|вечора)$/.test(input); - }, - meridiem : function (hour, minute, isLower) { - if (hour < 4) { - return 'ночі'; - } else if (hour < 12) { - return 'ранку'; - } else if (hour < 17) { - return 'дня'; - } else { - return 'вечора'; - } - }, - dayOfMonthOrdinalParse: /\d{1,2}-(й|го)/, - ordinal: function (number, period) { - switch (period) { - case 'M': - case 'd': - case 'DDD': - case 'w': - case 'W': - return number + '-й'; - case 'D': - return number + '-го'; - default: - return number; - } - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. - } -}); - -return uk; +function objectifier() { + return through(objectify, null, {autoDestroy: false}); -}))); + function objectify(line) { + this.emit('data', { + msg: line, + time: Date.now(), + }); + } +} +function staticTagger(tag) { + return through(tagger); -/***/ }), -/* 208 */ -/***/ (function(module, exports, __webpack_require__) { + function tagger(logEvent) { + logEvent.tag = tag; + this.emit('data', logEvent); + } +} -//! moment.js locale configuration -//! locale : Urdu [ur] -//! author : Sawood Alam : https://github.com/ibnesayeed -//! author : Zack : https://github.com/ZackVision - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var months = [ - 'جنوری', - 'فروری', - 'مارچ', - 'اپریل', - 'مئی', - 'جون', - 'جولائی', - 'اگست', - 'ستمبر', - 'اکتوبر', - 'نومبر', - 'دسمبر' -]; -var days = [ - 'اتوار', - 'پیر', - 'منگل', - 'بدھ', - 'جمعرات', - 'جمعہ', - 'ہفتہ' -]; +function textFormatter(options) { + return through(textify); -var ur = moment.defineLocale('ur', { - months : months, - monthsShort : months, - weekdays : days, - weekdaysShort : days, - weekdaysMin : days, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd، D MMMM YYYY HH:mm' - }, - meridiemParse: /صبح|شام/, - isPM : function (input) { - return 'شام' === input; - }, - meridiem : function (hour, minute, isLower) { - if (hour < 12) { - return 'صبح'; - } - return 'شام'; - }, - calendar : { - sameDay : '[آج بوقت] LT', - nextDay : '[کل بوقت] LT', - nextWeek : 'dddd [بوقت] LT', - lastDay : '[گذشتہ روز بوقت] LT', - lastWeek : '[گذشتہ] dddd [بوقت] LT', - sameElse : 'L' - }, - relativeTime : { - future : '%s بعد', - past : '%s قبل', - s : 'چند سیکنڈ', - ss : '%d سیکنڈ', - m : 'ایک منٹ', - mm : '%d منٹ', - h : 'ایک گھنٹہ', - hh : '%d گھنٹے', - d : 'ایک دن', - dd : '%d دن', - M : 'ایک ماہ', - MM : '%d ماہ', - y : 'ایک سال', - yy : '%d سال' - }, - preparse: function (string) { - return string.replace(/،/g, ','); - }, - postformat: function (string) { - return string.replace(/,/g, '،'); - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. + function textify(logEvent) { + var line = util.format('%s%s', textifyTags(logEvent.tag), + logEvent.msg.toString()); + if (options.timeStamp) { + line = util.format('%s %s', new Date(logEvent.time).toISOString(), line); } -}); - -return ur; - -}))); - - -/***/ }), -/* 209 */ -/***/ (function(module, exports, __webpack_require__) { + this.emit('data', line.replace(/\n/g, '\\n')); + } -//! moment.js locale configuration -//! locale : Uzbek [uz] -//! author : Sardor Muminov : https://github.com/muminoff - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var uz = moment.defineLocale('uz', { - months : 'январ_феврал_март_апрел_май_июн_июл_август_сентябр_октябр_ноябр_декабр'.split('_'), - monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'), - weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'), - weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'), - weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'D MMMM YYYY, dddd HH:mm' - }, - calendar : { - sameDay : '[Бугун соат] LT [да]', - nextDay : '[Эртага] LT [да]', - nextWeek : 'dddd [куни соат] LT [да]', - lastDay : '[Кеча соат] LT [да]', - lastWeek : '[Утган] dddd [куни соат] LT [да]', - sameElse : 'L' - }, - relativeTime : { - future : 'Якин %s ичида', - past : 'Бир неча %s олдин', - s : 'фурсат', - ss : '%d фурсат', - m : 'бир дакика', - mm : '%d дакика', - h : 'бир соат', - hh : '%d соат', - d : 'бир кун', - dd : '%d кун', - M : 'бир ой', - MM : '%d ой', - y : 'бир йил', - yy : '%d йил' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 4th is the first week of the year. + function textifyTags(tags) { + var str = ''; + if (typeof tags === 'string') { + str = tags + ' '; + } else if (typeof tags === 'object') { + for (var t in tags) { + str += t + ':' + tags[t] + ' '; + } } -}); - -return uz; - -}))); - + return str; + } +} -/***/ }), -/* 210 */ -/***/ (function(module, exports, __webpack_require__) { +function jsonFormatter(options) { + return through(jsonify); -//! moment.js locale configuration -//! locale : Uzbek Latin [uz-latn] -//! author : Rasulbek Mirzayev : github.com/Rasulbeeek - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var uzLatn = moment.defineLocale('uz-latn', { - months : 'Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr'.split('_'), - monthsShort : 'Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek'.split('_'), - weekdays : 'Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba'.split('_'), - weekdaysShort : 'Yak_Dush_Sesh_Chor_Pay_Jum_Shan'.split('_'), - weekdaysMin : 'Ya_Du_Se_Cho_Pa_Ju_Sha'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'D MMMM YYYY, dddd HH:mm' - }, - calendar : { - sameDay : '[Bugun soat] LT [da]', - nextDay : '[Ertaga] LT [da]', - nextWeek : 'dddd [kuni soat] LT [da]', - lastDay : '[Kecha soat] LT [da]', - lastWeek : '[O\'tgan] dddd [kuni soat] LT [da]', - sameElse : 'L' - }, - relativeTime : { - future : 'Yaqin %s ichida', - past : 'Bir necha %s oldin', - s : 'soniya', - ss : '%d soniya', - m : 'bir daqiqa', - mm : '%d daqiqa', - h : 'bir soat', - hh : '%d soat', - d : 'bir kun', - dd : '%d kun', - M : 'bir oy', - MM : '%d oy', - y : 'bir yil', - yy : '%d yil' - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 7 // The week that contains Jan 1st is the first week of the year. + function jsonify(logEvent) { + if (options.timeStamp) { + logEvent.time = new Date(logEvent.time).toISOString(); + } else { + delete logEvent.time; } -}); - -return uzLatn; - -}))); + logEvent.msg = logEvent.msg.toString(); + this.emit('data', JSON.stringify(logEvent)); + } +} +function lineMerger(host) { + var previousLine = null; + var flushTimer = null; + var stream = through(lineMergerWrite, lineMergerEnd); + var flush = _flush.bind(stream); -/***/ }), -/* 211 */ -/***/ (function(module, exports, __webpack_require__) { + return stream; -//! moment.js locale configuration -//! locale : Vietnamese [vi] -//! author : Bang Nguyen : https://github.com/bangnk - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var vi = moment.defineLocale('vi', { - months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'), - monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'), - monthsParseExact : true, - weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'), - weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'), - weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'), - weekdaysParseExact : true, - meridiemParse: /sa|ch/i, - isPM : function (input) { - return /^ch$/i.test(input); - }, - meridiem : function (hours, minutes, isLower) { - if (hours < 12) { - return isLower ? 'sa' : 'SA'; - } else { - return isLower ? 'ch' : 'CH'; - } - }, - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'DD/MM/YYYY', - LL : 'D MMMM [năm] YYYY', - LLL : 'D MMMM [năm] YYYY HH:mm', - LLLL : 'dddd, D MMMM [năm] YYYY HH:mm', - l : 'DD/M/YYYY', - ll : 'D MMM YYYY', - lll : 'D MMM YYYY HH:mm', - llll : 'ddd, D MMM YYYY HH:mm' - }, - calendar : { - sameDay: '[Hôm nay lúc] LT', - nextDay: '[Ngày mai lúc] LT', - nextWeek: 'dddd [tuần tới lúc] LT', - lastDay: '[Hôm qua lúc] LT', - lastWeek: 'dddd [tuần rồi lúc] LT', - sameElse: 'L' - }, - relativeTime : { - future : '%s tới', - past : '%s trước', - s : 'vài giây', - ss : '%d giây' , - m : 'một phút', - mm : '%d phút', - h : 'một giờ', - hh : '%d giờ', - d : 'một ngày', - dd : '%d ngày', - M : 'một tháng', - MM : '%d tháng', - y : 'một năm', - yy : '%d năm' - }, - dayOfMonthOrdinalParse: /\d{1,2}/, - ordinal : function (number) { - return number; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. + function lineMergerWrite(line) { + if (/^\s+/.test(line.msg)) { + if (previousLine) { + previousLine.msg += '\n' + line.msg; + } else { + previousLine = line; + } + } else { + flush(); + previousLine = line; } -}); + // rolling timeout + clearTimeout(flushTimer); + flushTimer = setTimeout(flush.bind(this), 10); + } -return vi; + function _flush() { + if (previousLine) { + this.emit('data', previousLine); + previousLine = null; + } + } -}))); + function lineMergerEnd() { + flush.call(this); + this.emit('end'); + } +} /***/ }), -/* 212 */ +/* 97 */ /***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Pseudo [x-pseudo] -//! author : Andrew Hood : https://github.com/andrewhood125 - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var xPseudo = moment.defineLocale('x-pseudo', { - months : 'J~áñúá~rý_F~ébrú~árý_~Márc~h_Áp~ríl_~Máý_~Júñé~_Júl~ý_Áú~gúst~_Sép~témb~ér_Ó~ctób~ér_Ñ~óvém~bér_~Décé~mbér'.split('_'), - monthsShort : 'J~áñ_~Féb_~Már_~Ápr_~Máý_~Júñ_~Júl_~Áúg_~Sép_~Óct_~Ñóv_~Déc'.split('_'), - monthsParseExact : true, - weekdays : 'S~úñdá~ý_Mó~ñdáý~_Túé~sdáý~_Wéd~ñésd~áý_T~húrs~dáý_~Fríd~áý_S~átúr~dáý'.split('_'), - weekdaysShort : 'S~úñ_~Móñ_~Túé_~Wéd_~Thú_~Frí_~Sát'.split('_'), - weekdaysMin : 'S~ú_Mó~_Tú_~Wé_T~h_Fr~_Sá'.split('_'), - weekdaysParseExact : true, - longDateFormat : { - LT : 'HH:mm', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY HH:mm', - LLLL : 'dddd, D MMMM YYYY HH:mm' - }, - calendar : { - sameDay : '[T~ódá~ý át] LT', - nextDay : '[T~ómó~rró~w át] LT', - nextWeek : 'dddd [át] LT', - lastDay : '[Ý~ést~érdá~ý át] LT', - lastWeek : '[L~ást] dddd [át] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'í~ñ %s', - past : '%s á~gó', - s : 'á ~féw ~sécó~ñds', - ss : '%d s~écóñ~ds', - m : 'á ~míñ~úté', - mm : '%d m~íñú~tés', - h : 'á~ñ hó~úr', - hh : '%d h~óúrs', - d : 'á ~dáý', - dd : '%d d~áýs', - M : 'á ~móñ~th', - MM : '%d m~óñt~hs', - y : 'á ~ýéár', - yy : '%d ý~éárs' - }, - dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - }, - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); - -return xPseudo; - -}))); - +"use strict"; -/***/ }), -/* 213 */ -/***/ (function(module, exports, __webpack_require__) { -//! moment.js locale configuration -//! locale : Yoruba Nigeria [yo] -//! author : Atolagbe Abisoye : https://github.com/andela-batolagbe - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var yo = moment.defineLocale('yo', { - months : 'Sẹ́rẹ́_Èrèlè_Ẹrẹ̀nà_Ìgbé_Èbibi_Òkùdu_Agẹmo_Ògún_Owewe_Ọ̀wàrà_Bélú_Ọ̀pẹ̀̀'.split('_'), - monthsShort : 'Sẹ́r_Èrl_Ẹrn_Ìgb_Èbi_Òkù_Agẹ_Ògú_Owe_Ọ̀wà_Bél_Ọ̀pẹ̀̀'.split('_'), - weekdays : 'Àìkú_Ajé_Ìsẹ́gun_Ọjọ́rú_Ọjọ́bọ_Ẹtì_Àbámẹ́ta'.split('_'), - weekdaysShort : 'Àìk_Ajé_Ìsẹ́_Ọjr_Ọjb_Ẹtì_Àbá'.split('_'), - weekdaysMin : 'Àì_Aj_Ìs_Ọr_Ọb_Ẹt_Àb'.split('_'), - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'DD/MM/YYYY', - LL : 'D MMMM YYYY', - LLL : 'D MMMM YYYY h:mm A', - LLLL : 'dddd, D MMMM YYYY h:mm A' - }, - calendar : { - sameDay : '[Ònì ni] LT', - nextDay : '[Ọ̀la ni] LT', - nextWeek : 'dddd [Ọsẹ̀ tón\'bọ] [ni] LT', - lastDay : '[Àna ni] LT', - lastWeek : 'dddd [Ọsẹ̀ tólọ́] [ni] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'ní %s', - past : '%s kọjá', - s : 'ìsẹjú aayá die', - ss :'aayá %d', - m : 'ìsẹjú kan', - mm : 'ìsẹjú %d', - h : 'wákati kan', - hh : 'wákati %d', - d : 'ọjọ́ kan', - dd : 'ọjọ́ %d', - M : 'osù kan', - MM : 'osù %d', - y : 'ọdún kan', - yy : 'ọdún %d' - }, - dayOfMonthOrdinalParse : /ọjọ́\s\d{1,2}/, - ordinal : 'ọjọ́ %d', - week : { - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } +Object.defineProperty(exports, "__esModule", { + value: true }); +exports.copyWorkspacePackages = exports.workspacePackagePaths = undefined; + +let workspacePackagePaths = exports.workspacePackagePaths = (() => { + var _ref = _asyncToGenerator(function* (rootPath) { + const rootPkgJson = yield (0, _package_json.readPackageJson)(_path2.default.join(rootPath, 'package.json')); + if (!rootPkgJson.workspaces) { + return []; + } + const workspacesPathsPatterns = rootPkgJson.workspaces.packages; + let workspaceProjectsPaths = []; + for (const pattern of workspacesPathsPatterns) { + workspaceProjectsPaths = workspaceProjectsPaths.concat((yield packagesFromGlobPattern({ pattern, rootPath }))); + } + // Filter out exclude glob patterns + for (const pattern of workspacesPathsPatterns) { + if (pattern.startsWith('!')) { + const pathToRemove = _path2.default.join(rootPath, pattern.slice(1), 'package.json'); + workspaceProjectsPaths = workspaceProjectsPaths.filter(function (p) { + return p !== pathToRemove; + }); + } + } + return workspaceProjectsPaths; + }); -return yo; - -}))); + return function workspacePackagePaths(_x) { + return _ref.apply(this, arguments); + }; +})(); +let copyWorkspacePackages = exports.copyWorkspacePackages = (() => { + var _ref2 = _asyncToGenerator(function* (rootPath) { + const workspaceProjects = yield getWorkspaceProjects(rootPath); + for (const project of workspaceProjects.values()) { + const dest = _path2.default.resolve(rootPath, 'node_modules', project.name); + // Remove the symlink + yield (0, _fs.unlink)(dest); + // Copy in the package + yield (0, _fs.copyDirectory)(project.path, dest); + } + }); -/***/ }), -/* 214 */ -/***/ (function(module, exports, __webpack_require__) { + return function copyWorkspacePackages(_x2) { + return _ref2.apply(this, arguments); + }; +})(); -//! moment.js locale configuration -//! locale : Chinese (China) [zh-cn] -//! author : suupic : https://github.com/suupic -//! author : Zeno Zeng : https://github.com/zenozeng - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var zhCn = moment.defineLocale('zh-cn', { - months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'), - monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'), - weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'), - weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'), - weekdaysMin : '日_一_二_三_四_五_六'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY/MM/DD', - LL : 'YYYY年M月D日', - LLL : 'YYYY年M月D日Ah点mm分', - LLLL : 'YYYY年M月D日ddddAh点mm分', - l : 'YYYY/M/D', - ll : 'YYYY年M月D日', - lll : 'YYYY年M月D日 HH:mm', - llll : 'YYYY年M月D日dddd HH:mm' - }, - meridiemParse: /凌晨|早上|上午|中午|下午|晚上/, - meridiemHour: function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === '凌晨' || meridiem === '早上' || - meridiem === '上午') { - return hour; - } else if (meridiem === '下午' || meridiem === '晚上') { - return hour + 12; - } else { - // '中午' - return hour >= 11 ? hour : hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - var hm = hour * 100 + minute; - if (hm < 600) { - return '凌晨'; - } else if (hm < 900) { - return '早上'; - } else if (hm < 1130) { - return '上午'; - } else if (hm < 1230) { - return '中午'; - } else if (hm < 1800) { - return '下午'; - } else { - return '晚上'; - } - }, - calendar : { - sameDay : '[今天]LT', - nextDay : '[明天]LT', - nextWeek : '[下]ddddLT', - lastDay : '[昨天]LT', - lastWeek : '[上]ddddLT', - sameElse : 'L' - }, - dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/, - ordinal : function (number, period) { - switch (period) { - case 'd': - case 'D': - case 'DDD': - return number + '日'; - case 'M': - return number + '月'; - case 'w': - case 'W': - return number + '周'; - default: - return number; +let getWorkspaceProjects = (() => { + var _ref3 = _asyncToGenerator(function* (rootPath) { + const projectPaths = (0, _config.getProjectPaths)(rootPath, {}); + const projects = yield (0, _projects.getProjects)(rootPath, projectPaths); + for (const [key, project] of projects.entries()) { + if (!project.isWorkspaceProject) { + projects.delete(key); + } } - }, - relativeTime : { - future : '%s内', - past : '%s前', - s : '几秒', - ss : '%d 秒', - m : '1 分钟', - mm : '%d 分钟', - h : '1 小时', - hh : '%d 小时', - d : '1 天', - dd : '%d 天', - M : '1 个月', - MM : '%d 个月', - y : '1 年', - yy : '%d 年' - }, - week : { - // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效 - dow : 1, // Monday is the first day of the week. - doy : 4 // The week that contains Jan 4th is the first week of the year. - } -}); + return projects; + }); -return zhCn; + return function getWorkspaceProjects(_x3) { + return _ref3.apply(this, arguments); + }; +})(); -}))); +var _glob = __webpack_require__(23); +var _glob2 = _interopRequireDefault(_glob); -/***/ }), -/* 215 */ -/***/ (function(module, exports, __webpack_require__) { +var _path = __webpack_require__(2); -//! moment.js locale configuration -//! locale : Chinese (Hong Kong) [zh-hk] -//! author : Ben : https://github.com/ben-lin -//! author : Chris Lam : https://github.com/hehachris -//! author : Konstantin : https://github.com/skfd - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var zhHk = moment.defineLocale('zh-hk', { - months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'), - monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'), - weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'), - weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'), - weekdaysMin : '日_一_二_三_四_五_六'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY/MM/DD', - LL : 'YYYY年M月D日', - LLL : 'YYYY年M月D日 HH:mm', - LLLL : 'YYYY年M月D日dddd HH:mm', - l : 'YYYY/M/D', - ll : 'YYYY年M月D日', - lll : 'YYYY年M月D日 HH:mm', - llll : 'YYYY年M月D日dddd HH:mm' - }, - meridiemParse: /凌晨|早上|上午|中午|下午|晚上/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') { - return hour; - } else if (meridiem === '中午') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === '下午' || meridiem === '晚上') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - var hm = hour * 100 + minute; - if (hm < 600) { - return '凌晨'; - } else if (hm < 900) { - return '早上'; - } else if (hm < 1130) { - return '上午'; - } else if (hm < 1230) { - return '中午'; - } else if (hm < 1800) { - return '下午'; - } else { - return '晚上'; - } - }, - calendar : { - sameDay : '[今天]LT', - nextDay : '[明天]LT', - nextWeek : '[下]ddddLT', - lastDay : '[昨天]LT', - lastWeek : '[上]ddddLT', - sameElse : 'L' - }, - dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/, - ordinal : function (number, period) { - switch (period) { - case 'd' : - case 'D' : - case 'DDD' : - return number + '日'; - case 'M' : - return number + '月'; - case 'w' : - case 'W' : - return number + '週'; - default : - return number; - } - }, - relativeTime : { - future : '%s內', - past : '%s前', - s : '幾秒', - ss : '%d 秒', - m : '1 分鐘', - mm : '%d 分鐘', - h : '1 小時', - hh : '%d 小時', - d : '1 天', - dd : '%d 天', - M : '1 個月', - MM : '%d 個月', - y : '1 年', - yy : '%d 年' - } -}); +var _path2 = _interopRequireDefault(_path); -return zhHk; +var _util = __webpack_require__(8); -}))); +var _config = __webpack_require__(60); +var _fs = __webpack_require__(39); -/***/ }), -/* 216 */ -/***/ (function(module, exports, __webpack_require__) { +var _package_json = __webpack_require__(41); -//! moment.js locale configuration -//! locale : Chinese (Taiwan) [zh-tw] -//! author : Ben : https://github.com/ben-lin -//! author : Chris Lam : https://github.com/hehachris - -;(function (global, factory) { - true ? factory(__webpack_require__(0)) : - typeof define === 'function' && define.amd ? define(['../moment'], factory) : - factory(global.moment) -}(this, (function (moment) { 'use strict'; - - -var zhTw = moment.defineLocale('zh-tw', { - months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'), - monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'), - weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'), - weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'), - weekdaysMin : '日_一_二_三_四_五_六'.split('_'), - longDateFormat : { - LT : 'HH:mm', - LTS : 'HH:mm:ss', - L : 'YYYY/MM/DD', - LL : 'YYYY年M月D日', - LLL : 'YYYY年M月D日 HH:mm', - LLLL : 'YYYY年M月D日dddd HH:mm', - l : 'YYYY/M/D', - ll : 'YYYY年M月D日', - lll : 'YYYY年M月D日 HH:mm', - llll : 'YYYY年M月D日dddd HH:mm' - }, - meridiemParse: /凌晨|早上|上午|中午|下午|晚上/, - meridiemHour : function (hour, meridiem) { - if (hour === 12) { - hour = 0; - } - if (meridiem === '凌晨' || meridiem === '早上' || meridiem === '上午') { - return hour; - } else if (meridiem === '中午') { - return hour >= 11 ? hour : hour + 12; - } else if (meridiem === '下午' || meridiem === '晚上') { - return hour + 12; - } - }, - meridiem : function (hour, minute, isLower) { - var hm = hour * 100 + minute; - if (hm < 600) { - return '凌晨'; - } else if (hm < 900) { - return '早上'; - } else if (hm < 1130) { - return '上午'; - } else if (hm < 1230) { - return '中午'; - } else if (hm < 1800) { - return '下午'; - } else { - return '晚上'; - } - }, - calendar : { - sameDay : '[今天]LT', - nextDay : '[明天]LT', - nextWeek : '[下]ddddLT', - lastDay : '[昨天]LT', - lastWeek : '[上]ddddLT', - sameElse : 'L' - }, - dayOfMonthOrdinalParse: /\d{1,2}(日|月|週)/, - ordinal : function (number, period) { - switch (period) { - case 'd' : - case 'D' : - case 'DDD' : - return number + '日'; - case 'M' : - return number + '月'; - case 'w' : - case 'W' : - return number + '週'; - default : - return number; - } - }, - relativeTime : { - future : '%s內', - past : '%s前', - s : '幾秒', - ss : '%d 秒', - m : '1 分鐘', - mm : '%d 分鐘', - h : '1 小時', - hh : '%d 小時', - d : '1 天', - dd : '%d 天', - M : '1 個月', - MM : '%d 個月', - y : '1 年', - yy : '%d 年' - } -}); +var _projects = __webpack_require__(22); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ -return zhTw; -}))); +const glob = (0, _util.promisify)(_glob2.default); +function packagesFromGlobPattern({ pattern, rootPath }) { + const globOptions = { + cwd: rootPath, + // Should throw in case of unusual errors when reading the file system + strict: true, + // Always returns absolute paths for matched files + absolute: true, + // Do not match ** against multiple filenames + // (This is only specified because we currently don't have a need for it.) + noglobstar: true + }; + return glob(_path2.default.join(pattern, 'package.json'), globOptions); +} /***/ }), -/* 217 */ +/* 98 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const globby = __webpack_require__(352); -const isPathCwd = __webpack_require__(356); -const isPathInCwd = __webpack_require__(357); -const pify = __webpack_require__(23); -const rimraf = __webpack_require__(360); -const pMap = __webpack_require__(361); +const path = __webpack_require__(2); +const globby = __webpack_require__(236); +const isPathCwd = __webpack_require__(240); +const isPathInCwd = __webpack_require__(241); +const pify = __webpack_require__(244); +const rimraf = __webpack_require__(245); +const pMap = __webpack_require__(246); const rimrafP = pify(rimraf); @@ -25296,22 +9196,22 @@ module.exports.sync = (patterns, opts) => { /***/ }), -/* 218 */ +/* 99 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -module.exports = typeof Promise === 'function' ? Promise : __webpack_require__(353); +module.exports = typeof Promise === 'function' ? Promise : __webpack_require__(237); /***/ }), -/* 219 */ +/* 100 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var arrayUniq = __webpack_require__(354); +var arrayUniq = __webpack_require__(238); module.exports = function () { return arrayUniq([].concat.apply([], arguments)); @@ -25319,7 +9219,7 @@ module.exports = function () { /***/ }), -/* 220 */ +/* 101 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -25416,13 +9316,13 @@ module.exports = shouldUseNative() ? Object.assign : function (target, source) { /***/ }), -/* 221 */ +/* 102 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return empty; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__config__ = __webpack_require__(43); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_hostReportError__ = __webpack_require__(63); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__config__ = __webpack_require__(42); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_hostReportError__ = __webpack_require__(61); /** PURE_IMPORTS_START _config,_util_hostReportError PURE_IMPORTS_END */ @@ -25443,7 +9343,7 @@ var empty = { /***/ }), -/* 222 */ +/* 103 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -25456,12 +9356,12 @@ function isObject(x) { /***/ }), -/* 223 */ +/* 104 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return UnsubscriptionError; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ var UnsubscriptionError = /*@__PURE__*/ (function (_super) { @@ -25481,18 +9381,18 @@ var UnsubscriptionError = /*@__PURE__*/ (function (_super) { /***/ }), -/* 224 */ +/* 105 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ConnectableObservable; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return connectableObservableDescriptor; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__operators_refCount__ = __webpack_require__(66); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__operators_refCount__ = __webpack_require__(64); /** PURE_IMPORTS_START tslib,_Subject,_Observable,_Subscriber,_Subscription,_operators_refCount PURE_IMPORTS_END */ @@ -25639,13 +9539,13 @@ var RefCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 225 */ +/* 106 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SubjectSubscription; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); /** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */ @@ -25681,16 +9581,16 @@ var SubjectSubscription = /*@__PURE__*/ (function (_super) { /***/ }), -/* 226 */ +/* 107 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["b"] = groupBy; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return GroupedObservable; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Observable__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Observable__ = __webpack_require__(3); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Subject__ = __webpack_require__(9); /** PURE_IMPORTS_START tslib,_Subscriber,_Subscription,_Observable,_Subject PURE_IMPORTS_END */ @@ -25877,14 +9777,14 @@ var InnerRefCountSubscription = /*@__PURE__*/ (function (_super) { /***/ }), -/* 227 */ +/* 108 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return BehaviorSubject; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__ = __webpack_require__(45); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ObjectUnsubscribedError__ = __webpack_require__(44); /** PURE_IMPORTS_START tslib,_Subject,_util_ObjectUnsubscribedError PURE_IMPORTS_END */ @@ -25931,13 +9831,13 @@ var BehaviorSubject = /*@__PURE__*/ (function (_super) { /***/ }), -/* 228 */ +/* 109 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return queue; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__QueueAction__ = __webpack_require__(378); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__ = __webpack_require__(380); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__QueueAction__ = __webpack_require__(263); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__ = __webpack_require__(265); /** PURE_IMPORTS_START _QueueAction,_QueueScheduler PURE_IMPORTS_END */ @@ -25946,7 +9846,7 @@ var queue = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__QueueScheduler__["a" /***/ }), -/* 229 */ +/* 110 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -25973,7 +9873,7 @@ var Scheduler = /*@__PURE__*/ (function () { /***/ }), -/* 230 */ +/* 111 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -25981,9 +9881,9 @@ var Scheduler = /*@__PURE__*/ (function () { /* unused harmony export ObserveOnOperator */ /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return ObserveOnSubscriber; }); /* unused harmony export ObserveOnMessage */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(46); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(45); /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -26053,7 +9953,7 @@ var ObserveOnMessage = /*@__PURE__*/ (function () { /***/ }), -/* 231 */ +/* 112 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -26073,13 +9973,13 @@ var subscribeToArray = function (array) { /***/ }), -/* 232 */ +/* 113 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return asap; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsapAction__ = __webpack_require__(381); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__ = __webpack_require__(383); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsapAction__ = __webpack_require__(266); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__ = __webpack_require__(268); /** PURE_IMPORTS_START _AsapAction,_AsapScheduler PURE_IMPORTS_END */ @@ -26088,12 +9988,12 @@ var asap = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AsapScheduler__["a" /* /***/ }), -/* 233 */ +/* 114 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return TimeoutError; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /** PURE_IMPORTS_START tslib PURE_IMPORTS_END */ var TimeoutError = /*@__PURE__*/ (function (_super) { @@ -26111,20 +10011,20 @@ var TimeoutError = /*@__PURE__*/ (function (_super) { /***/ }), -/* 234 */ +/* 115 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeTo; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeToArray__ = __webpack_require__(231); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__subscribeToPromise__ = __webpack_require__(235); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__subscribeToIterable__ = __webpack_require__(236); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__subscribeToObservable__ = __webpack_require__(237); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__isArrayLike__ = __webpack_require__(238); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__isPromise__ = __webpack_require__(239); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__isObject__ = __webpack_require__(222); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__symbol_iterator__ = __webpack_require__(37); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__subscribeToArray__ = __webpack_require__(112); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__subscribeToPromise__ = __webpack_require__(116); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__subscribeToIterable__ = __webpack_require__(117); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__subscribeToObservable__ = __webpack_require__(118); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__isArrayLike__ = __webpack_require__(119); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__isPromise__ = __webpack_require__(120); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__isObject__ = __webpack_require__(103); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__symbol_iterator__ = __webpack_require__(34); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__symbol_observable__ = __webpack_require__(24); /** PURE_IMPORTS_START _Observable,_subscribeToArray,_subscribeToPromise,_subscribeToIterable,_subscribeToObservable,_isArrayLike,_isPromise,_isObject,_symbol_iterator,_symbol_observable PURE_IMPORTS_END */ @@ -26173,12 +10073,12 @@ var subscribeTo = function (result) { /***/ }), -/* 235 */ +/* 116 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToPromise; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__hostReportError__ = __webpack_require__(63); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__hostReportError__ = __webpack_require__(61); /** PURE_IMPORTS_START _hostReportError PURE_IMPORTS_END */ var subscribeToPromise = function (promise) { @@ -26197,12 +10097,12 @@ var subscribeToPromise = function (promise) { /***/ }), -/* 236 */ +/* 117 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return subscribeToIterable; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(37); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(34); /** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ var subscribeToIterable = function (iterable) { @@ -26233,7 +10133,7 @@ var subscribeToIterable = function (iterable) { /***/ }), -/* 237 */ +/* 118 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -26256,7 +10156,7 @@ var subscribeToObservable = function (obj) { /***/ }), -/* 238 */ +/* 119 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -26267,7 +10167,7 @@ var isArrayLike = (function (x) { return x && typeof x.length === 'number' && ty /***/ }), -/* 239 */ +/* 120 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -26280,12 +10180,12 @@ function isPromise(value) { /***/ }), -/* 240 */ +/* 121 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = concatAll; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeAll__ = __webpack_require__(72); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeAll__ = __webpack_require__(70); /** PURE_IMPORTS_START _mergeAll PURE_IMPORTS_END */ function concatAll() { @@ -26295,15 +10195,15 @@ function concatAll() { /***/ }), -/* 241 */ +/* 122 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = merge; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(15); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__ = __webpack_require__(72); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fromArray__ = __webpack_require__(21); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isScheduler__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_mergeAll__ = __webpack_require__(70); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__fromArray__ = __webpack_require__(20); /** PURE_IMPORTS_START _Observable,_util_isScheduler,_operators_mergeAll,_fromArray PURE_IMPORTS_END */ @@ -26335,14 +10235,14 @@ function merge() { /***/ }), -/* 242 */ +/* 123 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return NEVER; }); /* harmony export (immutable) */ __webpack_exports__["b"] = never; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_noop__ = __webpack_require__(44); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_noop__ = __webpack_require__(43); /** PURE_IMPORTS_START _Observable,_util_noop PURE_IMPORTS_END */ @@ -26354,18 +10254,18 @@ function never() { /***/ }), -/* 243 */ +/* 124 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = race; /* unused harmony export RaceOperator */ /* unused harmony export RaceSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__fromArray__ = __webpack_require__(21); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__fromArray__ = __webpack_require__(20); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_util_isArray,_fromArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -26447,15 +10347,15 @@ var RaceSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 244 */ +/* 125 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = timer; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(49); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(48); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ @@ -26500,16 +10400,16 @@ function dispatch(state) { /***/ }), -/* 245 */ +/* 126 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = audit; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -26582,12 +10482,12 @@ var AuditSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 246 */ +/* 127 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = concatMap; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(38); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(35); /** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ function concatMap(project, resultSelector) { @@ -26597,7 +10497,7 @@ function concatMap(project, resultSelector) { /***/ }), -/* 247 */ +/* 128 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -26610,15 +10510,15 @@ function isDate(value) { /***/ }), -/* 248 */ +/* 129 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilChanged; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(13); /** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */ @@ -26681,15 +10581,15 @@ var DistinctUntilChangedSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 249 */ +/* 130 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = tap; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_noop__ = __webpack_require__(44); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isFunction__ = __webpack_require__(32); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_noop__ = __webpack_require__(43); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isFunction__ = __webpack_require__(29); /** PURE_IMPORTS_START tslib,_Subscriber,_util_noop,_util_isFunction PURE_IMPORTS_END */ @@ -26768,15 +10668,15 @@ var TapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 250 */ +/* 131 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["b"] = find; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return FindValueOperator; }); /* unused harmony export FindValueSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -26838,15 +10738,15 @@ var FindValueSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 251 */ +/* 132 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return defaultThrottleConfig; }); /* harmony export (immutable) */ __webpack_exports__["b"] = throttle; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -26941,16 +10841,16 @@ var ThrottleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 252 */ +/* 133 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = timeoutWith; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(247); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(128); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -27022,73 +10922,12 @@ var TimeoutWithSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 253 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - -const ansiRegex = __webpack_require__(494); - -module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input; - - -/***/ }), -/* 254 */ -/***/ (function(module, exports, __webpack_require__) { - -"use strict"; - - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.getProjectPaths = getProjectPaths; - -var _path = __webpack_require__(3); - -/** - * Returns all the paths where plugins are located - */ -function getProjectPaths(rootPath, options) { - const skipKibanaExtra = Boolean(options['skip-kibana-extra']); - const ossOnly = Boolean(options.oss); - const projectPaths = [rootPath, (0, _path.resolve)(rootPath, 'packages/*')]; - if (!ossOnly) { - projectPaths.push((0, _path.resolve)(rootPath, 'x-pack')); - projectPaths.push((0, _path.resolve)(rootPath, 'x-pack/plugins/*')); - } - if (!skipKibanaExtra) { - projectPaths.push((0, _path.resolve)(rootPath, '../kibana-extra/*')); - projectPaths.push((0, _path.resolve)(rootPath, '../kibana-extra/*/packages/*')); - projectPaths.push((0, _path.resolve)(rootPath, '../kibana-extra/*/plugins/*')); - } - return projectPaths; -} /* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/***/ }), -/* 255 */ +/* 134 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const NestedError = __webpack_require__(256); +const NestedError = __webpack_require__(135); class CpFileError extends NestedError { constructor(message, nested) { @@ -27102,10 +10941,10 @@ module.exports = CpFileError; /***/ }), -/* 256 */ +/* 135 */ /***/ (function(module, exports, __webpack_require__) { -var inherits = __webpack_require__(83); +var inherits = __webpack_require__(82); var NestedError = function (message, nested) { this.nested = nested; @@ -27156,7 +10995,7 @@ module.exports = NestedError; /***/ }), -/* 257 */ +/* 136 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -27166,7 +11005,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _cli = __webpack_require__(258); +var _cli = __webpack_require__(137); Object.defineProperty(exports, 'run', { enumerable: true, @@ -27175,7 +11014,7 @@ Object.defineProperty(exports, 'run', { } }); -var _production = __webpack_require__(497); +var _production = __webpack_require__(385); Object.defineProperty(exports, 'buildProductionProjects', { enumerable: true, @@ -27190,17 +11029,17 @@ Object.defineProperty(exports, 'prepareExternalProjectDependencies', { } }); -var _package_json = __webpack_require__(42); +var _workspaces = __webpack_require__(97); -Object.defineProperty(exports, 'transformDependencies', { +Object.defineProperty(exports, 'copyWorkspacePackages', { enumerable: true, get: function () { - return _package_json.transformDependencies; + return _workspaces.copyWorkspacePackages; } }); /***/ }), -/* 258 */ +/* 137 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -27251,25 +11090,25 @@ let run = exports.run = (() => { }; })(); -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _dedent = __webpack_require__(264); +var _dedent = __webpack_require__(143); var _dedent2 = _interopRequireDefault(_dedent); -var _getopts = __webpack_require__(265); +var _getopts = __webpack_require__(144); var _getopts2 = _interopRequireDefault(_getopts); -var _path = __webpack_require__(3); +var _path = __webpack_require__(2); -var _commands = __webpack_require__(266); +var _commands = __webpack_require__(145); -var _run = __webpack_require__(490); +var _run = __webpack_require__(375); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -27315,12 +11154,12 @@ function help() { } /***/ }), -/* 259 */ +/* 138 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; /* WEBPACK VAR INJECTION */(function(module) { -const colorConvert = __webpack_require__(53); +const colorConvert = __webpack_require__(52); const wrapAnsi16 = (fn, offset) => function () { const code = fn.apply(colorConvert, arguments); @@ -27485,10 +11324,10 @@ Object.defineProperty(module, 'exports', { get: assembleStyles }); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(27)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(38)(module))) /***/ }), -/* 260 */ +/* 139 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -27647,10 +11486,10 @@ module.exports = { /***/ }), -/* 261 */ +/* 140 */ /***/ (function(module, exports, __webpack_require__) { -var conversions = __webpack_require__(79); +var conversions = __webpack_require__(77); /* this function routes a model to all other models. @@ -27750,13 +11589,13 @@ module.exports = function (fromModel) { /***/ }), -/* 262 */ +/* 141 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const os = __webpack_require__(54); -const hasFlag = __webpack_require__(55); +const os = __webpack_require__(53); +const hasFlag = __webpack_require__(78); const env = process.env; @@ -27804,6 +11643,10 @@ function supportsColor(stream) { } if (stream && !stream.isTTY && forceColor !== true) { + // VS code debugger doesn't have isTTY set + if (env.VSCODE_PID) { + return 1; + } return 0; } @@ -27888,7 +11731,7 @@ module.exports = { /***/ }), -/* 263 */ +/* 142 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28023,7 +11866,7 @@ module.exports = (chalk, tmp) => { /***/ }), -/* 264 */ +/* 143 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28089,7 +11932,7 @@ if (true) { /***/ }), -/* 265 */ +/* 144 */ /***/ (function(module, exports) { const SHORTSPLIT = /$|[!-@\[-`{-~].*/g @@ -28257,7 +12100,7 @@ module.exports = function(argv, opts) { /***/ }), -/* 266 */ +/* 145 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28268,13 +12111,13 @@ Object.defineProperty(exports, "__esModule", { }); exports.commands = undefined; -var _bootstrap = __webpack_require__(267); +var _bootstrap = __webpack_require__(146); -var _clean = __webpack_require__(351); +var _clean = __webpack_require__(235); -var _run = __webpack_require__(373); +var _run = __webpack_require__(258); -var _watch = __webpack_require__(374); +var _watch = __webpack_require__(259); /* * Licensed to Elasticsearch B.V. under one or more contributor @@ -28302,7 +12145,7 @@ const commands = exports.commands = { }; /***/ }), -/* 267 */ +/* 146 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28313,17 +12156,17 @@ Object.defineProperty(exports, "__esModule", { }); exports.BootstrapCommand = undefined; -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _link_project_executables = __webpack_require__(268); +var _link_project_executables = __webpack_require__(147); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); -var _parallelize = __webpack_require__(57); +var _parallelize = __webpack_require__(54); -var _projects = __webpack_require__(30); +var _projects = __webpack_require__(22); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -28352,12 +12195,19 @@ const BootstrapCommand = exports.BootstrapCommand = { name: 'bootstrap', run(projects, projectGraph, { options }) { return _asyncToGenerator(function* () { + const batchedProjectsByWorkspace = (0, _projects.topologicallyBatchProjects)(projects, projectGraph, { + batchByWorkspace: true + }); const batchedProjects = (0, _projects.topologicallyBatchProjects)(projects, projectGraph); const frozenLockfile = options['frozen-lockfile'] === true; const extraArgs = frozenLockfile ? ['--frozen-lockfile'] : []; _log.log.write(_chalk2.default.bold('\nRunning installs in topological order:')); - for (const batch of batchedProjects) { + for (const batch of batchedProjectsByWorkspace) { for (const project of batch) { + if (project.isWorkspaceProject) { + _log.log.write(`Skipping workspace project: ${project.name}`); + continue; + } if (project.hasDependencies()) { yield project.installDependencies({ extraArgs }); } @@ -28389,7 +12239,7 @@ const BootstrapCommand = exports.BootstrapCommand = { }; /***/ }), -/* 268 */ +/* 147 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -28439,15 +12289,15 @@ let linkProjectExecutables = exports.linkProjectExecutables = (() => { }; })(); -var _path = __webpack_require__(3); +var _path = __webpack_require__(2); -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _fs = __webpack_require__(56); +var _fs = __webpack_require__(39); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -28471,7 +12321,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a */ /***/ }), -/* 269 */ +/* 148 */ /***/ (function(module, exports, __webpack_require__) { // On windows, create a .cmd file. @@ -28487,10 +12337,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a module.exports = cmdShim cmdShim.ifExists = cmdShimIfExists -var fs = __webpack_require__(28) +var fs = __webpack_require__(27) -var mkdir = __webpack_require__(81) - , path = __webpack_require__(3) +var mkdir = __webpack_require__(80) + , path = __webpack_require__(2) , shebangExpr = /^#\!\s*(?:\/usr\/bin\/env)?\s*([^ \t]+)(.*)$/ function cmdShimIfExists (from, to, cb) { @@ -28657,11 +12507,11 @@ function times(n, ok, cb) { /***/ }), -/* 270 */ +/* 149 */ /***/ (function(module, exports, __webpack_require__) { -var fs = __webpack_require__(80) -var constants = __webpack_require__(271) +var fs = __webpack_require__(79) +var constants = __webpack_require__(150) var origCwd = process.cwd var cwd = null @@ -28993,16 +12843,16 @@ function chownErOk (er) { /***/ }), -/* 271 */ +/* 150 */ /***/ (function(module, exports) { module.exports = require("constants"); /***/ }), -/* 272 */ +/* 151 */ /***/ (function(module, exports, __webpack_require__) { -var Stream = __webpack_require__(22).Stream +var Stream = __webpack_require__(21).Stream module.exports = legacy @@ -29123,7 +12973,274 @@ function legacy (fs) { /***/ }), -/* 273 */ +/* 152 */ +/***/ (function(module, exports, __webpack_require__) { + +var fs = __webpack_require__(6), + path = __webpack_require__(2); + +module.exports = ncp; +ncp.ncp = ncp; + +function ncp (source, dest, options, callback) { + var cback = callback; + + if (!callback) { + cback = options; + options = {}; + } + + var basePath = process.cwd(), + currentPath = path.resolve(basePath, source), + targetPath = path.resolve(basePath, dest), + filter = options.filter, + rename = options.rename, + transform = options.transform, + clobber = options.clobber !== false, + modified = options.modified, + dereference = options.dereference, + errs = null, + started = 0, + finished = 0, + running = 0, + limit = options.limit || ncp.limit || 16; + + limit = (limit < 1) ? 1 : (limit > 512) ? 512 : limit; + + startCopy(currentPath); + + function startCopy(source) { + started++; + if (filter) { + if (filter instanceof RegExp) { + if (!filter.test(source)) { + return cb(true); + } + } + else if (typeof filter === 'function') { + if (!filter(source)) { + return cb(true); + } + } + } + return getStats(source); + } + + function getStats(source) { + var stat = dereference ? fs.stat : fs.lstat; + if (running >= limit) { + return setImmediate(function () { + getStats(source); + }); + } + running++; + stat(source, function (err, stats) { + var item = {}; + if (err) { + return onError(err); + } + + // We need to get the mode from the stats object and preserve it. + item.name = source; + item.mode = stats.mode; + item.mtime = stats.mtime; //modified time + item.atime = stats.atime; //access time + + if (stats.isDirectory()) { + return onDir(item); + } + else if (stats.isFile()) { + return onFile(item); + } + else if (stats.isSymbolicLink()) { + // Symlinks don't really need to know about the mode. + return onLink(source); + } + }); + } + + function onFile(file) { + var target = file.name.replace(currentPath, targetPath); + if(rename) { + target = rename(target); + } + isWritable(target, function (writable) { + if (writable) { + return copyFile(file, target); + } + if(clobber) { + rmFile(target, function () { + copyFile(file, target); + }); + } + if (modified) { + var stat = dereference ? fs.stat : fs.lstat; + stat(target, function(err, stats) { + //if souce modified time greater to target modified time copy file + if (file.mtime.getTime()>stats.mtime.getTime()) + copyFile(file, target); + else return cb(); + }); + } + else { + return cb(); + } + }); + } + + function copyFile(file, target) { + var readStream = fs.createReadStream(file.name), + writeStream = fs.createWriteStream(target, { mode: file.mode }); + + readStream.on('error', onError); + writeStream.on('error', onError); + + if(transform) { + transform(readStream, writeStream, file); + } else { + writeStream.on('open', function() { + readStream.pipe(writeStream); + }); + } + writeStream.once('finish', function() { + if (modified) { + //target file modified date sync. + fs.utimesSync(target, file.atime, file.mtime); + cb(); + } + else cb(); + }); + } + + function rmFile(file, done) { + fs.unlink(file, function (err) { + if (err) { + return onError(err); + } + return done(); + }); + } + + function onDir(dir) { + var target = dir.name.replace(currentPath, targetPath); + isWritable(target, function (writable) { + if (writable) { + return mkDir(dir, target); + } + copyDir(dir.name); + }); + } + + function mkDir(dir, target) { + fs.mkdir(target, dir.mode, function (err) { + if (err) { + return onError(err); + } + copyDir(dir.name); + }); + } + + function copyDir(dir) { + fs.readdir(dir, function (err, items) { + if (err) { + return onError(err); + } + items.forEach(function (item) { + startCopy(path.join(dir, item)); + }); + return cb(); + }); + } + + function onLink(link) { + var target = link.replace(currentPath, targetPath); + fs.readlink(link, function (err, resolvedPath) { + if (err) { + return onError(err); + } + checkLink(resolvedPath, target); + }); + } + + function checkLink(resolvedPath, target) { + if (dereference) { + resolvedPath = path.resolve(basePath, resolvedPath); + } + isWritable(target, function (writable) { + if (writable) { + return makeLink(resolvedPath, target); + } + fs.readlink(target, function (err, targetDest) { + if (err) { + return onError(err); + } + if (dereference) { + targetDest = path.resolve(basePath, targetDest); + } + if (targetDest === resolvedPath) { + return cb(); + } + return rmFile(target, function () { + makeLink(resolvedPath, target); + }); + }); + }); + } + + function makeLink(linkPath, target) { + fs.symlink(linkPath, target, function (err) { + if (err) { + return onError(err); + } + return cb(); + }); + } + + function isWritable(path, done) { + fs.lstat(path, function (err) { + if (err) { + if (err.code === 'ENOENT') return done(true); + return done(false); + } + return done(false); + }); + } + + function onError(err) { + if (options.stopOnError) { + return cback(err); + } + else if (!errs && options.errs) { + errs = fs.createWriteStream(options.errs); + } + else if (!errs) { + errs = []; + } + if (typeof errs.write === 'undefined') { + errs.push(err); + } + else { + errs.write(err.stack + '\n\n'); + } + return cb(); + } + + function cb(skipped) { + if (!skipped) running--; + finished++; + if ((started === finished) && (running === 0)) { + if (cback !== undefined ) { + return errs ? cback(errs) : cback(null); + } + } + } +} + + + + +/***/ }), +/* 153 */ /***/ (function(module, exports, __webpack_require__) { // Copyright Joyent, Inc. and other Node contributors. @@ -29147,9 +13264,9 @@ function legacy (fs) { // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE // USE OR OTHER DEALINGS IN THE SOFTWARE. -var pathModule = __webpack_require__(3); +var pathModule = __webpack_require__(2); var isWindows = process.platform === 'win32'; -var fs = __webpack_require__(7); +var fs = __webpack_require__(6); // JavaScript implementation of realpath, ported from node pre-v6 @@ -29432,11 +13549,11 @@ exports.realpath = function realpath(p, cache, cb) { /***/ }), -/* 274 */ +/* 154 */ /***/ (function(module, exports, __webpack_require__) { -var concatMap = __webpack_require__(275); -var balanced = __webpack_require__(276); +var concatMap = __webpack_require__(155); +var balanced = __webpack_require__(156); module.exports = expandTop; @@ -29639,7 +13756,7 @@ function expand(str, isTop) { /***/ }), -/* 275 */ +/* 155 */ /***/ (function(module, exports) { module.exports = function (xs, fn) { @@ -29658,7 +13775,7 @@ var isArray = Array.isArray || function (xs) { /***/ }), -/* 276 */ +/* 156 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -29724,7 +13841,7 @@ function range(a, b, str) { /***/ }), -/* 277 */ +/* 157 */ /***/ (function(module, exports) { if (typeof Object.create === 'function') { @@ -29753,22 +13870,22 @@ if (typeof Object.create === 'function') { /***/ }), -/* 278 */ +/* 158 */ /***/ (function(module, exports, __webpack_require__) { module.exports = globSync globSync.GlobSync = GlobSync -var fs = __webpack_require__(7) -var rp = __webpack_require__(82) -var minimatch = __webpack_require__(58) +var fs = __webpack_require__(6) +var rp = __webpack_require__(81) +var minimatch = __webpack_require__(55) var Minimatch = minimatch.Minimatch -var Glob = __webpack_require__(31).Glob -var util = __webpack_require__(10) -var path = __webpack_require__(3) -var assert = __webpack_require__(29) -var isAbsolute = __webpack_require__(59) -var common = __webpack_require__(84) +var Glob = __webpack_require__(23).Glob +var util = __webpack_require__(8) +var path = __webpack_require__(2) +var assert = __webpack_require__(28) +var isAbsolute = __webpack_require__(56) +var common = __webpack_require__(83) var alphasort = common.alphasort var alphasorti = common.alphasorti var setopts = common.setopts @@ -30245,12 +14362,12 @@ GlobSync.prototype._makeAbs = function (f) { /***/ }), -/* 279 */ +/* 159 */ /***/ (function(module, exports, __webpack_require__) { -var wrappy = __webpack_require__(85) +var wrappy = __webpack_require__(84) var reqs = Object.create(null) -var once = __webpack_require__(86) +var once = __webpack_require__(85) module.exports = wrappy(inflight) @@ -30305,14 +14422,14 @@ function slice (args) { /***/ }), -/* 280 */ +/* 160 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const loadJsonFile = __webpack_require__(281); -const pathType = __webpack_require__(287); +const path = __webpack_require__(2); +const loadJsonFile = __webpack_require__(161); +const pathType = __webpack_require__(168); module.exports = (fp, opts) => { if (typeof fp !== 'string') { @@ -30332,7 +14449,7 @@ module.exports = (fp, opts) => { }) .then(x => { if (opts.normalize !== false) { - __webpack_require__(88)(x); + __webpack_require__(87)(x); } return x; @@ -30351,7 +14468,7 @@ module.exports.sync = (fp, opts) => { const x = loadJsonFile.sync(fp); if (opts.normalize !== false) { - __webpack_require__(88)(x); + __webpack_require__(87)(x); } return x; @@ -30359,16 +14476,16 @@ module.exports.sync = (fp, opts) => { /***/ }), -/* 281 */ +/* 161 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const fs = __webpack_require__(28); -const stripBom = __webpack_require__(282); -const parseJson = __webpack_require__(283); -const pify = __webpack_require__(23); +const path = __webpack_require__(2); +const fs = __webpack_require__(27); +const stripBom = __webpack_require__(162); +const parseJson = __webpack_require__(163); +const pify = __webpack_require__(167); const parse = (data, fp) => parseJson(stripBom(data), path.relative('.', fp)); @@ -30377,7 +14494,7 @@ module.exports.sync = fp => parse(fs.readFileSync(fp, 'utf8'), fp); /***/ }), -/* 282 */ +/* 162 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -30398,13 +14515,13 @@ module.exports = x => { /***/ }), -/* 283 */ +/* 163 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const errorEx = __webpack_require__(284); -const fallback = __webpack_require__(286); +const errorEx = __webpack_require__(164); +const fallback = __webpack_require__(166); const JSONError = errorEx('JSONError', { fileName: errorEx.append('in %s') @@ -30438,14 +14555,14 @@ module.exports = (input, reviver, filename) => { /***/ }), -/* 284 */ +/* 164 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var util = __webpack_require__(10); -var isArrayish = __webpack_require__(285); +var util = __webpack_require__(8); +var isArrayish = __webpack_require__(165); var errorEx = function errorEx(name, properties) { if (!name || name.constructor !== String) { @@ -30578,7 +14695,7 @@ module.exports = errorEx; /***/ }), -/* 285 */ +/* 165 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -30595,7 +14712,7 @@ module.exports = function isArrayish(obj) { /***/ }), -/* 286 */ +/* 166 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -30634,13 +14751,104 @@ function parseJson (txt, reviver, context) { /***/ }), -/* 287 */ +/* 167 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const fs = __webpack_require__(7); -const pify = __webpack_require__(23); + +const processFn = (fn, opts) => function () { + const P = opts.promiseModule; + const args = new Array(arguments.length); + + for (let i = 0; i < arguments.length; i++) { + args[i] = arguments[i]; + } + + return new P((resolve, reject) => { + if (opts.errorFirst) { + args.push(function (err, result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 1; i < arguments.length; i++) { + results[i - 1] = arguments[i]; + } + + if (err) { + results.unshift(err); + reject(results); + } else { + resolve(results); + } + } else if (err) { + reject(err); + } else { + resolve(result); + } + }); + } else { + args.push(function (result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 0; i < arguments.length; i++) { + results[i] = arguments[i]; + } + + resolve(results); + } else { + resolve(result); + } + }); + } + + fn.apply(this, args); + }); +}; + +module.exports = (obj, opts) => { + opts = Object.assign({ + exclude: [/.+(Sync|Stream)$/], + errorFirst: true, + promiseModule: Promise + }, opts); + + const filter = key => { + const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); + return opts.include ? opts.include.some(match) : !opts.exclude.some(match); + }; + + let ret; + if (typeof obj === 'function') { + ret = function () { + if (opts.excludeMain) { + return obj.apply(this, arguments); + } + + return processFn(obj, opts).apply(this, arguments); + }; + } else { + ret = Object.create(Object.getPrototypeOf(obj)); + } + + for (const key in obj) { // eslint-disable-line guard-for-in + const x = obj[key]; + ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; + } + + return ret; +}; + + +/***/ }), +/* 168 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const fs = __webpack_require__(6); +const pify = __webpack_require__(169); function type(fn, fn2, fp) { if (typeof fp !== 'string') { @@ -30683,17 +14891,108 @@ exports.symlinkSync = typeSync.bind(null, 'lstatSync', 'isSymbolicLink'); /***/ }), -/* 288 */ +/* 169 */ /***/ (function(module, exports, __webpack_require__) { -var semver = __webpack_require__(289) -var validateLicense = __webpack_require__(290); -var hostedGitInfo = __webpack_require__(295) -var isBuiltinModule = __webpack_require__(297) +"use strict"; + + +const processFn = (fn, opts) => function () { + const P = opts.promiseModule; + const args = new Array(arguments.length); + + for (let i = 0; i < arguments.length; i++) { + args[i] = arguments[i]; + } + + return new P((resolve, reject) => { + if (opts.errorFirst) { + args.push(function (err, result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 1; i < arguments.length; i++) { + results[i - 1] = arguments[i]; + } + + if (err) { + results.unshift(err); + reject(results); + } else { + resolve(results); + } + } else if (err) { + reject(err); + } else { + resolve(result); + } + }); + } else { + args.push(function (result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 0; i < arguments.length; i++) { + results[i] = arguments[i]; + } + + resolve(results); + } else { + resolve(result); + } + }); + } + + fn.apply(this, args); + }); +}; + +module.exports = (obj, opts) => { + opts = Object.assign({ + exclude: [/.+(Sync|Stream)$/], + errorFirst: true, + promiseModule: Promise + }, opts); + + const filter = key => { + const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); + return opts.include ? opts.include.some(match) : !opts.exclude.some(match); + }; + + let ret; + if (typeof obj === 'function') { + ret = function () { + if (opts.excludeMain) { + return obj.apply(this, arguments); + } + + return processFn(obj, opts).apply(this, arguments); + }; + } else { + ret = Object.create(Object.getPrototypeOf(obj)); + } + + for (const key in obj) { // eslint-disable-line guard-for-in + const x = obj[key]; + ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; + } + + return ret; +}; + + +/***/ }), +/* 170 */ +/***/ (function(module, exports, __webpack_require__) { + +var semver = __webpack_require__(171) +var validateLicense = __webpack_require__(172); +var hostedGitInfo = __webpack_require__(177) +var isBuiltinModule = __webpack_require__(179) var depTypes = ["dependencies","devDependencies","optionalDependencies"] -var extractDescription = __webpack_require__(299) -var url = __webpack_require__(89) -var typos = __webpack_require__(300) +var extractDescription = __webpack_require__(181) +var url = __webpack_require__(88) +var typos = __webpack_require__(182) var fixer = module.exports = { // default warning function @@ -31106,7 +15405,7 @@ function bugsTypos(bugs, warn) { /***/ }), -/* 289 */ +/* 171 */ /***/ (function(module, exports) { exports = module.exports = SemVer; @@ -31132,9 +15431,6 @@ exports.SEMVER_SPEC_VERSION = '2.0.0'; var MAX_LENGTH = 256; var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991; -// Max safe segment length for coercion. -var MAX_SAFE_COMPONENT_LENGTH = 16; - // The actual regexps go on exports.re var re = exports.re = []; var src = exports.src = []; @@ -31270,15 +15566,6 @@ src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$'; var XRANGELOOSE = R++; src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$'; -// Coercion. -// Extract anything that could conceivably be a part of a valid semver -var COERCE = R++; -src[COERCE] = '(?:^|[^\\d])' + - '(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' + - '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' + - '(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' + - '(?:$|[^\\d])'; - // Tilde ranges. // Meaning is "reasonably at or greater than" var LONETILDE = R++; @@ -32418,29 +16705,13 @@ function intersects(r1, r2, loose) { return r1.intersects(r2) } -exports.coerce = coerce; -function coerce(version) { - if (version instanceof SemVer) - return version; - - if (typeof version !== 'string') - return null; - - var match = version.match(re[COERCE]); - - if (match == null) - return null; - - return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0')); -} - /***/ }), -/* 290 */ +/* 172 */ /***/ (function(module, exports, __webpack_require__) { -var parse = __webpack_require__(291); -var correct = __webpack_require__(293); +var parse = __webpack_require__(173); +var correct = __webpack_require__(175); var genericWarning = ( 'license should be ' + @@ -32526,10 +16797,10 @@ module.exports = function(argument) { /***/ }), -/* 291 */ +/* 173 */ /***/ (function(module, exports, __webpack_require__) { -var parser = __webpack_require__(292).parser +var parser = __webpack_require__(174).parser module.exports = function (argument) { return parser.parse(argument) @@ -32537,7 +16808,7 @@ module.exports = function (argument) { /***/ }), -/* 292 */ +/* 174 */ /***/ (function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(module) {/* parser generated by jison 0.4.17 */ @@ -33890,7 +18161,7 @@ exports.main = function commonjsMain(args) { console.log('Usage: '+args[0]+' FILE'); process.exit(1); } - var source = __webpack_require__(7).readFileSync(__webpack_require__(3).normalize(args[1]), "utf8"); + var source = __webpack_require__(6).readFileSync(__webpack_require__(2).normalize(args[1]), "utf8"); return exports.parser.parse(source); }; if (typeof module !== 'undefined' && __webpack_require__.c[__webpack_require__.s] === module) { @@ -33898,13 +18169,13 @@ if (typeof module !== 'undefined' && __webpack_require__.c[__webpack_require__.s } } -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(27)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(38)(module))) /***/ }), -/* 293 */ +/* 175 */ /***/ (function(module, exports, __webpack_require__) { -var licenseIDs = __webpack_require__(294); +var licenseIDs = __webpack_require__(176); function valid(string) { return licenseIDs.indexOf(string) > -1; @@ -34144,20 +18415,20 @@ module.exports = function(identifier) { /***/ }), -/* 294 */ +/* 176 */ /***/ (function(module, exports) { module.exports = ["Glide","Abstyles","AFL-1.1","AFL-1.2","AFL-2.0","AFL-2.1","AFL-3.0","AMPAS","APL-1.0","Adobe-Glyph","APAFML","Adobe-2006","AGPL-1.0","Afmparse","Aladdin","ADSL","AMDPLPA","ANTLR-PD","Apache-1.0","Apache-1.1","Apache-2.0","AML","APSL-1.0","APSL-1.1","APSL-1.2","APSL-2.0","Artistic-1.0","Artistic-1.0-Perl","Artistic-1.0-cl8","Artistic-2.0","AAL","Bahyph","Barr","Beerware","BitTorrent-1.0","BitTorrent-1.1","BSL-1.0","Borceux","BSD-2-Clause","BSD-2-Clause-FreeBSD","BSD-2-Clause-NetBSD","BSD-3-Clause","BSD-3-Clause-Clear","BSD-4-Clause","BSD-Protection","BSD-Source-Code","BSD-3-Clause-Attribution","0BSD","BSD-4-Clause-UC","bzip2-1.0.5","bzip2-1.0.6","Caldera","CECILL-1.0","CECILL-1.1","CECILL-2.0","CECILL-2.1","CECILL-B","CECILL-C","ClArtistic","MIT-CMU","CNRI-Jython","CNRI-Python","CNRI-Python-GPL-Compatible","CPOL-1.02","CDDL-1.0","CDDL-1.1","CPAL-1.0","CPL-1.0","CATOSL-1.1","Condor-1.1","CC-BY-1.0","CC-BY-2.0","CC-BY-2.5","CC-BY-3.0","CC-BY-4.0","CC-BY-ND-1.0","CC-BY-ND-2.0","CC-BY-ND-2.5","CC-BY-ND-3.0","CC-BY-ND-4.0","CC-BY-NC-1.0","CC-BY-NC-2.0","CC-BY-NC-2.5","CC-BY-NC-3.0","CC-BY-NC-4.0","CC-BY-NC-ND-1.0","CC-BY-NC-ND-2.0","CC-BY-NC-ND-2.5","CC-BY-NC-ND-3.0","CC-BY-NC-ND-4.0","CC-BY-NC-SA-1.0","CC-BY-NC-SA-2.0","CC-BY-NC-SA-2.5","CC-BY-NC-SA-3.0","CC-BY-NC-SA-4.0","CC-BY-SA-1.0","CC-BY-SA-2.0","CC-BY-SA-2.5","CC-BY-SA-3.0","CC-BY-SA-4.0","CC0-1.0","Crossword","CrystalStacker","CUA-OPL-1.0","Cube","curl","D-FSL-1.0","diffmark","WTFPL","DOC","Dotseqn","DSDP","dvipdfm","EPL-1.0","ECL-1.0","ECL-2.0","eGenix","EFL-1.0","EFL-2.0","MIT-advertising","MIT-enna","Entessa","ErlPL-1.1","EUDatagrid","EUPL-1.0","EUPL-1.1","Eurosym","Fair","MIT-feh","Frameworx-1.0","FreeImage","FTL","FSFAP","FSFUL","FSFULLR","Giftware","GL2PS","Glulxe","AGPL-3.0","GFDL-1.1","GFDL-1.2","GFDL-1.3","GPL-1.0","GPL-2.0","GPL-3.0","LGPL-2.1","LGPL-3.0","LGPL-2.0","gnuplot","gSOAP-1.3b","HaskellReport","HPND","IBM-pibs","IPL-1.0","ICU","ImageMagick","iMatix","Imlib2","IJG","Info-ZIP","Intel-ACPI","Intel","Interbase-1.0","IPA","ISC","JasPer-2.0","JSON","LPPL-1.0","LPPL-1.1","LPPL-1.2","LPPL-1.3a","LPPL-1.3c","Latex2e","BSD-3-Clause-LBNL","Leptonica","LGPLLR","Libpng","libtiff","LAL-1.2","LAL-1.3","LiLiQ-P-1.1","LiLiQ-Rplus-1.1","LiLiQ-R-1.1","LPL-1.02","LPL-1.0","MakeIndex","MTLL","MS-PL","MS-RL","MirOS","MITNFA","MIT","Motosoto","MPL-1.0","MPL-1.1","MPL-2.0","MPL-2.0-no-copyleft-exception","mpich2","Multics","Mup","NASA-1.3","Naumen","NBPL-1.0","NetCDF","NGPL","NOSL","NPL-1.0","NPL-1.1","Newsletr","NLPL","Nokia","NPOSL-3.0","NLOD-1.0","Noweb","NRL","NTP","Nunit","OCLC-2.0","ODbL-1.0","PDDL-1.0","OCCT-PL","OGTSL","OLDAP-2.2.2","OLDAP-1.1","OLDAP-1.2","OLDAP-1.3","OLDAP-1.4","OLDAP-2.0","OLDAP-2.0.1","OLDAP-2.1","OLDAP-2.2","OLDAP-2.2.1","OLDAP-2.3","OLDAP-2.4","OLDAP-2.5","OLDAP-2.6","OLDAP-2.7","OLDAP-2.8","OML","OPL-1.0","OSL-1.0","OSL-1.1","OSL-2.0","OSL-2.1","OSL-3.0","OpenSSL","OSET-PL-2.1","PHP-3.0","PHP-3.01","Plexus","PostgreSQL","psfrag","psutils","Python-2.0","QPL-1.0","Qhull","Rdisc","RPSL-1.0","RPL-1.1","RPL-1.5","RHeCos-1.1","RSCPL","RSA-MD","Ruby","SAX-PD","Saxpath","SCEA","SWL","SMPPL","Sendmail","SGI-B-1.0","SGI-B-1.1","SGI-B-2.0","OFL-1.0","OFL-1.1","SimPL-2.0","Sleepycat","SNIA","Spencer-86","Spencer-94","Spencer-99","SMLNJ","SugarCRM-1.1.3","SISSL","SISSL-1.2","SPL-1.0","Watcom-1.0","TCL","Unlicense","TMate","TORQUE-1.1","TOSL","Unicode-TOU","UPL-1.0","NCSA","Vim","VOSTROM","VSL-1.0","W3C-19980720","W3C","Wsuipa","Xnet","X11","Xerox","XFree86-1.1","xinetd","xpp","XSkat","YPL-1.0","YPL-1.1","Zed","Zend-2.0","Zimbra-1.3","Zimbra-1.4","Zlib","zlib-acknowledgement","ZPL-1.1","ZPL-2.0","ZPL-2.1","BSD-3-Clause-No-Nuclear-License","BSD-3-Clause-No-Nuclear-Warranty","BSD-3-Clause-No-Nuclear-License-2014","eCos-2.0","GPL-2.0-with-autoconf-exception","GPL-2.0-with-bison-exception","GPL-2.0-with-classpath-exception","GPL-2.0-with-font-exception","GPL-2.0-with-GCC-exception","GPL-3.0-with-autoconf-exception","GPL-3.0-with-GCC-exception","StandardML-NJ","WXwindows"] /***/ }), -/* 295 */ +/* 177 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var url = __webpack_require__(89) -var gitHosts = __webpack_require__(90) -var GitHost = module.exports = __webpack_require__(296) +var url = __webpack_require__(88) +var gitHosts = __webpack_require__(89) +var GitHost = module.exports = __webpack_require__(178) var protocolToRepresentationMap = { 'git+ssh': 'sshurl', @@ -34278,13 +18549,13 @@ function parseGitUrl (giturl) { /***/ }), -/* 296 */ +/* 178 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var gitHosts = __webpack_require__(90) -var extend = Object.assign || __webpack_require__(10)._extend +var gitHosts = __webpack_require__(89) +var extend = Object.assign || __webpack_require__(8)._extend var GitHost = module.exports = function (type, user, auth, project, committish, defaultRepresentation, opts) { var gitHostInfo = this @@ -34399,12 +18670,12 @@ GitHost.prototype.toString = function (opts) { /***/ }), -/* 297 */ +/* 179 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var builtinModules = __webpack_require__(298); +var builtinModules = __webpack_require__(180); module.exports = function (str) { if (typeof str !== 'string') { @@ -34416,7 +18687,7 @@ module.exports = function (str) { /***/ }), -/* 298 */ +/* 180 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -34433,7 +18704,7 @@ module.exports = Object.keys(process.binding('natives')).filter(function (el) { /***/ }), -/* 299 */ +/* 181 */ /***/ (function(module, exports) { module.exports = extractDescription @@ -34453,17 +18724,17 @@ function extractDescription (d) { /***/ }), -/* 300 */ +/* 182 */ /***/ (function(module, exports) { module.exports = {"topLevel":{"dependancies":"dependencies","dependecies":"dependencies","depdenencies":"dependencies","devEependencies":"devDependencies","depends":"dependencies","dev-dependencies":"devDependencies","devDependences":"devDependencies","devDepenencies":"devDependencies","devdependencies":"devDependencies","repostitory":"repository","repo":"repository","prefereGlobal":"preferGlobal","hompage":"homepage","hampage":"homepage","autohr":"author","autor":"author","contributers":"contributors","publicationConfig":"publishConfig","script":"scripts"},"bugs":{"web":"url","name":"url"},"script":{"server":"start","tests":"test"}} /***/ }), -/* 301 */ +/* 183 */ /***/ (function(module, exports, __webpack_require__) { -var util = __webpack_require__(10) -var messages = __webpack_require__(302) +var util = __webpack_require__(8) +var messages = __webpack_require__(184) module.exports = function() { var args = Array.prototype.slice.call(arguments, 0) @@ -34488,20 +18759,20 @@ function makeTypoWarning (providedName, probableName, field) { /***/ }), -/* 302 */ +/* 184 */ /***/ (function(module, exports) { module.exports = {"repositories":"'repositories' (plural) Not supported. Please pick one as the 'repository' field","missingRepository":"No repository field.","brokenGitUrl":"Probably broken git url: %s","nonObjectScripts":"scripts must be an object","nonStringScript":"script values must be string commands","nonArrayFiles":"Invalid 'files' member","invalidFilename":"Invalid filename in 'files' list: %s","nonArrayBundleDependencies":"Invalid 'bundleDependencies' list. Must be array of package names","nonStringBundleDependency":"Invalid bundleDependencies member: %s","nonDependencyBundleDependency":"Non-dependency in bundleDependencies: %s","nonObjectDependencies":"%s field must be an object","nonStringDependency":"Invalid dependency: %s %s","deprecatedArrayDependencies":"specifying %s as array is deprecated","deprecatedModules":"modules field is deprecated","nonArrayKeywords":"keywords should be an array of strings","nonStringKeyword":"keywords should be an array of strings","conflictingName":"%s is also the name of a node core module.","nonStringDescription":"'description' field should be a string","missingDescription":"No description","missingReadme":"No README data","missingLicense":"No license field.","nonEmailUrlBugsString":"Bug string field must be url, email, or {email,url}","nonUrlBugsUrlField":"bugs.url field must be a string url. Deleted.","nonEmailBugsEmailField":"bugs.email field must be a string email. Deleted.","emptyNormalizedBugs":"Normalized value of bugs field is an empty object. Deleted.","nonUrlHomepage":"homepage field must be a string url. Deleted.","invalidLicense":"license should be a valid SPDX license expression","typo":"%s should probably be %s."} /***/ }), -/* 303 */ +/* 185 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const writeJsonFile = __webpack_require__(304); -const sortKeys = __webpack_require__(91); +const path = __webpack_require__(2); +const writeJsonFile = __webpack_require__(186); +const sortKeys = __webpack_require__(90); const opts = {detectIndent: true}; @@ -34554,18 +18825,18 @@ module.exports.sync = (fp, data) => { /***/ }), -/* 304 */ +/* 186 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const fs = __webpack_require__(28); -const writeFileAtomic = __webpack_require__(305); -const sortKeys = __webpack_require__(91); -const makeDir = __webpack_require__(92); -const pify = __webpack_require__(23); -const detectIndent = __webpack_require__(309); +const path = __webpack_require__(2); +const fs = __webpack_require__(27); +const writeFileAtomic = __webpack_require__(187); +const sortKeys = __webpack_require__(90); +const makeDir = __webpack_require__(91); +const pify = __webpack_require__(192); +const detectIndent = __webpack_require__(193); const init = (fn, fp, data, opts) => { if (!fp) { @@ -34634,7 +18905,7 @@ module.exports.sync = (fp, data, opts) => { /***/ }), -/* 305 */ +/* 187 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -34644,10 +18915,10 @@ module.exports.sync = writeFileSync module.exports._getTmpname = getTmpname // for testing module.exports._cleanupOnExit = cleanupOnExit -var fs = __webpack_require__(28) -var MurmurHash3 = __webpack_require__(306) -var onExit = __webpack_require__(61) -var path = __webpack_require__(3) +var fs = __webpack_require__(27) +var MurmurHash3 = __webpack_require__(188) +var onExit = __webpack_require__(58) +var path = __webpack_require__(2) var activeFiles = {} var invocations = 0 @@ -34840,7 +19111,7 @@ function writeFileSync (filename, data, options) { /***/ }), -/* 306 */ +/* 188 */ /***/ (function(module, exports, __webpack_require__) { /** @@ -34984,7 +19255,7 @@ function writeFileSync (filename, data, options) { /***/ }), -/* 307 */ +/* 189 */ /***/ (function(module, exports) { // This is not the set of all possible signals. @@ -35043,7 +19314,7 @@ if (process.platform === 'linux') { /***/ }), -/* 308 */ +/* 190 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -35057,7 +19328,189 @@ module.exports = function (x) { /***/ }), -/* 309 */ +/* 191 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +const processFn = (fn, opts) => function () { + const P = opts.promiseModule; + const args = new Array(arguments.length); + + for (let i = 0; i < arguments.length; i++) { + args[i] = arguments[i]; + } + + return new P((resolve, reject) => { + if (opts.errorFirst) { + args.push(function (err, result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 1; i < arguments.length; i++) { + results[i - 1] = arguments[i]; + } + + if (err) { + results.unshift(err); + reject(results); + } else { + resolve(results); + } + } else if (err) { + reject(err); + } else { + resolve(result); + } + }); + } else { + args.push(function (result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 0; i < arguments.length; i++) { + results[i] = arguments[i]; + } + + resolve(results); + } else { + resolve(result); + } + }); + } + + fn.apply(this, args); + }); +}; + +module.exports = (obj, opts) => { + opts = Object.assign({ + exclude: [/.+(Sync|Stream)$/], + errorFirst: true, + promiseModule: Promise + }, opts); + + const filter = key => { + const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); + return opts.include ? opts.include.some(match) : !opts.exclude.some(match); + }; + + let ret; + if (typeof obj === 'function') { + ret = function () { + if (opts.excludeMain) { + return obj.apply(this, arguments); + } + + return processFn(obj, opts).apply(this, arguments); + }; + } else { + ret = Object.create(Object.getPrototypeOf(obj)); + } + + for (const key in obj) { // eslint-disable-line guard-for-in + const x = obj[key]; + ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; + } + + return ret; +}; + + +/***/ }), +/* 192 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +const processFn = (fn, opts) => function () { + const P = opts.promiseModule; + const args = new Array(arguments.length); + + for (let i = 0; i < arguments.length; i++) { + args[i] = arguments[i]; + } + + return new P((resolve, reject) => { + if (opts.errorFirst) { + args.push(function (err, result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 1; i < arguments.length; i++) { + results[i - 1] = arguments[i]; + } + + if (err) { + results.unshift(err); + reject(results); + } else { + resolve(results); + } + } else if (err) { + reject(err); + } else { + resolve(result); + } + }); + } else { + args.push(function (result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 0; i < arguments.length; i++) { + results[i] = arguments[i]; + } + + resolve(results); + } else { + resolve(result); + } + }); + } + + fn.apply(this, args); + }); +}; + +module.exports = (obj, opts) => { + opts = Object.assign({ + exclude: [/.+(Sync|Stream)$/], + errorFirst: true, + promiseModule: Promise + }, opts); + + const filter = key => { + const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); + return opts.include ? opts.include.some(match) : !opts.exclude.some(match); + }; + + let ret; + if (typeof obj === 'function') { + ret = function () { + if (opts.excludeMain) { + return obj.apply(this, arguments); + } + + return processFn(obj, opts).apply(this, arguments); + }; + } else { + ret = Object.create(Object.getPrototypeOf(obj)); + } + + for (const key in obj) { // eslint-disable-line guard-for-in + const x = obj[key]; + ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; + } + + return ret; +}; + + +/***/ }), +/* 193 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -35186,7 +19639,7 @@ module.exports = str => { /***/ }), -/* 310 */ +/* 194 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -35202,7 +19655,7 @@ exports.runScriptInPackage = exports.installInDir = undefined; */ let installInDir = exports.installInDir = (() => { var _ref = _asyncToGenerator(function* (directory, extraArgs = []) { - const options = ['install', '--check-files', '--non-interactive', '--mutex=file', ...extraArgs]; + const options = ['install', '--non-interactive', '--mutex=file', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any // given time (e.g. to avoid conflicts). yield (0, _child_process.spawn)('yarn', options, { @@ -35238,7 +19691,7 @@ let runScriptInPackage = exports.runScriptInPackage = (() => { exports.runScriptInPackageStreaming = runScriptInPackageStreaming; -var _child_process = __webpack_require__(311); +var _child_process = __webpack_require__(195); function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* * Licensed to Elasticsearch B.V. under one or more contributor @@ -35270,7 +19723,7 @@ function runScriptInPackageStreaming(script, args, pkg) { } /***/ }), -/* 311 */ +/* 195 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -35303,26 +19756,26 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument exports.spawn = spawn; exports.spawnStreaming = spawnStreaming; -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _execa = __webpack_require__(312); +var _execa = __webpack_require__(196); var _execa2 = _interopRequireDefault(_execa); -var _logSymbols = __webpack_require__(96); +var _logSymbols = __webpack_require__(95); var _logSymbols2 = _interopRequireDefault(_logSymbols); -var _strongLogTransformer = __webpack_require__(342); +var _strongLogTransformer = __webpack_require__(227); var _strongLogTransformer2 = _interopRequireDefault(_strongLogTransformer); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function generateColors() { - const colorWheel = [_chalk2.default.cyan, _chalk2.default.magenta, _chalk2.default.blue, _chalk2.default.yellow, _chalk2.default.green, _chalk2.default.red]; + const colorWheel = [_chalk2.default.cyan, _chalk2.default.magenta, _chalk2.default.blue, _chalk2.default.yellow, _chalk2.default.green]; const count = colorWheel.length; let children = 0; return () => colorWheel[children++ % count]; @@ -35349,23 +19802,23 @@ function spawnStreaming(command, args, opts, { prefix }) { } /***/ }), -/* 312 */ +/* 196 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const childProcess = __webpack_require__(62); -const util = __webpack_require__(10); -const crossSpawn = __webpack_require__(313); -const stripEof = __webpack_require__(329); -const npmRunPath = __webpack_require__(330); -const isStream = __webpack_require__(332); -const _getStream = __webpack_require__(333); -const pFinally = __webpack_require__(335); -const onExit = __webpack_require__(61); -const errname = __webpack_require__(336); -const stdio = __webpack_require__(337); +const path = __webpack_require__(2); +const childProcess = __webpack_require__(59); +const util = __webpack_require__(8); +const crossSpawn = __webpack_require__(197); +const stripEof = __webpack_require__(213); +const npmRunPath = __webpack_require__(214); +const isStream = __webpack_require__(216); +const _getStream = __webpack_require__(217); +const pFinally = __webpack_require__(219); +const onExit = __webpack_require__(58); +const errname = __webpack_require__(220); +const stdio = __webpack_require__(221); const TEN_MEGABYTES = 1000 * 1000 * 10; @@ -35719,15 +20172,15 @@ module.exports.spawn = util.deprecate(module.exports, 'execa.spawn() is deprecat /***/ }), -/* 313 */ +/* 197 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var cp = __webpack_require__(62); -var parse = __webpack_require__(314); -var enoent = __webpack_require__(327); +var cp = __webpack_require__(59); +var parse = __webpack_require__(198); +var enoent = __webpack_require__(211); var cpSpawnSync = cp.spawnSync; @@ -35754,7 +20207,7 @@ function spawnSync(command, args, options) { if (!cpSpawnSync) { try { - cpSpawnSync = __webpack_require__(328); // eslint-disable-line global-require + cpSpawnSync = __webpack_require__(212); // eslint-disable-line global-require } catch (ex) { throw new Error( 'In order to use spawnSync on node 0.10 or older, you must ' + @@ -35785,17 +20238,17 @@ module.exports._enoent = enoent; /***/ }), -/* 314 */ +/* 198 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var resolveCommand = __webpack_require__(93); -var hasEmptyArgumentBug = __webpack_require__(322); -var escapeArgument = __webpack_require__(95); -var escapeCommand = __webpack_require__(323); -var readShebang = __webpack_require__(324); +var resolveCommand = __webpack_require__(92); +var hasEmptyArgumentBug = __webpack_require__(206); +var escapeArgument = __webpack_require__(94); +var escapeCommand = __webpack_require__(207); +var readShebang = __webpack_require__(208); var isWin = process.platform === 'win32'; var skipShellRegExp = /\.(?:com|exe)$/i; @@ -35905,7 +20358,7 @@ module.exports = parse; /***/ }), -/* 315 */ +/* 199 */ /***/ (function(module, exports, __webpack_require__) { module.exports = which @@ -35915,9 +20368,9 @@ var isWindows = process.platform === 'win32' || process.env.OSTYPE === 'cygwin' || process.env.OSTYPE === 'msys' -var path = __webpack_require__(3) +var path = __webpack_require__(2) var COLON = isWindows ? ';' : ':' -var isexe = __webpack_require__(316) +var isexe = __webpack_require__(200) function getNotFoundError (cmd) { var er = new Error('not found: ' + cmd) @@ -36046,15 +20499,15 @@ function whichSync (cmd, opt) { /***/ }), -/* 316 */ +/* 200 */ /***/ (function(module, exports, __webpack_require__) { -var fs = __webpack_require__(7) +var fs = __webpack_require__(6) var core if (process.platform === 'win32' || global.TESTING_WINDOWS) { - core = __webpack_require__(317) + core = __webpack_require__(201) } else { - core = __webpack_require__(318) + core = __webpack_require__(202) } module.exports = isexe @@ -36109,13 +20562,13 @@ function sync (path, options) { /***/ }), -/* 317 */ +/* 201 */ /***/ (function(module, exports, __webpack_require__) { module.exports = isexe isexe.sync = sync -var fs = __webpack_require__(7) +var fs = __webpack_require__(6) function checkPathExt (path, options) { var pathext = options.pathExt !== undefined ? @@ -36157,13 +20610,13 @@ function sync (path, options) { /***/ }), -/* 318 */ +/* 202 */ /***/ (function(module, exports, __webpack_require__) { module.exports = isexe isexe.sync = sync -var fs = __webpack_require__(7) +var fs = __webpack_require__(6) function isexe (path, options, cb) { fs.stat(path, function (er, stat) { @@ -36204,7 +20657,7 @@ function checkMode (stat, options) { /***/ }), -/* 319 */ +/* 203 */ /***/ (function(module, exports, __webpack_require__) { if (process.env.npm_package_name === 'pseudomap' && @@ -36214,12 +20667,12 @@ if (process.env.npm_package_name === 'pseudomap' && if (typeof Map === 'function' && !process.env.TEST_PSEUDOMAP) { module.exports = Map } else { - module.exports = __webpack_require__(320) + module.exports = __webpack_require__(204) } /***/ }), -/* 320 */ +/* 204 */ /***/ (function(module, exports) { var hasOwnProperty = Object.prototype.hasOwnProperty @@ -36338,7 +20791,7 @@ function set (data, k, v) { /***/ }), -/* 321 */ +/* 205 */ /***/ (function(module, exports) { module.exports = Yallist @@ -36714,7 +21167,7 @@ function Node (value, prev, next, list) { /***/ }), -/* 322 */ +/* 206 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -36739,13 +21192,13 @@ module.exports = hasEmptyArgumentBug(); /***/ }), -/* 323 */ +/* 207 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var escapeArgument = __webpack_require__(95); +var escapeArgument = __webpack_require__(94); function escapeCommand(command) { // Do not escape if this command is not dangerous.. @@ -36758,15 +21211,15 @@ module.exports = escapeCommand; /***/ }), -/* 324 */ +/* 208 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var fs = __webpack_require__(7); -var LRU = __webpack_require__(94); -var shebangCommand = __webpack_require__(325); +var fs = __webpack_require__(6); +var LRU = __webpack_require__(93); +var shebangCommand = __webpack_require__(209); var shebangCache = new LRU({ max: 50, maxAge: 30 * 1000 }); // Cache just for 30sec @@ -36802,12 +21255,12 @@ module.exports = readShebang; /***/ }), -/* 325 */ +/* 209 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var shebangRegex = __webpack_require__(326); +var shebangRegex = __webpack_require__(210); module.exports = function (str) { var match = str.match(shebangRegex); @@ -36828,7 +21281,7 @@ module.exports = function (str) { /***/ }), -/* 326 */ +/* 210 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -36837,14 +21290,14 @@ module.exports = /^#!.*/; /***/ }), -/* 327 */ +/* 211 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; var isWin = process.platform === 'win32'; -var resolveCommand = __webpack_require__(93); +var resolveCommand = __webpack_require__(92); var isNode10 = process.version.indexOf('v0.10.') === 0; @@ -36917,17 +21370,17 @@ module.exports.notFoundError = notFoundError; /***/ }), -/* 328 */ +/* 212 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -module.exports = __webpack_require__(62).spawnSync; +module.exports = __webpack_require__(59).spawnSync; /***/ }), -/* 329 */ +/* 213 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -36949,13 +21402,13 @@ module.exports = function (x) { /***/ }), -/* 330 */ +/* 214 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const pathKey = __webpack_require__(331); +const path = __webpack_require__(2); +const pathKey = __webpack_require__(215); module.exports = opts => { opts = Object.assign({ @@ -36995,7 +21448,7 @@ module.exports.env = opts => { /***/ }), -/* 331 */ +/* 215 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -37015,7 +21468,7 @@ module.exports = opts => { /***/ }), -/* 332 */ +/* 216 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -37043,12 +21496,12 @@ isStream.transform = function (stream) { /***/ }), -/* 333 */ +/* 217 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const bufferStream = __webpack_require__(334); +const bufferStream = __webpack_require__(218); function getStream(inputStream, opts) { if (!inputStream) { @@ -37101,12 +21554,12 @@ module.exports.array = (stream, opts) => getStream(stream, Object.assign({}, opt /***/ }), -/* 334 */ +/* 218 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const PassThrough = __webpack_require__(22).PassThrough; +const PassThrough = __webpack_require__(21).PassThrough; module.exports = opts => { opts = Object.assign({}, opts); @@ -37159,7 +21612,7 @@ module.exports = opts => { /***/ }), -/* 335 */ +/* 219 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -37181,7 +21634,7 @@ module.exports = (promise, onFinally) => { /***/ }), -/* 336 */ +/* 220 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -37225,7 +21678,7 @@ module.exports.__test__ = errname; /***/ }), -/* 337 */ +/* 221 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -37273,16 +21726,16 @@ module.exports = opts => { /***/ }), -/* 338 */ +/* 222 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const escapeStringRegexp = __webpack_require__(52); -const ansiStyles = __webpack_require__(339); -const stdoutColor = __webpack_require__(340).stdout; +const escapeStringRegexp = __webpack_require__(51); +const ansiStyles = __webpack_require__(223); +const supportsColor = __webpack_require__(224); -const template = __webpack_require__(341); +const template = __webpack_require__(226); const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); @@ -37298,7 +21751,7 @@ function applyOptions(obj, options) { options = options || {}; // Detect level if not set manually - const scLevel = stdoutColor ? stdoutColor.level : 0; + const scLevel = supportsColor ? supportsColor.level : 0; obj.level = options.level === undefined ? scLevel : options.level; obj.enabled = 'enabled' in options ? options.enabled : obj.level > 0; } @@ -37503,17 +21956,17 @@ function chalkTag(chalk, strings) { Object.defineProperties(Chalk.prototype, styles); module.exports = Chalk(); // eslint-disable-line new-cap -module.exports.supportsColor = stdoutColor; +module.exports.supportsColor = supportsColor; module.exports.default = module.exports; // For TypeScript /***/ }), -/* 339 */ +/* 223 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; /* WEBPACK VAR INJECTION */(function(module) { -const colorConvert = __webpack_require__(53); +const colorConvert = __webpack_require__(52); const wrapAnsi16 = (fn, offset) => function () { const code = fn.apply(colorConvert, arguments); @@ -37665,35 +22118,20 @@ Object.defineProperty(module, 'exports', { get: assembleStyles }); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(27)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(38)(module))) /***/ }), -/* 340 */ +/* 224 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const os = __webpack_require__(54); -const hasFlag = __webpack_require__(55); +const os = __webpack_require__(53); +const hasFlag = __webpack_require__(225); const env = process.env; -let forceColor; -if (hasFlag('no-color') || - hasFlag('no-colors') || - hasFlag('color=false')) { - forceColor = false; -} else if (hasFlag('color') || - hasFlag('colors') || - hasFlag('color=true') || - hasFlag('color=always')) { - forceColor = true; -} -if ('FORCE_COLOR' in env) { - forceColor = env.FORCE_COLOR.length === 0 || parseInt(env.FORCE_COLOR, 10) !== 0; -} - -function translateLevel(level) { +const support = level => { if (level === 0) { return false; } @@ -37704,10 +22142,12 @@ function translateLevel(level) { has256: level >= 2, has16m: level >= 3 }; -} +}; -function supportsColor(stream) { - if (forceColor === false) { +let supportLevel = (() => { + if (hasFlag('no-color') || + hasFlag('no-colors') || + hasFlag('color=false')) { return 0; } @@ -37721,26 +22161,30 @@ function supportsColor(stream) { return 2; } - if (stream && !stream.isTTY && forceColor !== true) { - return 0; + if (hasFlag('color') || + hasFlag('colors') || + hasFlag('color=true') || + hasFlag('color=always')) { + return 1; } - const min = forceColor ? 1 : 0; + if (process.stdout && !process.stdout.isTTY) { + return 0; + } if (process.platform === 'win32') { // Node.js 7.5.0 is the first version of Node.js to include a patch to // libuv that enables 256 color output on Windows. Anything earlier and it // won't work. However, here we target Node.js 8 at minimum as it is an LTS // release, and Node.js 7 is not. Windows 10 build 10586 is the first Windows - // release that supports 256 colors. Windows 10 build 14931 is the first release - // that supports 16m/TrueColor. + // release that supports 256 colors. const osRelease = os.release().split('.'); if ( Number(process.versions.node.split('.')[0]) >= 8 && Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586 ) { - return Number(osRelease[2]) >= 14931 ? 3 : 2; + return 2; } return 1; @@ -37751,7 +22195,7 @@ function supportsColor(stream) { return 1; } - return min; + return 0; } if ('TEAMCITY_VERSION' in env) { @@ -37785,26 +22229,38 @@ function supportsColor(stream) { } if (env.TERM === 'dumb') { - return min; + return 0; } - return min; -} + return 0; +})(); -function getSupportLevel(stream) { - const level = supportsColor(stream); - return translateLevel(level); +if ('FORCE_COLOR' in env) { + supportLevel = parseInt(env.FORCE_COLOR, 10) === 0 ? 0 : (supportLevel || 1); } -module.exports = { - supportsColor: getSupportLevel, - stdout: getSupportLevel(process.stdout), - stderr: getSupportLevel(process.stderr) +module.exports = process && support(supportLevel); + + +/***/ }), +/* 225 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +module.exports = function (flag, argv) { + argv = argv || process.argv; + + var terminatorPos = argv.indexOf('--'); + var prefix = /^-{1,2}/.test(flag) ? '' : '--'; + var pos = argv.indexOf(prefix + flag); + + return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos); }; /***/ }), -/* 341 */ +/* 226 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -37939,20 +22395,20 @@ module.exports = (chalk, tmp) => { /***/ }), -/* 342 */ +/* 227 */ /***/ (function(module, exports, __webpack_require__) { -// Copyright IBM Corp. 2014. All Rights Reserved. +// Copyright IBM Corp. 2014,2018. All Rights Reserved. // Node module: strong-log-transformer -// This file is licensed under the Artistic License 2.0. -// License text available at https://opensource.org/licenses/Artistic-2.0 +// This file is licensed under the Apache License 2.0. +// License text available at https://opensource.org/licenses/Apache-2.0 -module.exports = __webpack_require__(97); -module.exports.cli = __webpack_require__(348); +module.exports = __webpack_require__(96); +module.exports.cli = __webpack_require__(232); /***/ }), -/* 343 */ +/* 228 */ /***/ (function(module, exports, __webpack_require__) { // Copyright (C) 2011-2015 John Hewson @@ -37975,9 +22431,9 @@ module.exports.cli = __webpack_require__(348); // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. -var stream = __webpack_require__(22), - util = __webpack_require__(10), - timers = __webpack_require__(344); +var stream = __webpack_require__(21), + util = __webpack_require__(8), + timers = __webpack_require__(229); // convinience API module.exports = function(readStream, options) { @@ -38113,16 +22569,16 @@ LineStream.prototype._reencode = function(line, chunkEncoding) { /***/ }), -/* 344 */ +/* 229 */ /***/ (function(module, exports) { module.exports = require("timers"); /***/ }), -/* 345 */ +/* 230 */ /***/ (function(module, exports, __webpack_require__) { -var Stream = __webpack_require__(22) +var Stream = __webpack_require__(21) // through // @@ -38233,10 +22689,10 @@ function through (write, end, opts) { /***/ }), -/* 346 */ +/* 231 */ /***/ (function(module, exports, __webpack_require__) { -var Stream = __webpack_require__(22) +var Stream = __webpack_require__(21) var writeMethods = ["write", "end", "destroy"] var readMethods = ["resume", "pause"] var readEvents = ["data", "close"] @@ -38326,282 +22782,22 @@ function duplex(writer, reader) { /***/ }), -/* 347 */ -/***/ (function(module, exports, __webpack_require__) { - -var map = { - "./af": 98, - "./af.js": 98, - "./ar": 99, - "./ar-dz": 100, - "./ar-dz.js": 100, - "./ar-kw": 101, - "./ar-kw.js": 101, - "./ar-ly": 102, - "./ar-ly.js": 102, - "./ar-ma": 103, - "./ar-ma.js": 103, - "./ar-sa": 104, - "./ar-sa.js": 104, - "./ar-tn": 105, - "./ar-tn.js": 105, - "./ar.js": 99, - "./az": 106, - "./az.js": 106, - "./be": 107, - "./be.js": 107, - "./bg": 108, - "./bg.js": 108, - "./bm": 109, - "./bm.js": 109, - "./bn": 110, - "./bn.js": 110, - "./bo": 111, - "./bo.js": 111, - "./br": 112, - "./br.js": 112, - "./bs": 113, - "./bs.js": 113, - "./ca": 114, - "./ca.js": 114, - "./cs": 115, - "./cs.js": 115, - "./cv": 116, - "./cv.js": 116, - "./cy": 117, - "./cy.js": 117, - "./da": 118, - "./da.js": 118, - "./de": 119, - "./de-at": 120, - "./de-at.js": 120, - "./de-ch": 121, - "./de-ch.js": 121, - "./de.js": 119, - "./dv": 122, - "./dv.js": 122, - "./el": 123, - "./el.js": 123, - "./en-au": 124, - "./en-au.js": 124, - "./en-ca": 125, - "./en-ca.js": 125, - "./en-gb": 126, - "./en-gb.js": 126, - "./en-ie": 127, - "./en-ie.js": 127, - "./en-nz": 128, - "./en-nz.js": 128, - "./eo": 129, - "./eo.js": 129, - "./es": 130, - "./es-do": 131, - "./es-do.js": 131, - "./es-us": 132, - "./es-us.js": 132, - "./es.js": 130, - "./et": 133, - "./et.js": 133, - "./eu": 134, - "./eu.js": 134, - "./fa": 135, - "./fa.js": 135, - "./fi": 136, - "./fi.js": 136, - "./fo": 137, - "./fo.js": 137, - "./fr": 138, - "./fr-ca": 139, - "./fr-ca.js": 139, - "./fr-ch": 140, - "./fr-ch.js": 140, - "./fr.js": 138, - "./fy": 141, - "./fy.js": 141, - "./gd": 142, - "./gd.js": 142, - "./gl": 143, - "./gl.js": 143, - "./gom-latn": 144, - "./gom-latn.js": 144, - "./gu": 145, - "./gu.js": 145, - "./he": 146, - "./he.js": 146, - "./hi": 147, - "./hi.js": 147, - "./hr": 148, - "./hr.js": 148, - "./hu": 149, - "./hu.js": 149, - "./hy-am": 150, - "./hy-am.js": 150, - "./id": 151, - "./id.js": 151, - "./is": 152, - "./is.js": 152, - "./it": 153, - "./it.js": 153, - "./ja": 154, - "./ja.js": 154, - "./jv": 155, - "./jv.js": 155, - "./ka": 156, - "./ka.js": 156, - "./kk": 157, - "./kk.js": 157, - "./km": 158, - "./km.js": 158, - "./kn": 159, - "./kn.js": 159, - "./ko": 160, - "./ko.js": 160, - "./ky": 161, - "./ky.js": 161, - "./lb": 162, - "./lb.js": 162, - "./lo": 163, - "./lo.js": 163, - "./lt": 164, - "./lt.js": 164, - "./lv": 165, - "./lv.js": 165, - "./me": 166, - "./me.js": 166, - "./mi": 167, - "./mi.js": 167, - "./mk": 168, - "./mk.js": 168, - "./ml": 169, - "./ml.js": 169, - "./mr": 170, - "./mr.js": 170, - "./ms": 171, - "./ms-my": 172, - "./ms-my.js": 172, - "./ms.js": 171, - "./mt": 173, - "./mt.js": 173, - "./my": 174, - "./my.js": 174, - "./nb": 175, - "./nb.js": 175, - "./ne": 176, - "./ne.js": 176, - "./nl": 177, - "./nl-be": 178, - "./nl-be.js": 178, - "./nl.js": 177, - "./nn": 179, - "./nn.js": 179, - "./pa-in": 180, - "./pa-in.js": 180, - "./pl": 181, - "./pl.js": 181, - "./pt": 182, - "./pt-br": 183, - "./pt-br.js": 183, - "./pt.js": 182, - "./ro": 184, - "./ro.js": 184, - "./ru": 185, - "./ru.js": 185, - "./sd": 186, - "./sd.js": 186, - "./se": 187, - "./se.js": 187, - "./si": 188, - "./si.js": 188, - "./sk": 189, - "./sk.js": 189, - "./sl": 190, - "./sl.js": 190, - "./sq": 191, - "./sq.js": 191, - "./sr": 192, - "./sr-cyrl": 193, - "./sr-cyrl.js": 193, - "./sr.js": 192, - "./ss": 194, - "./ss.js": 194, - "./sv": 195, - "./sv.js": 195, - "./sw": 196, - "./sw.js": 196, - "./ta": 197, - "./ta.js": 197, - "./te": 198, - "./te.js": 198, - "./tet": 199, - "./tet.js": 199, - "./th": 200, - "./th.js": 200, - "./tl-ph": 201, - "./tl-ph.js": 201, - "./tlh": 202, - "./tlh.js": 202, - "./tr": 203, - "./tr.js": 203, - "./tzl": 204, - "./tzl.js": 204, - "./tzm": 205, - "./tzm-latn": 206, - "./tzm-latn.js": 206, - "./tzm.js": 205, - "./uk": 207, - "./uk.js": 207, - "./ur": 208, - "./ur.js": 208, - "./uz": 209, - "./uz-latn": 210, - "./uz-latn.js": 210, - "./uz.js": 209, - "./vi": 211, - "./vi.js": 211, - "./x-pseudo": 212, - "./x-pseudo.js": 212, - "./yo": 213, - "./yo.js": 213, - "./zh-cn": 214, - "./zh-cn.js": 214, - "./zh-hk": 215, - "./zh-hk.js": 215, - "./zh-tw": 216, - "./zh-tw.js": 216 -}; -function webpackContext(req) { - return __webpack_require__(webpackContextResolve(req)); -}; -function webpackContextResolve(req) { - var id = map[req]; - if(!(id + 1)) // check for number or string - throw new Error("Cannot find module '" + req + "'."); - return id; -}; -webpackContext.keys = function webpackContextKeys() { - return Object.keys(map); -}; -webpackContext.resolve = webpackContextResolve; -module.exports = webpackContext; -webpackContext.id = 347; - -/***/ }), -/* 348 */ +/* 232 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -// Copyright IBM Corp. 2014. All Rights Reserved. +// Copyright IBM Corp. 2014,2018. All Rights Reserved. // Node module: strong-log-transformer -// This file is licensed under the Artistic License 2.0. -// License text available at https://opensource.org/licenses/Artistic-2.0 +// This file is licensed under the Apache License 2.0. +// License text available at https://opensource.org/licenses/Apache-2.0 -var minimist = __webpack_require__(349); -var path = __webpack_require__(3); +var minimist = __webpack_require__(233); +var path = __webpack_require__(2); -var Logger = __webpack_require__(97); -var pkg = __webpack_require__(350); +var Logger = __webpack_require__(96); +var pkg = __webpack_require__(234); module.exports = cli; @@ -38613,6 +22809,8 @@ function cli(args) { version($0, p); } else if (opts.h || opts.help) { usage($0, p); + } else if (args.length < 3) { + process.stdin.pipe(Logger()).pipe(process.stdout); } else { process.stdin.pipe(Logger(opts)).pipe(process.stdout); } @@ -38640,9 +22838,8 @@ function usage($0, p) { p(''); function boolOpt(name, def) { - name = def ? 'no-' + name : name; name = name + PADDING.slice(0, 20-name.length); - p(' --%s default: %s', name, def ? 'on' : 'off'); + p(' --%s default: %s', name, def); } function stdOpt(name, def) { @@ -38654,17 +22851,25 @@ function usage($0, p) { /***/ }), -/* 349 */ +/* 233 */ /***/ (function(module, exports) { module.exports = function (args, opts) { if (!opts) opts = {}; - var flags = { bools : {}, strings : {} }; - - [].concat(opts['boolean']).filter(Boolean).forEach(function (key) { - flags.bools[key] = true; - }); + var flags = { bools : {}, strings : {}, unknownFn: null }; + + if (typeof opts['unknown'] === 'function') { + flags.unknownFn = opts['unknown']; + } + + if (typeof opts['boolean'] === 'boolean' && opts['boolean']) { + flags.allBools = true; + } else { + [].concat(opts['boolean']).filter(Boolean).forEach(function (key) { + flags.bools[key] = true; + }); + } var aliases = {}; Object.keys(opts.alias || {}).forEach(function (key) { @@ -38697,7 +22902,16 @@ module.exports = function (args, opts) { args = args.slice(0, args.indexOf('--')); } - function setArg (key, val) { + function argDefined(key, arg) { + return (flags.allBools && /^--[^=]+$/.test(arg)) || + flags.strings[key] || flags.bools[key] || aliases[key]; + } + + function setArg (key, val, arg) { + if (arg && flags.unknownFn && !argDefined(key, arg)) { + if (flags.unknownFn(arg) === false) return; + } + var value = !flags.strings[key] && isNumber(val) ? Number(val) : val ; @@ -38707,7 +22921,32 @@ module.exports = function (args, opts) { setKey(argv, x.split('.'), value); }); } + + function setKey (obj, keys, value) { + var o = obj; + keys.slice(0,-1).forEach(function (key) { + if (o[key] === undefined) o[key] = {}; + o = o[key]; + }); + + var key = keys[keys.length - 1]; + if (o[key] === undefined || flags.bools[key] || typeof o[key] === 'boolean') { + o[key] = value; + } + else if (Array.isArray(o[key])) { + o[key].push(value); + } + else { + o[key] = [ o[key], value ]; + } + } + function aliasIsBoolean(key) { + return aliases[key].some(function (x) { + return flags.bools[x]; + }); + } + for (var i = 0; i < args.length; i++) { var arg = args[i]; @@ -38716,27 +22955,33 @@ module.exports = function (args, opts) { // 'dotall' regex modifier. See: // http://stackoverflow.com/a/1068308/13216 var m = arg.match(/^--([^=]+)=([\s\S]*)$/); - setArg(m[1], m[2]); + var key = m[1]; + var value = m[2]; + if (flags.bools[key]) { + value = value !== 'false'; + } + setArg(key, value, arg); } else if (/^--no-.+/.test(arg)) { var key = arg.match(/^--no-(.+)/)[1]; - setArg(key, false); + setArg(key, false, arg); } else if (/^--.+/.test(arg)) { var key = arg.match(/^--(.+)/)[1]; var next = args[i + 1]; if (next !== undefined && !/^-/.test(next) && !flags.bools[key] - && (aliases[key] ? !flags.bools[aliases[key]] : true)) { - setArg(key, next); + && !flags.allBools + && (aliases[key] ? !aliasIsBoolean(key) : true)) { + setArg(key, next, arg); i++; } else if (/^(true|false)$/.test(next)) { - setArg(key, next === 'true'); + setArg(key, next === 'true', arg); i++; } else { - setArg(key, flags.strings[key] ? '' : true); + setArg(key, flags.strings[key] ? '' : true, arg); } } else if (/^-[^-]+/.test(arg)) { @@ -38747,24 +22992,30 @@ module.exports = function (args, opts) { var next = arg.slice(j+2); if (next === '-') { - setArg(letters[j], next) + setArg(letters[j], next, arg) continue; } + if (/[A-Za-z]/.test(letters[j]) && /=/.test(next)) { + setArg(letters[j], next.split('=')[1], arg); + broken = true; + break; + } + if (/[A-Za-z]/.test(letters[j]) && /-?\d+(\.\d*)?(e-?\d+)?$/.test(next)) { - setArg(letters[j], next); + setArg(letters[j], next, arg); broken = true; break; } if (letters[j+1] && letters[j+1].match(/\W/)) { - setArg(letters[j], arg.slice(j+2)); + setArg(letters[j], arg.slice(j+2), arg); broken = true; break; } else { - setArg(letters[j], flags.strings[letters[j]] ? '' : true); + setArg(letters[j], flags.strings[letters[j]] ? '' : true, arg); } } @@ -38772,23 +23023,29 @@ module.exports = function (args, opts) { if (!broken && key !== '-') { if (args[i+1] && !/^(-|--)[^-]/.test(args[i+1]) && !flags.bools[key] - && (aliases[key] ? !flags.bools[aliases[key]] : true)) { - setArg(key, args[i+1]); + && (aliases[key] ? !aliasIsBoolean(key) : true)) { + setArg(key, args[i+1], arg); i++; } else if (args[i+1] && /true|false/.test(args[i+1])) { - setArg(key, args[i+1] === 'true'); + setArg(key, args[i+1] === 'true', arg); i++; } else { - setArg(key, flags.strings[key] ? '' : true); + setArg(key, flags.strings[key] ? '' : true, arg); } } } else { - argv._.push( - flags.strings['_'] || !isNumber(arg) ? arg : Number(arg) - ); + if (!flags.unknownFn || flags.unknownFn(arg) !== false) { + argv._.push( + flags.strings['_'] || !isNumber(arg) ? arg : Number(arg) + ); + } + if (opts.stopEarly) { + argv._.push.apply(argv._, args.slice(i + 1)); + break; + } } } @@ -38827,25 +23084,6 @@ function hasKey (obj, keys) { return key in o; } -function setKey (obj, keys, value) { - var o = obj; - keys.slice(0,-1).forEach(function (key) { - if (o[key] === undefined) o[key] = {}; - o = o[key]; - }); - - var key = keys[keys.length - 1]; - if (o[key] === undefined || typeof o[key] === 'boolean') { - o[key] = value; - } - else if (Array.isArray(o[key])) { - o[key].push(value); - } - else { - o[key] = [ o[key], value ]; - } -} - function isNumber (x) { if (typeof x === 'number') return true; if (/^0x[0-9a-f]+$/i.test(x)) return true; @@ -38855,13 +23093,13 @@ function isNumber (x) { /***/ }), -/* 350 */ +/* 234 */ /***/ (function(module, exports) { -module.exports = {"name":"strong-log-transformer","version":"1.0.6","description":"Stream transformer that prefixes lines with timestamps and other things.","author":"Ryan Graham ","license":"Artistic-2.0","repository":{"type":"git","url":"git://github.com/strongloop/strong-log-transformer"},"keywords":["logging","streams"],"bugs":{"url":"https://github.com/strongloop/strong-log-transformer/issues"},"homepage":"https://github.com/strongloop/strong-log-transformer","directories":{"test":"test"},"bin":{"sl-log-transformer":"bin/sl-log-transformer.js"},"main":"index.js","scripts":{"test":"tap --coverage --coverage-report=cobertura test/test-*"},"dependencies":{"byline":"^5.0.0","duplexer":"^0.1.1","minimist":"^0.1.0","moment":"^2.6.0","through":"^2.3.4"},"devDependencies":{"tap":"^1.3.2"}} +module.exports = {"name":"strong-log-transformer","version":"2.0.0","description":"Stream transformer that prefixes lines with timestamps and other things.","author":"Ryan Graham ","license":"Apache-2.0","repository":{"type":"git","url":"git://github.com/strongloop/strong-log-transformer"},"keywords":["logging","streams"],"bugs":{"url":"https://github.com/strongloop/strong-log-transformer/issues"},"homepage":"https://github.com/strongloop/strong-log-transformer","directories":{"test":"test"},"bin":{"sl-log-transformer":"bin/sl-log-transformer.js"},"main":"index.js","scripts":{"test":"tap --100 test/test-*"},"dependencies":{"byline":"^5.0.0","duplexer":"^0.1.1","minimist":"^1.2.0","through":"^2.3.4"},"devDependencies":{"tap":"^12.0.1"},"engines":{"node":">=4"}} /***/ }), -/* 351 */ +/* 235 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -38872,23 +23110,23 @@ Object.defineProperty(exports, "__esModule", { }); exports.CleanCommand = undefined; -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _del = __webpack_require__(217); +var _del = __webpack_require__(98); var _del2 = _interopRequireDefault(_del); -var _ora = __webpack_require__(362); +var _ora = __webpack_require__(247); var _ora2 = _interopRequireDefault(_ora); -var _path = __webpack_require__(3); +var _path = __webpack_require__(2); -var _fs = __webpack_require__(56); +var _fs = __webpack_require__(39); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -38944,16 +23182,16 @@ const CleanCommand = exports.CleanCommand = { }; /***/ }), -/* 352 */ +/* 236 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var Promise = __webpack_require__(218); -var arrayUnion = __webpack_require__(219); -var objectAssign = __webpack_require__(220); -var glob = __webpack_require__(31); -var pify = __webpack_require__(355); +var Promise = __webpack_require__(99); +var arrayUnion = __webpack_require__(100); +var objectAssign = __webpack_require__(101); +var glob = __webpack_require__(23); +var pify = __webpack_require__(239); var globP = pify(glob, Promise).bind(glob); @@ -39039,7 +23277,7 @@ module.exports.hasMagic = function (patterns, opts) { /***/ }), -/* 353 */ +/* 237 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39338,7 +23576,7 @@ module.exports = Promise; /***/ }), -/* 354 */ +/* 238 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39407,7 +23645,7 @@ if ('Set' in global) { /***/ }), -/* 355 */ +/* 239 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -39482,12 +23720,12 @@ pify.all = pify; /***/ }), -/* 356 */ +/* 240 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var path = __webpack_require__(3); +var path = __webpack_require__(2); module.exports = function (str) { return path.resolve(str) === path.resolve(process.cwd()); @@ -39495,12 +23733,12 @@ module.exports = function (str) { /***/ }), -/* 357 */ +/* 241 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var isPathInside = __webpack_require__(358); +var isPathInside = __webpack_require__(242); module.exports = function (str) { return isPathInside(str, process.cwd()); @@ -39508,13 +23746,13 @@ module.exports = function (str) { /***/ }), -/* 358 */ +/* 242 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var path = __webpack_require__(3); -var pathIsInside = __webpack_require__(359); +var path = __webpack_require__(2); +var pathIsInside = __webpack_require__(243); module.exports = function (a, b) { a = path.resolve(a); @@ -39529,13 +23767,13 @@ module.exports = function (a, b) { /***/ }), -/* 359 */ +/* 243 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var path = __webpack_require__(3); +var path = __webpack_require__(2); module.exports = function (thePath, potentialParent) { // For inside-directory checking, we want to allow trailing slashes, so normalize. @@ -39564,16 +23802,107 @@ function stripTrailingSep(thePath) { /***/ }), -/* 360 */ +/* 244 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +const processFn = (fn, opts) => function () { + const P = opts.promiseModule; + const args = new Array(arguments.length); + + for (let i = 0; i < arguments.length; i++) { + args[i] = arguments[i]; + } + + return new P((resolve, reject) => { + if (opts.errorFirst) { + args.push(function (err, result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 1; i < arguments.length; i++) { + results[i - 1] = arguments[i]; + } + + if (err) { + results.unshift(err); + reject(results); + } else { + resolve(results); + } + } else if (err) { + reject(err); + } else { + resolve(result); + } + }); + } else { + args.push(function (result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 0; i < arguments.length; i++) { + results[i] = arguments[i]; + } + + resolve(results); + } else { + resolve(result); + } + }); + } + + fn.apply(this, args); + }); +}; + +module.exports = (obj, opts) => { + opts = Object.assign({ + exclude: [/.+(Sync|Stream)$/], + errorFirst: true, + promiseModule: Promise + }, opts); + + const filter = key => { + const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); + return opts.include ? opts.include.some(match) : !opts.exclude.some(match); + }; + + let ret; + if (typeof obj === 'function') { + ret = function () { + if (opts.excludeMain) { + return obj.apply(this, arguments); + } + + return processFn(obj, opts).apply(this, arguments); + }; + } else { + ret = Object.create(Object.getPrototypeOf(obj)); + } + + for (const key in obj) { // eslint-disable-line guard-for-in + const x = obj[key]; + ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; + } + + return ret; +}; + + +/***/ }), +/* 245 */ /***/ (function(module, exports, __webpack_require__) { module.exports = rimraf rimraf.sync = rimrafSync -var assert = __webpack_require__(29) -var path = __webpack_require__(3) -var fs = __webpack_require__(7) -var glob = __webpack_require__(31) +var assert = __webpack_require__(28) +var path = __webpack_require__(2) +var fs = __webpack_require__(6) +var glob = __webpack_require__(23) var _0666 = parseInt('666', 8) var defaultGlobOpts = { @@ -39934,7 +24263,7 @@ function rmkidsSync (p, options) { /***/ }), -/* 361 */ +/* 246 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40008,15 +24337,15 @@ module.exports = (iterable, mapper, opts) => new Promise((resolve, reject) => { /***/ }), -/* 362 */ +/* 247 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const chalk = __webpack_require__(363); -const cliCursor = __webpack_require__(367); -const cliSpinners = __webpack_require__(371); -const logSymbols = __webpack_require__(96); +const chalk = __webpack_require__(248); +const cliCursor = __webpack_require__(252); +const cliSpinners = __webpack_require__(256); +const logSymbols = __webpack_require__(95); class Ora { constructor(options) { @@ -40163,16 +24492,16 @@ module.exports.promise = (action, options) => { /***/ }), -/* 363 */ +/* 248 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const escapeStringRegexp = __webpack_require__(52); -const ansiStyles = __webpack_require__(364); -const stdoutColor = __webpack_require__(365).stdout; +const escapeStringRegexp = __webpack_require__(51); +const ansiStyles = __webpack_require__(249); +const stdoutColor = __webpack_require__(250).stdout; -const template = __webpack_require__(366); +const template = __webpack_require__(251); const isSimpleWindowsTerm = process.platform === 'win32' && !(process.env.TERM || '').toLowerCase().startsWith('xterm'); @@ -40398,12 +24727,12 @@ module.exports.default = module.exports; // For TypeScript /***/ }), -/* 364 */ +/* 249 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; /* WEBPACK VAR INJECTION */(function(module) { -const colorConvert = __webpack_require__(53); +const colorConvert = __webpack_require__(52); const wrapAnsi16 = (fn, offset) => function () { const code = fn.apply(colorConvert, arguments); @@ -40506,30 +24835,43 @@ function assembleStyles() { }); } + const ansi2ansi = n => n; const rgb2rgb = (r, g, b) => [r, g, b]; styles.color.close = '\u001B[39m'; styles.bgColor.close = '\u001B[49m'; - styles.color.ansi = {}; - styles.color.ansi256 = {}; + styles.color.ansi = { + ansi: wrapAnsi16(ansi2ansi, 0) + }; + styles.color.ansi256 = { + ansi256: wrapAnsi256(ansi2ansi, 0) + }; styles.color.ansi16m = { rgb: wrapAnsi16m(rgb2rgb, 0) }; - styles.bgColor.ansi = {}; - styles.bgColor.ansi256 = {}; + styles.bgColor.ansi = { + ansi: wrapAnsi16(ansi2ansi, 10) + }; + styles.bgColor.ansi256 = { + ansi256: wrapAnsi256(ansi2ansi, 10) + }; styles.bgColor.ansi16m = { rgb: wrapAnsi16m(rgb2rgb, 10) }; - for (const key of Object.keys(colorConvert)) { + for (let key of Object.keys(colorConvert)) { if (typeof colorConvert[key] !== 'object') { continue; } const suite = colorConvert[key]; + if (key === 'ansi16') { + key = 'ansi'; + } + if ('ansi16' in suite) { styles.color.ansi[key] = wrapAnsi16(suite.ansi16, 0); styles.bgColor.ansi[key] = wrapAnsi16(suite.ansi16, 10); @@ -40555,16 +24897,16 @@ Object.defineProperty(module, 'exports', { get: assembleStyles }); -/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(27)(module))) +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(38)(module))) /***/ }), -/* 365 */ +/* 250 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const os = __webpack_require__(54); -const hasFlag = __webpack_require__(55); +const os = __webpack_require__(53); +const hasFlag = __webpack_require__(78); const env = process.env; @@ -40612,6 +24954,10 @@ function supportsColor(stream) { } if (stream && !stream.isTTY && forceColor !== true) { + // VS code debugger doesn't have isTTY set + if (env.VSCODE_PID) { + return 1; + } return 0; } @@ -40648,14 +24994,16 @@ function supportsColor(stream) { return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0; } + if (env.COLORTERM === 'truecolor') { + return 3; + } + if ('TERM_PROGRAM' in env) { const version = parseInt((env.TERM_PROGRAM_VERSION || '').split('.')[0], 10); switch (env.TERM_PROGRAM) { case 'iTerm.app': return version >= 3 ? 3 : 2; - case 'Hyper': - return 3; case 'Apple_Terminal': return 2; // No default @@ -40694,7 +25042,7 @@ module.exports = { /***/ }), -/* 366 */ +/* 251 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40829,12 +25177,12 @@ module.exports = (chalk, tmp) => { /***/ }), -/* 367 */ +/* 252 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const restoreCursor = __webpack_require__(368); +const restoreCursor = __webpack_require__(253); let hidden = false; @@ -40875,13 +25223,13 @@ exports.toggle = (force, stream) => { /***/ }), -/* 368 */ +/* 253 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const onetime = __webpack_require__(369); -const signalExit = __webpack_require__(61); +const onetime = __webpack_require__(254); +const signalExit = __webpack_require__(58); module.exports = onetime(() => { signalExit(() => { @@ -40891,12 +25239,12 @@ module.exports = onetime(() => { /***/ }), -/* 369 */ +/* 254 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const mimicFn = __webpack_require__(370); +const mimicFn = __webpack_require__(255); module.exports = (fn, opts) => { // TODO: Remove this in v3 @@ -40937,7 +25285,7 @@ module.exports = (fn, opts) => { /***/ }), -/* 370 */ +/* 255 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40947,28 +25295,26 @@ module.exports = (to, from) => { for (const prop of Object.getOwnPropertyNames(from).concat(Object.getOwnPropertySymbols(from))) { Object.defineProperty(to, prop, Object.getOwnPropertyDescriptor(from, prop)); } - - return to; }; /***/ }), -/* 371 */ +/* 256 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -module.exports = __webpack_require__(372); +module.exports = __webpack_require__(257); /***/ }), -/* 372 */ +/* 257 */ /***/ (function(module, exports) { module.exports = {"dots":{"interval":80,"frames":["⠋","⠙","⠹","⠸","⠼","⠴","⠦","⠧","⠇","⠏"]},"dots2":{"interval":80,"frames":["⣾","⣽","⣻","⢿","⡿","⣟","⣯","⣷"]},"dots3":{"interval":80,"frames":["⠋","⠙","⠚","⠞","⠖","⠦","⠴","⠲","⠳","⠓"]},"dots4":{"interval":80,"frames":["⠄","⠆","⠇","⠋","⠙","⠸","⠰","⠠","⠰","⠸","⠙","⠋","⠇","⠆"]},"dots5":{"interval":80,"frames":["⠋","⠙","⠚","⠒","⠂","⠂","⠒","⠲","⠴","⠦","⠖","⠒","⠐","⠐","⠒","⠓","⠋"]},"dots6":{"interval":80,"frames":["⠁","⠉","⠙","⠚","⠒","⠂","⠂","⠒","⠲","⠴","⠤","⠄","⠄","⠤","⠴","⠲","⠒","⠂","⠂","⠒","⠚","⠙","⠉","⠁"]},"dots7":{"interval":80,"frames":["⠈","⠉","⠋","⠓","⠒","⠐","⠐","⠒","⠖","⠦","⠤","⠠","⠠","⠤","⠦","⠖","⠒","⠐","⠐","⠒","⠓","⠋","⠉","⠈"]},"dots8":{"interval":80,"frames":["⠁","⠁","⠉","⠙","⠚","⠒","⠂","⠂","⠒","⠲","⠴","⠤","⠄","⠄","⠤","⠠","⠠","⠤","⠦","⠖","⠒","⠐","⠐","⠒","⠓","⠋","⠉","⠈","⠈"]},"dots9":{"interval":80,"frames":["⢹","⢺","⢼","⣸","⣇","⡧","⡗","⡏"]},"dots10":{"interval":80,"frames":["⢄","⢂","⢁","⡁","⡈","⡐","⡠"]},"dots11":{"interval":100,"frames":["⠁","⠂","⠄","⡀","⢀","⠠","⠐","⠈"]},"dots12":{"interval":80,"frames":["⢀⠀","⡀⠀","⠄⠀","⢂⠀","⡂⠀","⠅⠀","⢃⠀","⡃⠀","⠍⠀","⢋⠀","⡋⠀","⠍⠁","⢋⠁","⡋⠁","⠍⠉","⠋⠉","⠋⠉","⠉⠙","⠉⠙","⠉⠩","⠈⢙","⠈⡙","⢈⠩","⡀⢙","⠄⡙","⢂⠩","⡂⢘","⠅⡘","⢃⠨","⡃⢐","⠍⡐","⢋⠠","⡋⢀","⠍⡁","⢋⠁","⡋⠁","⠍⠉","⠋⠉","⠋⠉","⠉⠙","⠉⠙","⠉⠩","⠈⢙","⠈⡙","⠈⠩","⠀⢙","⠀⡙","⠀⠩","⠀⢘","⠀⡘","⠀⠨","⠀⢐","⠀⡐","⠀⠠","⠀⢀","⠀⡀"]},"line":{"interval":130,"frames":["-","\\","|","/"]},"line2":{"interval":100,"frames":["⠂","-","–","—","–","-"]},"pipe":{"interval":100,"frames":["┤","┘","┴","└","├","┌","┬","┐"]},"simpleDots":{"interval":400,"frames":[". ",".. ","..."," "]},"simpleDotsScrolling":{"interval":200,"frames":[". ",".. ","..."," .."," ."," "]},"star":{"interval":70,"frames":["✶","✸","✹","✺","✹","✷"]},"star2":{"interval":80,"frames":["+","x","*"]},"flip":{"interval":70,"frames":["_","_","_","-","`","`","'","´","-","_","_","_"]},"hamburger":{"interval":100,"frames":["☱","☲","☴"]},"growVertical":{"interval":120,"frames":["▁","▃","▄","▅","▆","▇","▆","▅","▄","▃"]},"growHorizontal":{"interval":120,"frames":["▏","▎","▍","▌","▋","▊","▉","▊","▋","▌","▍","▎"]},"balloon":{"interval":140,"frames":[" ",".","o","O","@","*"," "]},"balloon2":{"interval":120,"frames":[".","o","O","°","O","o","."]},"noise":{"interval":100,"frames":["▓","▒","░"]},"bounce":{"interval":120,"frames":["⠁","⠂","⠄","⠂"]},"boxBounce":{"interval":120,"frames":["▖","▘","▝","▗"]},"boxBounce2":{"interval":100,"frames":["▌","▀","▐","▄"]},"triangle":{"interval":50,"frames":["◢","◣","◤","◥"]},"arc":{"interval":100,"frames":["◜","◠","◝","◞","◡","◟"]},"circle":{"interval":120,"frames":["◡","⊙","◠"]},"squareCorners":{"interval":180,"frames":["◰","◳","◲","◱"]},"circleQuarters":{"interval":120,"frames":["◴","◷","◶","◵"]},"circleHalves":{"interval":50,"frames":["◐","◓","◑","◒"]},"squish":{"interval":100,"frames":["╫","╪"]},"toggle":{"interval":250,"frames":["⊶","⊷"]},"toggle2":{"interval":80,"frames":["▫","▪"]},"toggle3":{"interval":120,"frames":["□","■"]},"toggle4":{"interval":100,"frames":["■","□","▪","▫"]},"toggle5":{"interval":100,"frames":["▮","▯"]},"toggle6":{"interval":300,"frames":["ဝ","၀"]},"toggle7":{"interval":80,"frames":["⦾","⦿"]},"toggle8":{"interval":100,"frames":["◍","◌"]},"toggle9":{"interval":100,"frames":["◉","◎"]},"toggle10":{"interval":100,"frames":["㊂","㊀","㊁"]},"toggle11":{"interval":50,"frames":["⧇","⧆"]},"toggle12":{"interval":120,"frames":["☗","☖"]},"toggle13":{"interval":80,"frames":["=","*","-"]},"arrow":{"interval":100,"frames":["←","↖","↑","↗","→","↘","↓","↙"]},"arrow2":{"interval":80,"frames":["⬆️ ","↗️ ","➡️ ","↘️ ","⬇️ ","↙️ ","⬅️ ","↖️ "]},"arrow3":{"interval":120,"frames":["▹▹▹▹▹","▸▹▹▹▹","▹▸▹▹▹","▹▹▸▹▹","▹▹▹▸▹","▹▹▹▹▸"]},"bouncingBar":{"interval":80,"frames":["[ ]","[= ]","[== ]","[=== ]","[ ===]","[ ==]","[ =]","[ ]","[ =]","[ ==]","[ ===]","[====]","[=== ]","[== ]","[= ]"]},"bouncingBall":{"interval":80,"frames":["( ● )","( ● )","( ● )","( ● )","( ●)","( ● )","( ● )","( ● )","( ● )","(● )"]},"smiley":{"interval":200,"frames":["😄 ","😝 "]},"monkey":{"interval":300,"frames":["🙈 ","🙈 ","🙉 ","🙊 "]},"hearts":{"interval":100,"frames":["💛 ","💙 ","💜 ","💚 ","❤️ "]},"clock":{"interval":100,"frames":["🕐 ","🕑 ","🕒 ","🕓 ","🕔 ","🕕 ","🕖 ","🕗 ","🕘 ","🕙 ","🕚 "]},"earth":{"interval":180,"frames":["🌍 ","🌎 ","🌏 "]},"moon":{"interval":80,"frames":["🌑 ","🌒 ","🌓 ","🌔 ","🌕 ","🌖 ","🌗 ","🌘 "]},"runner":{"interval":140,"frames":["🚶 ","🏃 "]},"pong":{"interval":80,"frames":["▐⠂ ▌","▐⠈ ▌","▐ ⠂ ▌","▐ ⠠ ▌","▐ ⡀ ▌","▐ ⠠ ▌","▐ ⠂ ▌","▐ ⠈ ▌","▐ ⠂ ▌","▐ ⠠ ▌","▐ ⡀ ▌","▐ ⠠ ▌","▐ ⠂ ▌","▐ ⠈ ▌","▐ ⠂▌","▐ ⠠▌","▐ ⡀▌","▐ ⠠ ▌","▐ ⠂ ▌","▐ ⠈ ▌","▐ ⠂ ▌","▐ ⠠ ▌","▐ ⡀ ▌","▐ ⠠ ▌","▐ ⠂ ▌","▐ ⠈ ▌","▐ ⠂ ▌","▐ ⠠ ▌","▐ ⡀ ▌","▐⠠ ▌"]},"shark":{"interval":120,"frames":["▐|\\____________▌","▐_|\\___________▌","▐__|\\__________▌","▐___|\\_________▌","▐____|\\________▌","▐_____|\\_______▌","▐______|\\______▌","▐_______|\\_____▌","▐________|\\____▌","▐_________|\\___▌","▐__________|\\__▌","▐___________|\\_▌","▐____________|\\▌","▐____________/|▌","▐___________/|_▌","▐__________/|__▌","▐_________/|___▌","▐________/|____▌","▐_______/|_____▌","▐______/|______▌","▐_____/|_______▌","▐____/|________▌","▐___/|_________▌","▐__/|__________▌","▐_/|___________▌","▐/|____________▌"]},"dqpb":{"interval":100,"frames":["d","q","p","b"]},"weather":{"interval":100,"frames":["☀️ ","☀️ ","☀️ ","🌤 ","⛅️ ","🌥 ","☁️ ","🌧 ","🌨 ","🌧 ","🌨 ","🌧 ","🌨 ","⛈ ","🌨 ","🌧 ","🌨 ","☁️ ","🌥 ","⛅️ ","🌤 ","☀️ ","☀️ "]},"christmas":{"interval":400,"frames":["🌲","🎄"]}} /***/ }), -/* 373 */ +/* 258 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -40979,15 +25325,15 @@ Object.defineProperty(exports, "__esModule", { }); exports.RunCommand = undefined; -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); -var _parallelize = __webpack_require__(57); +var _parallelize = __webpack_require__(54); -var _projects = __webpack_require__(30); +var _projects = __webpack_require__(22); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -41040,7 +25386,7 @@ const RunCommand = exports.RunCommand = { }; /***/ }), -/* 374 */ +/* 259 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -41051,17 +25397,17 @@ Object.defineProperty(exports, "__esModule", { }); exports.WatchCommand = undefined; -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); -var _parallelize = __webpack_require__(57); +var _parallelize = __webpack_require__(54); -var _projects = __webpack_require__(30); +var _projects = __webpack_require__(22); -var _watch = __webpack_require__(375); +var _watch = __webpack_require__(260); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -41143,7 +25489,7 @@ const WatchCommand = exports.WatchCommand = { }; /***/ }), -/* 375 */ +/* 260 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -41154,11 +25500,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.waitUntilWatchIsReady = waitUntilWatchIsReady; -var _rxjs = __webpack_require__(376); +var _rxjs = __webpack_require__(261); var Rx = _interopRequireWildcard(_rxjs); -var _operators = __webpack_require__(407); +var _operators = __webpack_require__(292); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } @@ -41212,115 +25558,115 @@ function waitUntilWatchIsReady(stream, opts = {}) { } /***/ }), -/* 376 */ +/* 261 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_Observable__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_Observable__ = __webpack_require__(3); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Observable", function() { return __WEBPACK_IMPORTED_MODULE_0__internal_Observable__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__ = __webpack_require__(224); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__ = __webpack_require__(105); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ConnectableObservable", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_observable_ConnectableObservable__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__ = __webpack_require__(226); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__ = __webpack_require__(107); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "GroupedObservable", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_groupBy__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__ = __webpack_require__(24); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observable", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_symbol_observable__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_Subject__ = __webpack_require__(9); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subject", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_Subject__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__ = __webpack_require__(227); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__ = __webpack_require__(108); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "BehaviorSubject", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_BehaviorSubject__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__ = __webpack_require__(67); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__ = __webpack_require__(65); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ReplaySubject", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_ReplaySubject__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__ = __webpack_require__(47); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__ = __webpack_require__(46); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "AsyncSubject", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_AsyncSubject__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__ = __webpack_require__(232); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__ = __webpack_require__(113); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asapScheduler", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_scheduler_asap__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__ = __webpack_require__(12); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "asyncScheduler", function() { return __WEBPACK_IMPORTED_MODULE_9__internal_scheduler_async__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__ = __webpack_require__(228); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__ = __webpack_require__(109); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "queueScheduler", function() { return __WEBPACK_IMPORTED_MODULE_10__internal_scheduler_queue__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__ = __webpack_require__(384); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__ = __webpack_require__(269); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "animationFrameScheduler", function() { return __WEBPACK_IMPORTED_MODULE_11__internal_scheduler_animationFrame__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__ = __webpack_require__(387); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__ = __webpack_require__(272); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualTimeScheduler", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__["b"]; }); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "VirtualAction", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_scheduler_VirtualTimeScheduler__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__ = __webpack_require__(229); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__ = __webpack_require__(110); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Scheduler", function() { return __WEBPACK_IMPORTED_MODULE_13__internal_Scheduler__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__ = __webpack_require__(7); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscription", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_Subscription__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__ = __webpack_require__(1); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Subscriber", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_Subscriber__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_Notification__ = __webpack_require__(46); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_Notification__ = __webpack_require__(45); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "Notification", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_Notification__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__ = __webpack_require__(65); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__ = __webpack_require__(63); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pipe", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_util_pipe__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__ = __webpack_require__(44); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__ = __webpack_require__(43); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "noop", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_util_noop__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__ = __webpack_require__(25); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "identity", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_util_identity__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__ = __webpack_require__(388); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__ = __webpack_require__(273); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isObservable", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_util_isObservable__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__ = __webpack_require__(35); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__ = __webpack_require__(32); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ArgumentOutOfRangeError", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_util_ArgumentOutOfRangeError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__ = __webpack_require__(36); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__ = __webpack_require__(33); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EmptyError", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_util_EmptyError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__ = __webpack_require__(45); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__ = __webpack_require__(44); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ObjectUnsubscribedError", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_util_ObjectUnsubscribedError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__ = __webpack_require__(223); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__ = __webpack_require__(104); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "UnsubscriptionError", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_util_UnsubscriptionError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__ = __webpack_require__(233); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__ = __webpack_require__(114); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "TimeoutError", function() { return __WEBPACK_IMPORTED_MODULE_25__internal_util_TimeoutError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__ = __webpack_require__(389); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__ = __webpack_require__(274); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindCallback", function() { return __WEBPACK_IMPORTED_MODULE_26__internal_observable_bindCallback__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__ = __webpack_require__(390); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__ = __webpack_require__(275); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bindNodeCallback", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_observable_bindNodeCallback__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__ = __webpack_require__(71); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__ = __webpack_require__(69); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_observable_combineLatest__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__ = __webpack_require__(48); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__ = __webpack_require__(47); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_observable_concat__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__ = __webpack_require__(73); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__ = __webpack_require__(71); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defer", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_observable_defer__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__ = __webpack_require__(11); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "empty", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__ = __webpack_require__(397); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__ = __webpack_require__(282); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "forkJoin", function() { return __WEBPACK_IMPORTED_MODULE_32__internal_observable_forkJoin__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__ = __webpack_require__(19); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__ = __webpack_require__(18); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "from", function() { return __WEBPACK_IMPORTED_MODULE_33__internal_observable_from__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__ = __webpack_require__(398); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__ = __webpack_require__(283); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "fromEvent", function() { return __WEBPACK_IMPORTED_MODULE_34__internal_observable_fromEvent__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__ = __webpack_require__(399); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__ = __webpack_require__(284); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "fromEventPattern", function() { return __WEBPACK_IMPORTED_MODULE_35__internal_observable_fromEventPattern__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__ = __webpack_require__(400); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__ = __webpack_require__(285); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "generate", function() { return __WEBPACK_IMPORTED_MODULE_36__internal_observable_generate__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__ = __webpack_require__(401); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__ = __webpack_require__(286); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "iif", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_observable_iif__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__ = __webpack_require__(402); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__ = __webpack_require__(287); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "interval", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_observable_interval__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__ = __webpack_require__(241); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__ = __webpack_require__(122); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_observable_merge__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__ = __webpack_require__(242); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__ = __webpack_require__(123); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "never", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__ = __webpack_require__(68); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__ = __webpack_require__(66); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "of", function() { return __WEBPACK_IMPORTED_MODULE_41__internal_observable_of__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__ = __webpack_require__(403); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__ = __webpack_require__(288); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return __WEBPACK_IMPORTED_MODULE_42__internal_observable_onErrorResumeNext__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__ = __webpack_require__(404); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__ = __webpack_require__(289); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pairs", function() { return __WEBPACK_IMPORTED_MODULE_43__internal_observable_pairs__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__ = __webpack_require__(243); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__ = __webpack_require__(124); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_44__internal_observable_race__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__ = __webpack_require__(405); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__ = __webpack_require__(290); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "range", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_observable_range__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__ = __webpack_require__(70); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__ = __webpack_require__(68); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwError", function() { return __WEBPACK_IMPORTED_MODULE_46__internal_observable_throwError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__ = __webpack_require__(244); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__ = __webpack_require__(125); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timer", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_observable_timer__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__ = __webpack_require__(406); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__ = __webpack_require__(291); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "using", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_observable_using__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__ = __webpack_require__(74); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__ = __webpack_require__(72); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_observable_zip__["b"]; }); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "EMPTY", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_observable_empty__["a"]; }); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "NEVER", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_observable_never__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_config__ = __webpack_require__(43); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_config__ = __webpack_require__(42); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "config", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_config__["a"]; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ @@ -41380,14 +25726,14 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /***/ }), -/* 377 */ +/* 262 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = toSubscriber; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__ = __webpack_require__(64); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(221); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__symbol_rxSubscriber__ = __webpack_require__(62); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observer__ = __webpack_require__(102); /** PURE_IMPORTS_START _Subscriber,_symbol_rxSubscriber,_Observer PURE_IMPORTS_END */ @@ -41410,13 +25756,13 @@ function toSubscriber(nextOrObserver, error, complete) { /***/ }), -/* 378 */ +/* 263 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueAction; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(33); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(30); /** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ @@ -41461,13 +25807,13 @@ var QueueAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 379 */ +/* 264 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Action; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); /** PURE_IMPORTS_START tslib,_Subscription PURE_IMPORTS_END */ @@ -41489,13 +25835,13 @@ var Action = /*@__PURE__*/ (function (_super) { /***/ }), -/* 380 */ +/* 265 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return QueueScheduler; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(34); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(31); /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ @@ -41511,14 +25857,14 @@ var QueueScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 381 */ +/* 266 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapAction; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_Immediate__ = __webpack_require__(382); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncAction__ = __webpack_require__(33); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_Immediate__ = __webpack_require__(267); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncAction__ = __webpack_require__(30); /** PURE_IMPORTS_START tslib,_util_Immediate,_AsyncAction PURE_IMPORTS_END */ @@ -41561,7 +25907,7 @@ var AsapAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 382 */ +/* 267 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -41590,13 +25936,13 @@ var Immediate = { /***/ }), -/* 383 */ +/* 268 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AsapScheduler; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(34); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(31); /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ @@ -41633,13 +25979,13 @@ var AsapScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 384 */ +/* 269 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return animationFrame; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AnimationFrameAction__ = __webpack_require__(385); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AnimationFrameScheduler__ = __webpack_require__(386); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AnimationFrameAction__ = __webpack_require__(270); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AnimationFrameScheduler__ = __webpack_require__(271); /** PURE_IMPORTS_START _AnimationFrameAction,_AnimationFrameScheduler PURE_IMPORTS_END */ @@ -41648,13 +25994,13 @@ var animationFrame = /*@__PURE__*/ new __WEBPACK_IMPORTED_MODULE_1__AnimationFra /***/ }), -/* 385 */ +/* 270 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameAction; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(33); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(30); /** PURE_IMPORTS_START tslib,_AsyncAction PURE_IMPORTS_END */ @@ -41696,13 +26042,13 @@ var AnimationFrameAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 386 */ +/* 271 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return AnimationFrameScheduler; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(34); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncScheduler__ = __webpack_require__(31); /** PURE_IMPORTS_START tslib,_AsyncScheduler PURE_IMPORTS_END */ @@ -41739,15 +26085,15 @@ var AnimationFrameScheduler = /*@__PURE__*/ (function (_super) { /***/ }), -/* 387 */ +/* 272 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "b", function() { return VirtualTimeScheduler; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return VirtualAction; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(33); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncScheduler__ = __webpack_require__(34); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncAction__ = __webpack_require__(30); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__AsyncScheduler__ = __webpack_require__(31); /** PURE_IMPORTS_START tslib,_AsyncAction,_AsyncScheduler PURE_IMPORTS_END */ @@ -41859,12 +26205,12 @@ var VirtualAction = /*@__PURE__*/ (function (_super) { /***/ }), -/* 388 */ +/* 273 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = isObservable; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ function isObservable(obj) { @@ -41874,16 +26220,16 @@ function isObservable(obj) { /***/ }), -/* 389 */ +/* 274 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = bindCallback; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(47); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(16); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(46); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_isArray,_util_isScheduler PURE_IMPORTS_END */ @@ -41986,16 +26332,16 @@ function dispatchError(state) { /***/ }), -/* 390 */ +/* 275 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = bindNodeCallback; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(47); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(16); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(15); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(11); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__AsyncSubject__ = __webpack_require__(46); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__operators_map__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isArray__ = __webpack_require__(10); /** PURE_IMPORTS_START _Observable,_AsyncSubject,_operators_map,_util_isScheduler,_util_isArray PURE_IMPORTS_END */ @@ -42106,13 +26452,13 @@ function dispatchError(arg) { /***/ }), -/* 391 */ +/* 276 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return InnerSubscriber; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -42144,7 +26490,7 @@ var InnerSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 392 */ +/* 277 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -42159,12 +26505,12 @@ function isInteropObservable(input) { /***/ }), -/* 393 */ +/* 278 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = isIterable; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(37); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__symbol_iterator__ = __webpack_require__(34); /** PURE_IMPORTS_START _symbol_iterator PURE_IMPORTS_END */ function isIterable(input) { @@ -42174,14 +26520,14 @@ function isIterable(input) { /***/ }), -/* 394 */ +/* 279 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = fromPromise; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToPromise__ = __webpack_require__(235); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToPromise__ = __webpack_require__(116); /** PURE_IMPORTS_START _Observable,_Subscription,_util_subscribeToPromise PURE_IMPORTS_END */ @@ -42211,15 +26557,15 @@ function fromPromise(input, scheduler) { /***/ }), -/* 395 */ +/* 280 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = fromIterable; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_iterator__ = __webpack_require__(37); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToIterable__ = __webpack_require__(236); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_iterator__ = __webpack_require__(34); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToIterable__ = __webpack_require__(117); /** PURE_IMPORTS_START _Observable,_Subscription,_symbol_iterator,_util_subscribeToIterable PURE_IMPORTS_END */ @@ -42275,15 +26621,15 @@ function fromIterable(input, scheduler) { /***/ }), -/* 396 */ +/* 281 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = fromObservable; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__symbol_observable__ = __webpack_require__(24); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__ = __webpack_require__(237); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToObservable__ = __webpack_require__(118); /** PURE_IMPORTS_START _Observable,_Subscription,_symbol_observable,_util_subscribeToObservable PURE_IMPORTS_END */ @@ -42312,18 +26658,18 @@ function fromObservable(input, scheduler) { /***/ }), -/* 397 */ +/* 282 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = forkJoin; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(12); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(11); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__operators_map__ = __webpack_require__(15); /** PURE_IMPORTS_START tslib,_Observable,_util_isArray,_empty,_util_subscribeToResult,_OuterSubscriber,_operators_map PURE_IMPORTS_END */ @@ -42401,15 +26747,15 @@ var ForkJoinSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 398 */ +/* 283 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = fromEvent; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(32); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(29); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(15); /** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ @@ -42476,15 +26822,15 @@ function isEventTarget(sourceObj) { /***/ }), -/* 399 */ +/* 284 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = fromEventPattern; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(32); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isFunction__ = __webpack_require__(29); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__operators_map__ = __webpack_require__(15); /** PURE_IMPORTS_START _Observable,_util_isArray,_util_isFunction,_operators_map PURE_IMPORTS_END */ @@ -42520,14 +26866,14 @@ function fromEventPattern(addHandler, removeHandler, resultSelector) { /***/ }), -/* 400 */ +/* 285 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = generate; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(25); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START _Observable,_util_identity,_util_isScheduler PURE_IMPORTS_END */ @@ -42656,13 +27002,13 @@ function dispatch(state) { /***/ }), -/* 401 */ +/* 286 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = iif; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__defer__ = __webpack_require__(73); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__empty__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__defer__ = __webpack_require__(71); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__empty__ = __webpack_require__(11); /** PURE_IMPORTS_START _defer,_empty PURE_IMPORTS_END */ @@ -42679,14 +27025,14 @@ function iif(condition, trueResult, falseResult) { /***/ }), -/* 402 */ +/* 287 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = interval; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(49); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isNumeric__ = __webpack_require__(48); /** PURE_IMPORTS_START _Observable,_scheduler_async,_util_isNumeric PURE_IMPORTS_END */ @@ -42718,15 +27064,15 @@ function dispatch(state) { /***/ }), -/* 403 */ +/* 288 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = onErrorResumeNext; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(19); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(18); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__empty__ = __webpack_require__(11); /** PURE_IMPORTS_START _Observable,_from,_util_isArray,_empty PURE_IMPORTS_END */ @@ -42757,14 +27103,14 @@ function onErrorResumeNext() { /***/ }), -/* 404 */ +/* 289 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = pairs; /* unused harmony export dispatch */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); /** PURE_IMPORTS_START _Observable,_Subscription PURE_IMPORTS_END */ @@ -42807,13 +27153,13 @@ function dispatch(state) { /***/ }), -/* 405 */ +/* 290 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = range; /* unused harmony export dispatch */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); /** PURE_IMPORTS_START _Observable PURE_IMPORTS_END */ function range(start, count, scheduler) { @@ -42864,14 +27210,14 @@ function dispatch(state) { /***/ }), -/* 406 */ +/* 291 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = using; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(19); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__from__ = __webpack_require__(18); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__empty__ = __webpack_require__(11); /** PURE_IMPORTS_START _Observable,_from,_empty PURE_IMPORTS_END */ @@ -42908,217 +27254,217 @@ function using(resourceFactory, observableFactory) { /***/ }), -/* 407 */ +/* 292 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__ = __webpack_require__(245); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__ = __webpack_require__(126); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "audit", function() { return __WEBPACK_IMPORTED_MODULE_0__internal_operators_audit__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__ = __webpack_require__(408); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__ = __webpack_require__(293); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "auditTime", function() { return __WEBPACK_IMPORTED_MODULE_1__internal_operators_auditTime__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__ = __webpack_require__(409); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__ = __webpack_require__(294); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "buffer", function() { return __WEBPACK_IMPORTED_MODULE_2__internal_operators_buffer__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__ = __webpack_require__(410); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__ = __webpack_require__(295); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferCount", function() { return __WEBPACK_IMPORTED_MODULE_3__internal_operators_bufferCount__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__ = __webpack_require__(411); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__ = __webpack_require__(296); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferTime", function() { return __WEBPACK_IMPORTED_MODULE_4__internal_operators_bufferTime__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__ = __webpack_require__(412); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__ = __webpack_require__(297); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferToggle", function() { return __WEBPACK_IMPORTED_MODULE_5__internal_operators_bufferToggle__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__ = __webpack_require__(413); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__ = __webpack_require__(298); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "bufferWhen", function() { return __WEBPACK_IMPORTED_MODULE_6__internal_operators_bufferWhen__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__ = __webpack_require__(414); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__ = __webpack_require__(299); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "catchError", function() { return __WEBPACK_IMPORTED_MODULE_7__internal_operators_catchError__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__ = __webpack_require__(415); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__ = __webpack_require__(300); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineAll", function() { return __WEBPACK_IMPORTED_MODULE_8__internal_operators_combineAll__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__ = __webpack_require__(416); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__ = __webpack_require__(301); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "combineLatest", function() { return __WEBPACK_IMPORTED_MODULE_9__internal_operators_combineLatest__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__ = __webpack_require__(417); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__ = __webpack_require__(302); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concat", function() { return __WEBPACK_IMPORTED_MODULE_10__internal_operators_concat__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__ = __webpack_require__(240); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__ = __webpack_require__(121); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatAll", function() { return __WEBPACK_IMPORTED_MODULE_11__internal_operators_concatAll__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__ = __webpack_require__(246); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__ = __webpack_require__(127); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatMap", function() { return __WEBPACK_IMPORTED_MODULE_12__internal_operators_concatMap__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__ = __webpack_require__(418); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__ = __webpack_require__(303); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "concatMapTo", function() { return __WEBPACK_IMPORTED_MODULE_13__internal_operators_concatMapTo__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__ = __webpack_require__(419); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__ = __webpack_require__(304); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "count", function() { return __WEBPACK_IMPORTED_MODULE_14__internal_operators_count__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__ = __webpack_require__(420); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__ = __webpack_require__(305); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "debounce", function() { return __WEBPACK_IMPORTED_MODULE_15__internal_operators_debounce__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__ = __webpack_require__(421); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__ = __webpack_require__(306); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "debounceTime", function() { return __WEBPACK_IMPORTED_MODULE_16__internal_operators_debounceTime__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__ = __webpack_require__(39); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__ = __webpack_require__(36); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "defaultIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_17__internal_operators_defaultIfEmpty__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__ = __webpack_require__(422); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__ = __webpack_require__(307); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "delay", function() { return __WEBPACK_IMPORTED_MODULE_18__internal_operators_delay__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__ = __webpack_require__(423); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__ = __webpack_require__(308); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "delayWhen", function() { return __WEBPACK_IMPORTED_MODULE_19__internal_operators_delayWhen__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__ = __webpack_require__(424); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__ = __webpack_require__(309); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "dematerialize", function() { return __WEBPACK_IMPORTED_MODULE_20__internal_operators_dematerialize__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__ = __webpack_require__(425); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__ = __webpack_require__(310); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinct", function() { return __WEBPACK_IMPORTED_MODULE_21__internal_operators_distinct__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__ = __webpack_require__(248); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__ = __webpack_require__(129); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilChanged", function() { return __WEBPACK_IMPORTED_MODULE_22__internal_operators_distinctUntilChanged__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__ = __webpack_require__(426); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__ = __webpack_require__(311); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "distinctUntilKeyChanged", function() { return __WEBPACK_IMPORTED_MODULE_23__internal_operators_distinctUntilKeyChanged__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__ = __webpack_require__(427); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__ = __webpack_require__(312); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "elementAt", function() { return __WEBPACK_IMPORTED_MODULE_24__internal_operators_elementAt__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__ = __webpack_require__(428); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__ = __webpack_require__(313); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "endWith", function() { return __WEBPACK_IMPORTED_MODULE_25__internal_operators_endWith__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__ = __webpack_require__(429); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__ = __webpack_require__(314); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "every", function() { return __WEBPACK_IMPORTED_MODULE_26__internal_operators_every__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__ = __webpack_require__(430); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__ = __webpack_require__(315); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "exhaust", function() { return __WEBPACK_IMPORTED_MODULE_27__internal_operators_exhaust__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__ = __webpack_require__(431); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__ = __webpack_require__(316); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustMap", function() { return __WEBPACK_IMPORTED_MODULE_28__internal_operators_exhaustMap__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__ = __webpack_require__(432); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__ = __webpack_require__(317); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "expand", function() { return __WEBPACK_IMPORTED_MODULE_29__internal_operators_expand__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__ = __webpack_require__(40); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__ = __webpack_require__(37); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "filter", function() { return __WEBPACK_IMPORTED_MODULE_30__internal_operators_filter__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__ = __webpack_require__(433); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__ = __webpack_require__(318); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "finalize", function() { return __WEBPACK_IMPORTED_MODULE_31__internal_operators_finalize__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__ = __webpack_require__(250); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__ = __webpack_require__(131); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "find", function() { return __WEBPACK_IMPORTED_MODULE_32__internal_operators_find__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__ = __webpack_require__(434); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__ = __webpack_require__(319); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "findIndex", function() { return __WEBPACK_IMPORTED_MODULE_33__internal_operators_findIndex__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__ = __webpack_require__(435); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__ = __webpack_require__(320); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "first", function() { return __WEBPACK_IMPORTED_MODULE_34__internal_operators_first__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__ = __webpack_require__(226); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__ = __webpack_require__(107); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "groupBy", function() { return __WEBPACK_IMPORTED_MODULE_35__internal_operators_groupBy__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__ = __webpack_require__(436); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__ = __webpack_require__(321); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "ignoreElements", function() { return __WEBPACK_IMPORTED_MODULE_36__internal_operators_ignoreElements__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__ = __webpack_require__(437); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__ = __webpack_require__(322); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "isEmpty", function() { return __WEBPACK_IMPORTED_MODULE_37__internal_operators_isEmpty__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__ = __webpack_require__(438); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__ = __webpack_require__(323); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "last", function() { return __WEBPACK_IMPORTED_MODULE_38__internal_operators_last__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__ = __webpack_require__(15); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "map", function() { return __WEBPACK_IMPORTED_MODULE_39__internal_operators_map__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__ = __webpack_require__(439); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__ = __webpack_require__(324); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mapTo", function() { return __WEBPACK_IMPORTED_MODULE_40__internal_operators_mapTo__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__ = __webpack_require__(440); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__ = __webpack_require__(325); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "materialize", function() { return __WEBPACK_IMPORTED_MODULE_41__internal_operators_materialize__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__ = __webpack_require__(441); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__ = __webpack_require__(326); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "max", function() { return __WEBPACK_IMPORTED_MODULE_42__internal_operators_max__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__ = __webpack_require__(442); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__ = __webpack_require__(327); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "merge", function() { return __WEBPACK_IMPORTED_MODULE_43__internal_operators_merge__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__ = __webpack_require__(72); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__ = __webpack_require__(70); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeAll", function() { return __WEBPACK_IMPORTED_MODULE_44__internal_operators_mergeAll__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__ = __webpack_require__(38); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__ = __webpack_require__(35); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMap", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__["a"]; }); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "flatMap", function() { return __WEBPACK_IMPORTED_MODULE_45__internal_operators_mergeMap__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__ = __webpack_require__(443); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__ = __webpack_require__(328); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeMapTo", function() { return __WEBPACK_IMPORTED_MODULE_46__internal_operators_mergeMapTo__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__ = __webpack_require__(444); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__ = __webpack_require__(329); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "mergeScan", function() { return __WEBPACK_IMPORTED_MODULE_47__internal_operators_mergeScan__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__ = __webpack_require__(445); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__ = __webpack_require__(330); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "min", function() { return __WEBPACK_IMPORTED_MODULE_48__internal_operators_min__["a"]; }); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__ = __webpack_require__(26); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "multicast", function() { return __WEBPACK_IMPORTED_MODULE_49__internal_operators_multicast__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__ = __webpack_require__(230); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__ = __webpack_require__(111); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "observeOn", function() { return __WEBPACK_IMPORTED_MODULE_50__internal_operators_observeOn__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__ = __webpack_require__(446); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__ = __webpack_require__(331); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "onErrorResumeNext", function() { return __WEBPACK_IMPORTED_MODULE_51__internal_operators_onErrorResumeNext__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__ = __webpack_require__(447); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__ = __webpack_require__(332); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pairwise", function() { return __WEBPACK_IMPORTED_MODULE_52__internal_operators_pairwise__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__ = __webpack_require__(448); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__ = __webpack_require__(333); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "partition", function() { return __WEBPACK_IMPORTED_MODULE_53__internal_operators_partition__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__ = __webpack_require__(450); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__ = __webpack_require__(335); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "pluck", function() { return __WEBPACK_IMPORTED_MODULE_54__internal_operators_pluck__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__ = __webpack_require__(451); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__ = __webpack_require__(336); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publish", function() { return __WEBPACK_IMPORTED_MODULE_55__internal_operators_publish__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__ = __webpack_require__(452); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__ = __webpack_require__(337); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishBehavior", function() { return __WEBPACK_IMPORTED_MODULE_56__internal_operators_publishBehavior__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__ = __webpack_require__(453); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__ = __webpack_require__(338); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishLast", function() { return __WEBPACK_IMPORTED_MODULE_57__internal_operators_publishLast__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__ = __webpack_require__(454); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__ = __webpack_require__(339); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "publishReplay", function() { return __WEBPACK_IMPORTED_MODULE_58__internal_operators_publishReplay__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__ = __webpack_require__(455); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__ = __webpack_require__(340); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "race", function() { return __WEBPACK_IMPORTED_MODULE_59__internal_operators_race__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__ = __webpack_require__(51); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__ = __webpack_require__(50); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "reduce", function() { return __WEBPACK_IMPORTED_MODULE_60__internal_operators_reduce__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__ = __webpack_require__(456); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__ = __webpack_require__(341); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeat", function() { return __WEBPACK_IMPORTED_MODULE_61__internal_operators_repeat__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__ = __webpack_require__(457); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__ = __webpack_require__(342); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "repeatWhen", function() { return __WEBPACK_IMPORTED_MODULE_62__internal_operators_repeatWhen__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__ = __webpack_require__(458); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__ = __webpack_require__(343); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "retry", function() { return __WEBPACK_IMPORTED_MODULE_63__internal_operators_retry__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__ = __webpack_require__(459); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__ = __webpack_require__(344); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "retryWhen", function() { return __WEBPACK_IMPORTED_MODULE_64__internal_operators_retryWhen__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__ = __webpack_require__(66); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__ = __webpack_require__(64); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "refCount", function() { return __WEBPACK_IMPORTED_MODULE_65__internal_operators_refCount__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__ = __webpack_require__(460); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__ = __webpack_require__(345); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sample", function() { return __WEBPACK_IMPORTED_MODULE_66__internal_operators_sample__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__ = __webpack_require__(461); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__ = __webpack_require__(346); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sampleTime", function() { return __WEBPACK_IMPORTED_MODULE_67__internal_operators_sampleTime__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__ = __webpack_require__(77); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__ = __webpack_require__(75); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "scan", function() { return __WEBPACK_IMPORTED_MODULE_68__internal_operators_scan__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__ = __webpack_require__(462); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__ = __webpack_require__(347); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "sequenceEqual", function() { return __WEBPACK_IMPORTED_MODULE_69__internal_operators_sequenceEqual__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__ = __webpack_require__(463); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__ = __webpack_require__(348); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "share", function() { return __WEBPACK_IMPORTED_MODULE_70__internal_operators_share__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__ = __webpack_require__(464); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__ = __webpack_require__(349); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "shareReplay", function() { return __WEBPACK_IMPORTED_MODULE_71__internal_operators_shareReplay__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__ = __webpack_require__(465); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__ = __webpack_require__(350); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "single", function() { return __WEBPACK_IMPORTED_MODULE_72__internal_operators_single__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__ = __webpack_require__(466); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__ = __webpack_require__(351); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skip", function() { return __WEBPACK_IMPORTED_MODULE_73__internal_operators_skip__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__ = __webpack_require__(467); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__ = __webpack_require__(352); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipLast", function() { return __WEBPACK_IMPORTED_MODULE_74__internal_operators_skipLast__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__ = __webpack_require__(468); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__ = __webpack_require__(353); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipUntil", function() { return __WEBPACK_IMPORTED_MODULE_75__internal_operators_skipUntil__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__ = __webpack_require__(469); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__ = __webpack_require__(354); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "skipWhile", function() { return __WEBPACK_IMPORTED_MODULE_76__internal_operators_skipWhile__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__ = __webpack_require__(470); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__ = __webpack_require__(355); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "startWith", function() { return __WEBPACK_IMPORTED_MODULE_77__internal_operators_startWith__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__ = __webpack_require__(471); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__ = __webpack_require__(356); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "subscribeOn", function() { return __WEBPACK_IMPORTED_MODULE_78__internal_operators_subscribeOn__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__ = __webpack_require__(473); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__ = __webpack_require__(358); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchAll", function() { return __WEBPACK_IMPORTED_MODULE_79__internal_operators_switchAll__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__ = __webpack_require__(78); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__ = __webpack_require__(76); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchMap", function() { return __WEBPACK_IMPORTED_MODULE_80__internal_operators_switchMap__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__ = __webpack_require__(474); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__ = __webpack_require__(359); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "switchMapTo", function() { return __WEBPACK_IMPORTED_MODULE_81__internal_operators_switchMapTo__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__ = __webpack_require__(75); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__ = __webpack_require__(73); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "take", function() { return __WEBPACK_IMPORTED_MODULE_82__internal_operators_take__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__ = __webpack_require__(76); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__ = __webpack_require__(74); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeLast", function() { return __WEBPACK_IMPORTED_MODULE_83__internal_operators_takeLast__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__ = __webpack_require__(475); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__ = __webpack_require__(360); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeUntil", function() { return __WEBPACK_IMPORTED_MODULE_84__internal_operators_takeUntil__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__ = __webpack_require__(476); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__ = __webpack_require__(361); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "takeWhile", function() { return __WEBPACK_IMPORTED_MODULE_85__internal_operators_takeWhile__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__ = __webpack_require__(249); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__ = __webpack_require__(130); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "tap", function() { return __WEBPACK_IMPORTED_MODULE_86__internal_operators_tap__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__ = __webpack_require__(251); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__ = __webpack_require__(132); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttle", function() { return __WEBPACK_IMPORTED_MODULE_87__internal_operators_throttle__["b"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__ = __webpack_require__(477); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__ = __webpack_require__(362); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throttleTime", function() { return __WEBPACK_IMPORTED_MODULE_88__internal_operators_throttleTime__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__ = __webpack_require__(50); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__ = __webpack_require__(49); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "throwIfEmpty", function() { return __WEBPACK_IMPORTED_MODULE_89__internal_operators_throwIfEmpty__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__ = __webpack_require__(478); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__ = __webpack_require__(363); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeInterval", function() { return __WEBPACK_IMPORTED_MODULE_90__internal_operators_timeInterval__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__ = __webpack_require__(479); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__ = __webpack_require__(364); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeout", function() { return __WEBPACK_IMPORTED_MODULE_91__internal_operators_timeout__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__ = __webpack_require__(252); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__ = __webpack_require__(133); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timeoutWith", function() { return __WEBPACK_IMPORTED_MODULE_92__internal_operators_timeoutWith__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__ = __webpack_require__(480); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__ = __webpack_require__(365); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "timestamp", function() { return __WEBPACK_IMPORTED_MODULE_93__internal_operators_timestamp__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__ = __webpack_require__(481); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__ = __webpack_require__(366); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "toArray", function() { return __WEBPACK_IMPORTED_MODULE_94__internal_operators_toArray__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__ = __webpack_require__(482); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__ = __webpack_require__(367); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "window", function() { return __WEBPACK_IMPORTED_MODULE_95__internal_operators_window__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__ = __webpack_require__(483); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__ = __webpack_require__(368); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowCount", function() { return __WEBPACK_IMPORTED_MODULE_96__internal_operators_windowCount__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__ = __webpack_require__(484); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__ = __webpack_require__(369); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowTime", function() { return __WEBPACK_IMPORTED_MODULE_97__internal_operators_windowTime__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__ = __webpack_require__(485); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__ = __webpack_require__(370); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowToggle", function() { return __WEBPACK_IMPORTED_MODULE_98__internal_operators_windowToggle__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__ = __webpack_require__(486); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__ = __webpack_require__(371); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "windowWhen", function() { return __WEBPACK_IMPORTED_MODULE_99__internal_operators_windowWhen__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__ = __webpack_require__(487); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__ = __webpack_require__(372); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "withLatestFrom", function() { return __WEBPACK_IMPORTED_MODULE_100__internal_operators_withLatestFrom__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__ = __webpack_require__(488); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__ = __webpack_require__(373); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zip", function() { return __WEBPACK_IMPORTED_MODULE_101__internal_operators_zip__["a"]; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__ = __webpack_require__(489); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__ = __webpack_require__(374); /* harmony reexport (binding) */ __webpack_require__.d(__webpack_exports__, "zipAll", function() { return __WEBPACK_IMPORTED_MODULE_102__internal_operators_zipAll__["a"]; }); /** PURE_IMPORTS_START PURE_IMPORTS_END */ @@ -43229,14 +27575,14 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); /***/ }), -/* 408 */ +/* 293 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = auditTime; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__audit__ = __webpack_require__(245); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_timer__ = __webpack_require__(244); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__audit__ = __webpack_require__(126); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_timer__ = __webpack_require__(125); /** PURE_IMPORTS_START _scheduler_async,_audit,_observable_timer PURE_IMPORTS_END */ @@ -43251,14 +27597,14 @@ function auditTime(duration, scheduler) { /***/ }), -/* 409 */ +/* 294 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = buffer; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -43299,13 +27645,13 @@ var BufferSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 410 */ +/* 295 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = bufferCount; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -43399,15 +27745,15 @@ var BufferSkipCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 411 */ +/* 296 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = bufferTime; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START tslib,_scheduler_async,_Subscriber,_util_isScheduler PURE_IMPORTS_END */ @@ -43559,15 +27905,15 @@ function dispatchBufferClose(arg) { /***/ }), -/* 412 */ +/* 297 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = bufferToggle; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); /** PURE_IMPORTS_START tslib,_Subscription,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */ @@ -43678,17 +28024,17 @@ var BufferToggleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 413 */ +/* 298 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = bufferWhen; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -43774,14 +28120,14 @@ var BufferWhenSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 414 */ +/* 299 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = catchError; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -43830,12 +28176,12 @@ var CatchSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 415 */ +/* 300 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = combineAll; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_combineLatest__ = __webpack_require__(71); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_combineLatest__ = __webpack_require__(69); /** PURE_IMPORTS_START _observable_combineLatest PURE_IMPORTS_END */ function combineAll(project) { @@ -43845,14 +28191,14 @@ function combineAll(project) { /***/ }), -/* 416 */ +/* 301 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = combineLatest; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_combineLatest__ = __webpack_require__(71); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_from__ = __webpack_require__(19); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_combineLatest__ = __webpack_require__(69); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_from__ = __webpack_require__(18); /** PURE_IMPORTS_START _util_isArray,_observable_combineLatest,_observable_from PURE_IMPORTS_END */ @@ -43876,12 +28222,12 @@ function combineLatest() { /***/ }), -/* 417 */ +/* 302 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = concat; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_concat__ = __webpack_require__(48); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_concat__ = __webpack_require__(47); /** PURE_IMPORTS_START _observable_concat PURE_IMPORTS_END */ function concat() { @@ -43895,12 +28241,12 @@ function concat() { /***/ }), -/* 418 */ +/* 303 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = concatMapTo; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__concatMap__ = __webpack_require__(246); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__concatMap__ = __webpack_require__(127); /** PURE_IMPORTS_START _concatMap PURE_IMPORTS_END */ function concatMapTo(innerObservable, resultSelector) { @@ -43910,13 +28256,13 @@ function concatMapTo(innerObservable, resultSelector) { /***/ }), -/* 419 */ +/* 304 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = count; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -43974,14 +28320,14 @@ var CountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 420 */ +/* 305 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = debounce; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44061,14 +28407,14 @@ var DebounceSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 421 */ +/* 306 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = debounceTime; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(12); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ @@ -44136,16 +28482,16 @@ function dispatchNext(subscriber) { /***/ }), -/* 422 */ +/* 307 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = delay; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(247); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Notification__ = __webpack_require__(46); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isDate__ = __webpack_require__(128); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__Notification__ = __webpack_require__(45); /** PURE_IMPORTS_START tslib,_scheduler_async,_util_isDate,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -44239,16 +28585,16 @@ var DelayMessage = /*@__PURE__*/ (function () { /***/ }), -/* 423 */ +/* 308 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = delayWhen; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subscriber,_Observable,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44379,13 +28725,13 @@ var SubscriptionDelaySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 424 */ +/* 309 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = dematerialize; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -44416,15 +28762,15 @@ var DeMaterializeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 425 */ +/* 310 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = distinct; /* unused harmony export DistinctSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44493,12 +28839,12 @@ var DistinctSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 426 */ +/* 311 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = distinctUntilKeyChanged; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__distinctUntilChanged__ = __webpack_require__(248); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__distinctUntilChanged__ = __webpack_require__(129); /** PURE_IMPORTS_START _distinctUntilChanged PURE_IMPORTS_END */ function distinctUntilKeyChanged(key, compare) { @@ -44508,16 +28854,16 @@ function distinctUntilKeyChanged(key, compare) { /***/ }), -/* 427 */ +/* 312 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = elementAt; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__ = __webpack_require__(35); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(40); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__ = __webpack_require__(50); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(39); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__take__ = __webpack_require__(75); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_ArgumentOutOfRangeError__ = __webpack_require__(32); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(37); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__throwIfEmpty__ = __webpack_require__(49); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(36); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__take__ = __webpack_require__(73); /** PURE_IMPORTS_START _util_ArgumentOutOfRangeError,_filter,_throwIfEmpty,_defaultIfEmpty,_take PURE_IMPORTS_END */ @@ -44539,16 +28885,16 @@ function elementAt(index, defaultValue) { /***/ }), -/* 428 */ +/* 313 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = endWith; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(21); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(69); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(12); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(48); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(20); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(67); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(11); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(47); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */ @@ -44584,13 +28930,13 @@ function endWith() { /***/ }), -/* 429 */ +/* 314 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = every; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -44645,14 +28991,14 @@ var EverySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 430 */ +/* 315 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = exhaust; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44701,16 +29047,16 @@ var SwitchFirstSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 431 */ +/* 316 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = exhaustMap; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(16); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__observable_from__ = __webpack_require__(19); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__observable_from__ = __webpack_require__(18); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult,_map,_observable_from PURE_IMPORTS_END */ @@ -44786,18 +29132,18 @@ var ExhaustMapSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 432 */ +/* 317 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = expand; /* unused harmony export ExpandOperator */ /* unused harmony export ExpandSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -44901,14 +29247,14 @@ var ExpandSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 433 */ +/* 318 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = finalize; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(8); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(7); /** PURE_IMPORTS_START tslib,_Subscriber,_Subscription PURE_IMPORTS_END */ @@ -44938,12 +29284,12 @@ var FinallySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 434 */ +/* 319 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = findIndex; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__operators_find__ = __webpack_require__(250); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__operators_find__ = __webpack_require__(131); /** PURE_IMPORTS_START _operators_find PURE_IMPORTS_END */ function findIndex(predicate, thisArg) { @@ -44953,16 +29299,16 @@ function findIndex(predicate, thisArg) { /***/ }), -/* 435 */ +/* 320 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = first; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(36); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(40); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__take__ = __webpack_require__(75); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(39); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__ = __webpack_require__(50); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(33); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(37); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__take__ = __webpack_require__(73); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__defaultIfEmpty__ = __webpack_require__(36); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__throwIfEmpty__ = __webpack_require__(49); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(25); /** PURE_IMPORTS_START _util_EmptyError,_filter,_take,_defaultIfEmpty,_throwIfEmpty,_util_identity PURE_IMPORTS_END */ @@ -44979,13 +29325,13 @@ function first(predicate, defaultValue) { /***/ }), -/* 436 */ +/* 321 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = ignoreElements; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -45015,13 +29361,13 @@ var IgnoreElementsSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 437 */ +/* 322 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = isEmpty; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -45058,16 +29404,16 @@ var IsEmptySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 438 */ +/* 323 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = last; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(36); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(40); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__takeLast__ = __webpack_require__(76); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__ = __webpack_require__(50); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__ = __webpack_require__(39); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_EmptyError__ = __webpack_require__(33); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(37); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__takeLast__ = __webpack_require__(74); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throwIfEmpty__ = __webpack_require__(49); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__defaultIfEmpty__ = __webpack_require__(36); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_identity__ = __webpack_require__(25); /** PURE_IMPORTS_START _util_EmptyError,_filter,_takeLast,_throwIfEmpty,_defaultIfEmpty,_util_identity PURE_IMPORTS_END */ @@ -45084,13 +29430,13 @@ function last(predicate, defaultValue) { /***/ }), -/* 439 */ +/* 324 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = mapTo; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -45122,14 +29468,14 @@ var MapToSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 440 */ +/* 325 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = materialize; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(46); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Notification__ = __webpack_require__(45); /** PURE_IMPORTS_START tslib,_Subscriber,_Notification PURE_IMPORTS_END */ @@ -45171,12 +29517,12 @@ var MaterializeSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 441 */ +/* 326 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = max; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(51); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(50); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function max(comparer) { @@ -45189,12 +29535,12 @@ function max(comparer) { /***/ }), -/* 442 */ +/* 327 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = merge; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_merge__ = __webpack_require__(241); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_merge__ = __webpack_require__(122); /** PURE_IMPORTS_START _observable_merge PURE_IMPORTS_END */ function merge() { @@ -45208,12 +29554,12 @@ function merge() { /***/ }), -/* 443 */ +/* 328 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = mergeMapTo; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(38); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__mergeMap__ = __webpack_require__(35); /** PURE_IMPORTS_START _mergeMap PURE_IMPORTS_END */ function mergeMapTo(innerObservable, resultSelector, concurrent) { @@ -45232,18 +29578,18 @@ function mergeMapTo(innerObservable, resultSelector, concurrent) { /***/ }), -/* 444 */ +/* 329 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = mergeScan; /* unused harmony export MergeScanOperator */ /* unused harmony export MergeScanSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(6); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(5); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(4); /** PURE_IMPORTS_START tslib,_util_tryCatch,_util_errorObject,_util_subscribeToResult,_OuterSubscriber PURE_IMPORTS_END */ @@ -45338,12 +29684,12 @@ var MergeScanSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 445 */ +/* 330 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = min; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(51); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(50); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function min(comparer) { @@ -45356,17 +29702,17 @@ function min(comparer) { /***/ }), -/* 446 */ +/* 331 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = onErrorResumeNext; /* unused harmony export onErrorResumeNextStatic */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_from__ = __webpack_require__(19); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_from__ = __webpack_require__(18); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_observable_from,_util_isArray,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -45439,13 +29785,13 @@ var OnErrorResumeNextSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 447 */ +/* 332 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = pairwise; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -45482,13 +29828,13 @@ var PairwiseSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 448 */ +/* 333 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = partition; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_not__ = __webpack_require__(449); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(40); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_not__ = __webpack_require__(334); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__filter__ = __webpack_require__(37); /** PURE_IMPORTS_START _util_not,_filter PURE_IMPORTS_END */ @@ -45504,7 +29850,7 @@ function partition(predicate, thisArg) { /***/ }), -/* 449 */ +/* 334 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -45522,12 +29868,12 @@ function not(pred, thisArg) { /***/ }), -/* 450 */ +/* 335 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = pluck; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__map__ = __webpack_require__(15); /** PURE_IMPORTS_START _map PURE_IMPORTS_END */ function pluck() { @@ -45561,7 +29907,7 @@ function plucker(props, length) { /***/ }), -/* 451 */ +/* 336 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -45580,12 +29926,12 @@ function publish(selector) { /***/ }), -/* 452 */ +/* 337 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = publishBehavior; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__ = __webpack_require__(227); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__BehaviorSubject__ = __webpack_require__(108); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(26); /** PURE_IMPORTS_START _BehaviorSubject,_multicast PURE_IMPORTS_END */ @@ -45597,12 +29943,12 @@ function publishBehavior(value) { /***/ }), -/* 453 */ +/* 338 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = publishLast; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__ = __webpack_require__(47); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__AsyncSubject__ = __webpack_require__(46); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(26); /** PURE_IMPORTS_START _AsyncSubject,_multicast PURE_IMPORTS_END */ @@ -45614,12 +29960,12 @@ function publishLast() { /***/ }), -/* 454 */ +/* 339 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = publishReplay; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(67); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(65); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__multicast__ = __webpack_require__(26); /** PURE_IMPORTS_START _ReplaySubject,_multicast PURE_IMPORTS_END */ @@ -45636,13 +29982,13 @@ function publishReplay(bufferSize, windowTime, selectorOrScheduler, scheduler) { /***/ }), -/* 455 */ +/* 340 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = race; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(11); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_race__ = __webpack_require__(243); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__util_isArray__ = __webpack_require__(10); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_race__ = __webpack_require__(124); /** PURE_IMPORTS_START _util_isArray,_observable_race PURE_IMPORTS_END */ @@ -45662,14 +30008,14 @@ function race() { /***/ }), -/* 456 */ +/* 341 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = repeat; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(11); /** PURE_IMPORTS_START tslib,_Subscriber,_observable_empty PURE_IMPORTS_END */ @@ -45726,17 +30072,17 @@ var RepeatSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 457 */ +/* 342 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = repeatWhen; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -45821,13 +30167,13 @@ var RepeatWhenSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 458 */ +/* 343 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = retry; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -45873,17 +30219,17 @@ var RetrySubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 459 */ +/* 344 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = retryWhen; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -45961,14 +30307,14 @@ var RetryWhenSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 460 */ +/* 345 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = sample; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -46017,14 +30363,14 @@ var SampleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 461 */ +/* 346 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = sampleTime; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(12); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async PURE_IMPORTS_END */ @@ -46076,17 +30422,17 @@ function dispatchNotification(state) { /***/ }), -/* 462 */ +/* 347 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = sequenceEqual; /* unused harmony export SequenceEqualOperator */ /* unused harmony export SequenceEqualSubscriber */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(14); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(13); /** PURE_IMPORTS_START tslib,_Subscriber,_util_tryCatch,_util_errorObject PURE_IMPORTS_END */ @@ -46194,13 +30540,13 @@ var SequenceEqualCompareToSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 463 */ +/* 348 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = share; /* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__multicast__ = __webpack_require__(26); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__refCount__ = __webpack_require__(66); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__refCount__ = __webpack_require__(64); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(9); /** PURE_IMPORTS_START _multicast,_refCount,_Subject PURE_IMPORTS_END */ @@ -46216,12 +30562,12 @@ function share() { /***/ }), -/* 464 */ +/* 349 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = shareReplay; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(67); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__ReplaySubject__ = __webpack_require__(65); /** PURE_IMPORTS_START _ReplaySubject PURE_IMPORTS_END */ function shareReplay(bufferSize, windowTime, scheduler) { @@ -46264,14 +30610,14 @@ function shareReplayOperator(bufferSize, windowTime, scheduler) { /***/ }), -/* 465 */ +/* 350 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = single; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_EmptyError__ = __webpack_require__(36); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_EmptyError__ = __webpack_require__(33); /** PURE_IMPORTS_START tslib,_Subscriber,_util_EmptyError PURE_IMPORTS_END */ @@ -46343,13 +30689,13 @@ var SingleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 466 */ +/* 351 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = skip; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -46384,14 +30730,14 @@ var SkipSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 467 */ +/* 352 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = skipLast; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(35); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_ArgumentOutOfRangeError__ = __webpack_require__(32); /** PURE_IMPORTS_START tslib,_Subscriber,_util_ArgumentOutOfRangeError PURE_IMPORTS_END */ @@ -46445,14 +30791,14 @@ var SkipLastSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 468 */ +/* 353 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = skipUntil; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -46496,13 +30842,13 @@ var SkipUntilSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 469 */ +/* 354 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = skipWhile; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -46551,16 +30897,16 @@ var SkipWhileSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 470 */ +/* 355 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = startWith; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(21); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(69); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(12); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(48); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_fromArray__ = __webpack_require__(20); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__observable_scalar__ = __webpack_require__(67); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_empty__ = __webpack_require__(11); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_concat__ = __webpack_require__(47); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START _observable_fromArray,_observable_scalar,_observable_empty,_observable_concat,_util_isScheduler PURE_IMPORTS_END */ @@ -46596,12 +30942,12 @@ function startWith() { /***/ }), -/* 471 */ +/* 356 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = subscribeOn; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_SubscribeOnObservable__ = __webpack_require__(472); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_SubscribeOnObservable__ = __webpack_require__(357); /** PURE_IMPORTS_START _observable_SubscribeOnObservable PURE_IMPORTS_END */ function subscribeOn(scheduler, delay) { @@ -46626,15 +30972,15 @@ var SubscribeOnOperator = /*@__PURE__*/ (function () { /***/ }), -/* 472 */ +/* 357 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return SubscribeOnObservable; }); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(4); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__ = __webpack_require__(232); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isNumeric__ = __webpack_require__(49); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Observable__ = __webpack_require__(3); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_asap__ = __webpack_require__(113); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_isNumeric__ = __webpack_require__(48); /** PURE_IMPORTS_START tslib,_Observable,_scheduler_asap,_util_isNumeric PURE_IMPORTS_END */ @@ -46689,12 +31035,12 @@ var SubscribeOnObservable = /*@__PURE__*/ (function (_super) { /***/ }), -/* 473 */ +/* 358 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = switchAll; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(78); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(76); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_identity__ = __webpack_require__(25); /** PURE_IMPORTS_START _switchMap,_util_identity PURE_IMPORTS_END */ @@ -46706,12 +31052,12 @@ function switchAll() { /***/ }), -/* 474 */ +/* 359 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = switchMapTo; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(78); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__switchMap__ = __webpack_require__(76); /** PURE_IMPORTS_START _switchMap PURE_IMPORTS_END */ function switchMapTo(innerObservable, resultSelector) { @@ -46721,14 +31067,14 @@ function switchMapTo(innerObservable, resultSelector) { /***/ }), -/* 475 */ +/* 360 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = takeUntil; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -46767,13 +31113,13 @@ var TakeUntilSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 476 */ +/* 361 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = takeWhile; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /** PURE_IMPORTS_START tslib,_Subscriber PURE_IMPORTS_END */ @@ -46824,15 +31170,15 @@ var TakeWhileSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 477 */ +/* 362 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = throttleTime; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throttle__ = __webpack_require__(251); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__throttle__ = __webpack_require__(132); /** PURE_IMPORTS_START tslib,_Subscriber,_scheduler_async,_throttle PURE_IMPORTS_END */ @@ -46917,16 +31263,16 @@ function dispatchNext(arg) { /***/ }), -/* 478 */ +/* 363 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = timeInterval; /* unused harmony export TimeInterval */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scan__ = __webpack_require__(77); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_defer__ = __webpack_require__(73); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__scan__ = __webpack_require__(75); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__observable_defer__ = __webpack_require__(71); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__map__ = __webpack_require__(15); /** PURE_IMPORTS_START _scheduler_async,_scan,_observable_defer,_map PURE_IMPORTS_END */ @@ -46960,15 +31306,15 @@ var TimeInterval = /*@__PURE__*/ (function () { /***/ }), -/* 479 */ +/* 364 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = timeout; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_TimeoutError__ = __webpack_require__(233); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__timeoutWith__ = __webpack_require__(252); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_throwError__ = __webpack_require__(70); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__util_TimeoutError__ = __webpack_require__(114); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__timeoutWith__ = __webpack_require__(133); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__observable_throwError__ = __webpack_require__(68); /** PURE_IMPORTS_START _scheduler_async,_util_TimeoutError,_timeoutWith,_observable_throwError PURE_IMPORTS_END */ @@ -46984,14 +31330,14 @@ function timeout(due, scheduler) { /***/ }), -/* 480 */ +/* 365 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = timestamp; /* unused harmony export Timestamp */ -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__map__ = __webpack_require__(15); /** PURE_IMPORTS_START _scheduler_async,_map PURE_IMPORTS_END */ @@ -47013,12 +31359,12 @@ var Timestamp = /*@__PURE__*/ (function () { /***/ }), -/* 481 */ +/* 366 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = toArray; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(51); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__reduce__ = __webpack_require__(50); /** PURE_IMPORTS_START _reduce PURE_IMPORTS_END */ function toArrayReducer(arr, item, index) { @@ -47035,15 +31381,15 @@ function toArray() { /***/ }), -/* 482 */ +/* 367 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = window; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -47114,13 +31460,13 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 483 */ +/* 368 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = windowCount; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(2); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subscriber__ = __webpack_require__(1); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subject__ = __webpack_require__(9); /** PURE_IMPORTS_START tslib,_Subscriber,_Subject PURE_IMPORTS_END */ @@ -47203,17 +31549,17 @@ var WindowCountSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 484 */ +/* 369 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = windowTime; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(13); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(2); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(49); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(15); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__scheduler_async__ = __webpack_require__(12); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__Subscriber__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_isNumeric__ = __webpack_require__(48); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_isScheduler__ = __webpack_require__(14); /** PURE_IMPORTS_START tslib,_Subject,_scheduler_async,_Subscriber,_util_isNumeric,_util_isScheduler PURE_IMPORTS_END */ @@ -47372,18 +31718,18 @@ function dispatchWindowClose(state) { /***/ }), -/* 485 */ +/* 370 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = windowToggle; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(8); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__Subscription__ = __webpack_require__(7); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subject,_Subscription,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -47517,17 +31863,17 @@ var WindowToggleSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 486 */ +/* 371 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = windowWhen; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Subject__ = __webpack_require__(9); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(17); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(14); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_tryCatch__ = __webpack_require__(16); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__util_errorObject__ = __webpack_require__(13); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_Subject,_util_tryCatch,_util_errorObject,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -47615,14 +31961,14 @@ var WindowSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 487 */ +/* 372 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = withLatestFrom; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(1); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(5); -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(6); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_tslib__ = __webpack_require__(0); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__OuterSubscriber__ = __webpack_require__(4); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__util_subscribeToResult__ = __webpack_require__(5); /** PURE_IMPORTS_START tslib,_OuterSubscriber,_util_subscribeToResult PURE_IMPORTS_END */ @@ -47709,12 +32055,12 @@ var WithLatestFromSubscriber = /*@__PURE__*/ (function (_super) { /***/ }), -/* 488 */ +/* 373 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = zip; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(74); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(72); /** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ function zip() { @@ -47730,12 +32076,12 @@ function zip() { /***/ }), -/* 489 */ +/* 374 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; /* harmony export (immutable) */ __webpack_exports__["a"] = zipAll; -/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(74); +/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__observable_zip__ = __webpack_require__(72); /** PURE_IMPORTS_START _observable_zip PURE_IMPORTS_END */ function zipAll(project) { @@ -47745,7 +32091,7 @@ function zipAll(project) { /***/ }), -/* 490 */ +/* 375 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -47799,27 +32145,27 @@ let runCommand = exports.runCommand = (() => { }; })(); -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _indentString = __webpack_require__(491); +var _indentString = __webpack_require__(376); var _indentString2 = _interopRequireDefault(_indentString); -var _wrapAnsi = __webpack_require__(492); +var _wrapAnsi = __webpack_require__(377); var _wrapAnsi2 = _interopRequireDefault(_wrapAnsi); -var _config = __webpack_require__(254); +var _config = __webpack_require__(60); -var _errors = __webpack_require__(60); +var _errors = __webpack_require__(57); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); -var _projects = __webpack_require__(30); +var _projects = __webpack_require__(22); -var _projects_tree = __webpack_require__(496); +var _projects_tree = __webpack_require__(384); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -47851,7 +32197,7 @@ function toArray(value) { } /***/ }), -/* 491 */ +/* 376 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -47885,13 +32231,13 @@ module.exports = (str, count, opts) => { /***/ }), -/* 492 */ +/* 377 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stringWidth = __webpack_require__(493); -const stripAnsi = __webpack_require__(253); +const stringWidth = __webpack_require__(378); +const stripAnsi = __webpack_require__(382); const ESCAPES = new Set([ '\u001B', @@ -48085,13 +32431,13 @@ module.exports = (str, cols, opts) => { /***/ }), -/* 493 */ +/* 378 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const stripAnsi = __webpack_require__(253); -const isFullwidthCodePoint = __webpack_require__(495); +const stripAnsi = __webpack_require__(379); +const isFullwidthCodePoint = __webpack_require__(381); module.exports = str => { if (typeof str !== 'string' || str.length === 0) { @@ -48128,7 +32474,18 @@ module.exports = str => { /***/ }), -/* 494 */ +/* 379 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const ansiRegex = __webpack_require__(380); + +module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input; + + +/***/ }), +/* 380 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48145,7 +32502,7 @@ module.exports = () => { /***/ }), -/* 495 */ +/* 381 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48198,7 +32555,35 @@ module.exports = x => { /***/ }), -/* 496 */ +/* 382 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const ansiRegex = __webpack_require__(383); + +module.exports = input => typeof input === 'string' ? input.replace(ansiRegex(), '') : input; + + +/***/ }), +/* 383 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +module.exports = () => { + const pattern = [ + '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)', + '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))' + ].join('|'); + + return new RegExp(pattern, 'g'); +}; + + +/***/ }), +/* 384 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48209,11 +32594,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.renderProjectsTree = renderProjectsTree; -var _chalk = __webpack_require__(18); +var _chalk = __webpack_require__(17); var _chalk2 = _interopRequireDefault(_chalk); -var _path = __webpack_require__(3); +var _path = __webpack_require__(2); var _path2 = _interopRequireDefault(_path); @@ -48340,7 +32725,7 @@ function addProjectToTree(tree, pathParts, project) { } /***/ }), -/* 497 */ +/* 385 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48350,7 +32735,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var _build_production_projects = __webpack_require__(498); +var _build_production_projects = __webpack_require__(386); Object.defineProperty(exports, 'buildProductionProjects', { enumerable: true, @@ -48359,7 +32744,7 @@ Object.defineProperty(exports, 'buildProductionProjects', { } }); -var _prepare_project_dependencies = __webpack_require__(509); +var _prepare_project_dependencies = __webpack_require__(398); Object.defineProperty(exports, 'prepareExternalProjectDependencies', { enumerable: true, @@ -48369,7 +32754,7 @@ Object.defineProperty(exports, 'prepareExternalProjectDependencies', { }); /***/ }), -/* 498 */ +/* 386 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48381,7 +32766,7 @@ Object.defineProperty(exports, "__esModule", { exports.buildProductionProjects = undefined; let buildProductionProjects = exports.buildProductionProjects = (() => { - var _ref = _asyncToGenerator(function* ({ kibanaRoot, buildRoot }) { + var _ref = _asyncToGenerator(function* ({ kibanaRoot, buildRoots }) { const projects = yield getProductionProjects(kibanaRoot); const projectGraph = (0, _projects.buildProjectGraph)(projects); const batchedProjects = (0, _projects.topologicallyBatchProjects)(projects, projectGraph); @@ -48393,7 +32778,9 @@ let buildProductionProjects = exports.buildProductionProjects = (() => { for (const project of batch) { yield deleteTarget(project); yield buildProject(project); - yield copyToBuild(project, kibanaRoot, buildRoot); + for (const buildRoot of buildRoots) { + yield copyToBuild(project, kibanaRoot, buildRoot); + } } } }); @@ -48483,8 +32870,7 @@ let copyToBuild = (() => { // the intermediate build, we fall back to using the project's already defined // `package.json`. const packageJson = (yield (0, _fs.isFile)((0, _path.join)(buildProjectPath, 'package.json'))) ? yield (0, _package_json.readPackageJson)(buildProjectPath) : project.json; - const preparedPackageJson = (0, _package_json.createProductionPackageJson)(packageJson); - yield (0, _package_json.writePackageJson)(buildProjectPath, preparedPackageJson); + yield (0, _package_json.writePackageJson)(buildProjectPath, packageJson); }); return function copyToBuild(_x5, _x6, _x7) { @@ -48492,25 +32878,25 @@ let copyToBuild = (() => { }; })(); -var _cpy = __webpack_require__(499); +var _cpy = __webpack_require__(387); var _cpy2 = _interopRequireDefault(_cpy); -var _del = __webpack_require__(217); +var _del = __webpack_require__(98); var _del2 = _interopRequireDefault(_del); -var _path = __webpack_require__(3); +var _path = __webpack_require__(2); -var _config = __webpack_require__(254); +var _config = __webpack_require__(60); -var _fs = __webpack_require__(56); +var _fs = __webpack_require__(39); -var _log = __webpack_require__(20); +var _log = __webpack_require__(19); -var _package_json = __webpack_require__(42); +var _package_json = __webpack_require__(41); -var _projects = __webpack_require__(30); +var _projects = __webpack_require__(22); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -48534,17 +32920,17 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a */ /***/ }), -/* 499 */ +/* 387 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const EventEmitter = __webpack_require__(41); -const path = __webpack_require__(3); -const arrify = __webpack_require__(500); -const globby = __webpack_require__(501); -const cpFile = __webpack_require__(503); -const CpyError = __webpack_require__(508); +const EventEmitter = __webpack_require__(40); +const path = __webpack_require__(2); +const arrify = __webpack_require__(388); +const globby = __webpack_require__(389); +const cpFile = __webpack_require__(391); +const CpyError = __webpack_require__(397); const preprocessSrcPath = (srcPath, opts) => opts.cwd ? path.resolve(opts.cwd, srcPath) : srcPath; @@ -48638,7 +33024,7 @@ module.exports = (src, dest, opts) => { /***/ }), -/* 500 */ +/* 388 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48653,16 +33039,16 @@ module.exports = function (val) { /***/ }), -/* 501 */ +/* 389 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -var Promise = __webpack_require__(218); -var arrayUnion = __webpack_require__(219); -var objectAssign = __webpack_require__(220); -var glob = __webpack_require__(31); -var pify = __webpack_require__(502); +var Promise = __webpack_require__(99); +var arrayUnion = __webpack_require__(100); +var objectAssign = __webpack_require__(101); +var glob = __webpack_require__(23); +var pify = __webpack_require__(390); var globP = pify(glob, Promise).bind(glob); @@ -48748,7 +33134,7 @@ module.exports.hasMagic = function (patterns, opts) { /***/ }), -/* 502 */ +/* 390 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -48823,17 +33209,17 @@ pify.all = pify; /***/ }), -/* 503 */ +/* 391 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const path = __webpack_require__(3); -const fsConstants = __webpack_require__(7).constants; -const Buffer = __webpack_require__(504).Buffer; -const CpFileError = __webpack_require__(255); -const fs = __webpack_require__(506); -const ProgressEmitter = __webpack_require__(507); +const path = __webpack_require__(2); +const fsConstants = __webpack_require__(6).constants; +const Buffer = __webpack_require__(392).Buffer; +const CpFileError = __webpack_require__(134); +const fs = __webpack_require__(394); +const ProgressEmitter = __webpack_require__(396); module.exports = (src, dest, opts) => { if (!src || !dest) { @@ -48983,11 +33369,11 @@ module.exports.sync = (src, dest, opts) => { /***/ }), -/* 504 */ +/* 392 */ /***/ (function(module, exports, __webpack_require__) { /* eslint-disable node/no-deprecated-api */ -var buffer = __webpack_require__(505) +var buffer = __webpack_require__(393) var Buffer = buffer.Buffer // alternative to using Object.keys for old browsers @@ -49051,21 +33437,21 @@ SafeBuffer.allocUnsafeSlow = function (size) { /***/ }), -/* 505 */ +/* 393 */ /***/ (function(module, exports) { module.exports = require("buffer"); /***/ }), -/* 506 */ +/* 394 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const fs = __webpack_require__(28); -const makeDir = __webpack_require__(92); -const pify = __webpack_require__(23); -const CpFileError = __webpack_require__(255); +const fs = __webpack_require__(27); +const makeDir = __webpack_require__(91); +const pify = __webpack_require__(395); +const CpFileError = __webpack_require__(134); const fsP = pify(fs); @@ -49210,12 +33596,103 @@ if (fs.copyFileSync) { /***/ }), -/* 507 */ +/* 395 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const EventEmitter = __webpack_require__(41); + +const processFn = (fn, opts) => function () { + const P = opts.promiseModule; + const args = new Array(arguments.length); + + for (let i = 0; i < arguments.length; i++) { + args[i] = arguments[i]; + } + + return new P((resolve, reject) => { + if (opts.errorFirst) { + args.push(function (err, result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 1; i < arguments.length; i++) { + results[i - 1] = arguments[i]; + } + + if (err) { + results.unshift(err); + reject(results); + } else { + resolve(results); + } + } else if (err) { + reject(err); + } else { + resolve(result); + } + }); + } else { + args.push(function (result) { + if (opts.multiArgs) { + const results = new Array(arguments.length - 1); + + for (let i = 0; i < arguments.length; i++) { + results[i] = arguments[i]; + } + + resolve(results); + } else { + resolve(result); + } + }); + } + + fn.apply(this, args); + }); +}; + +module.exports = (obj, opts) => { + opts = Object.assign({ + exclude: [/.+(Sync|Stream)$/], + errorFirst: true, + promiseModule: Promise + }, opts); + + const filter = key => { + const match = pattern => typeof pattern === 'string' ? key === pattern : pattern.test(key); + return opts.include ? opts.include.some(match) : !opts.exclude.some(match); + }; + + let ret; + if (typeof obj === 'function') { + ret = function () { + if (opts.excludeMain) { + return obj.apply(this, arguments); + } + + return processFn(obj, opts).apply(this, arguments); + }; + } else { + ret = Object.create(Object.getPrototypeOf(obj)); + } + + for (const key in obj) { // eslint-disable-line guard-for-in + const x = obj[key]; + ret[key] = typeof x === 'function' && filter(key) ? processFn(x, opts) : x; + } + + return ret; +}; + + +/***/ }), +/* 396 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + +const EventEmitter = __webpack_require__(40); const written = new WeakMap(); @@ -49252,12 +33729,12 @@ module.exports = ProgressEmitter; /***/ }), -/* 508 */ +/* 397 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; -const NestedError = __webpack_require__(256); +const NestedError = __webpack_require__(135); class CpyError extends NestedError { constructor(message, nested) { @@ -49271,7 +33748,7 @@ module.exports = CpyError; /***/ }), -/* 509 */ +/* 398 */ /***/ (function(module, exports, __webpack_require__) { "use strict"; @@ -49311,9 +33788,9 @@ let prepareExternalProjectDependencies = exports.prepareExternalProjectDependenc }; })(); -var _package_json = __webpack_require__(42); +var _package_json = __webpack_require__(41); -var _project = __webpack_require__(87); +var _project = __webpack_require__(86); function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } /* * Licensed to Elasticsearch B.V. under one or more contributor diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json index 4ca3f0b16400c..0c03bd9238b4f 100644 --- a/packages/kbn-pm/package.json +++ b/packages/kbn-pm/package.json @@ -24,6 +24,7 @@ "@types/lodash.clonedeepwith": "^4.5.3", "@types/log-symbols": "^2.0.0", "@types/mkdirp": "^0.5.2", + "@types/ncp": "^2.0.1", "@types/node": "^8.9.4", "@types/ora": "^1.3.2", "@types/read-pkg": "^3.0.0", @@ -50,14 +51,15 @@ "lodash.clonedeepwith": "^4.5.0", "log-symbols": "^2.2.0", "mkdirp": "^0.5.1", + "ncp": "^2.0.0", "ora": "^1.4.0", - "prettier": "^1.14.0", + "prettier": "^1.14.3", "read-pkg": "^3.0.0", "rxjs": "^6.2.1", "spawn-sync": "^1.0.15", "string-replace-loader": "^1.3.0", "strip-ansi": "^4.0.0", - "strong-log-transformer": "^1.0.6", + "strong-log-transformer": "^2.0.0", "tempy": "^0.2.1", "ts-loader": "^3.5.0", "typescript": "^3.0.3", diff --git a/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap b/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap index 8e7fa2cc6c97f..003d434978ef5 100644 --- a/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap +++ b/packages/kbn-pm/src/commands/__snapshots__/bootstrap.test.ts.snap @@ -6,22 +6,29 @@ Array [ Map { "kibana" => Project { "allDependencies": Object { - "bar": "link:packages/bar", + "bar": "1.0.0", }, "devDependencies": Object {}, + "isWorkspaceProject": false, + "isWorkspaceRoot": true, "json": Object { "dependencies": Object { - "bar": "link:packages/bar", + "bar": "1.0.0", }, "name": "kibana", "version": "1.0.0", + "workspaces": Object { + "packages": Array [ + "packages/*", + ], + }, }, "nodeModulesLocation": "/packages/kbn-pm/src/commands/node_modules", "optimizeLocation": "/packages/kbn-pm/src/commands/optimize", "packageJsonLocation": "/packages/kbn-pm/src/commands/package.json", "path": "/packages/kbn-pm/src/commands", "productionDependencies": Object { - "bar": "link:packages/bar", + "bar": "1.0.0", }, "scripts": Object {}, "targetLocation": "/packages/kbn-pm/src/commands/target", @@ -29,6 +36,8 @@ Array [ "bar" => Project { "allDependencies": Object {}, "devDependencies": Object {}, + "isWorkspaceProject": false, + "isWorkspaceRoot": false, "json": Object { "name": "bar", "scripts": Object { @@ -52,6 +61,8 @@ Array [ Project { "allDependencies": Object {}, "devDependencies": Object {}, + "isWorkspaceProject": false, + "isWorkspaceRoot": false, "json": Object { "name": "bar", "scripts": Object { @@ -84,6 +95,8 @@ Array [ Project { "allDependencies": Object {}, "devDependencies": Object {}, + "isWorkspaceProject": false, + "isWorkspaceRoot": false, "json": Object { "name": "bar", "scripts": Object { @@ -158,11 +171,11 @@ Array [ exports[`handles dependencies of dependencies: install in dir 1`] = ` Array [ Array [ - "/packages/kbn-pm/src/commands/packages/bar", + "/packages/kbn-pm/src/commands", Array [], ], Array [ - "/packages/kbn-pm/src/commands", + "/packages/kbn-pm/src/commands/packages/bar", Array [], ], Array [ @@ -181,13 +194,13 @@ Running installs in topological order:", Array [ " -Installing dependencies in [bar]: +Installing dependencies in [kibana]: ", ], Array [ " -Installing dependencies in [kibana]: +Installing dependencies in [bar]: ", ], Array [ diff --git a/packages/kbn-pm/src/commands/bootstrap.test.ts b/packages/kbn-pm/src/commands/bootstrap.test.ts index 66bdc6d82ecda..f7f1cf4e6784f 100644 --- a/packages/kbn-pm/src/commands/bootstrap.test.ts +++ b/packages/kbn-pm/src/commands/bootstrap.test.ts @@ -34,8 +34,8 @@ const mockInstallInDir = installInDir as jest.Mock; const mockRunScriptInPackageStreaming = runScriptInPackageStreaming as jest.Mock; const mockLinkProjectExecutables = linkProjectExecutables as jest.Mock; -const createProject = (packageJson: IPackageJson, path = '.') => - new Project( +const createProject = (packageJson: IPackageJson, path = '.') => { + const project = new Project( { name: 'kibana', version: '1.0.0', @@ -44,6 +44,12 @@ const createProject = (packageJson: IPackageJson, path = '.') => resolve(__dirname, path) ); + if (packageJson.workspaces) { + project.isWorkspaceRoot = true; + } + + return project; +}; expect.addSnapshotSerializer(absolutePathSnapshotSerializer); expect.addSnapshotSerializer(stripAnsiSnapshotSerializer); @@ -59,7 +65,10 @@ afterEach(() => { test('handles dependencies of dependencies', async () => { const kibana = createProject({ dependencies: { - bar: 'link:packages/bar', + bar: '1.0.0', + }, + workspaces: { + packages: ['packages/*'], }, }); const foo = createProject( @@ -86,6 +95,7 @@ test('handles dependencies of dependencies', async () => { }, 'packages/baz' ); + const projects = new Map([['kibana', kibana], ['foo', foo], ['bar', bar], ['baz', baz]]); const projectGraph = buildProjectGraph(projects); @@ -104,7 +114,10 @@ test('handles dependencies of dependencies', async () => { test('does not run installer if no deps in package', async () => { const kibana = createProject({ dependencies: { - bar: 'link:packages/bar', + bar: '1.0.0', + }, + workspaces: { + packages: ['packages/*'], }, }); // bar has no dependencies @@ -135,6 +148,9 @@ test('handles "frozen-lockfile"', async () => { dependencies: { foo: '2.2.0', }, + workspaces: { + packages: ['packages/*'], + }, }); const projects = new Map([['kibana', kibana]]); @@ -156,7 +172,10 @@ test('handles "frozen-lockfile"', async () => { test('calls "kbn:bootstrap" scripts and links executables after installing deps', async () => { const kibana = createProject({ dependencies: { - bar: 'link:packages/bar', + bar: '1.0.0', + }, + workspaces: { + packages: ['packages/*'], }, }); const bar = createProject( diff --git a/packages/kbn-pm/src/commands/bootstrap.ts b/packages/kbn-pm/src/commands/bootstrap.ts index 2d2aa9b040a75..2469e4cca1cb1 100644 --- a/packages/kbn-pm/src/commands/bootstrap.ts +++ b/packages/kbn-pm/src/commands/bootstrap.ts @@ -30,6 +30,9 @@ export const BootstrapCommand: ICommand = { name: 'bootstrap', async run(projects, projectGraph, { options }) { + const batchedProjectsByWorkspace = topologicallyBatchProjects(projects, projectGraph, { + batchByWorkspace: true, + }); const batchedProjects = topologicallyBatchProjects(projects, projectGraph); const frozenLockfile = options['frozen-lockfile'] === true; @@ -37,8 +40,13 @@ export const BootstrapCommand: ICommand = { log.write(chalk.bold('\nRunning installs in topological order:')); - for (const batch of batchedProjects) { + for (const batch of batchedProjectsByWorkspace) { for (const project of batch) { + if (project.isWorkspaceProject) { + log.write(`Skipping workspace project: ${project.name}`); + continue; + } + if (project.hasDependencies()) { await project.installDependencies({ extraArgs }); } diff --git a/packages/kbn-pm/src/index.ts b/packages/kbn-pm/src/index.ts index 76979b31e90e2..a4c411f5152c3 100644 --- a/packages/kbn-pm/src/index.ts +++ b/packages/kbn-pm/src/index.ts @@ -19,4 +19,4 @@ export { run } from './cli'; export { buildProductionProjects, prepareExternalProjectDependencies } from './production'; -export { transformDependencies } from './utils/package_json'; +export { copyWorkspacePackages } from './utils/workspaces'; diff --git a/packages/kbn-pm/src/production/build_production_projects.ts b/packages/kbn-pm/src/production/build_production_projects.ts index 292020b22781f..cbb0aadf3cf11 100644 --- a/packages/kbn-pm/src/production/build_production_projects.ts +++ b/packages/kbn-pm/src/production/build_production_projects.ts @@ -24,11 +24,7 @@ import { join, relative, resolve } from 'path'; import { getProjectPaths } from '../config'; import { isDirectory, isFile } from '../utils/fs'; import { log } from '../utils/log'; -import { - createProductionPackageJson, - readPackageJson, - writePackageJson, -} from '../utils/package_json'; +import { readPackageJson, writePackageJson } from '../utils/package_json'; import { Project } from '../utils/project'; import { buildProjectGraph, @@ -39,10 +35,10 @@ import { export async function buildProductionProjects({ kibanaRoot, - buildRoot, + buildRoots, }: { kibanaRoot: string; - buildRoot: string; + buildRoots: string[]; }) { const projects = await getProductionProjects(kibanaRoot); const projectGraph = buildProjectGraph(projects); @@ -55,7 +51,9 @@ export async function buildProductionProjects({ for (const project of batch) { await deleteTarget(project); await buildProject(project); - await copyToBuild(project, kibanaRoot, buildRoot); + for (const buildRoot of buildRoots) { + await copyToBuild(project, kibanaRoot, buildRoot); + } } } } @@ -128,6 +126,5 @@ async function copyToBuild(project: Project, kibanaRoot: string, buildRoot: stri ? await readPackageJson(buildProjectPath) : project.json; - const preparedPackageJson = createProductionPackageJson(packageJson); - await writePackageJson(buildProjectPath, preparedPackageJson); + await writePackageJson(buildProjectPath, packageJson); } diff --git a/packages/kbn-pm/src/production/integration_tests/__snapshots__/build_production_projects.test.ts.snap b/packages/kbn-pm/src/production/integration_tests/__snapshots__/build_production_projects.test.ts.snap index 9a5c479255218..94642340e0d9d 100644 --- a/packages/kbn-pm/src/production/integration_tests/__snapshots__/build_production_projects.test.ts.snap +++ b/packages/kbn-pm/src/production/integration_tests/__snapshots__/build_production_projects.test.ts.snap @@ -44,7 +44,7 @@ Object { exports[`kbn-pm production builds and copies projects for production: packages/foo/package.json 1`] = ` Object { "dependencies": Object { - "@elastic/bar": "file:../bar", + "@elastic/bar": "link:../bar", }, "devDependencies": Object { "babel-cli": "^6.26.0", diff --git a/packages/kbn-pm/src/production/integration_tests/build_production_projects.test.ts b/packages/kbn-pm/src/production/integration_tests/build_production_projects.test.ts index d0f2f05bec1b1..0cef08fc7d064 100644 --- a/packages/kbn-pm/src/production/integration_tests/build_production_projects.test.ts +++ b/packages/kbn-pm/src/production/integration_tests/build_production_projects.test.ts @@ -51,7 +51,7 @@ describe('kbn-pm production', () => { }); } - await buildProductionProjects({ kibanaRoot: tmpDir, buildRoot }); + await buildProductionProjects({ kibanaRoot: tmpDir, buildRoots: [buildRoot] }); const files = await globby(['**/*', '!**/node_modules/**'], { cwd: buildRoot, diff --git a/packages/kbn-pm/src/utils/__fixtures__/kibana/package.json b/packages/kbn-pm/src/utils/__fixtures__/kibana/package.json index 98bc15383f844..4479334f22dd7 100644 --- a/packages/kbn-pm/src/utils/__fixtures__/kibana/package.json +++ b/packages/kbn-pm/src/utils/__fixtures__/kibana/package.json @@ -2,6 +2,11 @@ "name": "kibana", "version": "1.0.0", "dependencies": { - "foo": "link:packages/foo" + "foo": "1.0.0" + }, + "workspaces": { + "packages": [ + "packages/*" + ] } } diff --git a/packages/kbn-pm/src/utils/__fixtures__/kibana/packages/bar/package.json b/packages/kbn-pm/src/utils/__fixtures__/kibana/packages/bar/package.json index b5eae58393860..c5bdda83e8e6c 100644 --- a/packages/kbn-pm/src/utils/__fixtures__/kibana/packages/bar/package.json +++ b/packages/kbn-pm/src/utils/__fixtures__/kibana/packages/bar/package.json @@ -2,6 +2,6 @@ "name": "bar", "version": "1.0.0", "dependencies": { - "foo": "link:../foo" + "foo": "1.0.0" } } diff --git a/packages/kbn-pm/src/utils/__fixtures__/plugins/zorge/package.json b/packages/kbn-pm/src/utils/__fixtures__/plugins/zorge/package.json new file mode 100644 index 0000000000000..80a27b17661dd --- /dev/null +++ b/packages/kbn-pm/src/utils/__fixtures__/plugins/zorge/package.json @@ -0,0 +1,7 @@ +{ + "name": "zorge", + "version": "1.0.0", + "dependencies": { + "foo": "link:../../kibana/packages/foo" + } +} diff --git a/packages/kbn-pm/src/utils/__snapshots__/link_project_executables.test.ts.snap b/packages/kbn-pm/src/utils/__snapshots__/link_project_executables.test.ts.snap index cae0463a23cfd..451333e1216b6 100644 --- a/packages/kbn-pm/src/utils/__snapshots__/link_project_executables.test.ts.snap +++ b/packages/kbn-pm/src/utils/__snapshots__/link_project_executables.test.ts.snap @@ -3,6 +3,7 @@ exports[`bin script points nowhere does not try to create symlink or node_modules/.bin directory: fs module calls 1`] = ` Object { "chmod": Array [], + "copyDirectory": Array [], "createSymlink": Array [], "isDirectory": Array [], "isFile": Array [ @@ -15,6 +16,7 @@ Object { ], "mkdirp": Array [], "readFile": Array [], + "unlink": Array [], } `; @@ -30,6 +32,7 @@ Object { "755", ], ], + "copyDirectory": Array [], "createSymlink": Array [ Array [ "/packages/kbn-pm/src/utils/bar/bin/bar.js", @@ -60,6 +63,7 @@ Object { ], ], "readFile": Array [], + "unlink": Array [], } `; diff --git a/packages/kbn-pm/src/utils/__snapshots__/project.test.ts.snap b/packages/kbn-pm/src/utils/__snapshots__/project.test.ts.snap index f6c34e862f70f..5146ec8c56033 100644 --- a/packages/kbn-pm/src/utils/__snapshots__/project.test.ts.snap +++ b/packages/kbn-pm/src/utils/__snapshots__/project.test.ts.snap @@ -1,7 +1,11 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`#ensureValidProjectDependency using link: in workspace 1`] = `"[kibana] depends on [foo] but should be using a workspace. Update its package.json to the expected value below."`; + exports[`#ensureValidProjectDependency using link:, but with wrong path 1`] = `"[kibana] depends on [foo] using 'link:', but the path is wrong. Update its package.json to the expected value below."`; -exports[`#ensureValidProjectDependency using version instead of link: 1`] = `"[kibana] depends on [foo], but it's not using the local package. Update its package.json to the expected value below."`; +exports[`#ensureValidProjectDependency using version instead of link: 1`] = `"[kibana] depends on [foo] but it's not using the local package. Update its package.json to the expected value below."`; + +exports[`#ensureValidProjectDependency using wrong version in workspace 1`] = `"[kibana] depends on [foo] but it's not using the local package. Update its package.json to the expected value below."`; exports[`#getExecutables() throws CliError when bin is something strange 1`] = `"[kibana] has an invalid \\"bin\\" field in its package.json, expected an object or a string"`; diff --git a/packages/kbn-pm/src/utils/__snapshots__/projects.test.ts.snap b/packages/kbn-pm/src/utils/__snapshots__/projects.test.ts.snap index 07bc6ad775ac9..86ba136c50aa1 100644 --- a/packages/kbn-pm/src/utils/__snapshots__/projects.test.ts.snap +++ b/packages/kbn-pm/src/utils/__snapshots__/projects.test.ts.snap @@ -14,6 +14,9 @@ Object { "bar", "baz", ], + "zorge": Array [ + "foo", + ], } `; @@ -26,6 +29,7 @@ Array [ Array [ "kibana", "bar", + "zorge", ], Array [ "quux", @@ -39,6 +43,7 @@ Array [ "kibana", "bar", "baz", + "zorge", ], Array [ "quux", diff --git a/packages/kbn-pm/src/utils/__snapshots__/projects_tree.test.ts.snap b/packages/kbn-pm/src/utils/__snapshots__/projects_tree.test.ts.snap index 70c650fae7d45..12cbc704b4803 100644 --- a/packages/kbn-pm/src/utils/__snapshots__/projects_tree.test.ts.snap +++ b/packages/kbn-pm/src/utils/__snapshots__/projects_tree.test.ts.snap @@ -7,7 +7,8 @@ exports[`handles projects outside root folder 1`] = ` │ └── foo └── ../plugins ├── baz - └── quux" + ├── quux + └── zorge" `; exports[`handles projects with root folder 1`] = ` diff --git a/packages/kbn-pm/src/utils/child_process.ts b/packages/kbn-pm/src/utils/child_process.ts index caf1e822ff96d..c90f2d1379ecf 100644 --- a/packages/kbn-pm/src/utils/child_process.ts +++ b/packages/kbn-pm/src/utils/child_process.ts @@ -23,7 +23,7 @@ import logSymbols from 'log-symbols'; import logTransformer from 'strong-log-transformer'; function generateColors() { - const colorWheel = [chalk.cyan, chalk.magenta, chalk.blue, chalk.yellow, chalk.green, chalk.red]; + const colorWheel = [chalk.cyan, chalk.magenta, chalk.blue, chalk.yellow, chalk.green]; const count = colorWheel.length; let children = 0; diff --git a/packages/kbn-pm/src/utils/fs.ts b/packages/kbn-pm/src/utils/fs.ts index 1f3a689eccd73..e40ead8d8287f 100644 --- a/packages/kbn-pm/src/utils/fs.ts +++ b/packages/kbn-pm/src/utils/fs.ts @@ -20,16 +20,18 @@ import cmdShimCb from 'cmd-shim'; import fs from 'fs'; import mkdirpCb from 'mkdirp'; +import { ncp } from 'ncp'; import { dirname, relative } from 'path'; import { promisify } from 'util'; const stat = promisify(fs.stat); const readFile = promisify(fs.readFile); -const unlink = promisify(fs.unlink); const symlink = promisify(fs.symlink); const chmod = promisify(fs.chmod); const cmdShim = promisify(cmdShimCb); const mkdirp = promisify(mkdirpCb); +export const unlink = promisify(fs.unlink); +export const copyDirectory = promisify(ncp); export { chmod, readFile, mkdirp }; diff --git a/packages/kbn-pm/src/utils/package_json.ts b/packages/kbn-pm/src/utils/package_json.ts index 132325149d824..c865b8e0c1a3d 100644 --- a/packages/kbn-pm/src/utils/package_json.ts +++ b/packages/kbn-pm/src/utils/package_json.ts @@ -38,31 +38,4 @@ export function writePackageJson(path: string, json: IPackageJson) { return writePkg(path, json); } -export const createProductionPackageJson = (pkgJson: IPackageJson) => ({ - ...pkgJson, - dependencies: transformDependencies(pkgJson.dependencies), -}); - export const isLinkDependency = (depVersion: string) => depVersion.startsWith('link:'); - -/** - * Replaces `link:` dependencies with `file:` dependencies. When installing - * dependencies, these `file:` dependencies will be copied into `node_modules` - * instead of being symlinked. - * - * This will allow us to copy packages into the build and run `yarn`, which - * will then _copy_ the `file:` dependencies into `node_modules` instead of - * symlinking like we do in development. - */ -export function transformDependencies(dependencies: IPackageDependencies = {}) { - const newDeps: IPackageDependencies = {}; - for (const name of Object.keys(dependencies)) { - const depVersion = dependencies[name]; - if (isLinkDependency(depVersion)) { - newDeps[name] = depVersion.replace('link:', 'file:'); - } else { - newDeps[name] = depVersion; - } - } - return newDeps; -} diff --git a/packages/kbn-pm/src/utils/project.test.ts b/packages/kbn-pm/src/utils/project.test.ts index ba7d44814f64c..ce4f0bbe8ccff 100644 --- a/packages/kbn-pm/src/utils/project.test.ts +++ b/packages/kbn-pm/src/utils/project.test.ts @@ -76,7 +76,7 @@ describe('#ensureValidProjectDependency', () => { 'packages/foo' ); - expect(() => root.ensureValidProjectDependency(foo)).not.toThrow(); + expect(() => root.ensureValidProjectDependency(foo, false)).not.toThrow(); }); test('using link:, but with wrong path', () => { @@ -96,7 +96,7 @@ describe('#ensureValidProjectDependency', () => { 'packages/foo' ); - expect(() => root.ensureValidProjectDependency(foo)).toThrowErrorMatchingSnapshot(); + expect(() => root.ensureValidProjectDependency(foo, false)).toThrowErrorMatchingSnapshot(); }); test('using version instead of link:', () => { @@ -116,7 +116,60 @@ describe('#ensureValidProjectDependency', () => { 'packages/foo' ); - expect(() => root.ensureValidProjectDependency(foo)).toThrowErrorMatchingSnapshot(); + expect(() => root.ensureValidProjectDependency(foo, false)).toThrowErrorMatchingSnapshot(); + }); + + test('using version in workspace', () => { + const root = createProjectWith({ + dependencies: { + foo: '1.0.0', + }, + }); + + const foo = createProjectWith( + { + name: 'foo', + version: '1.0.0', + }, + 'packages/foo' + ); + + expect(() => root.ensureValidProjectDependency(foo, true)).not.toThrow(); + }); + + test('using wrong version in workspace', () => { + const root = createProjectWith({ + dependencies: { + foo: '1.0.0', + }, + }); + + const foo = createProjectWith( + { + name: 'foo', + version: '2.0.0', + }, + 'packages/foo' + ); + + expect(() => root.ensureValidProjectDependency(foo, true)).toThrowErrorMatchingSnapshot(); + }); + + test('using link: in workspace', () => { + const root = createProjectWith({ + dependencies: { + foo: 'link:packages/foo', + }, + }); + + const foo = createProjectWith( + { + name: 'foo', + }, + 'packages/foo' + ); + + expect(() => root.ensureValidProjectDependency(foo, true)).toThrowErrorMatchingSnapshot(); }); }); diff --git a/packages/kbn-pm/src/utils/project.ts b/packages/kbn-pm/src/utils/project.ts index 817bfe5450cf6..58cc047aa8c22 100644 --- a/packages/kbn-pm/src/utils/project.ts +++ b/packages/kbn-pm/src/utils/project.ts @@ -53,6 +53,8 @@ export class Project { public readonly productionDependencies: IPackageDependencies; public readonly devDependencies: IPackageDependencies; public readonly scripts: IPackageScripts; + public isWorkspaceRoot = false; + public isWorkspaceProject = false; constructor(packageJson: IPackageJson, projectPath: string) { this.json = Object.freeze(packageJson); @@ -69,6 +71,7 @@ export class Project { ...this.devDependencies, ...this.productionDependencies, }; + this.isWorkspaceRoot = this.json.hasOwnProperty('workspaces'); this.scripts = this.json.scripts || {}; } @@ -77,37 +80,40 @@ export class Project { return this.json.name; } - public ensureValidProjectDependency(project: Project) { - const relativePathToProject = normalizePath(relative(this.path, project.path)); - + public ensureValidProjectDependency(project: Project, dependentProjectIsInWorkspace: boolean) { const versionInPackageJson = this.allDependencies[project.name]; - const expectedVersionInPackageJson = `link:${relativePathToProject}`; + let expectedVersionInPackageJson; + if (dependentProjectIsInWorkspace) { + expectedVersionInPackageJson = project.json.version; + } else { + const relativePathToProject = normalizePath(relative(this.path, project.path)); + expectedVersionInPackageJson = `link:${relativePathToProject}`; + } + + // No issues! if (versionInPackageJson === expectedVersionInPackageJson) { return; } - const updateMsg = 'Update its package.json to the expected value below.'; - const meta = { - actual: `"${project.name}": "${versionInPackageJson}"`, - expected: `"${project.name}": "${expectedVersionInPackageJson}"`, - package: `${this.name} (${this.packageJsonLocation})`, - }; - - if (isLinkDependency(versionInPackageJson)) { - throw new CliError( - `[${this.name}] depends on [${ - project.name - }] using 'link:', but the path is wrong. ${updateMsg}`, - meta - ); + let problemMsg; + if (isLinkDependency(versionInPackageJson) && dependentProjectIsInWorkspace) { + problemMsg = `but should be using a workspace`; + } else if (isLinkDependency(versionInPackageJson)) { + problemMsg = `using 'link:', but the path is wrong`; + } else { + problemMsg = `but it's not using the local package`; } throw new CliError( `[${this.name}] depends on [${ project.name - }], but it's not using the local package. ${updateMsg}`, - meta + }] ${problemMsg}. Update its package.json to the expected value below.`, + { + actual: `"${project.name}": "${versionInPackageJson}"`, + expected: `"${project.name}": "${expectedVersionInPackageJson}"`, + package: `${this.name} (${this.packageJsonLocation})`, + } ); } diff --git a/packages/kbn-pm/src/utils/projects.test.ts b/packages/kbn-pm/src/utils/projects.test.ts index e2b6f225472d1..1dbb90861b183 100644 --- a/packages/kbn-pm/src/utils/projects.test.ts +++ b/packages/kbn-pm/src/utils/projects.test.ts @@ -52,9 +52,9 @@ describe('#getProjects', () => { test('handles packages outside root', async () => { const projects = await getProjects(rootPath, ['../plugins/*']); - const expectedProjects = ['baz', 'quux']; + const expectedProjects = ['baz', 'quux', 'zorge']; - expect(projects.size).toBe(2); + expect(projects.size).toBe(3); expect([...projects.keys()]).toEqual(expect.arrayContaining(expectedProjects)); }); @@ -194,6 +194,16 @@ describe('#topologicallyBatchProjects', () => { expect(expectedBatches).toMatchSnapshot(); }); + + describe('batchByWorkspace = true', async () => { + test('batches projects topologically based on their project dependencies and workspaces', async () => { + const batches = topologicallyBatchProjects(projects, graph, { batchByWorkspace: true }); + + const expectedBatches = batches.map(batch => batch.map(project => project.name)); + + expect(expectedBatches).toEqual([['kibana'], ['bar', 'foo'], ['baz', 'zorge'], ['quux']]); + }); + }); }); describe('#includeTransitiveProjects', () => { diff --git a/packages/kbn-pm/src/utils/projects.ts b/packages/kbn-pm/src/utils/projects.ts index d46596a08694c..e8a40cce3011a 100644 --- a/packages/kbn-pm/src/utils/projects.ts +++ b/packages/kbn-pm/src/utils/projects.ts @@ -23,6 +23,7 @@ import { promisify } from 'util'; import { CliError } from './errors'; import { Project } from './project'; +import { workspacePackagePaths } from './workspaces'; const glob = promisify(globSync); @@ -40,6 +41,8 @@ export async function getProjects( ) { const projects: ProjectMap = new Map(); + const workspaceProjectsPaths = await workspacePackagePaths(rootPath); + for (const pattern of projectsPathsPatterns) { const pathsToProcess = await packagesFromGlobPattern({ pattern, rootPath }); @@ -48,6 +51,10 @@ export async function getProjects( const projectDir = path.dirname(projectConfigPath); const project = await Project.fromPath(projectDir); + if (workspaceProjectsPaths.indexOf(filePath) >= 0) { + project.isWorkspaceProject = true; + } + const excludeProject = exclude.includes(project.name) || (include.length > 0 && !include.includes(project.name)); @@ -105,7 +112,9 @@ export function buildProjectGraph(projects: ProjectMap) { if (projects.has(depName)) { const dep = projects.get(depName)!; - project.ensureValidProjectDependency(dep); + const dependentProjectIsInWorkspace = + project.isWorkspaceProject || project.json.name === 'kibana'; + project.ensureValidProjectDependency(dep, dependentProjectIsInWorkspace); projectDeps.push(dep); } @@ -119,21 +128,47 @@ export function buildProjectGraph(projects: ProjectMap) { export function topologicallyBatchProjects( projectsToBatch: ProjectMap, - projectGraph: ProjectGraph + projectGraph: ProjectGraph, + { batchByWorkspace = false } = {} ) { // We're going to be chopping stuff out of this list, so copy it. - const projectToBatchNames = new Set(projectsToBatch.keys()); - + const projectsLeftToBatch = new Set(projectsToBatch.keys()); const batches = []; - while (projectToBatchNames.size > 0) { + + if (batchByWorkspace) { + const workspaceRootProject = Array.from(projectsToBatch.values()).find(p => p.isWorkspaceRoot); + + if (!workspaceRootProject) { + throw new CliError(`There was no yarn workspace root found.`); + } + + // Push in the workspace root first. + batches.push([workspaceRootProject]); + projectsLeftToBatch.delete(workspaceRootProject.name); + + // In the next batch, push in all workspace projects. + const workspaceBatch = []; + for (const projectName of projectsLeftToBatch) { + const project = projectsToBatch.get(projectName)!; + + if (project.isWorkspaceProject) { + workspaceBatch.push(project); + projectsLeftToBatch.delete(projectName); + } + } + + batches.push(workspaceBatch); + } + + while (projectsLeftToBatch.size > 0) { // Get all projects that have no remaining dependencies within the repo // that haven't yet been picked. const batch = []; - for (const projectName of projectToBatchNames) { + for (const projectName of projectsLeftToBatch) { const projectDeps = projectGraph.get(projectName)!; - const hasNotBatchedDependencies = projectDeps.some(dep => projectToBatchNames.has(dep.name)); + const needsDependenciesBatched = projectDeps.some(dep => projectsLeftToBatch.has(dep.name)); - if (!hasNotBatchedDependencies) { + if (!needsDependenciesBatched) { batch.push(projectsToBatch.get(projectName)!); } } @@ -142,7 +177,7 @@ export function topologicallyBatchProjects( // then we've encountered a cycle in the dependency graph. const hasCycles = batch.length === 0; if (hasCycles) { - const cycleProjectNames = [...projectToBatchNames]; + const cycleProjectNames = [...projectsLeftToBatch]; const message = 'Encountered a cycle in the dependency graph. Projects in cycle are:\n' + cycleProjectNames.join(', '); @@ -152,7 +187,7 @@ export function topologicallyBatchProjects( batches.push(batch); - batch.forEach(project => projectToBatchNames.delete(project.name)); + batch.forEach(project => projectsLeftToBatch.delete(project.name)); } return batches; diff --git a/packages/kbn-pm/src/utils/scripts.ts b/packages/kbn-pm/src/utils/scripts.ts index d7076b1d28b39..177068b9b1112 100644 --- a/packages/kbn-pm/src/utils/scripts.ts +++ b/packages/kbn-pm/src/utils/scripts.ts @@ -24,7 +24,7 @@ import { Project } from './project'; * Install all dependencies in the given directory */ export async function installInDir(directory: string, extraArgs: string[] = []) { - const options = ['install', '--check-files', '--non-interactive', '--mutex=file', ...extraArgs]; + const options = ['install', '--non-interactive', '--mutex=file', ...extraArgs]; // We pass the mutex flag to ensure only one instance of yarn runs at any // given time (e.g. to avoid conflicts). diff --git a/packages/kbn-pm/src/utils/workspaces.ts b/packages/kbn-pm/src/utils/workspaces.ts new file mode 100644 index 0000000000000..12548523db2ac --- /dev/null +++ b/packages/kbn-pm/src/utils/workspaces.ts @@ -0,0 +1,100 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import globSync from 'glob'; +import path from 'path'; +import { promisify } from 'util'; + +import { getProjectPaths } from '../config'; +import { copyDirectory, unlink } from './fs'; +import { readPackageJson } from './package_json'; +import { getProjects } from './projects'; + +const glob = promisify(globSync); + +export async function workspacePackagePaths(rootPath: string): Promise { + const rootPkgJson = await readPackageJson(path.join(rootPath, 'package.json')); + + if (!rootPkgJson.workspaces) { + return []; + } + + const workspacesPathsPatterns: string[] = rootPkgJson.workspaces.packages; + let workspaceProjectsPaths: string[] = []; + + for (const pattern of workspacesPathsPatterns) { + workspaceProjectsPaths = workspaceProjectsPaths.concat( + await packagesFromGlobPattern({ pattern, rootPath }) + ); + } + + // Filter out exclude glob patterns + for (const pattern of workspacesPathsPatterns) { + if (pattern.startsWith('!')) { + const pathToRemove = path.join(rootPath, pattern.slice(1), 'package.json'); + workspaceProjectsPaths = workspaceProjectsPaths.filter(p => p !== pathToRemove); + } + } + + return workspaceProjectsPaths; +} + +export async function copyWorkspacePackages(rootPath: string): Promise { + const workspaceProjects = await getWorkspaceProjects(rootPath); + + for (const project of workspaceProjects.values()) { + const dest = path.resolve(rootPath, 'node_modules', project.name); + + // Remove the symlink + await unlink(dest); + // Copy in the package + await copyDirectory(project.path, dest); + } +} + +async function getWorkspaceProjects(rootPath: string) { + const projectPaths = getProjectPaths(rootPath, {}); + const projects = await getProjects(rootPath, projectPaths); + + for (const [key, project] of projects.entries()) { + if (!project.isWorkspaceProject) { + projects.delete(key); + } + } + + return projects; +} + +function packagesFromGlobPattern({ pattern, rootPath }: { pattern: string; rootPath: string }) { + const globOptions = { + cwd: rootPath, + + // Should throw in case of unusual errors when reading the file system + strict: true, + + // Always returns absolute paths for matched files + absolute: true, + + // Do not match ** against multiple filenames + // (This is only specified because we currently don't have a need for it.) + noglobstar: true, + }; + + return glob(path.join(pattern, 'package.json'), globOptions); +} diff --git a/packages/kbn-pm/yarn.lock b/packages/kbn-pm/yarn.lock deleted file mode 100644 index c9bf49572df53..0000000000000 --- a/packages/kbn-pm/yarn.lock +++ /dev/null @@ -1,3853 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@mrmlnc/readdir-enhanced@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" - dependencies: - call-me-maybe "^1.0.1" - glob-to-regexp "^0.3.0" - -"@types/cmd-shim@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/cmd-shim/-/cmd-shim-2.0.0.tgz#c3d81d3c2a51af3c65c19b4f1d493a75abf07a5c" - -"@types/cp-file@*": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@types/cp-file/-/cp-file-4.2.0.tgz#2b12186b50dad407b11021284627bdf4adb87a87" - -"@types/cpy@^5.1.0": - version "5.1.0" - resolved "https://registry.yarnpkg.com/@types/cpy/-/cpy-5.1.0.tgz#ced20cbae8528031ae5478f1d0fe4bca2518eda7" - dependencies: - "@types/cp-file" "*" - "@types/glob" "*" - -"@types/dedent@^0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@types/dedent/-/dedent-0.7.0.tgz#155f339ca404e6dd90b9ce46a3f78fd69ca9b050" - -"@types/del@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/del/-/del-3.0.0.tgz#1c8cd8b6e38da3b572352ca8eaf5527931426288" - dependencies: - "@types/glob" "*" - -"@types/events@*": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02" - -"@types/execa@^0.8.1": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@types/execa/-/execa-0.8.1.tgz#0a9398c7661015c7d6c8e09d1f0a4018d5002f6e" - dependencies: - "@types/node" "*" - -"@types/getopts@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/getopts/-/getopts-2.0.0.tgz#8a603370cb367d3192bd8012ad39ab2320b5b476" - -"@types/glob@*", "@types/glob@^5.0.35": - version "5.0.35" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.35.tgz#1ae151c802cece940443b5ac246925c85189f32a" - dependencies: - "@types/events" "*" - "@types/minimatch" "*" - "@types/node" "*" - -"@types/globby@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@types/globby/-/globby-6.1.0.tgz#7c25b975512a89effea2a656ca8cf6db7fb29d11" - dependencies: - "@types/glob" "*" - -"@types/has-ansi@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/has-ansi/-/has-ansi-3.0.0.tgz#636403dc4e0b2649421c4158e5c404416f3f0330" - -"@types/indent-string@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/indent-string/-/indent-string-3.0.0.tgz#9ebb391ceda548926f5819ad16405349641b999f" - -"@types/jest@^23.3.1": - version "23.3.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf" - -"@types/lodash.clonedeepwith@^4.5.3": - version "4.5.3" - resolved "https://registry.yarnpkg.com/@types/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.3.tgz#8057f074de743bdcff59fdbf26cd04c674a186cc" - dependencies: - "@types/lodash" "*" - -"@types/lodash@*": - version "4.14.104" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.104.tgz#53ee2357fa2e6e68379341d92eb2ecea4b11bb80" - -"@types/log-symbols@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/log-symbols/-/log-symbols-2.0.0.tgz#7919e2ec3c8d13879bfdcab310dd7a3f7fc9466d" - -"@types/minimatch@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - -"@types/mkdirp@^0.5.2": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.5.2.tgz#503aacfe5cc2703d5484326b1b27efa67a339c1f" - dependencies: - "@types/node" "*" - -"@types/node@*": - version "9.4.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.6.tgz#d8176d864ee48753d053783e4e463aec86b8d82e" - -"@types/node@^8.9.4": - version "8.9.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.4.tgz#dfd327582a06c114eb6e0441fa3d6fab35edad48" - -"@types/normalize-package-data@*": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - -"@types/ora@^1.3.2": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/ora/-/ora-1.3.2.tgz#ded29aeec023deaa1e56b99cb51234954f35a7cd" - dependencies: - "@types/node" "*" - -"@types/read-pkg@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/read-pkg/-/read-pkg-3.0.0.tgz#17ab6f0b396a58a5567ee387f558f2caedc8ae53" - dependencies: - "@types/normalize-package-data" "*" - -"@types/strip-ansi@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/strip-ansi/-/strip-ansi-3.0.0.tgz#9b63d453a6b54aa849182207711a08be8eea48ae" - -"@types/strong-log-transformer@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/strong-log-transformer/-/strong-log-transformer-1.0.0.tgz#47b0c9fe1f0c997ed4239746e633e8e36fc836ac" - dependencies: - "@types/node" "*" - -"@types/tempy@^0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@types/tempy/-/tempy-0.1.0.tgz#8ba0339dcd5abb554f301683dc3396d153ec5bfd" - -"@types/wrap-ansi@^2.0.14": - version "2.0.14" - resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-2.0.14.tgz#5afbdd8374de9ff8ad752cb03ab9f225f7c2ee24" - -"@types/write-pkg@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@types/write-pkg/-/write-pkg-3.1.0.tgz#f58767f4fb9a6a3ad8e95d3e9cd1f2d026ceab26" - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -acorn-dynamic-import@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" - dependencies: - acorn "^4.0.3" - -acorn@^4.0.3: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - -acorn@^5.0.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102" - -ajv-keywords@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.1.0.tgz#ac2b27939c543e95d2c06e7f7f5c27be4aa543be" - -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -ajv@^6.1.0: - version "6.1.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e" - dependencies: - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88" - dependencies: - color-convert "^1.9.0" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - -arr-flatten@^1.0.1, arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - -asn1.js@^4.0.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -assert@^1.1.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" - dependencies: - util "0.10.3" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -async@^2.1.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" - dependencies: - lodash "^4.14.0" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -atob@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws4@^1.2.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.0" - debug "^2.6.8" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.7" - slash "^1.0.0" - source-map "^0.5.6" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-loader@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126" - dependencies: - find-cache-dir "^1.0.0" - loader-utils "^1.0.2" - mkdirp "^0.5.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-preset-env@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^2.1.2" - invariant "^2.2.2" - semver "^5.3.0" - -babel-preset-stage-3@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395" - dependencies: - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-generator-functions "^6.24.1" - babel-plugin-transform-async-to-generator "^6.24.1" - babel-plugin-transform-exponentiation-operator "^6.24.1" - babel-plugin-transform-object-rest-spread "^6.22.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base64-js@^1.0.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801" - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - -big.js@^3.1.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.0, braces@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb" - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - define-property "^1.0.0" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - kind-of "^6.0.2" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -brorand@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f" - dependencies: - buffer-xor "^1.0.3" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.3" - inherits "^2.0.1" - safe-buffer "^5.0.1" - -browserify-cipher@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd" - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - -browserify-rsa@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" - dependencies: - bn.js "^4.1.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - dependencies: - pako "~1.0.5" - -browserslist@^2.1.2: - version "2.11.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" - dependencies: - caniuse-lite "^1.0.30000792" - electron-to-chromium "^1.3.30" - -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - -buffer@^4.3.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - -byline@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -call-me-maybe@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" - -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - -caniuse-lite@^1.0.30000792: - version "1.0.30000810" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz#47585fffce0e9f3593a6feea4673b945424351d9" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796" - dependencies: - ansi-styles "^3.2.0" - escape-string-regexp "^1.0.5" - supports-color "^5.2.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chokidar@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - dependencies: - restore-cursor "^2.0.0" - -cli-spinners@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06" - -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -cmd-shim@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb" - dependencies: - graceful-fs "^4.1.2" - mkdirp "~0.5.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" - dependencies: - delayed-stream "~1.0.0" - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - -component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -concat-stream@^1.4.7: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" - dependencies: - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -console-browserify@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - dependencies: - date-now "^0.1.4" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - -convert-source-map@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - -core-js@^2.4.0, core-js@^2.5.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cp-file@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-5.0.0.tgz#bc700fd30ca32d24d46c7fb02b992e435fc5a978" - dependencies: - graceful-fs "^4.1.2" - make-dir "^1.0.0" - nested-error-stacks "^2.0.0" - pify "^3.0.0" - safe-buffer "^5.0.1" - -cpy@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cpy/-/cpy-6.0.0.tgz#0b6888e037bb5a7b02a62249551316208a523253" - dependencies: - arrify "^1.0.1" - cp-file "^5.0.0" - globby "^6.0.0" - nested-error-stacks "^2.0.0" - -create-ecdh@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" - dependencies: - bn.js "^4.1.0" - elliptic "^6.0.0" - -create-hash@^1.1.0, create-hash@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - ripemd160 "^2.0.0" - sha.js "^2.4.0" - -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: - version "1.1.6" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06" - dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" - -crypto-random-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" - dependencies: - es5-ext "^0.10.9" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -date-now@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" - -debug@^2.2.0, debug@^2.3.3, debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -decamelize@^1.0.0, decamelize@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -del@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - dependencies: - globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -des.js@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - dependencies: - repeating "^2.0.0" - -detect-indent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -diffie-hellman@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - -dir-glob@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034" - dependencies: - arrify "^1.0.1" - path-type "^3.0.0" - -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - -duplexer@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - -electron-to-chromium@^1.3.30: - version "1.3.33" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.33.tgz#bf00703d62a7c65238136578c352d6c5c042a545" - -elliptic@^6.0.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" - dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" - hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - -enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - object-assign "^4.0.1" - tapable "^0.2.7" - -errno@^0.1.3: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - dependencies: - prr "~1.0.1" - -error-ex@^1.2.0, error-ex@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" - dependencies: - is-arrayish "^0.2.1" - -es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.39" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.39.tgz#fca21b67559277ca4ac1a1ed7048b107b6f76d87" - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.1" - -es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-map@^0.1.3: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-set "~0.1.5" - es6-symbol "~3.1.1" - event-emitter "~0.3.5" - -es6-set@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-symbol "3.1.1" - event-emitter "~0.3.5" - -es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" - dependencies: - d "1" - es5-ext "~0.10.14" - -es6-weak-map@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" - dependencies: - d "1" - es5-ext "^0.10.14" - es6-iterator "^2.0.1" - es6-symbol "^3.1.1" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -escope@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" - dependencies: - es6-map "^0.1.3" - es6-weak-map "^2.0.1" - esrecurse "^4.1.0" - estraverse "^4.1.1" - -esrecurse@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163" - dependencies: - estraverse "^4.1.0" - object-assign "^4.0.1" - -estraverse@^4.1.0, estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -event-emitter@~0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - dependencies: - d "1" - es5-ext "~0.10.14" - -events@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@~3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -extglob@^2.0.2, extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff" - -fast-glob@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.0.4.tgz#a4b9f49e36175f5ef1a3456f580226a6e7abcc9e" - dependencies: - "@mrmlnc/readdir-enhanced" "^2.2.1" - glob-parent "3.1.0" - merge2 "1.2.1" - micromatch "3.1.5" - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -find-cache-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" - dependencies: - commondir "^1.0.1" - make-dir "^1.0.0" - pkg-dir "^2.0.0" - -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - dependencies: - locate-path "^2.0.0" - -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - dependencies: - map-cache "^0.2.2" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" - dependencies: - nan "^2.3.0" - node-pre-gyp "^0.6.39" - -fstream-ignore@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" - dependencies: - fstream "^1.0.0" - inherits "2" - minimatch "^3.0.0" - -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - -getopts@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.0.0.tgz#e9119f3e79d22d0685b77fbe78d5cd6e19ca1af0" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob-to-regexp@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" - -glob@^7.0.3, glob@^7.0.5, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -globby@^6.0.0, globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -globby@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50" - dependencies: - array-union "^1.0.1" - dir-glob "^2.0.0" - fast-glob "^2.0.2" - glob "^7.1.2" - ignore "^3.3.5" - pify "^3.0.0" - slash "^1.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37" - dependencies: - ansi-regex "^3.0.0" - -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -hash-base@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" - dependencies: - inherits "^2.0.1" - -hash-base@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.0" - -hawk@3.1.3, hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hmac-drbg@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -hosted-git-info@^2.1.4: - version "2.5.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - -ieee754@^1.1.4: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" - -ignore@^3.3.5: - version "3.3.7" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - -indent-string@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -interpret@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" - -invariant@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688" - dependencies: - loose-envify "^1.0.0" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - dependencies: - kind-of "^6.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-extglob@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - -is-odd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" - dependencies: - is-number "^4.0.0" - -is-path-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" - -is-path-in-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" - dependencies: - is-path-inside "^1.0.0" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - dependencies: - path-is-inside "^1.0.1" - -is-plain-obj@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - dependencies: - isobject "^3.0.1" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -json-loader@^0.5.4: - version "0.5.7" - resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" - -json-parse-better-errors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" - -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -json5@^0.5.0, json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - -lazy-cache@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" - dependencies: - set-getter "^0.1.0" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - dependencies: - invert-kv "^1.0.0" - -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - -loader-runner@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" - -loader-utils@^1.0.2, loader-utils@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -lodash.clonedeepwith@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeepwith/-/lodash.clonedeepwith-4.5.0.tgz#6ee30573a03a1a60d670a62ef33c10cf1afdbdd4" - -lodash@^4, lodash@^4.14.0, lodash@^4.17.4: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -log-symbols@^2.1.0, log-symbols@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - dependencies: - chalk "^2.0.1" - -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -lru-cache@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -make-dir@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b" - dependencies: - pify "^3.0.0" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - dependencies: - object-visit "^1.0.0" - -md5.js@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - dependencies: - mimic-fn "^1.0.0" - -memory-fs@^0.4.0, memory-fs@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -merge2@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.1.tgz#271d2516ff52d4af7f7b710b8bf3e16e183fef66" - -micromatch@3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.0" - define-property "^1.0.0" - extend-shallow "^2.0.1" - extglob "^2.0.2" - fragment-cache "^0.2.1" - kind-of "^6.0.0" - nanomatch "^1.2.5" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.4: - version "3.1.6" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.6.tgz#8d7c043b48156f408ca07a4715182b79b99420bf" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" - -mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - -mime-types@^2.1.12, mime-types@~2.1.7: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - dependencies: - mime-db "~1.33.0" - -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - -minimalistic-assert@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" - -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - -minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@^2.6.0: - version "2.20.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -nan@^2.3.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" - -nanomatch@^1.2.5, nanomatch@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-odd "^2.0.0" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -nested-error-stacks@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.0.0.tgz#98b2ffaefb4610fa3936f1e71435d30700de2840" - dependencies: - inherits "~2.0.1" - -node-libs-browser@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.0" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - -node-pre-gyp@^0.6.39: - version "0.6.39" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" - dependencies: - detect-libc "^1.0.2" - hawk "3.1.3" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.0.2" - rc "^1.1.7" - request "2.81.0" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-package-data@^2.3.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^4.0.1, object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - dependencies: - isobject "^3.0.0" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - dependencies: - isobject "^3.0.1" - -once@^1.3.0, once@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - dependencies: - mimic-fn "^1.0.0" - -ora@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5" - dependencies: - chalk "^2.1.0" - cli-cursor "^2.1.0" - cli-spinners "^1.0.1" - log-symbols "^2.1.0" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - -os-shim@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" - dependencies: - p-try "^1.0.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - dependencies: - p-limit "^1.1.0" - -p-map@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - -pako@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" - -parse-asn1@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" - dependencies: - asn1.js "^4.0.0" - browserify-aes "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - dependencies: - error-ex "^1.2.0" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - -path-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - dependencies: - pify "^2.0.0" - -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - dependencies: - pify "^3.0.0" - -pbkdf2@^3.0.3: - version "3.0.14" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade" - dependencies: - create-hash "^1.1.2" - create-hmac "^1.1.4" - ripemd160 "^2.0.1" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - dependencies: - find-up "^2.1.0" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -prettier@^1.14.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.14.0.tgz#847c235522035fd988100f1f43cf20a7d24f9372" - -private@^0.1.6, private@^0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -public-encrypt@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - -punycode@^1.2.4, punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" - dependencies: - safe-buffer "^5.1.0" - -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - -rc@^1.1.7: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - -readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.3.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.4.tgz#c946c3f47fa7d8eabc0b6150f4a12f69a4574071" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -regex-not@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -request@2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - dependencies: - onetime "^2.0.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - -rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" - dependencies: - hash-base "^2.0.0" - inherits "^2.0.1" - -rxjs@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1" - dependencies: - tslib "^1.9.0" - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - dependencies: - ret "~0.1.10" - -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-getter@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" - dependencies: - to-object-path "^0.3.0" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.10" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370" - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^2.0.0" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -sort-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128" - dependencies: - is-plain-obj "^1.0.0" - -source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" - -source-map-resolve@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" - dependencies: - atob "^2.0.0" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - dependencies: - source-map "^0.5.6" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - -source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - -spawn-sync@^1.0.15: - version "1.0.15" - resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" - dependencies: - concat-stream "^1.4.7" - os-shim "^0.1.2" - -spdx-correct@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40" - dependencies: - spdx-license-ids "^1.0.2" - -spdx-expression-parse@~1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c" - -spdx-license-ids@^1.0.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - dependencies: - extend-shallow "^3.0.0" - -sshpk@^1.7.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -stream-browserify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-http@^2.7.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.3" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -string-replace-loader@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-1.3.0.tgz#1d404a7bf5e2ec21b08ffc76d89445fbe49bc01d" - dependencies: - loader-utils "^1.1.0" - lodash "^4" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.0.0, string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@^1.0.0, string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -strong-log-transformer@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-1.0.6.tgz#f7fb93758a69a571140181277eea0c2eb1301fa3" - dependencies: - byline "^5.0.0" - duplexer "^0.1.1" - minimist "^0.1.0" - moment "^2.6.0" - through "^2.3.4" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - -supports-color@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.2.0.tgz#b0d5333b1184dd3666cbe5aa0b45c5ac7ac17a4a" - dependencies: - has-flag "^3.0.0" - -supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - -tapable@^0.2.7: - version "0.2.8" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" - -tar-pack@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -temp-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" - -tempy@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.2.1.tgz#9038e4dbd1c201b74472214179bc2c6f7776e54c" - dependencies: - temp-dir "^1.0.0" - unique-string "^1.0.0" - -through@^2.3.4: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -timers-browserify@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae" - dependencies: - setimmediate "^1.0.4" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.1.tgz#15358bee4a2c83bd76377ba1dc049d0f18837aae" - dependencies: - define-property "^0.2.5" - extend-shallow "^2.0.1" - regex-not "^1.0.0" - -tough-cookie@~2.3.0: - version "2.3.3" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561" - dependencies: - punycode "^1.4.1" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -ts-loader@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.5.0.tgz#151d004dcddb4cf8e381a3bf9d6b74c2d957a9c0" - dependencies: - chalk "^2.3.0" - enhanced-resolve "^3.0.0" - loader-utils "^1.0.2" - micromatch "^3.1.4" - semver "^5.0.1" - -tslib@^1.9.0, tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - -typescript@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8" - -uglify-js@^2.8.29: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - -uglifyjs-webpack-plugin@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" - dependencies: - source-map "^0.5.6" - uglify-js "^2.8.29" - webpack-sources "^1.0.1" - -uid-number@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" - -unique-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - dependencies: - crypto-random-string "^1.0.0" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -use@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8" - dependencies: - define-property "^0.2.5" - isobject "^3.0.0" - lazy-cache "^2.0.2" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -util@0.10.3, util@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - dependencies: - inherits "2.0.1" - -uuid@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -validate-npm-package-license@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc" - dependencies: - spdx-correct "~1.0.0" - spdx-expression-parse "~1.0.0" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vm-browserify@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" - dependencies: - indexof "0.0.1" - -watchpack@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac" - dependencies: - async "^2.1.2" - chokidar "^1.7.0" - graceful-fs "^4.1.2" - -webpack-sources@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894" - dependencies: - acorn "^5.0.0" - acorn-dynamic-import "^2.0.0" - ajv "^6.1.0" - ajv-keywords "^3.1.0" - async "^2.1.2" - enhanced-resolve "^3.4.0" - escope "^3.6.0" - interpret "^1.0.0" - json-loader "^0.5.4" - json5 "^0.5.1" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - mkdirp "~0.5.0" - node-libs-browser "^2.0.0" - source-map "^0.5.3" - supports-color "^4.2.1" - tapable "^0.2.7" - uglifyjs-webpack-plugin "^0.4.6" - watchpack "^1.4.0" - webpack-sources "^1.0.1" - yargs "^8.0.2" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - -which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrap-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" - dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write-file-atomic@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -write-json-file@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" - dependencies: - detect-indent "^5.0.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - pify "^3.0.0" - sort-keys "^2.0.0" - write-file-atomic "^2.0.0" - -write-pkg@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/write-pkg/-/write-pkg-3.1.0.tgz#030a9994cc9993d25b4e75a9f1a1923607291ce9" - dependencies: - sort-keys "^2.0.0" - write-json-file "^2.2.0" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - dependencies: - camelcase "^4.1.0" - -yargs@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" diff --git a/packages/kbn-system-loader/package.json b/packages/kbn-system-loader/package.json index c436a8b6cc451..6e6c0eeaeac5c 100644 --- a/packages/kbn-system-loader/package.json +++ b/packages/kbn-system-loader/package.json @@ -3,16 +3,8 @@ "version": "1.0.0", "license": "Apache-2.0", "private": true, - "main": "target/index.js", - "typings": "target/index.d.ts", - "scripts": { - "build": "tsc", - "kbn:bootstrap": "yarn build" - }, - "devDependencies": { - "@types/jest": "^23.3.1", - "typescript": "^3.0.3" - }, + "main": "src/index.js", + "typings": "src/index.d.ts", "dependencies": { "tslib": "^1.9.3" } diff --git a/packages/kbn-system-loader/yarn.lock b/packages/kbn-system-loader/yarn.lock deleted file mode 100644 index c11d44a742123..0000000000000 --- a/packages/kbn-system-loader/yarn.lock +++ /dev/null @@ -1,15 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@types/jest@^23.3.1": - version "23.3.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf" - -tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -typescript@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.0.3.tgz#4853b3e275ecdaa27f78fda46dc273a7eb7fc1c8" diff --git a/packages/kbn-test-subj-selector/yarn.lock b/packages/kbn-test-subj-selector/yarn.lock deleted file mode 100644 index d608375475719..0000000000000 --- a/packages/kbn-test-subj-selector/yarn.lock +++ /dev/null @@ -1,107 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -commander@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06" - -commander@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873" - -debug@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da" - dependencies: - ms "0.7.1" - -diff@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" - -escape-string-regexp@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz#4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1" - -expect.js@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/expect.js/-/expect.js-0.3.1.tgz#b0a59a0d2eff5437544ebf0ceaa6015841d09b5b" - -glob@3.2.11: - version "3.2.11" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d" - dependencies: - inherits "2" - minimatch "0.3" - -growl@1.9.2: - version "1.9.2" - resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f" - -inherits@2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -jade@0.26.3: - version "0.26.3" - resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c" - dependencies: - commander "0.6.1" - mkdirp "0.3.0" - -lru-cache@2: - version "2.7.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" - -minimatch@0.3: - version "0.3.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -mkdirp@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e" - -mkdirp@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -mocha@^2.3.4: - version "2.5.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-2.5.3.tgz#161be5bdeb496771eb9b35745050b622b5aefc58" - dependencies: - commander "2.3.0" - debug "2.2.0" - diff "1.4.0" - escape-string-regexp "1.0.2" - glob "3.2.11" - growl "1.9.2" - jade "0.26.3" - mkdirp "0.5.1" - supports-color "1.2.0" - to-iso-string "0.0.2" - -ms@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" - -sigmund@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - -supports-color@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.2.0.tgz#ff1ed1e61169d06b3cf2d588e188b18d8847e17e" - -to-iso-string@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/to-iso-string/-/to-iso-string-0.0.2.tgz#4dc19e664dfccbe25bd8db508b00c6da158255d1" diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json index dd0c39f59d503..773add70b6923 100644 --- a/packages/kbn-test/package.json +++ b/packages/kbn-test/package.json @@ -10,13 +10,14 @@ "kbn:watch": "yarn build --watch" }, "devDependencies": { - "@kbn/babel-preset": "link:../kbn-babel-preset", - "@kbn/dev-utils": "link:../kbn-dev-utils", + "@kbn/babel-preset": "1.0.0", + "@kbn/dev-utils": "1.0.0", "babel-cli": "^6.26.0" }, "dependencies": { "chalk": "^2.4.1", "dedent": "^0.7.0", + "del": "^3.0.0", "getopts": "^2.0.6", "glob": "^7.1.2", "rxjs": "^6.2.1", diff --git a/packages/kbn-test/src/es/es_test_cluster.js b/packages/kbn-test/src/es/es_test_cluster.js index 20bee8f1f0468..b6d4a4490acb7 100644 --- a/packages/kbn-test/src/es/es_test_cluster.js +++ b/packages/kbn-test/src/es/es_test_cluster.js @@ -23,10 +23,10 @@ import { get } from 'lodash'; import toPath from 'lodash/internal/toPath'; import { Cluster } from '@kbn/es'; import { esTestConfig } from './es_test_config'; -import { rmrfSync } from './rmrf_sync'; import { KIBANA_ROOT } from '../'; import elasticsearch from 'elasticsearch'; const path = require('path'); +const del = require('del'); export function createEsTestCluster(options = {}) { const { @@ -58,7 +58,7 @@ export function createEsTestCluster(options = {}) { const second = 1000; const minute = second * 60; - return esFrom === 'snapshot' ? minute : minute * 6; + return esFrom === 'snapshot' ? 3 * minute : 6 * minute; } async start(esArgs = []) { @@ -91,7 +91,7 @@ export function createEsTestCluster(options = {}) { async cleanup() { await this.stop(); - rmrfSync(config.installPath); + await del(config.installPath, { force: true }); log.info('[es] cleanup complete'); } diff --git a/packages/kbn-test/src/es/rmrf_sync.js b/packages/kbn-test/src/es/rmrf_sync.js deleted file mode 100644 index 51cd8369f397c..0000000000000 --- a/packages/kbn-test/src/es/rmrf_sync.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import * as fs from 'fs'; - -/** - * Recursive deletion for a directory - * - * @param {String} path - */ -export function rmrfSync(path) { - if (fs.existsSync(path)) { - fs.readdirSync(path).forEach(file => { - const curPath = path + '/' + file; - - if (fs.lstatSync(curPath).isDirectory()) { - rmrfSync(curPath); - } else { - fs.unlinkSync(curPath); - } - }); - fs.rmdirSync(path); - } -} diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap index 04122fbf55f95..93d129213ff02 100644 --- a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap +++ b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/args.test.js.snap @@ -16,6 +16,8 @@ Options: --bail Stop the test run at the first failure. --grep Pattern to select which tests to run. --updateBaselines Replace baseline screenshots with whatever is generated from the test. + --include-tag Tags that suites must include to be run, can be included multiple times. + --exclude-tag Tags that suites must NOT include to be run, can be included multiple times. --verbose Log everything. --debug Run in debug mode. --quiet Only log errors. @@ -29,6 +31,10 @@ Object { ], "createLogger": [Function], "extraKbnOpts": undefined, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, "updateBaselines": true, } `; @@ -41,6 +47,10 @@ Object { "createLogger": [Function], "debug": true, "extraKbnOpts": undefined, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -52,6 +62,10 @@ Object { ], "createLogger": [Function], "extraKbnOpts": undefined, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -67,6 +81,10 @@ Object { "extraKbnOpts": Object { "server.foo": "bar", }, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -78,6 +96,10 @@ Object { "createLogger": [Function], "extraKbnOpts": undefined, "quiet": true, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -89,6 +111,10 @@ Object { "createLogger": [Function], "extraKbnOpts": undefined, "silent": true, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -100,6 +126,10 @@ Object { "createLogger": [Function], "esFrom": "source", "extraKbnOpts": undefined, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -111,6 +141,10 @@ Object { "createLogger": [Function], "extraKbnOpts": undefined, "installDir": "foo", + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -122,6 +156,10 @@ Object { "createLogger": [Function], "extraKbnOpts": undefined, "grep": "management", + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, } `; @@ -132,6 +170,10 @@ Object { ], "createLogger": [Function], "extraKbnOpts": undefined, + "suiteTags": Object { + "exclude": Array [], + "include": Array [], + }, "verbose": true, } `; diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap index 854415c734e0f..6d4b35f754b42 100644 --- a/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap +++ b/packages/kbn-test/src/functional_tests/cli/run_tests/__snapshots__/cli.test.js.snap @@ -16,6 +16,8 @@ Options: --bail Stop the test run at the first failure. --grep Pattern to select which tests to run. --updateBaselines Replace baseline screenshots with whatever is generated from the test. + --include-tag Tags that suites must include to be run, can be included multiple times. + --exclude-tag Tags that suites must NOT include to be run, can be included multiple times. --verbose Log everything. --debug Run in debug mode. --quiet Only log errors. diff --git a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js index c03649a1167eb..6aa1e1aa5c31b 100644 --- a/packages/kbn-test/src/functional_tests/cli/run_tests/args.js +++ b/packages/kbn-test/src/functional_tests/cli/run_tests/args.js @@ -44,6 +44,14 @@ const options = { updateBaselines: { desc: 'Replace baseline screenshots with whatever is generated from the test.', }, + 'include-tag': { + arg: '', + desc: 'Tags that suites must include to be run, can be included multiple times.', + }, + 'exclude-tag': { + arg: '', + desc: 'Tags that suites must NOT include to be run, can be included multiple times.', + }, verbose: { desc: 'Log everything.' }, debug: { desc: 'Run in debug mode.' }, quiet: { desc: 'Only log errors.' }, @@ -98,6 +106,13 @@ export function processOptions(userOptions, defaultConfigPaths) { delete userOptions['kibana-install-dir']; } + userOptions.suiteTags = { + include: [].concat(userOptions['include-tag'] || []), + exclude: [].concat(userOptions['exclude-tag'] || []), + }; + delete userOptions['include-tag']; + delete userOptions['exclude-tag']; + function createLogger() { return new ToolingLog({ level: pickLevelFromFlags(userOptions), @@ -115,7 +130,9 @@ export function processOptions(userOptions, defaultConfigPaths) { function validateOptions(userOptions) { Object.entries(userOptions).forEach(([key, val]) => { - if (key === '_') return; + if (key === '_' || key === 'suiteTags') { + return; + } // Validate flags passed if (options[key] === undefined) { diff --git a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.js b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.js index d0a3160018fea..d0cc7091d7767 100644 --- a/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.js +++ b/packages/kbn-test/src/functional_tests/lib/run_elasticsearch.js @@ -25,12 +25,15 @@ import { setupUsers, DEFAULT_SUPERUSER_PASS } from './auth'; export async function runElasticsearch({ config, options }) { const { log, esFrom } = options; - const isOss = config.get('esTestCluster.license') === 'oss'; + const license = config.get('esTestCluster.license'); + const isTrialLicense = config.get('esTestCluster.license') === 'trial'; const cluster = createEsTestCluster({ port: config.get('servers.elasticsearch.port'), - password: !isOss ? DEFAULT_SUPERUSER_PASS : config.get('servers.elasticsearch.password'), - license: config.get('esTestCluster.license'), + password: isTrialLicense + ? DEFAULT_SUPERUSER_PASS + : config.get('servers.elasticsearch.password'), + license, log, basePath: resolve(KIBANA_ROOT, '.es'), esFrom: esFrom || config.get('esTestCluster.from'), @@ -40,7 +43,7 @@ export async function runElasticsearch({ config, options }) { await cluster.start(esArgs); - if (!isOss) { + if (isTrialLicense) { await setupUsers(log, config); } diff --git a/packages/kbn-test/src/functional_tests/lib/run_ftr.js b/packages/kbn-test/src/functional_tests/lib/run_ftr.js index 6fe02ec39d9a4..779286212f5c7 100644 --- a/packages/kbn-test/src/functional_tests/lib/run_ftr.js +++ b/packages/kbn-test/src/functional_tests/lib/run_ftr.js @@ -20,7 +20,10 @@ import { createFunctionalTestRunner } from '../../../../../src/functional_test_runner'; import { CliError } from './run_cli'; -export async function runFtr({ configPath, options: { log, bail, grep, updateBaselines } }) { +export async function runFtr({ + configPath, + options: { log, bail, grep, updateBaselines, suiteTags }, +}) { const ftr = createFunctionalTestRunner({ log, configFile: configPath, @@ -30,6 +33,7 @@ export async function runFtr({ configPath, options: { log, bail, grep, updateBas grep, }, updateBaselines, + suiteTags, }, }); diff --git a/packages/kbn-test/yarn.lock b/packages/kbn-test/yarn.lock deleted file mode 100644 index 941eca6869018..0000000000000 --- a/packages/kbn-test/yarn.lock +++ /dev/null @@ -1,1689 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@kbn/babel-preset@link:../kbn-babel-preset": - version "0.0.0" - uid "" - -"@kbn/dev-utils@link:../kbn-dev-utils": - version "0.0.0" - uid "" - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-flatten@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -babel-cli@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" - dependencies: - babel-core "^6.26.0" - babel-polyfill "^6.26.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - commander "^2.11.0" - convert-source-map "^1.5.0" - fs-readdir-recursive "^1.0.0" - glob "^7.1.2" - lodash "^4.17.4" - output-file-sync "^1.1.2" - path-is-absolute "^1.0.1" - slash "^1.0.0" - source-map "^0.5.6" - v8flags "^2.1.1" - optionalDependencies: - chokidar "^1.6.1" - -babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@^6.26.0: - version "6.26.3" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.1" - debug "^2.6.9" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.8" - slash "^1.0.0" - source-map "^0.5.7" - -babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-messages@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-class-properties@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-flow@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - -babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-class-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" - dependencies: - babel-helper-function-name "^6.24.1" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-define@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.0.tgz#94c5f9459c810c738cc7c50cbd44a31829d6f319" - dependencies: - lodash "4.17.4" - traverse "0.6.6" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.23.0: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-env@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^1.4.0" - invariant "^2.2.2" - -babel-preset-flow@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" - dependencies: - babel-plugin-transform-flow-strip-types "^6.22.0" - -babel-preset-react@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" - dependencies: - babel-plugin-syntax-jsx "^6.3.13" - babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.24.1" - babel-plugin-transform-react-jsx-self "^6.22.0" - babel-plugin-transform-react-jsx-source "^6.22.0" - babel-preset-flow "^6.23.0" - -babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -bl@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c" - dependencies: - readable-stream "^2.3.5" - safe-buffer "^5.1.1" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -browserslist@^1.4.0: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - -buffer-alloc-unsafe@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-0.1.1.tgz#ffe1f67551dd055737de253337bfe853dfab1a6a" - -buffer-alloc@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.1.0.tgz#05514d33bf1656d3540c684f65b1202e90eca303" - dependencies: - buffer-alloc-unsafe "^0.1.0" - buffer-fill "^0.1.0" - -buffer-fill@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071" - -caniuse-db@^1.0.30000639: - version "1.0.30000836" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000836.tgz#788b6c8f6f02991743b18cdbbd54f96d05b4b95a" - -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chownr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -commander@^2.11.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -convert-source-map@^1.5.0, convert-source-map@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -core-js@^2.4.0, core-js@^2.5.0: - version "2.5.6" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d" - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -debug@^2.1.2, debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -dedent@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" - -deep-extend@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz#b894a9dd90d3023fbf1c55a394fb858eb2066f1f" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -electron-to-chromium@^1.2.7: - version "1.3.45" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8" - -end-of-stream@^1.0.0, end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - dependencies: - once "^1.4.0" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -execa@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50" - dependencies: - cross-spawn "^6.0.0" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -for-in@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -fs-constants@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" - -fs-minipass@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" - dependencies: - minipass "^2.2.1" - -fs-readdir-recursive@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.0.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.3.tgz#08292982e7059f6674c93d8b829c1e8604979ac0" - dependencies: - nan "^2.9.2" - node-pre-gyp "^0.9.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -getopts@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.0.6.tgz#4788d533a977527e79efd57b5e742ffa0dd33105" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob@^7.0.5, glob@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -graceful-fs@^4.1.2, graceful-fs@^4.1.4: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -iconv-lite@^0.4.4: - version "0.4.23" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ignore-walk@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" - dependencies: - minimatch "^3.0.4" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - dependencies: - loose-envify "^1.0.0" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -kind-of@^3.0.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -lodash@4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - -lodash@^4.17.4: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" - -loose-envify@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -math-random@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -minimatch@^3.0.2, minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minipass@^2.2.1, minipass@^2.2.4: - version "2.3.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.0.tgz#2e11b1c46df7fe7f1afbe9a490280add21ffe384" - dependencies: - safe-buffer "^5.1.1" - yallist "^3.0.0" - -minizlib@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" - dependencies: - minipass "^2.2.1" - -mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@^2.20.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -nan@^2.9.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - -needle@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d" - dependencies: - debug "^2.1.2" - iconv-lite "^0.4.4" - sax "^1.2.4" - -nice-try@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.4.tgz#d93962f6c52f2c1558c0fbda6d512819f1efe1c4" - -node-pre-gyp@^0.9.0: - version "0.9.1" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.9.1.tgz#f11c07516dd92f87199dbc7e1838eab7cd56c9e0" - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.0" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.1.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-path@^2.0.0, normalize-path@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -npm-bundled@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" - -npm-packlist@^1.1.6: - version "1.1.10" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a" - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -object-assign@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -os-homedir@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -output-file-sync@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" - dependencies: - graceful-fs "^4.1.4" - mkdirp "^0.5.1" - object-assign "^4.1.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -private@^0.1.6, private@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -pump@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954" - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -randomatic@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923" - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - -rc@^1.1.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.7.tgz#8a10ca30d588d00464360372b890d06dacd02297" - dependencies: - deep-extend "^0.5.1" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - -regenerator-runtime@^0.10.5: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -rxjs@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1" - dependencies: - tslib "^1.9.0" - -safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - -semver@^5.3.0, semver@^5.5.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -signal-exit@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - dependencies: - source-map "^0.5.6" - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^5.3.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - -tar-fs@^1.16.2: - version "1.16.2" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.2.tgz#17e5239747e399f7e77344f5f53365f04af53577" - dependencies: - chownr "^1.0.1" - mkdirp "^0.5.1" - pump "^1.0.0" - tar-stream "^1.1.2" - -tar-stream@^1.1.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.0.tgz#a50efaa7b17760b82c27b3cae4a301a8254a5715" - dependencies: - bl "^1.0.0" - buffer-alloc "^1.1.0" - end-of-stream "^1.0.0" - fs-constants "^1.0.0" - readable-stream "^2.0.0" - to-buffer "^1.1.0" - xtend "^4.0.0" - -tar@^4: - version "4.4.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.2.tgz#60685211ba46b38847b1ae7ee1a24d744a2cd462" - dependencies: - chownr "^1.0.1" - fs-minipass "^1.2.5" - minipass "^2.2.4" - minizlib "^1.1.0" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.2" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - dependencies: - os-tmpdir "~1.0.2" - -to-buffer@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -traverse@0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" - -tree-kill@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -tslib@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.1.tgz#a5d1f0532a49221c87755cfcc89ca37197242ba7" - -tslib@^1.9.3: - version "1.9.3" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -v8flags@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - dependencies: - user-home "^1.1.1" - -which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -xtend@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -yallist@^3.0.0, yallist@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" - -zlib@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0" diff --git a/packages/kbn-ui-framework/dist/ui_framework.css b/packages/kbn-ui-framework/dist/ui_framework.css index 928c41497a547..a05df90d8f947 100644 --- a/packages/kbn-ui-framework/dist/ui_framework.css +++ b/packages/kbn-ui-framework/dist/ui_framework.css @@ -2213,7 +2213,8 @@ main { -ms-flex-align: center; align-items: center; padding-left: 10px; - /* 1 */ } + /* 1 */ + height: 100%; } .kuiLocalBreadcrumb { font-size: 14px; @@ -2685,6 +2686,8 @@ main { -ms-flex-pack: justify; justify-content: space-between; min-height: 29px; + /* 1 */ + line-height: 29px; /* 1 */ } .kuiLocalNavRow__section { @@ -2719,7 +2722,7 @@ main { display: -ms-flexbox; display: flex; width: 100%; - margin-bottom: 10px; } + margin-bottom: 8px; } .kuiLocalSearchInput { -webkit-appearance: none; diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json index a778f036a65ac..a2ac3316a380d 100644 --- a/packages/kbn-ui-framework/package.json +++ b/packages/kbn-ui-framework/package.json @@ -17,7 +17,7 @@ "dependencies": { "classnames": "2.2.5", "focus-trap-react": "^3.1.1", - "lodash": "3.10.1", + "lodash": "npm:@elastic/lodash@3.10.1-kibana1", "prop-types": "15.5.8", "react": "^16.2.0", "react-ace": "^5.9.0", @@ -31,7 +31,7 @@ }, "devDependencies": { "@elastic/eui": "0.0.23", - "@kbn/babel-preset": "link:../kbn-babel-preset", + "@kbn/babel-preset": "1.0.0", "autoprefixer": "6.5.4", "babel-core": "6.21.0", "babel-loader": "7.1.2", @@ -70,6 +70,6 @@ "webpack": "3.6.0", "webpack-dev-server": "2.9.1", "yeoman-generator": "1.1.1", - "yo": "2.0.0" + "yo": "2.0.3" } } diff --git a/packages/kbn-ui-framework/src/components/local_nav/_local_breadcrumbs.scss b/packages/kbn-ui-framework/src/components/local_nav/_local_breadcrumbs.scss index b6a732b0e51a1..94186c39d3692 100644 --- a/packages/kbn-ui-framework/src/components/local_nav/_local_breadcrumbs.scss +++ b/packages/kbn-ui-framework/src/components/local_nav/_local_breadcrumbs.scss @@ -6,6 +6,7 @@ display: flex; align-items: center; padding-left: $localNavSideSpacing; /* 1 */ + height: 100%; } .kuiLocalBreadcrumb { diff --git a/packages/kbn-ui-framework/src/components/local_nav/_local_nav.scss b/packages/kbn-ui-framework/src/components/local_nav/_local_nav.scss index 54ae35593b6cc..c5d7421addf2e 100644 --- a/packages/kbn-ui-framework/src/components/local_nav/_local_nav.scss +++ b/packages/kbn-ui-framework/src/components/local_nav/_local_nav.scss @@ -28,6 +28,7 @@ align-items: stretch; justify-content: space-between; min-height: 29px; /* 1 */ + line-height: 29px; /* 1 */ } .kuiLocalNavRow__section { diff --git a/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss b/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss index f1f4ba2dfcf50..10e9a8a847aa3 100644 --- a/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss +++ b/packages/kbn-ui-framework/src/components/local_nav/_local_search.scss @@ -1,7 +1,7 @@ .kuiLocalSearch { display: flex; width: 100%; - margin-bottom: 10px; + margin-bottom: 8px; } .kuiLocalSearchInput { diff --git a/packages/kbn-ui-framework/yarn.lock b/packages/kbn-ui-framework/yarn.lock deleted file mode 100644 index 1e56d3ddcc536..0000000000000 --- a/packages/kbn-ui-framework/yarn.lock +++ /dev/null @@ -1,7673 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@elastic/eui@0.0.23": - version "0.0.23" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-0.0.23.tgz#01a3d88aeaff175da5d42b70d407d08a32783f3d" - dependencies: - brace "^0.10.0" - classnames "^2.2.5" - core-js "^2.5.1" - focus-trap-react "^3.0.4" - highlight.js "^9.12.0" - html "^1.0.0" - jquery "^3.2.1" - keymirror "^0.1.1" - lodash "^3.10.1" - numeral "^2.0.6" - prop-types "^15.6.0" - react-ace "^5.5.0" - react-color "^2.13.8" - serve "^6.3.1" - tabbable "^1.1.0" - uuid "^3.1.0" - -"@kbn/babel-preset@link:../kbn-babel-preset": - version "0.0.0" - uid "" - -"@sinonjs/formatio@^2.0.0": - version "2.0.0" - resolved "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2" - dependencies: - samsam "1.3.0" - -"@zeit/check-updates@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@zeit/check-updates/-/check-updates-1.1.0.tgz#d0f65026a36f27cd1fd54c647d8294447c1d2d8b" - dependencies: - chalk "2.3.0" - ms "2.1.1" - update-notifier "2.3.0" - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - -accepts@~1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" - dependencies: - mime-types "~2.1.18" - negotiator "0.6.1" - -acorn-dynamic-import@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4" - dependencies: - acorn "^4.0.3" - -acorn@^4.0.3: - version "4.0.13" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" - -acorn@^5.0.0: - version "5.5.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" - -address@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9" - -aggregate-error@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-1.0.0.tgz#888344dad0220a72e3af50906117f48771925fac" - dependencies: - clean-stack "^1.0.0" - indent-string "^3.0.0" - -ajv-keywords@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" - -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - -ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5: - version "5.5.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - dependencies: - co "^4.6.0" - fast-deep-equal "^1.0.0" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.3.0" - -align-text@^0.1.1, align-text@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" - dependencies: - kind-of "^3.0.2" - longest "^1.0.1" - repeat-string "^1.5.2" - -alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - -amdefine@>=0.0.4: - version "1.0.1" - resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" - -ansi-align@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" - dependencies: - string-width "^2.0.0" - -ansi-escapes@^1.1.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" - -ansi-escapes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92" - -ansi-html@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -ansi-styles@^3.0.0, ansi-styles@^3.1.0, ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - dependencies: - color-convert "^1.9.0" - -ansi@^0.3.0, ansi@~0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - -arch@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.0.tgz#3613aa46149064b3c1f0607919bf1d4786e82889" - -are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^1.0.2, argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - dependencies: - sprintf-js "~1.0.2" - -args@3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/args/-/args-3.0.8.tgz#2f425ab639c69d74ff728f3d7c6e93b97b91af7c" - dependencies: - camelcase "4.1.0" - chalk "2.1.0" - mri "1.1.0" - pkginfo "0.4.1" - string-similarity "1.2.0" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - -arr-flatten@^1.0.1, arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - -array-flatten@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" - -array-includes@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - dependencies: - array-uniq "^1.0.1" - -array-uniq@^1.0.0, array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - -arrify@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - -asn1.js@^4.0.0: - version "4.10.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -asn1@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - -assert@^1.1.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91" - dependencies: - util "0.10.3" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - -ast-types@0.9.6: - version "0.9.6" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" - -async-each@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d" - -async-foreach@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" - -async@^1.4.0, async@^1.4.2, async@^1.5.2, async@~1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - -async@^2.0.0, async@^2.1.2, async@^2.1.4, async@^2.1.5: - version "2.6.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" - dependencies: - lodash "^4.14.0" - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - -atob@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" - -autoprefixer@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.4.tgz#1386eb6708ccff36aefff70adc694ecfd60af1b0" - dependencies: - browserslist "~1.4.0" - caniuse-db "^1.0.30000597" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^5.2.6" - postcss-value-parser "^3.2.3" - -autoprefixer@^6.3.1: - version "6.7.7" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" - dependencies: - browserslist "^1.7.6" - caniuse-db "^1.0.30000634" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^5.2.16" - postcss-value-parser "^3.2.3" - -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - -aws4@^1.2.1, aws4@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" - -babel-code-frame@^6.11.0, babel-code-frame@^6.20.0, babel-code-frame@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - -babel-core@6.21.0: - version "6.21.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.21.0.tgz#75525480c21c803f826ef3867d22c19f080a3724" - dependencies: - babel-code-frame "^6.20.0" - babel-generator "^6.21.0" - babel-helpers "^6.16.0" - babel-messages "^6.8.0" - babel-register "^6.18.0" - babel-runtime "^6.20.0" - babel-template "^6.16.0" - babel-traverse "^6.21.0" - babel-types "^6.21.0" - babylon "^6.11.0" - convert-source-map "^1.1.0" - debug "^2.1.1" - json5 "^0.5.0" - lodash "^4.2.0" - minimatch "^3.0.2" - path-is-absolute "^1.0.0" - private "^0.1.6" - slash "^1.0.0" - source-map "^0.5.0" - -babel-core@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.0" - debug "^2.6.8" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.7" - slash "^1.0.0" - source-map "^0.5.6" - -babel-generator@^6.21.0, babel-generator@^6.26.0: - version "6.26.1" - resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" - dependencies: - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - detect-indent "^4.0.0" - jsesc "^1.3.0" - lodash "^4.17.4" - source-map "^0.5.7" - trim-right "^1.0.1" - -babel-helper-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-builder-react-jsx@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - esutils "^2.0.2" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-function-name@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9" - dependencies: - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-get-function-arity@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-remap-async-to-generator@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helpers@^6.16.0, babel-helpers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-loader@7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126" - dependencies: - find-cache-dir "^1.0.0" - loader-utils "^1.0.2" - mkdirp "^0.5.1" - -babel-messages@^6.23.0, babel-messages@^6.8.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-add-module-exports@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz#9ae9a1f4a8dc67f0cdec4f4aeda1e43a5ff65e25" - -babel-plugin-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-syntax-async-functions@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" - -babel-plugin-syntax-async-generators@^6.5.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz#6bc963ebb16eccbae6b92b596eb7f35c342a8b9a" - -babel-plugin-syntax-class-properties@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de" - -babel-plugin-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - -babel-plugin-syntax-flow@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d" - -babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - -babel-plugin-syntax-object-rest-spread@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - -babel-plugin-transform-async-generator-functions@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-generators "^6.5.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-async-to-generator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761" - dependencies: - babel-helper-remap-async-to-generator "^6.24.1" - babel-plugin-syntax-async-functions "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-class-properties@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac" - dependencies: - babel-helper-function-name "^6.24.1" - babel-plugin-syntax-class-properties "^6.8.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-define@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.0.tgz#94c5f9459c810c738cc7c50cbd44a31829d6f319" - dependencies: - lodash "4.17.4" - traverse "0.6.6" - -babel-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - dependencies: - babel-helper-call-delegate "^6.24.1" - babel-helper-get-function-arity "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-flow-strip-types@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf" - dependencies: - babel-plugin-syntax-flow "^6.18.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-object-rest-spread@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06" - dependencies: - babel-plugin-syntax-object-rest-spread "^6.8.0" - babel-runtime "^6.26.0" - -babel-plugin-transform-react-display-name@^6.23.0: - version "6.25.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1" - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-self@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx-source@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6" - dependencies: - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-react-jsx@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3" - dependencies: - babel-helper-builder-react-jsx "^6.24.1" - babel-plugin-syntax-jsx "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@6.20.0: - version "6.20.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.20.0.tgz#de4a371006139e20990aac0be367d398331204e7" - dependencies: - babel-runtime "^6.20.0" - core-js "^2.4.0" - regenerator-runtime "^0.10.0" - -babel-preset-env@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a" - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^1.4.0" - invariant "^2.2.2" - -babel-preset-flow@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d" - dependencies: - babel-plugin-transform-flow-strip-types "^6.22.0" - -babel-preset-react@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380" - dependencies: - babel-plugin-syntax-jsx "^6.3.13" - babel-plugin-transform-react-display-name "^6.23.0" - babel-plugin-transform-react-jsx "^6.24.1" - babel-plugin-transform-react-jsx-self "^6.22.0" - babel-plugin-transform-react-jsx-source "^6.22.0" - babel-preset-flow "^6.23.0" - -babel-register@^6.18.0, babel-register@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071" - dependencies: - babel-core "^6.26.0" - babel-runtime "^6.26.0" - core-js "^2.5.0" - home-or-tmp "^2.0.0" - lodash "^4.17.4" - mkdirp "^0.5.1" - source-map-support "^0.4.15" - -babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - dependencies: - babel-runtime "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - lodash "^4.17.4" - -babel-traverse@^6.21.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" - dependencies: - babel-code-frame "^6.26.0" - babel-messages "^6.23.0" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - debug "^2.6.8" - globals "^9.18.0" - invariant "^2.2.2" - lodash "^4.17.4" - -babel-types@^6.19.0, babel-types@^6.21.0, babel-types@^6.24.1, babel-types@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497" - dependencies: - babel-runtime "^6.26.0" - esutils "^2.0.2" - lodash "^4.17.4" - to-fast-properties "^1.0.3" - -babylon@^6.11.0, babylon@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" - -balanced-match@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - -base64-js@^1.0.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801" - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -basic-auth@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba" - dependencies: - safe-buffer "5.1.1" - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - -bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" - dependencies: - tweetnacl "^0.14.3" - -big.js@^3.1.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" - -bin-version-check@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-2.1.0.tgz#e4e5df290b9069f7d111324031efc13fdd11a5b0" - dependencies: - bin-version "^1.0.0" - minimist "^1.1.0" - semver "^4.0.3" - semver-truncate "^1.0.0" - -bin-version@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-1.0.4.tgz#9eb498ee6fd76f7ab9a7c160436f89579435d78e" - dependencies: - find-versions "^1.0.0" - -binary-extensions@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205" - -binaryextensions@2: - version "2.1.1" - resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935" - -block-stream@*: - version "0.0.9" - resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a" - dependencies: - inherits "~2.0.0" - -bluebird@3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: - version "4.11.8" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" - -body-parser@1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" - dependencies: - bytes "3.0.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.1" - http-errors "~1.6.2" - iconv-lite "0.4.19" - on-finished "~2.3.0" - qs "6.5.1" - raw-body "2.3.2" - type-is "~1.6.15" - -bonjour@^3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5" - dependencies: - array-flatten "^2.1.0" - deep-equal "^1.0.1" - dns-equal "^1.0.0" - dns-txt "^2.0.2" - multicast-dns "^6.0.1" - multicast-dns-service-types "^1.1.0" - -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - -boxen@1.3.0, boxen@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" - dependencies: - ansi-align "^2.0.0" - camelcase "^4.0.0" - chalk "^2.0.1" - cli-boxes "^1.0.0" - string-width "^2.0.0" - term-size "^1.2.0" - widest-line "^2.0.0" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace@0.10.0, brace@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/brace/-/brace-0.10.0.tgz#edef4eb9b0928ba1ee5f717ffc157749a6dd5d76" - dependencies: - w3c-blob "0.0.1" - -brace@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.0, braces@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb" - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - define-property "^1.0.0" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - kind-of "^6.0.2" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -brorand@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.1.1" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f" - dependencies: - buffer-xor "^1.0.3" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.3" - inherits "^2.0.1" - safe-buffer "^5.0.1" - -browserify-cipher@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd" - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - -browserify-rsa@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" - dependencies: - bn.js "^4.1.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298" - dependencies: - bn.js "^4.1.1" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.2" - elliptic "^6.0.0" - inherits "^2.0.1" - parse-asn1 "^5.0.0" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - dependencies: - pako "~1.0.5" - -browserslist@^1.3.6, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.6: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - -browserslist@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.4.0.tgz#9cfdcf5384d9158f5b70da2aa00b30e8ff019049" - dependencies: - caniuse-db "^1.0.30000539" - -buffer-indexof@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" - -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - -buffer@^4.3.0: - version "4.9.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -builtin-modules@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -camel-case@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" - dependencies: - no-case "^2.2.0" - upper-case "^1.1.1" - -camelcase-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7" - dependencies: - camelcase "^2.0.0" - map-obj "^1.0.0" - -camelcase@4.1.0, camelcase@^4.0.0, camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - -camelcase@^1.0.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" - -camelcase@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" - -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - -caniuse-api@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" - dependencies: - browserslist "^1.3.6" - caniuse-db "^1.0.30000529" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000597, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000813" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000813.tgz#e0a1c603f8880ad787b2a35652b2733f32a5e29a" - -capture-stack-trace@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - -center-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad" - dependencies: - align-text "^0.1.3" - lazy-cache "^1.0.3" - -chalk@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.1.0.tgz#ac5becf14fa21b99c6c92ca7a7d7cfd5b17e743e" - dependencies: - ansi-styles "^3.1.0" - escape-string-regexp "^1.0.5" - supports-color "^4.0.0" - -chalk@2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba" - dependencies: - ansi-styles "^3.1.0" - escape-string-regexp "^1.0.5" - supports-color "^4.0.0" - -chalk@2.3.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3, chalk@~1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chardet@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" - -chokidar@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.0.tgz#90c32ad4802901d7713de532dc284e96a63ad058" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^1.6.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7" - dependencies: - anymatch "^2.0.0" - async-each "^1.0.0" - braces "^2.3.0" - glob-parent "^3.1.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^2.1.1" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - upath "^1.0.0" - optionalDependencies: - fsevents "^1.0.0" - -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -clap@^1.0.9: - version "1.2.3" - resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51" - dependencies: - chalk "^1.1.3" - -class-extend@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/class-extend/-/class-extend-0.1.2.tgz#8057a82b00f53f82a5d62c50ef8cffdec6fabc34" - dependencies: - object-assign "^2.0.0" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -classnames@2.2.5, classnames@^2.2.5: - version "2.2.5" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" - -clean-css@4.1.x: - version "4.1.11" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a" - dependencies: - source-map "0.5.x" - -clean-stack@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31" - -cli-boxes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" - -cli-cursor@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" - dependencies: - restore-cursor "^1.0.1" - -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - dependencies: - restore-cursor "^2.0.0" - -cli-list@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/cli-list/-/cli-list-0.2.0.tgz#7e673ee0dd39a611a486476e53f3c6b3941cb582" - -cli-table@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" - dependencies: - colors "1.0.3" - -cli-width@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-1.1.1.tgz#a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - -clipboardy@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef" - dependencies: - arch "^2.1.0" - execa "^0.8.0" - -cliui@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1" - dependencies: - center-align "^0.1.1" - right-align "^0.1.1" - wordwrap "0.0.2" - -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - -clone-deep@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8" - dependencies: - for-own "^1.0.0" - is-plain-object "^2.0.1" - kind-of "^3.2.2" - shallow-clone "^0.1.2" - -clone-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c" - dependencies: - is-regexp "^1.0.0" - is-supported-regexp-flag "^1.0.0" - -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - -clone@^1.0.0, clone@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" - -clone@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" - -cloneable-readable@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.1.tgz#c27a4f3a943ca37bed9b01c7d572ee61b1302b15" - dependencies: - inherits "^2.0.1" - process-nextick-args "^2.0.0" - readable-stream "^2.3.5" - -co@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - -coa@~1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" - dependencies: - q "^1.1.2" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - -coffee-script@~1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.10.0.tgz#12938bcf9be1948fa006f92e0c4c9e81705108c0" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.3.0, color-convert@^1.9.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed" - dependencies: - color-name "^1.1.1" - -color-name@^1.0.0, color-name@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - -color-string@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" - dependencies: - color-name "^1.0.0" - -color@^0.11.0: - version "0.11.4" - resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" - dependencies: - clone "^1.0.2" - color-convert "^1.3.0" - color-string "^0.3.0" - -colormin@^1.0.5: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133" - dependencies: - color "^0.11.0" - css-color-names "0.0.4" - has "^1.0.1" - -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - -combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" - dependencies: - delayed-stream "~1.0.0" - -commander@2.14.x, commander@~2.14.1: - version "2.14.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - -component-emitter@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - -compressible@~2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9" - dependencies: - mime-db ">= 1.33.0 < 2" - -compression@^1.5.2, compression@^1.6.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69" - dependencies: - accepts "~1.3.4" - bytes "3.0.0" - compressible "~2.0.13" - debug "2.6.9" - on-headers "~1.0.1" - safe-buffer "5.1.1" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -concat-stream@^1.4.7: - version "1.6.1" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" - dependencies: - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -configstore@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-1.4.0.tgz#c35781d0501d268c25c54b8b17f6240e8a4fb021" - dependencies: - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - object-assign "^4.0.1" - os-tmpdir "^1.0.0" - osenv "^0.1.0" - uuid "^2.0.1" - write-file-atomic "^1.1.2" - xdg-basedir "^2.0.0" - -configstore@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90" - dependencies: - dot-prop "^4.1.0" - graceful-fs "^4.1.2" - make-dir "^1.0.0" - unique-string "^1.0.0" - write-file-atomic "^2.0.0" - xdg-basedir "^3.0.0" - -connect-history-api-fallback@^1.3.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" - -console-browserify@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" - dependencies: - date-now "^0.1.4" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - -content-disposition@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" - -content-type@1.0.4, content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - -convert-source-map@^1.1.0, convert-source-map@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - -cookie@0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - -core-js@^1.0.0: - version "1.2.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" - -core-js@^2.4.0, core-js@^2.5.0, core-js@^2.5.1: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -cosmiconfig@^2.1.0, cosmiconfig@^2.1.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892" - dependencies: - is-directory "^0.3.1" - js-yaml "^3.4.3" - minimist "^1.2.0" - object-assign "^4.1.0" - os-homedir "^1.0.1" - parse-json "^2.2.0" - require-from-string "^1.1.0" - -create-ecdh@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" - dependencies: - bn.js "^4.1.0" - elliptic "^6.0.0" - -create-error-class@^3.0.0, create-error-class@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6" - dependencies: - capture-stack-trace "^1.0.0" - -create-hash@^1.1.0, create-hash@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - ripemd160 "^2.0.0" - sha.js "^2.4.0" - -create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: - version "1.1.6" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06" - dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -create-react-class@^15.5.1: - version "15.6.3" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - -cross-spawn-async@^2.1.1: - version "2.2.5" - resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" - dependencies: - lru-cache "^4.0.0" - which "^1.2.8" - -cross-spawn@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982" - dependencies: - lru-cache "^4.0.1" - which "^1.2.9" - -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - -cryptiles@3.x.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" - dependencies: - boom "5.x.x" - -crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" - -crypto-random-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" - -css-color-names@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - -css-loader@0.28.7: - version "0.28.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.7.tgz#5f2ee989dd32edd907717f953317656160999c1b" - dependencies: - babel-code-frame "^6.11.0" - css-selector-tokenizer "^0.7.0" - cssnano ">=2.6.1 <4" - icss-utils "^2.1.0" - loader-utils "^1.0.2" - lodash.camelcase "^4.3.0" - object-assign "^4.0.1" - postcss "^5.0.6" - postcss-modules-extract-imports "^1.0.0" - postcss-modules-local-by-default "^1.0.1" - postcss-modules-scope "^1.0.0" - postcss-modules-values "^1.1.0" - postcss-value-parser "^3.3.0" - source-list-map "^2.0.0" - -css-selector-tokenizer@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" - dependencies: - cssesc "^0.1.0" - fastparse "^1.1.1" - regexpu-core "^1.0.0" - -cssesc@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4" - -"cssnano@>=2.6.1 <4": - version "3.10.0" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" - dependencies: - autoprefixer "^6.3.1" - decamelize "^1.1.2" - defined "^1.0.0" - has "^1.0.1" - object-assign "^4.0.1" - postcss "^5.0.14" - postcss-calc "^5.2.0" - postcss-colormin "^2.1.8" - postcss-convert-values "^2.3.4" - postcss-discard-comments "^2.0.4" - postcss-discard-duplicates "^2.0.1" - postcss-discard-empty "^2.0.1" - postcss-discard-overridden "^0.1.1" - postcss-discard-unused "^2.2.1" - postcss-filter-plugins "^2.0.0" - postcss-merge-idents "^2.1.5" - postcss-merge-longhand "^2.0.1" - postcss-merge-rules "^2.0.3" - postcss-minify-font-values "^1.0.2" - postcss-minify-gradients "^1.0.1" - postcss-minify-params "^1.0.4" - postcss-minify-selectors "^2.0.4" - postcss-normalize-charset "^1.1.0" - postcss-normalize-url "^3.0.7" - postcss-ordered-values "^2.1.0" - postcss-reduce-idents "^2.2.2" - postcss-reduce-initial "^1.0.0" - postcss-reduce-transforms "^1.0.3" - postcss-svgo "^2.1.1" - postcss-unique-selectors "^2.0.2" - postcss-value-parser "^3.2.3" - postcss-zindex "^2.0.1" - -csso@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" - dependencies: - clap "^1.0.9" - source-map "^0.5.3" - -currently-unhandled@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - dependencies: - array-find-index "^1.0.1" - -d@1: - version "1.0.0" - resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f" - dependencies: - es5-ext "^0.10.9" - -dargs@5.1.0, dargs@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dargs/-/dargs-5.1.0.tgz#ec7ea50c78564cd36c9d5ec18f66329fade27829" - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - dependencies: - assert-plus "^1.0.0" - -date-now@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" - -dateformat@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062" - -dateformat@~1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.12.tgz#9f124b67594c937ff706932e4a642cca8dbbfee9" - dependencies: - get-stdin "^4.0.1" - meow "^3.3.0" - -debug@2.6.9, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - dependencies: - ms "2.0.0" - -debug@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - dependencies: - ms "2.0.0" - -decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - -deep-equal@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5" - -deep-extend@^0.4.0, deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" - -default-uid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-uid/-/default-uid-1.0.0.tgz#fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e" - -define-properties@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94" - dependencies: - foreach "^2.0.5" - object-keys "^1.0.8" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -defined@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - -del@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - dependencies: - globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - -depd@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" - -depd@~1.1.1, depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - -des.js@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc" - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - -detect-conflict@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/detect-conflict/-/detect-conflict-1.0.1.tgz#088657a66a961c05019db7c4230883b1c6b4176e" - -detect-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" - dependencies: - repeating "^2.0.0" - -detect-libc@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - -detect-node@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" - -detect-port@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.2.2.tgz#57a44533632d8bc74ad255676866ca43f96c7469" - dependencies: - address "^1.0.1" - debug "^2.6.0" - -diff@^2.1.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/diff/-/diff-2.2.3.tgz#60eafd0d28ee906e4e8ff0a52c1229521033bf99" - -diff@^3.1.0, diff@^3.3.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" - -diffie-hellman@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - -dns-packet@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" - dependencies: - ip "^1.1.0" - safe-buffer "^5.0.1" - -dns-txt@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6" - dependencies: - buffer-indexof "^1.0.0" - -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - -dot-prop@^4.1.0, dot-prop@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - dependencies: - is-obj "^1.0.0" - -downgrade-root@^1.0.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/downgrade-root/-/downgrade-root-1.2.2.tgz#531319715b0e81ffcc22eb28478ba27643e12c6c" - dependencies: - default-uid "^1.0.0" - is-root "^1.0.0" - -duplexer2@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - dependencies: - readable-stream "^2.0.2" - -duplexer3@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - -each-async@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/each-async/-/each-async-1.1.1.tgz#dee5229bdf0ab6ba2012a395e1b869abf8813473" - dependencies: - onetime "^1.0.0" - set-immediate-shim "^1.0.0" - -ecc-jsbn@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" - dependencies: - jsbn "~0.1.0" - -editions@^1.3.3: - version "1.3.4" - resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - -ejs@^2.3.1: - version "2.5.7" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" - -electron-to-chromium@^1.2.7: - version "1.3.37" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.37.tgz#4a92734e0044c8cf0b1553be57eae21a4c6e5fab" - -elliptic@^6.0.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df" - dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" - hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" - -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - -encodeurl@~1.0.1, encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - -encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - dependencies: - iconv-lite "~0.4.13" - -enhanced-resolve@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.4.0" - object-assign "^4.0.1" - tapable "^0.2.7" - -errno@^0.1.3: - version "0.1.7" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" - dependencies: - prr "~1.0.1" - -error-ex@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" - dependencies: - is-arrayish "^0.2.1" - -error@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02" - dependencies: - string-template "~0.2.1" - xtend "~4.0.0" - -es-abstract@^1.7.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864" - dependencies: - es-to-primitive "^1.1.1" - function-bind "^1.1.1" - has "^1.0.1" - is-callable "^1.1.3" - is-regex "^1.0.4" - -es-to-primitive@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d" - dependencies: - is-callable "^1.1.1" - is-date-object "^1.0.1" - is-symbol "^1.0.1" - -es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.40" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.40.tgz#ab3d2179b943008c5e9ef241beb25ef41424c774" - dependencies: - es6-iterator "~2.0.3" - es6-symbol "~3.1.1" - -es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" - dependencies: - d "1" - es5-ext "^0.10.35" - es6-symbol "^3.1.1" - -es6-map@^0.1.3: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-set "~0.1.5" - es6-symbol "~3.1.1" - event-emitter "~0.3.5" - -es6-set@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" - dependencies: - d "1" - es5-ext "~0.10.14" - es6-iterator "~2.0.1" - es6-symbol "3.1.1" - event-emitter "~0.3.5" - -es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" - dependencies: - d "1" - es5-ext "~0.10.14" - -es6-templates@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4" - dependencies: - recast "~0.11.12" - through "~2.3.6" - -es6-weak-map@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f" - dependencies: - d "1" - es5-ext "^0.10.14" - es6-iterator "^2.0.1" - es6-symbol "^3.1.1" - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -escope@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3" - dependencies: - es6-map "^0.1.3" - es6-weak-map "^2.0.1" - esrecurse "^4.1.0" - estraverse "^4.1.1" - -esprima@^2.6.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" - -esprima@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" - -esprima@~3.1.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633" - -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - dependencies: - estraverse "^4.1.0" - -estraverse@^4.1.0, estraverse@^4.1.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - -esutils@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - -event-emitter@~0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" - dependencies: - d "1" - es5-ext "~0.10.14" - -eventemitter2@~0.4.13: - version "0.4.14" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab" - -eventemitter3@1.x.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" - -events@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - -eventsource@0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232" - dependencies: - original ">=0.0.5" - -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - -execa@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.4.0.tgz#4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3" - dependencies: - cross-spawn-async "^2.1.1" - is-stream "^1.1.0" - npm-run-path "^1.0.0" - object-assign "^4.0.1" - path-key "^1.0.0" - strip-eof "^1.0.0" - -execa@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execall@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" - dependencies: - clone-regexp "^1.0.0" - -exit-hook@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" - -exit@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -expose-loader@0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-0.7.3.tgz#35fbd3659789e4faa81f59de8b7e9fc39e466d51" - -express@^4.13.3: - version "4.16.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c" - dependencies: - accepts "~1.3.4" - array-flatten "1.1.1" - body-parser "1.18.2" - content-disposition "0.5.2" - content-type "~1.0.4" - cookie "0.3.1" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.1" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.1.0" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.2" - path-to-regexp "0.1.7" - proxy-addr "~2.0.2" - qs "6.5.1" - range-parser "~1.2.0" - safe-buffer "5.1.1" - send "0.16.1" - serve-static "1.13.1" - setprototypeof "1.1.0" - statuses "~1.3.1" - type-is "~1.6.15" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@^3.0.0, extend@~3.0.0, extend@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" - -external-editor@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b" - dependencies: - extend "^3.0.0" - spawn-sync "^1.0.15" - tmp "^0.0.29" - -external-editor@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48" - dependencies: - chardet "^0.4.0" - iconv-lite "^0.4.17" - tmp "^0.0.33" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - -fast-deep-equal@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - -fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - -fastparse@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8" - -faye-websocket@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - dependencies: - websocket-driver ">=0.5.1" - -faye-websocket@~0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38" - dependencies: - websocket-driver ">=0.5.1" - -fbjs@^0.8.16, fbjs@^0.8.9: - version "0.8.16" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db" - dependencies: - core-js "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.9" - -figures@^1.3.5: - version "1.7.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" - dependencies: - escape-string-regexp "^1.0.5" - object-assign "^4.1.0" - -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - dependencies: - escape-string-regexp "^1.0.5" - -file-loader@1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-1.1.4.tgz#5ca9384adfafe008077c3439a435b2781a889ef5" - dependencies: - loader-utils "^1.0.2" - schema-utils "^0.3.0" - -file-sync-cmp@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - -filesize@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -filter-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz#9b311112bc6c6127a16e016c6c5d7f19e0805c5b" - -finalhandler@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5" - dependencies: - debug "2.6.9" - encodeurl "~1.0.1" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.2" - statuses "~1.3.1" - unpipe "~1.0.0" - -find-cache-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" - dependencies: - commondir "^1.0.1" - make-dir "^1.0.0" - pkg-dir "^2.0.0" - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - dependencies: - locate-path "^2.0.0" - -find-versions@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-1.2.1.tgz#cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62" - dependencies: - array-uniq "^1.0.0" - get-stdin "^4.0.1" - meow "^3.5.0" - semver-regex "^1.0.0" - -findup-sync@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16" - dependencies: - glob "~5.0.0" - -first-chunk-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70" - dependencies: - readable-stream "^2.0.2" - -flatten@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" - -focus-trap-react@^3.0.4, focus-trap-react@^3.1.1: - version "3.1.2" - resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-3.1.2.tgz#4dd021ccd028bbd3321147d132cdf7585d6d1394" - dependencies: - focus-trap "^2.0.1" - -focus-trap@^2.0.1: - version "2.4.3" - resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-2.4.3.tgz#95edc23e77829b7772cb2486d61fd6371ce112f9" - dependencies: - tabbable "^1.0.3" - -for-in@^0.1.3: - version "0.1.8" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" - -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - dependencies: - for-in "^1.0.1" - -for-own@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b" - dependencies: - for-in "^1.0.1" - -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - -foreachasync@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/foreachasync/-/foreachasync-3.0.0.tgz#5502987dc8714be3392097f32e0071c9dee07cf6" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - -form-data@~2.1.1: - version "2.1.4" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1" - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.12" - -form-data@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099" - dependencies: - asynckit "^0.4.0" - combined-stream "1.0.6" - mime-types "^2.1.12" - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - -fs-extra@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -fsevents@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" - dependencies: - nan "^2.3.0" - node-pre-gyp "^0.6.39" - -fstream-ignore@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" - dependencies: - fstream "^1.0.0" - inherits "2" - minimatch "^3.0.0" - -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: - version "1.0.11" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" - dependencies: - graceful-fs "^4.1.2" - inherits "~2.0.0" - mkdirp ">=0.5 0" - rimraf "2" - -fullname@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/fullname/-/fullname-3.3.0.tgz#a08747d6921229610b8178b7614fce10cb185f5a" - dependencies: - execa "^0.6.0" - filter-obj "^1.1.0" - mem "^1.1.0" - p-any "^1.0.0" - p-try "^1.0.0" - passwd-user "^2.1.0" - rc "^1.1.6" - -function-bind@^1.0.2, function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - -gauge@~1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" - dependencies: - ansi "^0.3.0" - has-unicode "^2.0.0" - lodash.pad "^4.1.0" - lodash.padend "^4.1.0" - lodash.padstart "^4.1.0" - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -gaze@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" - dependencies: - globule "^1.0.0" - -get-caller-file@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5" - -get-stdin@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" - -get-stream@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - -getobject@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/getobject/-/getobject-0.1.0.tgz#047a449789fa160d018f5486ed91320b6ec7885c" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - dependencies: - assert-plus "^1.0.0" - -gh-got@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/gh-got/-/gh-got-5.0.0.tgz#ee95be37106fd8748a96f8d1db4baea89e1bfa8a" - dependencies: - got "^6.2.0" - is-plain-obj "^1.1.0" - -github-username@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/github-username/-/github-username-3.0.0.tgz#0a772219b3130743429f2456d0bdd3db55dce7b1" - dependencies: - gh-got "^5.0.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@~7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@~5.0.0: - version "5.0.15" - resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@~7.0.0: - version "7.0.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - -global-dirs@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445" - dependencies: - ini "^1.3.4" - -globals@^9.18.0: - version "9.18.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a" - -globby@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-4.1.0.tgz#080f54549ec1b82a6c60e631fc82e1211dbe95f8" - dependencies: - array-union "^1.0.1" - arrify "^1.0.0" - glob "^6.0.1" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -globule@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" - dependencies: - glob "~7.1.1" - lodash "~4.17.4" - minimatch "~3.0.2" - -got@^5.0.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35" - dependencies: - create-error-class "^3.0.1" - duplexer2 "^0.1.4" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - node-status-codes "^1.0.0" - object-assign "^4.0.1" - parse-json "^2.1.0" - pinkie-promise "^2.0.0" - read-all-stream "^3.0.0" - readable-stream "^2.0.5" - timed-out "^3.0.0" - unzip-response "^1.0.2" - url-parse-lax "^1.0.0" - -got@^6.2.0, got@^6.7.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0" - dependencies: - create-error-class "^3.0.0" - duplexer3 "^0.1.4" - get-stream "^3.0.0" - is-redirect "^1.0.0" - is-retry-allowed "^1.0.0" - is-stream "^1.0.0" - lowercase-keys "^1.0.0" - safe-buffer "^5.0.1" - timed-out "^4.0.0" - unzip-response "^2.0.1" - url-parse-lax "^1.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.1.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" - -grouped-queue@^0.3.0, grouped-queue@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/grouped-queue/-/grouped-queue-0.3.3.tgz#c167d2a5319c5a0e0964ef6a25b7c2df8996c85c" - dependencies: - lodash "^4.17.2" - -grunt-babel@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/grunt-babel/-/grunt-babel-7.0.0.tgz#13c90c01f154dec214e0eeb5d66ac7c70cedf2d3" - -grunt-cli@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-1.2.0.tgz#562b119ebb069ddb464ace2845501be97b35b6a8" - dependencies: - findup-sync "~0.3.0" - grunt-known-options "~1.1.0" - nopt "~3.0.6" - resolve "~1.1.0" - -grunt-contrib-clean@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-1.1.0.tgz#564abf2d0378a983a15b9e3f30ee75b738c40638" - dependencies: - async "^1.5.2" - rimraf "^2.5.1" - -grunt-contrib-copy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-contrib-copy/-/grunt-contrib-copy-1.0.0.tgz#7060c6581e904b8ab0d00f076e0a8f6e3e7c3573" - dependencies: - chalk "^1.1.1" - file-sync-cmp "^0.1.0" - -grunt-known-options@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/grunt-known-options/-/grunt-known-options-1.1.0.tgz#a4274eeb32fa765da5a7a3b1712617ce3b144149" - -grunt-legacy-log-utils@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-1.0.0.tgz#a7b8e2d0fb35b5a50f4af986fc112749ebc96f3d" - dependencies: - chalk "~1.1.1" - lodash "~4.3.0" - -grunt-legacy-log@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-1.0.1.tgz#c7731b2745f4732aa9950ee4d7ae63c553f68469" - dependencies: - colors "~1.1.2" - grunt-legacy-log-utils "~1.0.0" - hooker "~0.2.3" - lodash "~4.17.5" - underscore.string "~3.3.4" - -grunt-legacy-util@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-1.0.0.tgz#386aa78dc6ed50986c2b18957265b1b48abb9b86" - dependencies: - async "~1.5.2" - exit "~0.1.1" - getobject "~0.1.0" - hooker "~0.2.3" - lodash "~4.3.0" - underscore.string "~3.2.3" - which "~1.2.1" - -grunt@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/grunt/-/grunt-1.0.1.tgz#e8778764e944b18f32bb0f10b9078475c9dfb56b" - dependencies: - coffee-script "~1.10.0" - dateformat "~1.0.12" - eventemitter2 "~0.4.13" - exit "~0.1.1" - findup-sync "~0.3.0" - glob "~7.0.0" - grunt-cli "~1.2.0" - grunt-known-options "~1.1.0" - grunt-legacy-log "~1.0.0" - grunt-legacy-util "~1.0.0" - iconv-lite "~0.4.13" - js-yaml "~3.5.2" - minimatch "~3.0.0" - nopt "~3.0.6" - path-is-absolute "~1.0.0" - rimraf "~2.2.8" - -handle-thing@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4" - -handlebars@4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" - dependencies: - async "^1.4.0" - optimist "^0.6.1" - source-map "^0.4.4" - optionalDependencies: - uglify-js "^2.6" - -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - -har-validator@~5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" - dependencies: - ajv "^5.1.0" - har-schema "^2.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - -has-flag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" - dependencies: - function-bind "^1.0.2" - -hash-base@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" - dependencies: - inherits "^2.0.1" - -hash-base@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.0" - -hawk@3.1.3, hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - -hawk@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" - dependencies: - boom "4.x.x" - cryptiles "3.x.x" - hoek "4.x.x" - sntp "2.x.x" - -he@1.1.x: - version "1.1.1" - resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd" - -highlight.js@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.0.0.tgz#f5f8d564c97ab374a046f5598077ae6adddbe620" - -highlight.js@^9.12.0: - version "9.12.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" - -history@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" - dependencies: - invariant "^2.2.1" - loose-envify "^1.2.0" - query-string "^4.2.2" - warning "^3.0.0" - -history@^4.7.2: - version "4.7.2" - resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b" - dependencies: - invariant "^2.2.1" - loose-envify "^1.2.0" - resolve-pathname "^2.2.0" - value-equal "^0.4.0" - warning "^3.0.0" - -hmac-drbg@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - -hoek@4.x.x: - version "4.2.1" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" - -hoist-non-react-statics@^2.3.0, hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40" - -home-or-tmp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.1" - -hooker@~0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959" - -hosted-git-info@^2.1.4: - version "2.6.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-comment-regex@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e" - -html-entities@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" - -html-loader@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.1.tgz#4f1e8396a1ea6ab42bedc987dfac058070861ebe" - dependencies: - es6-templates "^0.2.2" - fastparse "^1.1.1" - html-minifier "^3.0.1" - loader-utils "^1.0.2" - object-assign "^4.1.0" - -html-minifier@^3.0.1: - version "3.5.10" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.10.tgz#8522c772c388db81aa5c26f62033302d906ea1c7" - dependencies: - camel-case "3.0.x" - clean-css "4.1.x" - commander "2.14.x" - he "1.1.x" - ncname "1.0.x" - param-case "2.1.x" - relateurl "0.2.x" - uglify-js "3.3.x" - -html@1.0.0, html@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61" - dependencies: - concat-stream "^1.4.7" - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - -http-errors@1.6.2, http-errors@~1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" - dependencies: - depd "1.1.1" - inherits "2.0.3" - setprototypeof "1.0.3" - statuses ">= 1.3.1 < 2" - -http-parser-js@>=0.4.0: - version "0.4.11" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529" - -http-proxy-middleware@~0.17.4: - version "0.17.4" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833" - dependencies: - http-proxy "^1.16.2" - is-glob "^3.1.0" - lodash "^4.17.2" - micromatch "^2.3.11" - -http-proxy@^1.16.2: - version "1.16.2" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742" - dependencies: - eventemitter3 "1.x.x" - requires-port "1.x.x" - -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" - dependencies: - assert-plus "^0.2.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - -humanize-string@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/humanize-string/-/humanize-string-1.0.1.tgz#fce2d6c545efc25dea1f23235182c98da0180b42" - dependencies: - decamelize "^1.0.0" - -iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@~0.4.13: - version "0.4.19" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" - -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - -icss-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962" - dependencies: - postcss "^6.0.1" - -ieee754@^1.1.4: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" - -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - -imports-loader@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.7.1.tgz#f204b5f34702a32c1db7d48d89d5e867a0441253" - dependencies: - loader-utils "^1.0.2" - source-map "^0.5.6" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - -in-publish@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51" - -indent-string@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80" - dependencies: - repeating "^2.0.0" - -indent-string@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - -ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - -inquirer@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.10.1.tgz#ea25e4ce69ca145e05c99e46dcfec05e4012594a" - dependencies: - ansi-escapes "^1.1.0" - ansi-regex "^2.0.0" - chalk "^1.0.0" - cli-cursor "^1.0.1" - cli-width "^1.0.1" - figures "^1.3.5" - lodash "^3.3.1" - readline2 "^1.0.1" - run-async "^0.1.0" - rx-lite "^3.1.2" - strip-ansi "^3.0.0" - through "^2.3.6" - -inquirer@^1.0.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" - dependencies: - ansi-escapes "^1.1.0" - chalk "^1.0.0" - cli-cursor "^1.0.1" - cli-width "^2.0.0" - external-editor "^1.1.0" - figures "^1.3.5" - lodash "^4.3.0" - mute-stream "0.0.6" - pinkie-promise "^2.0.0" - run-async "^2.2.0" - rx "^4.1.0" - string-width "^1.0.1" - strip-ansi "^3.0.0" - through "^2.3.6" - -inquirer@^3.0.1, inquirer@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.0.4" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" - string-width "^2.1.0" - strip-ansi "^4.0.0" - through "^2.3.6" - -insight@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/insight/-/insight-0.8.4.tgz#671caf65b47c9fe8c3d1b3206cf45bb211b75884" - dependencies: - async "^1.4.2" - chalk "^1.0.0" - configstore "^1.0.0" - inquirer "^0.10.0" - lodash.debounce "^3.0.1" - object-assign "^4.0.1" - os-name "^1.0.0" - request "^2.74.0" - tough-cookie "^2.0.0" - uuid "^3.0.0" - -internal-ip@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c" - dependencies: - meow "^3.3.0" - -interpret@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" - -invariant@^2.0.0, invariant@^2.2.1, invariant@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.3.tgz#1a827dfde7dcbd7c323f0ca826be8fa7c5e9d688" - dependencies: - loose-envify "^1.0.0" - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - -ip@1.1.5, ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - -ipaddr.js@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b" - -is-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - dependencies: - kind-of "^6.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.0.2, is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - -is-builtin-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe" - dependencies: - builtin-modules "^1.0.0" - -is-callable@^1.1.1, is-callable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - -is-docker@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-1.1.0.tgz#f04374d4eee5310e9a8e113bf1495411e46176a1" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - -is-finite@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" - dependencies: - is-extglob "^2.1.1" - -is-installed-globally@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80" - dependencies: - global-dirs "^0.1.0" - is-path-inside "^1.0.0" - -is-npm@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - -is-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - -is-odd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" - dependencies: - is-number "^4.0.0" - -is-path-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" - -is-path-in-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" - dependencies: - is-path-inside "^1.0.0" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - dependencies: - path-is-inside "^1.0.1" - -is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - -is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - dependencies: - isobject "^3.0.1" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - -is-redirect@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" - -is-regex@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - dependencies: - has "^1.0.1" - -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - -is-retry-allowed@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" - -is-root@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-root/-/is-root-1.0.0.tgz#07b6c233bc394cd9d02ba15c966bd6660d6342d5" - -is-scoped@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-scoped/-/is-scoped-1.0.0.tgz#449ca98299e713038256289ecb2b540dc437cb30" - dependencies: - scoped-regex "^1.0.0" - -is-stream@1.1.0, is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-supported-regexp-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8" - -is-svg@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" - dependencies: - html-comment-regex "^1.1.0" - -is-symbol@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - -isomorphic-fetch@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" - dependencies: - node-fetch "^1.0.1" - whatwg-fetch ">=0.10.0" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - -istextorbinary@^2.1.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz#a5231a08ef6dd22b268d0895084cf8d58b5bec53" - dependencies: - binaryextensions "2" - editions "^1.3.3" - textextensions "2" - -jquery@^3.2.1, jquery@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" - -js-base64@^2.1.8, js-base64@^2.1.9: - version "2.4.3" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" - -js-tokens@^3.0.0, js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - -js-yaml@^3.4.3: - version "3.11.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef" - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@~3.5.2: - version "3.5.5" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.5.5.tgz#0377c38017cabc7322b0d1fbcd25a491641f2fbe" - dependencies: - argparse "^1.0.2" - esprima "^2.6.0" - -js-yaml@~3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" - dependencies: - argparse "^1.0.7" - esprima "^2.6.0" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - -json-loader@^0.5.4: - version "0.5.7" - resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" - -json-schema-traverse@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - -json3@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1" - -json5@^0.5.0, json5@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - optionalDependencies: - graceful-fs "^4.1.6" - -jsonify@~0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -just-extend@^1.1.27: - version "1.1.27" - resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905" - -keymirror@0.1.1, keymirror@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35" - -kind-of@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-2.0.1.tgz#018ec7a4ce7e3a86cb9141be519d24c8faa981b5" - dependencies: - is-buffer "^1.0.2" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0, kind-of@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - -latest-version@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" - dependencies: - package-json "^4.0.0" - -lazy-cache@^0.2.3: - version "0.2.7" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65" - -lazy-cache@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e" - -lazy-cache@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264" - dependencies: - set-getter "^0.1.0" - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - dependencies: - invert-kv "^1.0.0" - -load-json-file@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -loader-runner@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" - -loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd" - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -lodash-es@^4.17.5, lodash-es@^4.2.1: - version "4.17.7" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.7.tgz#db240a3252c3dd8360201ac9feef91ac977ea856" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash.assign@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" - -lodash.camelcase@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" - -lodash.clonedeep@^4.3.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - -lodash.debounce@^3.0.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5" - dependencies: - lodash._getnative "^3.0.0" - -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - -lodash.isequal@^4.1.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - -lodash.mergewith@^4.6.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927" - -lodash.pad@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" - -lodash.padend@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padend/-/lodash.padend-4.6.1.tgz#53ccba047d06e158d311f45da625f4e49e6f166e" - -lodash.padstart@^4.1.0: - version "4.6.1" - resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" - -lodash.tail@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" - -lodash.uniq@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" - -lodash@3.10.1, lodash@^3.10.1, lodash@^3.3.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" - -lodash@4.17.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - -lodash@^4.0.0, lodash@^4.0.1, lodash@^4.11.1, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.4, lodash@~4.17.5: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -lodash@~4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.3.0.tgz#efd9c4a6ec53f3b05412429915c3e4824e4d25a4" - -log-symbols@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" - dependencies: - chalk "^1.0.0" - -log-symbols@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" - dependencies: - chalk "^2.0.1" - -loglevel@^1.4.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" - -lolex@^2.2.0, lolex@^2.3.2: - version "2.5.0" - resolved "https://registry.yarnpkg.com/lolex/-/lolex-2.5.0.tgz#69d6a667607738564daf108f63240ae8cbd28fb4" - -longest@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" - -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848" - dependencies: - js-tokens "^3.0.0" - -loud-rejection@^1.0.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - dependencies: - currently-unhandled "^0.4.1" - signal-exit "^3.0.0" - -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - -lowercase-keys@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" - -lru-cache@^4.0.0, lru-cache@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -macaddress@^0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" - -make-dir@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b" - dependencies: - pify "^3.0.0" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -map-obj@^1.0.0, map-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - dependencies: - object-visit "^1.0.0" - -material-colors@^1.2.1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.5.tgz#5292593e6754cb1bcc2b98030e4e0d6a3afc9ea1" - -math-expression-evaluator@^1.2.14: - version "1.2.17" - resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" - -md5.js@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - -mem-fs-editor@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/mem-fs-editor/-/mem-fs-editor-3.0.2.tgz#dd0a6eaf2bb8a6b37740067aa549eb530105af9f" - dependencies: - commondir "^1.0.1" - deep-extend "^0.4.0" - ejs "^2.3.1" - glob "^7.0.3" - globby "^6.1.0" - mkdirp "^0.5.0" - multimatch "^2.0.0" - rimraf "^2.2.8" - through2 "^2.0.0" - vinyl "^2.0.1" - -mem-fs@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/mem-fs/-/mem-fs-1.1.3.tgz#b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc" - dependencies: - through2 "^2.0.0" - vinyl "^1.1.0" - vinyl-file "^2.0.0" - -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - dependencies: - mimic-fn "^1.0.0" - -memory-fs@^0.4.0, memory-fs@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -meow@^3.0.0, meow@^3.3.0, meow@^3.5.0, meow@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" - dependencies: - camelcase-keys "^2.0.0" - decamelize "^1.1.2" - loud-rejection "^1.0.0" - map-obj "^1.0.1" - minimist "^1.1.3" - normalize-package-data "^2.3.4" - object-assign "^4.0.1" - read-pkg-up "^1.0.1" - redent "^1.0.0" - trim-newlines "^1.0.0" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - -micro-compress@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micro-compress/-/micro-compress-1.0.0.tgz#53f5a80b4ad0320ca165a559b6e3df145d4f704f" - dependencies: - compression "^1.6.2" - -micro@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/micro/-/micro-9.1.0.tgz#f2effba306639076e994c007c327dfc36a5185e9" - dependencies: - content-type "1.0.4" - is-stream "1.1.0" - mri "1.1.0" - raw-body "2.3.2" - -micromatch@^2.1.5, micromatch@^2.3.11: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.4: - version "3.1.9" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" - -"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0: - version "1.33.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" - -mime-types@2.1.18, mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7: - version "2.1.18" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8" - dependencies: - mime-db "~1.33.0" - -mime@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" - -mime@^1.5.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - -minimalistic-assert@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" - -minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - -"minimatch@2 || 3", minimatch@3.0.x, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.0, minimatch@~3.0.2: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -minimist@~0.0.1: - version "0.0.10" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" - -mixin-deep@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mixin-object@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e" - dependencies: - for-in "^0.1.3" - is-extendable "^0.1.1" - -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -moment@^2.20.1: - version "2.21.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a" - -mri@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.0.tgz#5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - -multicast-dns-service-types@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901" - -multicast-dns@^6.0.1: - version "6.2.3" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229" - dependencies: - dns-packet "^1.3.1" - thunky "^1.0.2" - -multimatch@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b" - dependencies: - array-differ "^1.0.0" - array-union "^1.0.1" - arrify "^1.0.0" - minimatch "^3.0.0" - -mute-stream@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" - -mute-stream@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" - -mute-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - -nan@^2.3.0, nan@^2.3.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" - -nanomatch@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-odd "^2.0.0" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -ncname@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c" - dependencies: - xml-char-classes "^1.0.0" - -negotiator@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" - -neo-async@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f" - -nise@^1.2.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/nise/-/nise-1.3.3.tgz#c17a850066a8a1dfeb37f921da02441afc4a82ba" - dependencies: - "@sinonjs/formatio" "^2.0.0" - just-extend "^1.1.27" - lolex "^2.3.2" - path-to-regexp "^1.7.0" - text-encoding "^0.6.4" - -no-case@^2.2.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" - dependencies: - lower-case "^1.1.1" - -node-fetch@^1.0.1: - version "1.7.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - -node-forge@0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.1.tgz#9da611ea08982f4b94206b3beb4cc9665f20c300" - -node-gyp@^3.3.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60" - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - minimatch "^3.0.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "2" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -node-libs-browser@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^1.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.0" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.10.3" - vm-browserify "0.0.4" - -node-pre-gyp@^0.6.39: - version "0.6.39" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" - dependencies: - detect-libc "^1.0.2" - hawk "3.1.3" - mkdirp "^0.5.1" - nopt "^4.0.1" - npmlog "^4.0.2" - rc "^1.1.7" - request "2.81.0" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" - -node-sass@4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.5.3.tgz#d09c9d1179641239d1b97ffc6231fdcec53e1568" - dependencies: - async-foreach "^0.1.3" - chalk "^1.1.1" - cross-spawn "^3.0.0" - gaze "^1.0.0" - get-stdin "^4.0.1" - glob "^7.0.3" - in-publish "^2.0.0" - lodash.assign "^4.2.0" - lodash.clonedeep "^4.3.2" - lodash.mergewith "^4.6.0" - meow "^3.7.0" - mkdirp "^0.5.1" - nan "^2.3.2" - node-gyp "^3.3.1" - npmlog "^4.0.0" - request "^2.79.0" - sass-graph "^2.1.1" - stdout-stream "^1.4.0" - -node-status-codes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f" - -node-version@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.1.0.tgz#f437d7ba407e65e2c4eaef8887b1718ba523d4f0" - -"nopt@2 || 3", nopt@~3.0.6: - version "3.0.6" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" - dependencies: - abbrev "1" - -nopt@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" - dependencies: - abbrev "1" - osenv "^0.1.4" - -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: - version "2.4.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f" - dependencies: - hosted-git-info "^2.1.4" - is-builtin-module "^1.0.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - dependencies: - remove-trailing-separator "^1.0.1" - -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - -normalize-url@^1.4.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" - dependencies: - object-assign "^4.0.1" - prepend-http "^1.0.0" - query-string "^4.1.0" - sort-keys "^1.0.0" - -npm-keyword@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/npm-keyword/-/npm-keyword-4.2.0.tgz#98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0" - dependencies: - got "^5.0.0" - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - registry-url "^3.0.3" - -npm-run-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f" - dependencies: - path-key "^1.0.0" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - dependencies: - path-key "^2.0.0" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -npmlog@^2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-2.0.4.tgz#98b52530f2514ca90d09ec5b22c8846722375692" - dependencies: - ansi "~0.3.1" - are-we-there-yet "~1.1.2" - gauge "~1.2.5" - -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - -numeral@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506" - -oauth-sign@~0.8.1, oauth-sign@~0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" - -object-assign@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa" - -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-keys@^1.0.8: - version "1.0.11" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d" - -object-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/object-values/-/object-values-1.0.0.tgz#72af839630119e5b98c3b02bb8c27e3237158105" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - dependencies: - isobject "^3.0.0" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - dependencies: - isobject "^3.0.1" - -obuf@^1.0.0, obuf@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" - -once@^1.3.0, once@^1.3.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -onetime@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" - -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - dependencies: - mimic-fn "^1.0.0" - -openssl-self-signed-certificate@1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/openssl-self-signed-certificate/-/openssl-self-signed-certificate-1.1.6.tgz#9d3a4776b1a57e9847350392114ad2f915a83dd4" - -opn@5.2.0, opn@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225" - dependencies: - is-wsl "^1.1.0" - -opn@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/opn/-/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95" - dependencies: - object-assign "^4.0.1" - pinkie-promise "^2.0.0" - -optimist@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" - dependencies: - minimist "~0.0.1" - wordwrap "~0.0.2" - -original@>=0.0.5: - version "1.0.0" - resolved "https://registry.yarnpkg.com/original/-/original-1.0.0.tgz#9147f93fa1696d04be61e01bd50baeaca656bd3b" - dependencies: - url-parse "1.0.x" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - -os-homedir@^1.0.0, os-homedir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - dependencies: - lcid "^1.0.0" - -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - -os-name@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/os-name/-/os-name-1.0.3.tgz#1b379f64835af7c5a7f498b357cb95215c159edf" - dependencies: - osx-release "^1.0.0" - win-release "^1.0.0" - -os-shim@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - -os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - -osenv@0, osenv@^0.1.0, osenv@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" - dependencies: - os-homedir "^1.0.0" - os-tmpdir "^1.0.0" - -osx-release@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/osx-release/-/osx-release-1.1.0.tgz#f217911a28136949af1bf9308b241e2737d3cd6c" - dependencies: - minimist "^1.1.0" - -p-any@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-any/-/p-any-1.1.0.tgz#1d03835c7eed1e34b8e539c47b7b60d0d015d4e1" - dependencies: - p-some "^2.0.0" - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - -p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" - dependencies: - p-try "^1.0.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - dependencies: - p-limit "^1.1.0" - -p-map@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" - -p-some@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/p-some/-/p-some-2.0.1.tgz#65d87c8b154edbcf5221d167778b6d2e150f6f06" - dependencies: - aggregate-error "^1.0.0" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - -package-json@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-2.4.0.tgz#0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb" - dependencies: - got "^5.0.0" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - -package-json@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz#8869a0401253661c4c4ca3da6c2121ed555f5eed" - dependencies: - got "^6.7.1" - registry-auth-token "^3.0.1" - registry-url "^3.0.3" - semver "^5.1.0" - -pad-component@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/pad-component/-/pad-component-0.0.1.tgz#ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac" - -pako@~1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" - -param-case@2.1.x: - version "2.1.1" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" - dependencies: - no-case "^2.2.0" - -parse-asn1@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" - dependencies: - asn1.js "^4.0.0" - browserify-aes "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-help@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/parse-help/-/parse-help-0.1.1.tgz#2f4df942e77a5581bba9967c0c3f48e4c66d7dda" - dependencies: - execall "^1.0.0" - -parse-json@^2.1.0, parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - dependencies: - error-ex "^1.2.0" - -parseurl@~1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - -passwd-user@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/passwd-user/-/passwd-user-2.1.0.tgz#fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e" - dependencies: - execa "^0.4.0" - pify "^2.3.0" - -path-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a" - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - dependencies: - pinkie-promise "^2.0.0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - -path-is-absolute@^1.0.0, path-is-absolute@^1.0.1, path-is-absolute@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-is-inside@1.0.2, path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - -path-key@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af" - -path-key@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - -path-parse@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1" - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - -path-to-regexp@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d" - dependencies: - isarray "0.0.1" - -path-type@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - dependencies: - pify "^3.0.0" - -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - dependencies: - pify "^2.0.0" - -pbkdf2@^3.0.3: - version "3.0.14" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade" - dependencies: - create-hash "^1.1.2" - create-hmac "^1.1.4" - ripemd160 "^2.0.1" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - -pify@^2.0.0, pify@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - dependencies: - find-up "^2.1.0" - -pkginfo@0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" - -portfinder@^1.0.9: - version "1.0.13" - resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" - dependencies: - async "^1.5.2" - debug "^2.2.0" - mkdirp "0.5.x" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - -postcss-calc@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e" - dependencies: - postcss "^5.0.2" - postcss-message-helpers "^2.0.0" - reduce-css-calc "^1.2.6" - -postcss-colormin@^2.1.8: - version "2.2.2" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b" - dependencies: - colormin "^1.0.5" - postcss "^5.0.13" - postcss-value-parser "^3.2.3" - -postcss-convert-values@^2.3.4: - version "2.6.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d" - dependencies: - postcss "^5.0.11" - postcss-value-parser "^3.1.2" - -postcss-discard-comments@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d" - dependencies: - postcss "^5.0.14" - -postcss-discard-duplicates@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932" - dependencies: - postcss "^5.0.4" - -postcss-discard-empty@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5" - dependencies: - postcss "^5.0.14" - -postcss-discard-overridden@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58" - dependencies: - postcss "^5.0.16" - -postcss-discard-unused@^2.2.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433" - dependencies: - postcss "^5.0.14" - uniqs "^2.0.0" - -postcss-filter-plugins@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c" - dependencies: - postcss "^5.0.4" - uniqid "^4.0.0" - -postcss-load-config@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a" - dependencies: - cosmiconfig "^2.1.0" - object-assign "^4.1.0" - postcss-load-options "^1.2.0" - postcss-load-plugins "^2.3.0" - -postcss-load-options@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c" - dependencies: - cosmiconfig "^2.1.0" - object-assign "^4.1.0" - -postcss-load-plugins@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92" - dependencies: - cosmiconfig "^2.1.1" - object-assign "^4.1.0" - -postcss-loader@2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.6.tgz#8c7e0055a3df1889abc6bad52dd45b2f41bbc6fc" - dependencies: - loader-utils "^1.1.0" - postcss "^6.0.2" - postcss-load-config "^1.2.0" - schema-utils "^0.3.0" - -postcss-merge-idents@^2.1.5: - version "2.1.7" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" - dependencies: - has "^1.0.1" - postcss "^5.0.10" - postcss-value-parser "^3.1.1" - -postcss-merge-longhand@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658" - dependencies: - postcss "^5.0.4" - -postcss-merge-rules@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721" - dependencies: - browserslist "^1.5.2" - caniuse-api "^1.5.2" - postcss "^5.0.4" - postcss-selector-parser "^2.2.2" - vendors "^1.0.0" - -postcss-message-helpers@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e" - -postcss-minify-font-values@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69" - dependencies: - object-assign "^4.0.1" - postcss "^5.0.4" - postcss-value-parser "^3.0.2" - -postcss-minify-gradients@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1" - dependencies: - postcss "^5.0.12" - postcss-value-parser "^3.3.0" - -postcss-minify-params@^1.0.4: - version "1.2.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3" - dependencies: - alphanum-sort "^1.0.1" - postcss "^5.0.2" - postcss-value-parser "^3.0.2" - uniqs "^2.0.0" - -postcss-minify-selectors@^2.0.4: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf" - dependencies: - alphanum-sort "^1.0.2" - has "^1.0.1" - postcss "^5.0.14" - postcss-selector-parser "^2.0.0" - -postcss-modules-extract-imports@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" - dependencies: - postcss "^6.0.1" - -postcss-modules-local-by-default@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-scope@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - -postcss-modules-values@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" - dependencies: - icss-replace-symbols "^1.1.0" - postcss "^6.0.1" - -postcss-normalize-charset@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1" - dependencies: - postcss "^5.0.5" - -postcss-normalize-url@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222" - dependencies: - is-absolute-url "^2.0.0" - normalize-url "^1.4.0" - postcss "^5.0.14" - postcss-value-parser "^3.2.3" - -postcss-ordered-values@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d" - dependencies: - postcss "^5.0.4" - postcss-value-parser "^3.0.1" - -postcss-reduce-idents@^2.2.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3" - dependencies: - postcss "^5.0.4" - postcss-value-parser "^3.0.2" - -postcss-reduce-initial@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea" - dependencies: - postcss "^5.0.4" - -postcss-reduce-transforms@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1" - dependencies: - has "^1.0.1" - postcss "^5.0.8" - postcss-value-parser "^3.0.1" - -postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" - dependencies: - flatten "^1.0.2" - indexes-of "^1.0.1" - uniq "^1.0.1" - -postcss-svgo@^2.1.1: - version "2.1.6" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" - dependencies: - is-svg "^2.0.0" - postcss "^5.0.14" - postcss-value-parser "^3.2.3" - svgo "^0.7.0" - -postcss-unique-selectors@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d" - dependencies: - alphanum-sort "^1.0.1" - postcss "^5.0.4" - uniqs "^2.0.0" - -postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15" - -postcss-zindex@^2.0.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22" - dependencies: - has "^1.0.1" - postcss "^5.0.4" - uniqs "^2.0.0" - -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.6: - version "5.2.18" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^6.0.1, postcss@^6.0.2: - version "6.0.19" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.19.tgz#76a78386f670b9d9494a655bf23ac012effd1555" - dependencies: - chalk "^2.3.1" - source-map "^0.6.1" - supports-color "^5.2.0" - -prepend-http@^1.0.0, prepend-http@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -pretty-bytes@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" - -private@^0.1.6, private@^0.1.7, private@~0.1.5: - version "0.1.8" - resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" - -process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - dependencies: - asap "~2.0.3" - -prop-types@15.5.8: - version "15.5.8" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394" - dependencies: - fbjs "^0.8.9" - -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0: - version "15.6.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.3.1" - object-assign "^4.1.1" - -proxy-addr@~2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.6.0" - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - -public-encrypt@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - -punycode@^1.2.4, punycode@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - -q@^1.1.2: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - -qs@6.5.1, qs@~6.5.1: - version "6.5.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" - -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - -query-string@^4.1.0, query-string@^4.2.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - -querystringify@0.0.x: - version "0.0.4" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-0.0.4.tgz#0cf7f84f9463ff0ae51c4c4b142d95be37724d9c" - -querystringify@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb" - -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80" - dependencies: - safe-buffer "^5.1.0" - -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - -range-parser@^1.0.3, range-parser@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" - -raw-body@2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" - dependencies: - bytes "3.0.0" - http-errors "1.6.2" - iconv-lite "0.4.19" - unpipe "1.0.0" - -raw-loader@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" - -rc@^1.0.1, rc@^1.1.6, rc@^1.1.7: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" - dependencies: - deep-extend "~0.4.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -react-ace@^5.5.0, react-ace@^5.9.0: - version "5.9.0" - resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-5.9.0.tgz#427a1cc4869b960a6f9748aa7eb169a9269fc336" - dependencies: - brace "^0.11.0" - lodash.get "^4.4.2" - lodash.isequal "^4.1.1" - prop-types "^15.5.8" - -react-color@^2.13.8: - version "2.14.0" - resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.14.0.tgz#5828a11c034aa0939befbd888a066ee37d8c3cc2" - dependencies: - lodash "^4.0.1" - material-colors "^1.2.1" - prop-types "^15.5.10" - reactcss "^1.2.0" - tinycolor2 "^1.4.1" - -react-dom@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" - -react-redux@^5.0.6: - version "5.0.7" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8" - dependencies: - hoist-non-react-statics "^2.5.0" - invariant "^2.0.0" - lodash "^4.17.5" - lodash-es "^4.17.5" - loose-envify "^1.1.0" - prop-types "^15.6.0" - -react-router-dom@4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.2.2.tgz#c8a81df3adc58bba8a76782e946cbd4eae649b8d" - dependencies: - history "^4.7.2" - invariant "^2.2.2" - loose-envify "^1.3.1" - prop-types "^15.5.4" - react-router "^4.2.0" - warning "^3.0.0" - -react-router-redux@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.8.tgz#227403596b5151e182377dab835b5d45f0f8054e" - -react-router@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.2.1.tgz#b9a3279962bdfbe684c8bd0482b81ef288f0f244" - dependencies: - create-react-class "^15.5.1" - history "^3.0.0" - hoist-non-react-statics "^2.3.1" - invariant "^2.2.1" - loose-envify "^1.2.0" - prop-types "^15.5.6" - warning "^3.0.0" - -react-router@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986" - dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.3.0" - invariant "^2.2.2" - loose-envify "^1.3.1" - path-to-regexp "^1.7.0" - prop-types "^15.5.4" - warning "^3.0.0" - -react@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba" - dependencies: - fbjs "^0.8.16" - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.0" - -reactcss@^1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.3.tgz#c00013875e557b1cf0dfd9a368a1c3dab3b548dd" - dependencies: - lodash "^4.0.1" - -read-all-stream@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa" - dependencies: - pinkie-promise "^2.0.0" - readable-stream "^2.0.0" - -read-chunk@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/read-chunk/-/read-chunk-2.1.0.tgz#6a04c0928005ed9d42e1a6ac5600e19cbc7ff655" - dependencies: - pify "^3.0.0" - safe-buffer "^5.1.1" - -read-pkg-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.0.3" - util-deprecate "~1.0.1" - -readdirp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78" - dependencies: - graceful-fs "^4.1.2" - minimatch "^3.0.2" - readable-stream "^2.0.2" - set-immediate-shim "^1.0.1" - -readline2@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - mute-stream "0.0.5" - -recast@~0.11.12: - version "0.11.23" - resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3" - dependencies: - ast-types "0.9.6" - esprima "~3.1.0" - private "~0.1.5" - source-map "~0.5.0" - -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - dependencies: - resolve "^1.1.6" - -redent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde" - dependencies: - indent-string "^2.1.0" - strip-indent "^1.0.1" - -reduce-css-calc@^1.2.6: - version "1.3.0" - resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" - dependencies: - balanced-match "^0.4.2" - math-expression-evaluator "^1.2.14" - reduce-function-call "^1.0.1" - -reduce-function-call@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99" - dependencies: - balanced-match "^0.4.2" - -redux-thunk@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5" - -redux@3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" - dependencies: - lodash "^4.2.1" - lodash-es "^4.2.1" - loose-envify "^1.1.0" - symbol-observable "^1.0.3" - -regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" - -regenerator-runtime@^0.10.0: - version "0.10.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - dependencies: - is-equal-shallow "^0.1.3" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexpu-core@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -registry-auth-token@^3.0.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20" - dependencies: - rc "^1.1.6" - safe-buffer "^5.0.1" - -registry-url@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942" - dependencies: - rc "^1.0.1" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - dependencies: - jsesc "~0.5.0" - -relateurl@0.2.x: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -repeating@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - dependencies: - is-finite "^1.0.0" - -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - -replace-ext@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" - -request@2, request@^2.74.0, request@^2.79.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.6.0" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.1" - forever-agent "~0.6.1" - form-data "~2.3.1" - har-validator "~5.0.3" - hawk "~6.0.2" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.17" - oauth-sign "~0.8.2" - performance-now "^2.1.0" - qs "~6.5.1" - safe-buffer "^5.1.1" - stringstream "~0.0.5" - tough-cookie "~2.3.3" - tunnel-agent "^0.6.0" - uuid "^3.1.0" - -request@2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - -require-from-string@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - -requires-port@1.0.x, requires-port@1.x.x, requires-port@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - -resolve-pathname@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.2.0.tgz#7e9ae21ed815fd63ab189adeee64dc831eefa879" - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - -resolve@^1.1.6: - version "1.5.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" - dependencies: - path-parse "^1.0.5" - -resolve@~1.1.0: - version "1.1.7" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - -restore-cursor@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" - dependencies: - exit-hook "^1.0.0" - onetime "^1.0.0" - -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - dependencies: - onetime "^2.0.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - -right-align@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef" - dependencies: - align-text "^0.1.1" - -rimraf@2, rimraf@^2.2.0, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" - dependencies: - glob "^7.0.5" - -rimraf@~2.2.8: - version "2.2.8" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582" - -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" - dependencies: - hash-base "^2.0.0" - inherits "^2.0.1" - -root-check@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/root-check/-/root-check-1.0.0.tgz#c52a794bf0db9fad567536e41898f0c9e0a86697" - dependencies: - downgrade-root "^1.0.0" - sudo-block "^1.1.0" - -run-async@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389" - dependencies: - once "^1.3.0" - -run-async@^2.0.0, run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - dependencies: - is-promise "^2.1.0" - -rx-lite-aggregates@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" - dependencies: - rx-lite "*" - -rx-lite@*, rx-lite@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" - -rx-lite@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" - -rx@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" - -safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - dependencies: - ret "~0.1.10" - -samsam@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50" - -sass-graph@^2.1.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49" - dependencies: - glob "^7.0.0" - lodash "^4.0.0" - scss-tokenizer "^0.2.3" - yargs "^7.0.0" - -sass-loader@6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9" - dependencies: - async "^2.1.5" - clone-deep "^0.3.0" - loader-utils "^1.0.1" - lodash.tail "^4.1.1" - pify "^3.0.0" - -sax@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - -schema-utils@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - dependencies: - ajv "^5.0.0" - -scoped-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8" - -scss-tokenizer@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" - dependencies: - js-base64 "^2.1.8" - source-map "^0.4.2" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - -selfsigned@^1.9.1: - version "1.10.2" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.2.tgz#b4449580d99929b65b10a48389301a6592088758" - dependencies: - node-forge "0.7.1" - -semver-diff@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36" - dependencies: - semver "^5.0.3" - -semver-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9" - -semver-truncate@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8" - dependencies: - semver "^5.3.0" - -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" - -semver@^4.0.3: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - -send@0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" - dependencies: - debug "2.6.9" - depd "~1.1.1" - destroy "~1.0.4" - encodeurl "~1.0.1" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.3.1" - -send@0.16.2: - version "0.16.2" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.6.2" - mime "1.4.1" - ms "2.0.0" - on-finished "~2.3.0" - range-parser "~1.2.0" - statuses "~1.4.0" - -serve-index@^1.7.2: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719" - dependencies: - encodeurl "~1.0.1" - escape-html "~1.0.3" - parseurl "~1.3.2" - send "0.16.1" - -serve@^6.3.1: - version "6.5.2" - resolved "https://registry.yarnpkg.com/serve/-/serve-6.5.2.tgz#b6030a82c3f5597813f231f75abc29536bb098f9" - dependencies: - "@zeit/check-updates" "1.1.0" - args "3.0.8" - basic-auth "2.0.0" - bluebird "3.5.1" - boxen "1.3.0" - chalk "2.3.2" - clipboardy "1.2.3" - dargs "5.1.0" - detect-port "1.2.2" - filesize "3.6.0" - fs-extra "5.0.0" - handlebars "4.0.11" - ip "1.1.5" - micro "9.1.0" - micro-compress "1.0.0" - mime-types "2.1.18" - node-version "1.1.0" - openssl-self-signed-certificate "1.1.6" - opn "5.2.0" - path-is-inside "1.0.2" - path-type "3.0.0" - send "0.16.2" - -set-blocking@^2.0.0, set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - -set-getter@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376" - dependencies: - to-object-path "^0.3.0" - -set-immediate-shim@^1.0.0, set-immediate-shim@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61" - -set-value@^0.4.3: - version "0.4.3" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.1" - to-object-path "^0.3.0" - -set-value@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274" - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.4, setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - -setprototypeof@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.10" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b" - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -shallow-clone@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-0.1.2.tgz#5909e874ba77106d73ac414cfec1ffca87d97060" - dependencies: - is-extendable "^0.1.1" - kind-of "^2.0.1" - lazy-cache "^0.2.3" - mixin-object "^2.0.1" - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - -shelljs@^0.7.0: - version "0.7.8" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3" - dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - -sinon@^5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/sinon/-/sinon-5.0.7.tgz#3bded6a73613ccc9e512e20246ced69a27c27dab" - dependencies: - "@sinonjs/formatio" "^2.0.0" - diff "^3.1.0" - lodash.get "^4.4.2" - lolex "^2.2.0" - nise "^1.2.0" - supports-color "^5.1.0" - type-detect "^4.0.5" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - -slide@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370" - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^2.0.0" - -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - -sntp@2.x.x: - version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" - dependencies: - hoek "4.x.x" - -sockjs-client@1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12" - dependencies: - debug "^2.6.6" - eventsource "0.1.6" - faye-websocket "~0.11.0" - inherits "^2.0.1" - json3 "^3.3.2" - url-parse "^1.1.8" - -sockjs@0.3.18: - version "0.3.18" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.18.tgz#d9b289316ca7df77595ef299e075f0f937eb4207" - dependencies: - faye-websocket "^0.10.0" - uuid "^2.0.2" - -sort-keys@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" - dependencies: - is-plain-obj "^1.0.0" - -sort-on@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/sort-on/-/sort-on-2.0.0.tgz#0df42a679d7ae4aed9c30ba2f55807d979910fcc" - dependencies: - arrify "^1.0.0" - dot-prop "^4.1.1" - -source-list-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" - -source-map-resolve@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" - dependencies: - atob "^2.0.0" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.4.15: - version "0.4.18" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" - dependencies: - source-map "^0.5.6" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - -source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.1: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - -source-map@^0.4.2, source-map@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" - dependencies: - amdefine ">=0.0.4" - -source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - -spawn-sync@^1.0.15: - version "1.0.15" - resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" - dependencies: - concat-stream "^1.4.7" - os-shim "^0.1.2" - -spdx-correct@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82" - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9" - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87" - -spdy-transport@^2.0.18: - version "2.0.20" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-2.0.20.tgz#735e72054c486b2354fe89e702256004a39ace4d" - dependencies: - debug "^2.6.8" - detect-node "^2.0.3" - hpack.js "^2.1.6" - obuf "^1.1.1" - readable-stream "^2.2.9" - safe-buffer "^5.0.1" - wbuf "^1.7.2" - -spdy@^3.4.1: - version "3.4.7" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc" - dependencies: - debug "^2.6.8" - handle-thing "^1.2.5" - http-deceiver "^1.2.7" - safe-buffer "^5.0.1" - select-hose "^2.0.0" - spdy-transport "^2.0.18" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - dependencies: - extend-shallow "^3.0.0" - -sprintf-js@^1.0.3: - version "1.1.1" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - -sshpk@^1.7.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - dashdash "^1.12.0" - getpass "^0.1.1" - optionalDependencies: - bcrypt-pbkdf "^1.0.0" - ecc-jsbn "~0.1.1" - jsbn "~0.1.0" - tweetnacl "~0.14.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.3.1 < 2", statuses@~1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" - -statuses@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" - -stdout-stream@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b" - dependencies: - readable-stream "^2.0.1" - -stream-browserify@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-http@^2.7.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.3" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -strict-uri-encode@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" - -string-length@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac" - dependencies: - strip-ansi "^3.0.0" - -string-similarity@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-1.2.0.tgz#d75153cb383846318b7a39a8d9292bb4db4e9c30" - dependencies: - lodash "^4.13.1" - -string-template@~0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string_decoder@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403" - dependencies: - safe-buffer "~5.1.0" - -string_decoder@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" - dependencies: - safe-buffer "~5.1.0" - -stringstream@~0.0.4, stringstream@~0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - dependencies: - ansi-regex "^3.0.0" - -strip-bom-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca" - dependencies: - first-chunk-stream "^2.0.0" - strip-bom "^2.0.0" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - dependencies: - is-utf8 "^0.2.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - -strip-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" - dependencies: - get-stdin "^4.0.1" - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - -style-loader@0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759" - dependencies: - loader-utils "^1.0.2" - schema-utils "^0.3.0" - -sudo-block@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/sudo-block/-/sudo-block-1.2.0.tgz#cc539bf8191624d4f507d83eeb45b4cea27f3463" - dependencies: - chalk "^1.0.0" - is-docker "^1.0.0" - is-root "^1.0.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -supports-color@^3.1.2, supports-color@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - dependencies: - has-flag "^1.0.0" - -supports-color@^4.0.0, supports-color@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b" - dependencies: - has-flag "^2.0.0" - -supports-color@^5.1.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" - dependencies: - has-flag "^3.0.0" - -supports-color@^5.2.0, supports-color@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" - dependencies: - has-flag "^3.0.0" - -svgo@^0.7.0: - version "0.7.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" - dependencies: - coa "~1.0.1" - colors "~1.1.2" - csso "~2.3.1" - js-yaml "~3.7.0" - mkdirp "~0.5.1" - sax "~1.2.1" - whet.extend "~0.9.9" - -symbol-observable@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - -tabbable@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.0.tgz#2c9a9c9f09db5bb0659f587d532548dd6ef2067b" - -tabbable@^1.0.3, tabbable@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.2.tgz#b171680aea6e0a3e9281ff23532e2e5de11c0d94" - -tabtab@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-1.3.2.tgz#bb9c2ca6324f659fde7634c2caf3c096e1187ca7" - dependencies: - debug "^2.2.0" - inquirer "^1.0.2" - minimist "^1.2.0" - mkdirp "^0.5.1" - npmlog "^2.0.3" - object-assign "^4.1.0" - -taketalk@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/taketalk/-/taketalk-1.0.0.tgz#b4d4f0deed206ae7df775b129ea2ca6de52f26dd" - dependencies: - get-stdin "^4.0.1" - minimist "^1.1.0" - -tapable@^0.2.7: - version "0.2.8" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22" - -tar-pack@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.0.0, tar@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - dependencies: - block-stream "*" - fstream "^1.0.2" - inherits "2" - -term-size@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" - dependencies: - execa "^0.7.0" - -text-encoding@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - -textextensions@2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286" - -through2@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" - dependencies: - readable-stream "^2.1.5" - xtend "~4.0.1" - -through@^2.3.6, through@~2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - -thunky@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371" - -time-stamp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357" - -timed-out@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217" - -timed-out@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" - -timers-browserify@^2.0.4: - version "2.0.6" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae" - dependencies: - setimmediate "^1.0.4" - -tinycolor2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" - -titleize@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/titleize/-/titleize-1.0.0.tgz#7d350722061830ba6617631e0cfd3ea08398d95a" - -tmp@^0.0.29: - version "0.0.29" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0" - dependencies: - os-tmpdir "~1.0.1" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - dependencies: - os-tmpdir "~1.0.2" - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - -to-fast-properties@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -tough-cookie@^2.0.0, tough-cookie@~2.3.0, tough-cookie@~2.3.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655" - dependencies: - punycode "^1.4.1" - -traverse@0.6.6: - version "0.6.6" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137" - -trim-newlines@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - -twig@^0.8.2: - version "0.8.9" - resolved "https://registry.yarnpkg.com/twig/-/twig-0.8.9.tgz#b1594f002b684e5f029de3e54e87bec4f084b6c2" - dependencies: - minimatch "3.0.x" - walk "2.3.x" - -type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - -type-is@~1.6.15: - version "1.6.16" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" - dependencies: - media-typer "0.3.0" - mime-types "~2.1.18" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - -ua-parser-js@^0.7.9: - version "0.7.17" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac" - -uglify-js@3.3.x: - version "3.3.13" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.13.tgz#8a1a89eeb16e2d6a66b0db2b04cb871af3c669cf" - dependencies: - commander "~2.14.1" - source-map "~0.6.1" - -uglify-js@^2.6, uglify-js@^2.8.29: - version "2.8.29" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" - dependencies: - source-map "~0.5.1" - yargs "~3.10.0" - optionalDependencies: - uglify-to-browserify "~1.0.0" - -uglify-to-browserify@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" - -uglifyjs-webpack-plugin@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309" - dependencies: - source-map "^0.5.6" - uglify-js "^2.8.29" - webpack-sources "^1.0.1" - -uid-number@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" - -underscore.string@~3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.2.3.tgz#806992633665d5e5fcb4db1fb3a862eb68e9e6da" - -underscore.string@~3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db" - dependencies: - sprintf-js "^1.0.3" - util-deprecate "^1.0.2" - -union-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4" - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^0.4.3" - -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - -uniqid@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1" - dependencies: - macaddress "^0.2.8" - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - -unique-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" - dependencies: - crypto-random-string "^1.0.0" - -universalify@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -untildify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0" - dependencies: - os-homedir "^1.0.0" - -untildify@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.2.tgz#7f1f302055b3fea0f3e81dc78eb36766cb65e3f1" - -unzip-response@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" - -unzip-response@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97" - -upath@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d" - -update-notifier@2.3.0, update-notifier@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451" - dependencies: - boxen "^1.2.1" - chalk "^2.0.1" - configstore "^3.0.0" - import-lazy "^2.1.0" - is-installed-globally "^0.1.0" - is-npm "^1.0.0" - latest-version "^3.0.0" - semver-diff "^2.0.0" - xdg-basedir "^3.0.0" - -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - -url-parse-lax@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz#7af8f303645e9bd79a272e7a14ac68bc0609da73" - dependencies: - prepend-http "^1.0.1" - -url-parse@1.0.x: - version "1.0.5" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b" - dependencies: - querystringify "0.0.x" - requires-port "1.0.x" - -url-parse@^1.1.8: - version "1.2.0" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986" - dependencies: - querystringify "~1.0.0" - requires-port "~1.0.0" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -use@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8" - dependencies: - define-property "^0.2.5" - isobject "^3.0.0" - lazy-cache "^2.0.2" - -user-home@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f" - dependencies: - os-homedir "^1.0.0" - -util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -util@0.10.3, util@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - dependencies: - inherits "2.0.1" - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - -uuid@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" - -uuid@^2.0.1, uuid@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - -uuid@^3.0.0, uuid@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" - -validate-npm-package-license@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338" - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -value-equal@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.4.0.tgz#c5bdd2f54ee093c04839d71ce2e4758a6890abc7" - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - -vendors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vinyl-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a" - dependencies: - graceful-fs "^4.1.2" - pify "^2.3.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - strip-bom-stream "^2.0.0" - vinyl "^1.1.0" - -vinyl@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - -vinyl@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c" - dependencies: - clone "^2.1.1" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -vm-browserify@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" - dependencies: - indexof "0.0.1" - -w3c-blob@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/w3c-blob/-/w3c-blob-0.0.1.tgz#b0cd352a1a50f515563420ffd5861f950f1d85b8" - -walk@2.3.x: - version "2.3.9" - resolved "https://registry.yarnpkg.com/walk/-/walk-2.3.9.tgz#31b4db6678f2ae01c39ea9fb8725a9031e558a7b" - dependencies: - foreachasync "^3.0.0" - -warning@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" - dependencies: - loose-envify "^1.0.0" - -watchpack@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz#231e783af830a22f8966f65c4c4bacc814072eed" - dependencies: - chokidar "^2.0.2" - graceful-fs "^4.1.2" - neo-async "^2.5.0" - -wbuf@^1.1.0, wbuf@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe" - dependencies: - minimalistic-assert "^1.0.0" - -webpack-dev-middleware@^1.11.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e" - dependencies: - memory-fs "~0.4.1" - mime "^1.5.0" - path-is-absolute "^1.0.0" - range-parser "^1.0.3" - time-stamp "^2.0.0" - -webpack-dev-server@2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.9.1.tgz#7ac9320b61b00eb65b2109f15c82747fc5b93585" - dependencies: - ansi-html "0.0.7" - array-includes "^3.0.3" - bonjour "^3.5.0" - chokidar "^1.6.0" - compression "^1.5.2" - connect-history-api-fallback "^1.3.0" - del "^3.0.0" - express "^4.13.3" - html-entities "^1.2.0" - http-proxy-middleware "~0.17.4" - internal-ip "1.2.0" - ip "^1.1.5" - loglevel "^1.4.1" - opn "^5.1.0" - portfinder "^1.0.9" - selfsigned "^1.9.1" - serve-index "^1.7.2" - sockjs "0.3.18" - sockjs-client "1.1.4" - spdy "^3.4.1" - strip-ansi "^3.0.1" - supports-color "^4.2.1" - webpack-dev-middleware "^1.11.0" - yargs "^6.6.0" - -webpack-sources@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.6.0.tgz#a89a929fbee205d35a4fa2cc487be9cbec8898bc" - dependencies: - acorn "^5.0.0" - acorn-dynamic-import "^2.0.0" - ajv "^5.1.5" - ajv-keywords "^2.0.0" - async "^2.1.2" - enhanced-resolve "^3.4.0" - escope "^3.6.0" - interpret "^1.0.0" - json-loader "^0.5.4" - json5 "^0.5.1" - loader-runner "^2.3.0" - loader-utils "^1.1.0" - memory-fs "~0.4.1" - mkdirp "~0.5.0" - node-libs-browser "^2.0.0" - source-map "^0.5.3" - supports-color "^4.2.1" - tapable "^0.2.7" - uglifyjs-webpack-plugin "^0.4.6" - watchpack "^1.4.0" - webpack-sources "^1.0.1" - yargs "^8.0.2" - -websocket-driver@>=0.5.1: - version "0.7.0" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb" - dependencies: - http-parser-js ">=0.4.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29" - -whatwg-fetch@>=0.10.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" - -whet.extend@~0.9.9: - version "0.9.9" - resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" - -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - -which@1, which@^1.2.8, which@^1.2.9: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" - dependencies: - isexe "^2.0.0" - -which@~1.2.1: - version "1.2.14" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5" - dependencies: - isexe "^2.0.0" - -wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" - dependencies: - string-width "^1.0.2" - -widest-line@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273" - dependencies: - string-width "^2.1.1" - -win-release@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/win-release/-/win-release-1.1.1.tgz#5fa55e02be7ca934edfc12665632e849b72e5209" - dependencies: - semver "^5.0.1" - -window-size@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" - -wordwrap@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" - -wordwrap@~0.0.2: - version "0.0.3" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -write-file-atomic@^1.1.2: - version "1.3.4" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - slide "^1.1.5" - -write-file-atomic@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" - dependencies: - graceful-fs "^4.1.11" - imurmurhash "^0.1.4" - signal-exit "^3.0.2" - -xdg-basedir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2" - dependencies: - os-homedir "^1.0.0" - -xdg-basedir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" - -xml-char-classes@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d" - -xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - -yargs-parser@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" - dependencies: - camelcase "^3.0.0" - -yargs-parser@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" - dependencies: - camelcase "^3.0.0" - -yargs-parser@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9" - dependencies: - camelcase "^4.1.0" - -yargs@^6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^4.2.0" - -yargs@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8" - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^5.0.0" - -yargs@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360" - dependencies: - camelcase "^4.1.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - read-pkg-up "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^7.0.0" - -yargs@~3.10.0: - version "3.10.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1" - dependencies: - camelcase "^1.0.2" - cliui "^2.1.0" - decamelize "^1.0.0" - window-size "0.1.0" - -yeoman-character@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/yeoman-character/-/yeoman-character-1.1.0.tgz#90d4b5beaf92759086177015b2fdfa2e0684d7c7" - dependencies: - supports-color "^3.1.2" - -yeoman-doctor@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz#94ab784896a64f53a9fac452d5e9133e2750a236" - dependencies: - bin-version-check "^2.1.0" - chalk "^1.0.0" - each-async "^1.1.1" - log-symbols "^1.0.1" - object-values "^1.0.0" - semver "^5.0.3" - twig "^0.8.2" - user-home "^2.0.0" - -yeoman-environment@^1.1.0: - version "1.6.6" - resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-1.6.6.tgz#cd85fa67d156060e440d7807d7ef7cf0d2d1d671" - dependencies: - chalk "^1.0.0" - debug "^2.0.0" - diff "^2.1.2" - escape-string-regexp "^1.0.2" - globby "^4.0.0" - grouped-queue "^0.3.0" - inquirer "^1.0.2" - lodash "^4.11.1" - log-symbols "^1.0.1" - mem-fs "^1.1.0" - text-table "^0.2.0" - untildify "^2.0.0" - -yeoman-environment@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.0.5.tgz#84f22bafa84088971fe99ea85f654a3a3dd2b693" - dependencies: - chalk "^2.1.0" - debug "^3.1.0" - diff "^3.3.1" - escape-string-regexp "^1.0.2" - globby "^6.1.0" - grouped-queue "^0.3.3" - inquirer "^3.3.0" - is-scoped "^1.0.0" - lodash "^4.17.4" - log-symbols "^2.1.0" - mem-fs "^1.1.0" - text-table "^0.2.0" - untildify "^3.0.2" - -yeoman-generator@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-1.1.1.tgz#40c2b4f6cdfbe05e1952fdd72933f0d8925dbdf5" - dependencies: - async "^2.0.0" - chalk "^1.0.0" - class-extend "^0.1.0" - cli-table "^0.3.1" - cross-spawn "^5.0.1" - dargs "^5.1.0" - dateformat "^2.0.0" - debug "^2.1.0" - detect-conflict "^1.0.0" - error "^7.0.2" - find-up "^2.1.0" - github-username "^3.0.0" - glob "^7.0.3" - istextorbinary "^2.1.0" - lodash "^4.11.1" - mem-fs-editor "^3.0.0" - minimist "^1.2.0" - mkdirp "^0.5.0" - path-exists "^3.0.0" - path-is-absolute "^1.0.0" - pretty-bytes "^4.0.2" - read-chunk "^2.0.0" - read-pkg-up "^2.0.0" - rimraf "^2.2.0" - run-async "^2.0.0" - shelljs "^0.7.0" - text-table "^0.2.0" - through2 "^2.0.0" - user-home "^2.0.0" - yeoman-environment "^1.1.0" - -yo@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yo/-/yo-2.0.0.tgz#0cd75211379ed87105f99510885759062147b517" - dependencies: - async "^2.1.4" - chalk "^1.0.0" - cli-list "^0.2.0" - configstore "^3.0.0" - cross-spawn "^5.0.1" - figures "^2.0.0" - fullname "^3.2.0" - got "^6.7.1" - humanize-string "^1.0.0" - inquirer "^3.0.1" - insight "^0.8.4" - lodash "^4.17.4" - meow "^3.0.0" - npm-keyword "^4.1.0" - opn "^4.0.2" - package-json "^2.1.0" - parse-help "^0.1.1" - read-pkg-up "^2.0.0" - root-check "^1.0.0" - sort-on "^2.0.0" - string-length "^1.0.0" - tabtab "^1.3.2" - titleize "^1.0.0" - update-notifier "^2.1.0" - user-home "^2.0.0" - yeoman-character "^1.0.0" - yeoman-doctor "^2.0.0" - yeoman-environment "^2.0.0" - yosay "^2.0.0" - -yosay@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/yosay/-/yosay-2.0.1.tgz#078167f0365732e5c82d3f64633f9cd3a0526d2f" - dependencies: - ansi-regex "^2.0.0" - ansi-styles "^3.0.0" - chalk "^1.0.0" - cli-boxes "^1.0.0" - pad-component "0.0.1" - string-width "^2.0.0" - strip-ansi "^3.0.0" - taketalk "^1.0.0" - wrap-ansi "^2.0.0" diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js index 1ea8a91eb21ef..347391dfe8e06 100644 --- a/src/cli/cluster/cluster_manager.js +++ b/src/cli/cluster/cluster_manager.js @@ -18,9 +18,12 @@ */ import { resolve } from 'path'; +import { format as formatUrl } from 'url'; +import opn from 'opn'; + import { debounce, invoke, bindAll, once, uniq } from 'lodash'; -import { fromEvent, race } from 'rxjs'; -import { first } from 'rxjs/operators'; +import * as Rx from 'rxjs'; +import { first, mapTo, filter, map, take } from 'rxjs/operators'; import Log from '../log'; import Worker from './worker'; @@ -45,44 +48,40 @@ export default class ClusterManager { this.basePathProxy = basePathProxy; const serverArgv = []; - const optimizerArgv = [ - '--plugins.initialize=false', - '--server.autoListen=false', - ]; + const optimizerArgv = ['--plugins.initialize=false', '--server.autoListen=false']; if (this.basePathProxy) { optimizerArgv.push( `--server.basePath=${this.basePathProxy.basePath}`, - '--server.rewriteBasePath=true', + '--server.rewriteBasePath=true' ); serverArgv.push( `--server.port=${this.basePathProxy.targetPort}`, `--server.basePath=${this.basePathProxy.basePath}`, - '--server.rewriteBasePath=true', + '--server.rewriteBasePath=true' ); } this.workers = [ - this.optimizer = new Worker({ + (this.optimizer = new Worker({ type: 'optmzr', title: 'optimizer', log: this.log, argv: optimizerArgv, - watch: false - }), - - this.server = new Worker({ + watch: false, + })), + (this.server = new Worker({ type: 'server', log: this.log, - argv: serverArgv - }) + argv: serverArgv, + })), ]; // broker messages between workers - this.workers.forEach((worker) => { - worker.on('broadcast', (msg) => { - this.workers.forEach((to) => { + this.workers.forEach(worker => { + worker.on('broadcast', msg => { + this.workers.forEach(to => { if (to !== worker && to.online) { to.fork.send(msg); } @@ -92,29 +91,38 @@ export default class ClusterManager { bindAll(this, 'onWatcherAdd', 'onWatcherError', 'onWatcherChange'); + if (opts.open) { + this.setupOpen(formatUrl({ + protocol: config.get('server.ssl.enabled') ? 'https' : 'http', + hostname: config.get('server.host'), + port: config.get('server.port'), + pathname: (this.basePathProxy ? this.basePathProxy.basePath : ''), + })); + } + if (opts.watch) { const pluginPaths = config.get('plugins.paths'); const scanDirs = config.get('plugins.scanDirs'); - const extraPaths = [ - ...pluginPaths, - ...scanDirs, - ]; + const extraPaths = [...pluginPaths, ...scanDirs]; const extraIgnores = scanDirs .map(scanDir => resolve(scanDir, '*')) .concat(pluginPaths) - .reduce((acc, path) => acc.concat( - resolve(path, 'test'), - resolve(path, 'build'), - resolve(path, 'target'), - resolve(path, 'scripts'), - resolve(path, 'docs'), - ), []); + .reduce( + (acc, path) => + acc.concat( + resolve(path, 'test'), + resolve(path, 'build'), + resolve(path, 'target'), + resolve(path, 'scripts'), + resolve(path, 'docs'), + resolve(path, 'x-pack/plugins/canvas/canvas_plugin_src') // prevents server from restarting twice for Canvas plugin changes + ), + [] + ); this.setupWatching(extraPaths, extraIgnores); - } - - else this.startCluster(); + } else this.startCluster(); } startCluster() { @@ -128,6 +136,28 @@ export default class ClusterManager { } } + setupOpen(openUrl) { + const serverListening$ = Rx.merge( + Rx.fromEvent(this.server, 'listening') + .pipe(mapTo(true)), + Rx.fromEvent(this.server, 'fork:exit') + .pipe(mapTo(false)), + Rx.fromEvent(this.server, 'crashed') + .pipe(mapTo(false)) + ); + + const optimizeSuccess$ = Rx.fromEvent(this.optimizer, 'optimizeStatus') + .pipe(map(msg => !!msg.success)); + + Rx.combineLatest(serverListening$, optimizeSuccess$) + .pipe( + filter(([serverListening, optimizeSuccess]) => serverListening && optimizeSuccess), + take(1), + ) + .toPromise() + .then(() => opn(openUrl)); + } + setupWatching(extraPaths, extraIgnores) { const chokidar = require('chokidar'); const { fromRoot } = require('../../utils'); @@ -142,7 +172,7 @@ export default class ClusterManager { fromRoot('x-pack/server'), fromRoot('x-pack/webpackShims'), fromRoot('config'), - ...extraPaths + ...extraPaths, ].map(path => resolve(path)); this.watcher = chokidar.watch(uniq(watchPaths), { @@ -150,21 +180,24 @@ export default class ClusterManager { ignored: [ /[\\\/](\..*|node_modules|bower_components|public|__[a-z0-9_]+__|coverage)[\\\/]/, /\.test\.js$/, - ...extraIgnores - ] + ...extraIgnores, + ], }); this.watcher.on('add', this.onWatcherAdd); this.watcher.on('error', this.onWatcherError); - this.watcher.on('ready', once(() => { - // start sending changes to workers - this.watcher.removeListener('add', this.onWatcherAdd); - this.watcher.on('all', this.onWatcherChange); + this.watcher.on( + 'ready', + once(() => { + // start sending changes to workers + this.watcher.removeListener('add', this.onWatcherAdd); + this.watcher.on('all', this.onWatcherChange); - this.log.good('watching for changes', `(${this.addedCount} files)`); - this.startCluster(); - })); + this.log.good('watching for changes', `(${this.addedCount} files)`); + this.startCluster(); + }) + ); } setupManualRestart() { @@ -178,7 +211,7 @@ export default class ClusterManager { const rl = readline.createInterface(process.stdin, process.stdout); let nls = 0; - const clear = () => nls = 0; + const clear = () => (nls = 0); const clearSoon = debounce(clear, 2000); rl.setPrompt(''); @@ -230,9 +263,11 @@ export default class ClusterManager { return Promise.resolve(); } - return race( - fromEvent(this.server, 'listening'), - fromEvent(this.server, 'crashed') - ).pipe(first()).toPromise(); + return Rx.race( + Rx.fromEvent(this.server, 'listening'), + Rx.fromEvent(this.server, 'crashed') + ) + .pipe(first()) + .toPromise(); } } diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js index a7176bc0c734c..2d7c870d38522 100644 --- a/src/cli/cluster/worker.js +++ b/src/cli/cluster/worker.js @@ -125,6 +125,9 @@ export default class Worker extends EventEmitter { case 'WORKER_BROADCAST': this.emit('broadcast', data); break; + case 'OPTIMIZE_STATUS': + this.emit('optimizeStatus', data); + break; case 'WORKER_LISTENING': this.listening = true; this.emit('listening'); diff --git a/src/cli/serve/integration_tests/__snapshots__/invalid_config.test.js.snap b/src/cli/serve/integration_tests/__snapshots__/invalid_config.test.js.snap deleted file mode 100644 index 47b98f740af58..0000000000000 --- a/src/cli/serve/integration_tests/__snapshots__/invalid_config.test.js.snap +++ /dev/null @@ -1,18 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`cli invalid config support exits with statusCode 64 and logs a single line when config is invalid 1`] = ` -Array [ - Object { - "@timestamp": "## @timestamp ##", - "error": "## Error with stack trace ##", - "level": "fatal", - "message": "\\"unknown.key\\", \\"other.unknown.key\\", \\"other.third\\", \\"some.flat.key\\", and \\"some.array\\" settings were not applied. Check for spelling errors and ensure that expected plugins are installed.", - "pid": "## PID ##", - "tags": Array [ - "fatal", - "root", - ], - "type": "error", - }, -] -`; diff --git a/src/cli/serve/integration_tests/__snapshots__/reload_logging_config.test.js.snap b/src/cli/serve/integration_tests/__snapshots__/reload_logging_config.test.js.snap deleted file mode 100644 index fa3e0bcbc8204..0000000000000 --- a/src/cli/serve/integration_tests/__snapshots__/reload_logging_config.test.js.snap +++ /dev/null @@ -1,76 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Server logging configuration should be reloadable via SIGHUP process signaling 1`] = ` -Object { - "code": 0, - "lines": Array [ - Object { - "@timestamp": "## @timestamp ##", - "message": "Plugin initialization disabled.", - "pid": "## PID ##", - "tags": Array [ - "info", - ], - "type": "log", - }, - Object { - "@timestamp": "## @timestamp ##", - "message": "The elasticsearch plugin is disabled. Skipping migrations.", - "pid": "## PID ##", - "tags": Array [ - "warning", - "migration", - ], - "type": "log", - }, - Object { - "@timestamp": "## @timestamp ##", - "message": "Server running at http://localhost:8274", - "pid": "## PID ##", - "tags": Array [ - "info", - "http", - "server", - "listening", - ], - "type": "log", - }, - Object { - "@timestamp": "## @timestamp ##", - "message": "Reloading logging configuration due to SIGHUP.", - "pid": "## PID ##", - "tags": Array [ - "info", - "config", - ], - "type": "log", - }, - Object { - "@timestamp": "## @timestamp ##", - "message": "New logging configuration: -{ - \\"ops\\": { - \\"interval\\": 5000 - }, - \\"logging\\": { - \\"json\\": false, - \\"silent\\": false, - \\"quiet\\": false, - \\"verbose\\": false, - \\"events\\": {}, - \\"dest\\": \\"stdout\\", - \\"filter\\": {}, - \\"useUTC\\": true - } -}", - "pid": "## PID ##", - "tags": Array [ - "info", - "config", - ], - "type": "log", - }, - " log [## timestamp ##] [info][config] Reloaded logging configuration due to SIGHUP.", - ], -} -`; diff --git a/src/cli/serve/integration_tests/invalid_config.test.js b/src/cli/serve/integration_tests/invalid_config.test.js index 495bfbeaa939e..add9654b30ad8 100644 --- a/src/cli/serve/integration_tests/invalid_config.test.js +++ b/src/cli/serve/integration_tests/invalid_config.test.js @@ -45,6 +45,9 @@ describe('cli invalid config support', function () { expect(error).toBe(undefined); expect(status).toBe(64); - expect(logLines).toMatchSnapshot(); + expect(logLines[0].message).toMatch('{ Error: "unknown.key", "other.unknown.key", "other.third", "some.flat.key", and "' + + 'some.array" settings were not applied. Check for spelling errors and ensure that expected plugins are installed.'); + expect(logLines[0].tags).toEqual(['fatal', 'root']); + expect(logLines[0].type).toEqual('log'); }, 20 * 1000); }); diff --git a/src/cli/serve/integration_tests/reload_logging_config.test.js b/src/cli/serve/integration_tests/reload_logging_config.test.js index 61e590f2b51d5..e80a3d9d4fb81 100644 --- a/src/cli/serve/integration_tests/reload_logging_config.test.js +++ b/src/cli/serve/integration_tests/reload_logging_config.test.js @@ -22,8 +22,7 @@ import { writeFileSync } from 'fs'; import { relative, resolve } from 'path'; import { safeDump } from 'js-yaml'; import es from 'event-stream'; -import stripAnsi from 'strip-ansi'; -import { getConfigFromFiles } from '../../../core/server/config'; +import { getConfigFromFiles } from '../../../core/server/config/read_config'; const testConfigFile = follow('__fixtures__/reload_logging_config/kibana.test.yml'); const kibanaPath = follow('../../../../scripts/kibana.js'); @@ -42,19 +41,7 @@ function setLoggingJson(enabled) { writeFileSync(testConfigFile, yaml); } -const prepareJson = obj => ({ - ...obj, - pid: '## PID ##', - '@timestamp': '## @timestamp ##' -}); - -const prepareLogLine = str => - stripAnsi(str.replace( - /\[\d{2}:\d{2}:\d{2}.\d{3}\]/, - '[## timestamp ##]' - )); - -describe.skip('Server logging configuration', function () { +describe('Server logging configuration', function () { let child; let isJson; @@ -80,7 +67,7 @@ describe.skip('Server logging configuration', function () { }); } else { it('should be reloadable via SIGHUP process signaling', function (done) { - expect.assertions(1); + expect.assertions(3); child = spawn('node', [kibanaPath, '--config', testConfigFile]); @@ -88,12 +75,15 @@ describe.skip('Server logging configuration', function () { done(new Error(`error in child process while attempting to reload config. ${err.stack || err.message || err}`)); }); - const lines = []; + let sawJson = false; + let sawNonjson = false; child.on('exit', _code => { const code = _code === null ? 0 : _code; - expect({ code, lines }).toMatchSnapshot(); + expect(code).toEqual(0); + expect(sawJson).toEqual(true); + expect(sawNonjson).toEqual(true); done(); }); @@ -107,23 +97,18 @@ describe.skip('Server logging configuration', function () { if (isJson) { const data = JSON.parse(line); - lines.push(prepareJson(data)); + sawJson = true; if (data.tags.includes('listening')) { switchToPlainTextLog(); } } else if (line.startsWith('{')) { // We have told Kibana to stop logging json, but it hasn't completed - // the switch yet, so we verify the messages that are logged while - // switching over. - - const data = JSON.parse(line); - lines.push(prepareJson(data)); + // the switch yet, so we ignore before switching over. } else { - // Kibana has successfully stopped logging json, so we verify the - // log line and kill the server. + // Kibana has successfully stopped logging json, so kill the server. - lines.push(prepareLogLine(line)); + sawNonjson = true; child.kill(); child = undefined; diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js index e1d0421003e07..8de60c209dc7c 100644 --- a/src/cli/serve/serve.js +++ b/src/cli/serve/serve.js @@ -191,6 +191,7 @@ export default function (program) { if (CAN_CLUSTER) { command .option('--dev', 'Run the server with development mode defaults') + .option('--open', 'Open a browser window to the base url after the server is started') .option('--ssl', 'Run the dev server using HTTPS') .option('--no-base-path', 'Don\'t put a proxy in front of the dev server, which adds a random basePath') .option('--no-watch', 'Prevents automatic restarts of the server in --dev mode'); @@ -214,6 +215,7 @@ export default function (program) { configs: [].concat(opts.config || []), cliArgs: { dev: !!opts.dev, + open: !!opts.open, envName: unknownOptions.env ? unknownOptions.env.name : undefined, quiet: !!opts.quiet, silent: !!opts.silent, diff --git a/src/cli_plugin/install/downloaders/http.js b/src/cli_plugin/install/downloaders/http.js index a704f3df77c1d..cd9a1f8f3309d 100644 --- a/src/cli_plugin/install/downloaders/http.js +++ b/src/cli_plugin/install/downloaders/http.js @@ -19,7 +19,6 @@ import Wreck from 'wreck'; import Progress from '../progress'; -import { fromNode as fn } from 'bluebird'; import { createWriteStream } from 'fs'; import HttpProxyAgent from 'http-proxy-agent'; import HttpsProxyAgent from 'https-proxy-agent'; @@ -41,32 +40,31 @@ function getProxyAgent(sourceUrl, logger) { } } -function sendRequest({ sourceUrl, timeout }, logger) { +async function sendRequest({ sourceUrl, timeout }, logger) { const maxRedirects = 11; //Because this one goes to 11. - return fn(cb => { - const reqOptions = { timeout, redirects: maxRedirects }; - const proxyAgent = getProxyAgent(sourceUrl, logger); + const reqOptions = { timeout, redirects: maxRedirects }; + const proxyAgent = getProxyAgent(sourceUrl, logger); - if (proxyAgent) { - reqOptions.agent = proxyAgent; - } - - const req = Wreck.request('GET', sourceUrl, reqOptions, (err, resp) => { - if (err) { - if (err.code === 'ECONNREFUSED') { - err = new Error('ENOTFOUND'); - } + if (proxyAgent) { + reqOptions.agent = proxyAgent; + } - return cb(err); - } + try { + const promise = Wreck.request('GET', sourceUrl, reqOptions); + const req = promise.req; + const resp = await promise; + if (resp.statusCode >= 400) { + throw new Error('ENOTFOUND'); + } - if (resp.statusCode >= 400) { - return cb(new Error('ENOTFOUND')); - } + return { req, resp }; + } catch (err) { + if (err.code === 'ECONNREFUSED') { + err = new Error('ENOTFOUND'); + } - cb(null, { req, resp }); - }); - }); + throw err; + } } function downloadResponse({ resp, targetPath, progress }) { diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts new file mode 100644 index 0000000000000..5840f826ba125 --- /dev/null +++ b/src/core/public/chrome/chrome_service.test.ts @@ -0,0 +1,239 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import * as Rx from 'rxjs'; +import { toArray } from 'rxjs/operators'; + +const store = new Map(); +(window as any).localStorage = { + setItem: (key: string, value: string) => store.set(String(key), String(value)), + getItem: (key: string) => store.get(String(key)), + removeItem: (key: string) => store.delete(String(key)), +}; + +import { ChromeService } from './chrome_service'; + +beforeEach(() => { + store.clear(); +}); + +describe('start', () => { + describe('brand', () => { + it('updates/emits the brand as it changes', async () => { + const service = new ChromeService(); + const start = service.start(); + const promise = start + .getBrand$() + .pipe(toArray()) + .toPromise(); + + start.setBrand({ + logo: 'big logo', + smallLogo: 'not so big logo', + }); + start.setBrand({ + logo: 'big logo without small logo', + }); + service.stop(); + + await expect(promise).resolves.toMatchInlineSnapshot(` +Array [ + Object {}, + Object { + "logo": "big logo", + "smallLogo": "not so big logo", + }, + Object { + "logo": "big logo without small logo", + "smallLogo": undefined, + }, +] +`); + }); + }); + + describe('visibility', () => { + it('updates/emits the visibility', async () => { + const service = new ChromeService(); + const start = service.start(); + const promise = start + .getIsVisible$() + .pipe(toArray()) + .toPromise(); + + start.setIsVisible(true); + start.setIsVisible(false); + start.setIsVisible(true); + service.stop(); + + await expect(promise).resolves.toMatchInlineSnapshot(` +Array [ + true, + true, + false, + true, +] +`); + }); + + it('always emits false if embed query string is in hash when started', async () => { + window.history.pushState(undefined, '', '#/home?a=b&embed=true'); + + const service = new ChromeService(); + const start = service.start(); + const promise = start + .getIsVisible$() + .pipe(toArray()) + .toPromise(); + + start.setIsVisible(true); + start.setIsVisible(false); + start.setIsVisible(true); + service.stop(); + + await expect(promise).resolves.toMatchInlineSnapshot(` +Array [ + false, + false, + false, + false, +] +`); + }); + }); + + describe('is collapsed', () => { + it('updates/emits isCollapsed', async () => { + const service = new ChromeService(); + const start = service.start(); + const promise = start + .getIsCollapsed$() + .pipe(toArray()) + .toPromise(); + + start.setIsCollapsed(true); + start.setIsCollapsed(false); + start.setIsCollapsed(true); + service.stop(); + + await expect(promise).resolves.toMatchInlineSnapshot(` +Array [ + false, + true, + false, + true, +] +`); + }); + + it('only stores true in localStorage', async () => { + const service = new ChromeService(); + const start = service.start(); + + start.setIsCollapsed(true); + expect(store.size).toBe(1); + + start.setIsCollapsed(false); + expect(store.size).toBe(0); + }); + }); + + describe('application classes', () => { + it('updates/emits the application classes', async () => { + const service = new ChromeService(); + const start = service.start(); + const promise = start + .getApplicationClasses$() + .pipe(toArray()) + .toPromise(); + + start.addApplicationClass('foo'); + start.addApplicationClass('foo'); + start.addApplicationClass('bar'); + start.addApplicationClass('bar'); + start.addApplicationClass('baz'); + start.removeApplicationClass('bar'); + start.removeApplicationClass('foo'); + service.stop(); + + await expect(promise).resolves.toMatchInlineSnapshot(` +Array [ + Array [], + Array [ + "foo", + ], + Array [ + "foo", + ], + Array [ + "foo", + "bar", + ], + Array [ + "foo", + "bar", + ], + Array [ + "foo", + "bar", + "baz", + ], + Array [ + "foo", + "baz", + ], + Array [ + "baz", + ], +] +`); + }); + }); +}); + +describe('stop', () => { + it('completes applicationClass$, isCollapsed$, isVisible$, and brand$ observables', async () => { + const service = new ChromeService(); + const start = service.start(); + const promise = Rx.combineLatest( + start.getBrand$(), + start.getApplicationClasses$(), + start.getIsCollapsed$(), + start.getIsVisible$() + ).toPromise(); + + service.stop(); + await promise; + }); + + it('completes immediately if service already stopped', async () => { + const service = new ChromeService(); + const start = service.start(); + service.stop(); + + await expect( + Rx.combineLatest( + start.getBrand$(), + start.getApplicationClasses$(), + start.getIsCollapsed$(), + start.getIsVisible$() + ).toPromise() + ).resolves.toBe(undefined); + }); +}); diff --git a/src/core/public/chrome/chrome_service.ts b/src/core/public/chrome/chrome_service.ts new file mode 100644 index 0000000000000..1e634aa42e2d8 --- /dev/null +++ b/src/core/public/chrome/chrome_service.ts @@ -0,0 +1,146 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import * as Url from 'url'; + +import * as Rx from 'rxjs'; +import { map, takeUntil } from 'rxjs/operators'; + +const IS_COLLAPSED_KEY = 'core.chrome.isCollapsed'; + +function isEmbedParamInHash() { + const { query } = Url.parse(String(window.location.hash).slice(1), true); + return Boolean(query.embed); +} + +export interface Brand { + logo?: string; + smallLogo?: string; +} + +export class ChromeService { + private readonly stop$ = new Rx.ReplaySubject(1); + + public start() { + const FORCE_HIDDEN = isEmbedParamInHash(); + + const brand$ = new Rx.BehaviorSubject({}); + const isVisible$ = new Rx.BehaviorSubject(true); + const isCollapsed$ = new Rx.BehaviorSubject(!!localStorage.getItem(IS_COLLAPSED_KEY)); + const applicationClasses$ = new Rx.BehaviorSubject>(new Set()); + + return { + /** + * Set the brand configuration. Normally the `logo` property will be rendered as the + * CSS background for the home link in the chrome navigation, but when the page is + * rendered in a small window the `smallLogo` will be used and rendered at about + * 45px wide. + * + * example: + * + * chrome.setBrand({ + * logo: 'url(/plugins/app/logo.png) center no-repeat' + * smallLogo: 'url(/plugins/app/logo-small.png) center no-repeat' + * }) + * + */ + setBrand: (brand: Brand) => { + brand$.next( + Object.freeze({ + logo: brand.logo, + smallLogo: brand.smallLogo, + }) + ); + }, + + /** + * Get an observable of the current brand information. + */ + getBrand$: () => brand$.pipe(takeUntil(this.stop$)), + + /** + * Set the temporary visibility for the chrome. This does nothing if the chrome is hidden + * by default and should be used to hide the chrome for things like full-screen modes + * with an exit button. + */ + setIsVisible: (visibility: boolean) => { + isVisible$.next(visibility); + }, + + /** + * Get an observable of the current visibility state of the chrome. + */ + getIsVisible$: () => + isVisible$.pipe( + map(visibility => (FORCE_HIDDEN ? false : visibility)), + takeUntil(this.stop$) + ), + + /** + * Set the collapsed state of the chrome navigation. + */ + setIsCollapsed: (isCollapsed: boolean) => { + isCollapsed$.next(isCollapsed); + if (isCollapsed) { + localStorage.setItem(IS_COLLAPSED_KEY, 'true'); + } else { + localStorage.removeItem(IS_COLLAPSED_KEY); + } + }, + + /** + * Get an observable of the current collapsed state of the chrome. + */ + getIsCollapsed$: () => isCollapsed$.pipe(takeUntil(this.stop$)), + + /** + * Add a className that should be set on the application container. + */ + addApplicationClass: (className: string) => { + const update = new Set([...applicationClasses$.getValue()]); + update.add(className); + applicationClasses$.next(update); + }, + + /** + * Remove a className added with `addApplicationClass()`. If className is unknown it is ignored. + */ + removeApplicationClass: (className: string) => { + const update = new Set([...applicationClasses$.getValue()]); + update.delete(className); + applicationClasses$.next(update); + }, + + /** + * Get the current set of classNames that will be set on the application container. + */ + getApplicationClasses$: () => + applicationClasses$.pipe( + map(set => [...set]), + takeUntil(this.stop$) + ), + }; + } + + public stop() { + this.stop$.next(); + } +} + +export type ChromeStartContract = ReturnType; diff --git a/src/core/public/chrome/index.ts b/src/core/public/chrome/index.ts new file mode 100644 index 0000000000000..afc3d237ececb --- /dev/null +++ b/src/core/public/chrome/index.ts @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { ChromeService, ChromeStartContract, Brand } from './chrome_service'; diff --git a/src/core/public/core_system.test.ts b/src/core/public/core_system.test.ts index e5c5319fb85ed..29fa38fb5ed91 100644 --- a/src/core/public/core_system.test.ts +++ b/src/core/public/core_system.test.ts @@ -18,6 +18,7 @@ */ import { BasePathService } from './base_path'; +import { ChromeService } from './chrome'; import { FatalErrorsService } from './fatal_errors'; import { InjectedMetadataService } from './injected_metadata'; import { LegacyPlatformService } from './legacy_platform'; @@ -92,11 +93,21 @@ const MockUiSettingsService = jest.fn(function _MockNotificat this: any ) { this.start = jest.fn().mockReturnValue(mockUiSettingsContract); + this.stop = jest.fn(); }); jest.mock('./ui_settings', () => ({ UiSettingsService: MockUiSettingsService, })); +const mockChromeStartContract = {}; +const MockChromeService = jest.fn(function _MockNotificationsService(this: any) { + this.start = jest.fn().mockReturnValue(mockChromeStartContract); + this.stop = jest.fn(); +}); +jest.mock('./chrome', () => ({ + ChromeService: MockChromeService, +})); + import { CoreSystem } from './core_system'; jest.spyOn(CoreSystem.prototype, 'stop'); @@ -124,6 +135,7 @@ describe('constructor', () => { expect(MockLoadingCountService).toHaveBeenCalledTimes(1); expect(MockBasePathService).toHaveBeenCalledTimes(1); expect(MockUiSettingsService).toHaveBeenCalledTimes(1); + expect(MockChromeService).toHaveBeenCalledTimes(1); }); it('passes injectedMetadata param to InjectedMetadataService', () => { @@ -231,6 +243,28 @@ describe('#stop', () => { expect(loadingCountService.stop).toHaveBeenCalled(); }); + it('calls chrome.stop()', () => { + const coreSystem = new CoreSystem({ + ...defaultCoreSystemParams, + }); + + const [chromeService] = MockChromeService.mock.instances; + expect(chromeService.stop).not.toHaveBeenCalled(); + coreSystem.stop(); + expect(chromeService.stop).toHaveBeenCalled(); + }); + + it('calls uiSettings.stop()', () => { + const coreSystem = new CoreSystem({ + ...defaultCoreSystemParams, + }); + + const [uiSettings] = MockUiSettingsService.mock.instances; + expect(uiSettings.stop).not.toHaveBeenCalled(); + coreSystem.stop(); + expect(uiSettings.stop).toHaveBeenCalled(); + }); + it('clears the rootDomElement', () => { const rootDomElement = document.createElement('div'); const coreSystem = new CoreSystem({ @@ -312,6 +346,13 @@ describe('#start()', () => { expect(mockInstance.start).toHaveBeenCalledTimes(1); expect(mockInstance.start).toHaveBeenCalledWith(); }); + + it('calls chrome#start()', () => { + startCore(); + const [mockInstance] = MockChromeService.mock.instances; + expect(mockInstance.start).toHaveBeenCalledTimes(1); + expect(mockInstance.start).toHaveBeenCalledWith(); + }); }); describe('LegacyPlatform targetDomElement', () => { diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts index 5d39a883e39f8..a7df47f37e89b 100644 --- a/src/core/public/core_system.ts +++ b/src/core/public/core_system.ts @@ -20,6 +20,7 @@ import './core.css'; import { BasePathService } from './base_path'; +import { ChromeService } from './chrome'; import { FatalErrorsService } from './fatal_errors'; import { InjectedMetadataParams, InjectedMetadataService } from './injected_metadata'; import { LegacyPlatformParams, LegacyPlatformService } from './legacy_platform'; @@ -48,6 +49,7 @@ export class CoreSystem { private readonly loadingCount: LoadingCountService; private readonly uiSettings: UiSettingsService; private readonly basePath: BasePathService; + private readonly chrome: ChromeService; private readonly rootDomElement: HTMLElement; private readonly notificationsTargetDomElement: HTMLDivElement; @@ -78,6 +80,7 @@ export class CoreSystem { this.loadingCount = new LoadingCountService(); this.basePath = new BasePathService(); this.uiSettings = new UiSettingsService(); + this.chrome = new ChromeService(); this.legacyPlatformTargetDomElement = document.createElement('div'); this.legacyPlatform = new LegacyPlatformService({ @@ -106,6 +109,8 @@ export class CoreSystem { injectedMetadata, basePath, }); + const chrome = this.chrome.start(); + this.legacyPlatform.start({ injectedMetadata, fatalErrors, @@ -113,6 +118,7 @@ export class CoreSystem { loadingCount, basePath, uiSettings, + chrome, }); } catch (error) { this.fatalErrors.add(error); @@ -123,6 +129,8 @@ export class CoreSystem { this.legacyPlatform.stop(); this.notifications.stop(); this.loadingCount.stop(); + this.uiSettings.stop(); + this.chrome.stop(); this.rootDomElement.textContent = ''; } } diff --git a/src/core/public/fatal_errors/fatal_errors_service.tsx b/src/core/public/fatal_errors/fatal_errors_service.tsx index 3a7e821a368a6..942d05c41a51c 100644 --- a/src/core/public/fatal_errors/fatal_errors_service.tsx +++ b/src/core/public/fatal_errors/fatal_errors_service.tsx @@ -36,12 +36,17 @@ export class FatalErrorsService { private readonly errorInfo$ = new Rx.ReplaySubject(); constructor(private params: FatalErrorsParams) { - this.errorInfo$.pipe(first(), tap(() => this.onFirstError())).subscribe({ - error: error => { - // tslint:disable-next-line no-console - console.error('Uncaught error in fatal error screen internals', error); - }, - }); + this.errorInfo$ + .pipe( + first(), + tap(() => this.onFirstError()) + ) + .subscribe({ + error: error => { + // tslint:disable-next-line no-console + console.error('Uncaught error in fatal error screen internals', error); + }, + }); } public add = (error: Error | string, source?: string) => { diff --git a/src/core/public/legacy_platform/__snapshots__/legacy_platform_service.test.ts.snap b/src/core/public/legacy_platform/__snapshots__/legacy_platform_service.test.ts.snap index 9e9d34ebfe02a..b4a3fb8eface6 100644 --- a/src/core/public/legacy_platform/__snapshots__/legacy_platform_service.test.ts.snap +++ b/src/core/public/legacy_platform/__snapshots__/legacy_platform_service.test.ts.snap @@ -9,6 +9,9 @@ Array [ "ui/chrome/api/base_path", "ui/chrome/api/ui_settings", "ui/chrome/api/injected_vars", + "ui/chrome/api/controls", + "ui/chrome/api/theme", + "ui/chrome/services/global_nav_state", "ui/chrome", "legacy files", ] @@ -23,6 +26,9 @@ Array [ "ui/chrome/api/base_path", "ui/chrome/api/ui_settings", "ui/chrome/api/injected_vars", + "ui/chrome/api/controls", + "ui/chrome/api/theme", + "ui/chrome/services/global_nav_state", "ui/test_harness", "legacy files", ] diff --git a/src/core/public/legacy_platform/legacy_platform_service.test.ts b/src/core/public/legacy_platform/legacy_platform_service.test.ts index 913cfc79a6ae9..8abf529a2a6bf 100644 --- a/src/core/public/legacy_platform/legacy_platform_service.test.ts +++ b/src/core/public/legacy_platform/legacy_platform_service.test.ts @@ -94,6 +94,30 @@ jest.mock('ui/chrome/api/injected_vars', () => { }; }); +const mockChromeControlsInit = jest.fn(); +jest.mock('ui/chrome/api/controls', () => { + mockLoadOrder.push('ui/chrome/api/controls'); + return { + __newPlatformInit__: mockChromeControlsInit, + }; +}); + +const mockChromeThemeInit = jest.fn(); +jest.mock('ui/chrome/api/theme', () => { + mockLoadOrder.push('ui/chrome/api/theme'); + return { + __newPlatformInit__: mockChromeThemeInit, + }; +}); + +const mockGlobalNavStateInit = jest.fn(); +jest.mock('ui/chrome/services/global_nav_state', () => { + mockLoadOrder.push('ui/chrome/services/global_nav_state'); + return { + __newPlatformInit__: mockGlobalNavStateInit, + }; +}); + import { LegacyPlatformService } from './legacy_platform_service'; const fatalErrorsStartContract = {} as any; @@ -118,6 +142,7 @@ const basePathStartContract = { }; const uiSettingsStartContract: any = {}; +const chromeStartContract: any = {}; const defaultParams = { targetDomElement: document.createElement('div'), @@ -133,6 +158,7 @@ const defaultStartDeps = { loadingCount: loadingCountStartContract, basePath: basePathStartContract, uiSettings: uiSettingsStartContract, + chrome: chromeStartContract, }; afterEach(() => { @@ -224,6 +250,39 @@ describe('#start()', () => { expect(mockInjectedVarsInit).toHaveBeenCalledWith(injectedMetadataStartContract); }); + it('passes chrome service to ui/chrome/api/controls', () => { + const legacyPlatform = new LegacyPlatformService({ + ...defaultParams, + }); + + legacyPlatform.start(defaultStartDeps); + + expect(mockChromeControlsInit).toHaveBeenCalledTimes(1); + expect(mockChromeControlsInit).toHaveBeenCalledWith(chromeStartContract); + }); + + it('passes chrome service to ui/chrome/api/theme', () => { + const legacyPlatform = new LegacyPlatformService({ + ...defaultParams, + }); + + legacyPlatform.start(defaultStartDeps); + + expect(mockChromeThemeInit).toHaveBeenCalledTimes(1); + expect(mockChromeThemeInit).toHaveBeenCalledWith(chromeStartContract); + }); + + it('passes chrome service to ui/chrome/api/global_nav_state', () => { + const legacyPlatform = new LegacyPlatformService({ + ...defaultParams, + }); + + legacyPlatform.start(defaultStartDeps); + + expect(mockGlobalNavStateInit).toHaveBeenCalledTimes(1); + expect(mockGlobalNavStateInit).toHaveBeenCalledWith(chromeStartContract); + }); + describe('useLegacyTestHarness = false', () => { it('passes the targetDomElement to ui/chrome', () => { const legacyPlatform = new LegacyPlatformService({ diff --git a/src/core/public/legacy_platform/legacy_platform_service.ts b/src/core/public/legacy_platform/legacy_platform_service.ts index 2b7ae5f2bc894..8354b9592f840 100644 --- a/src/core/public/legacy_platform/legacy_platform_service.ts +++ b/src/core/public/legacy_platform/legacy_platform_service.ts @@ -19,6 +19,7 @@ import angular from 'angular'; import { BasePathStartContract } from '../base_path'; +import { ChromeStartContract } from '../chrome'; import { FatalErrorsStartContract } from '../fatal_errors'; import { InjectedMetadataStartContract } from '../injected_metadata'; import { LoadingCountStartContract } from '../loading_count'; @@ -32,6 +33,7 @@ interface Deps { loadingCount: LoadingCountStartContract; basePath: BasePathStartContract; uiSettings: UiSettingsClient; + chrome: ChromeStartContract; } export interface LegacyPlatformParams { @@ -57,6 +59,7 @@ export class LegacyPlatformService { loadingCount, basePath, uiSettings, + chrome, }: Deps) { // Inject parts of the new platform into parts of the legacy platform // so that legacy APIs/modules can mimic their new platform counterparts @@ -67,6 +70,9 @@ export class LegacyPlatformService { require('ui/chrome/api/base_path').__newPlatformInit__(basePath); require('ui/chrome/api/ui_settings').__newPlatformInit__(uiSettings); require('ui/chrome/api/injected_vars').__newPlatformInit__(injectedMetadata); + require('ui/chrome/api/controls').__newPlatformInit__(chrome); + require('ui/chrome/api/theme').__newPlatformInit__(chrome); + require('ui/chrome/services/global_nav_state').__newPlatformInit__(chrome); // Load the bootstrap module before loading the legacy platform files so that // the bootstrap module can modify the environment a bit first diff --git a/src/core/server/config/__mocks__/env.ts b/src/core/server/config/__mocks__/env.ts index 839b3d4983462..2f9c0575858c3 100644 --- a/src/core/server/config/__mocks__/env.ts +++ b/src/core/server/config/__mocks__/env.ts @@ -30,6 +30,7 @@ export function getEnvOptions(options: DeepPartial = {}): EnvOptions configs: options.configs || [], cliArgs: { dev: true, + open: false, quiet: false, silent: false, watch: false, diff --git a/src/core/server/config/__snapshots__/env.test.ts.snap b/src/core/server/config/__snapshots__/env.test.ts.snap index ebe6c4ea83470..ba106ca56bf85 100644 --- a/src/core/server/config/__snapshots__/env.test.ts.snap +++ b/src/core/server/config/__snapshots__/env.test.ts.snap @@ -7,6 +7,7 @@ Env { "basePath": false, "dev": true, "envName": "development", + "open": false, "optimize": false, "quiet": false, "repl": false, @@ -17,7 +18,6 @@ Env { "configs": Array [ "/some/other/path/some-kibana.yml", ], - "corePluginsDir": "/test/cwd/core_plugins", "homeDir": "/test/cwd", "isDevClusterMaster": false, "logDir": "/test/cwd/log", @@ -43,6 +43,7 @@ Env { "basePath": false, "dev": false, "envName": "production", + "open": false, "optimize": false, "quiet": false, "repl": false, @@ -53,7 +54,6 @@ Env { "configs": Array [ "/some/other/path/some-kibana.yml", ], - "corePluginsDir": "/test/cwd/core_plugins", "homeDir": "/test/cwd", "isDevClusterMaster": false, "logDir": "/test/cwd/log", @@ -78,6 +78,7 @@ Env { "cliArgs": Object { "basePath": false, "dev": true, + "open": false, "optimize": false, "quiet": false, "repl": false, @@ -88,7 +89,6 @@ Env { "configs": Array [ "/test/cwd/config/kibana.yml", ], - "corePluginsDir": "/test/cwd/core_plugins", "homeDir": "/test/cwd", "isDevClusterMaster": true, "logDir": "/test/cwd/log", @@ -113,6 +113,7 @@ Env { "cliArgs": Object { "basePath": false, "dev": false, + "open": false, "optimize": false, "quiet": false, "repl": false, @@ -123,7 +124,6 @@ Env { "configs": Array [ "/some/other/path/some-kibana.yml", ], - "corePluginsDir": "/test/cwd/core_plugins", "homeDir": "/test/cwd", "isDevClusterMaster": false, "logDir": "/test/cwd/log", @@ -148,6 +148,7 @@ Env { "cliArgs": Object { "basePath": false, "dev": false, + "open": false, "optimize": false, "quiet": false, "repl": false, @@ -158,7 +159,6 @@ Env { "configs": Array [ "/some/other/path/some-kibana.yml", ], - "corePluginsDir": "/test/cwd/core_plugins", "homeDir": "/test/cwd", "isDevClusterMaster": false, "logDir": "/test/cwd/log", @@ -183,6 +183,7 @@ Env { "cliArgs": Object { "basePath": false, "dev": false, + "open": false, "optimize": false, "quiet": false, "repl": false, @@ -193,7 +194,6 @@ Env { "configs": Array [ "/some/other/path/some-kibana.yml", ], - "corePluginsDir": "/some/home/dir/core_plugins", "homeDir": "/some/home/dir", "isDevClusterMaster": false, "logDir": "/some/home/dir/log", diff --git a/src/core/server/config/config_service.test.ts b/src/core/server/config/config_service.test.ts index 22598b2a971d0..086b465b8d42e 100644 --- a/src/core/server/config/config_service.test.ts +++ b/src/core/server/config/config_service.test.ts @@ -25,7 +25,7 @@ import { first } from 'rxjs/operators'; const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); -import { schema, Type, TypeOf } from './schema'; +import { schema, Type, TypeOf } from '@kbn/config-schema'; import { ConfigService, Env, ObjectToConfigAdapter } from '.'; import { logger } from '../logging/__mocks__'; diff --git a/src/core/server/config/config_service.ts b/src/core/server/config/config_service.ts index a3314d5657141..0d71fbeb5c986 100644 --- a/src/core/server/config/config_service.ts +++ b/src/core/server/config/config_service.ts @@ -17,13 +17,13 @@ * under the License. */ +import { Type } from '@kbn/config-schema'; import { isEqual } from 'lodash'; import { Observable } from 'rxjs'; import { distinctUntilChanged, first, map } from 'rxjs/operators'; import { Config, ConfigPath, ConfigWithSchema, Env } from '.'; import { Logger, LoggerFactory } from '../logging'; -import { Type } from './schema'; export class ConfigService { private readonly log: Logger; @@ -146,7 +146,10 @@ export class ConfigService { private getDistinctConfig(path: ConfigPath) { this.markAsHandled(path); - return this.config$.pipe(map(config => config.get(path)), distinctUntilChanged(isEqual)); + return this.config$.pipe( + map(config => config.get(path)), + distinctUntilChanged(isEqual) + ); } private markAsHandled(path: ConfigPath) { diff --git a/src/core/server/config/config_with_schema.ts b/src/core/server/config/config_with_schema.ts index 31de12a95cc9f..1c392b93b6a75 100644 --- a/src/core/server/config/config_with_schema.ts +++ b/src/core/server/config/config_with_schema.ts @@ -18,8 +18,8 @@ */ // TODO inline all of these +import { Type, TypeOf } from '@kbn/config-schema'; import { Env } from './env'; -import { Type, TypeOf } from './schema'; /** * Interface that defines the static side of a config class. diff --git a/src/core/server/config/env.ts b/src/core/server/config/env.ts index b5a1092724b84..9dcdab0faa8af 100644 --- a/src/core/server/config/env.ts +++ b/src/core/server/config/env.ts @@ -22,7 +22,7 @@ import process from 'process'; import { pkg } from '../../../utils/package_json'; -interface PackageInfo { +export interface PackageInfo { version: string; branch: string; buildNum: number; @@ -50,6 +50,7 @@ export interface CliArgs { repl: boolean; basePath: boolean; optimize: boolean; + open: boolean; } export class Env { @@ -61,7 +62,6 @@ export class Env { } public readonly configDir: string; - public readonly corePluginsDir: string; public readonly binDir: string; public readonly logDir: string; public readonly staticFilesDir: string; @@ -96,7 +96,6 @@ export class Env { */ constructor(readonly homeDir: string, options: EnvOptions) { this.configDir = resolve(this.homeDir, 'config'); - this.corePluginsDir = resolve(this.homeDir, 'core_plugins'); this.binDir = resolve(this.homeDir, 'bin'); this.logDir = resolve(this.homeDir, 'log'); this.staticFilesDir = resolve(this.homeDir, 'ui'); diff --git a/src/core/server/config/index.ts b/src/core/server/config/index.ts index bbddec03a0f41..51fcd8a41fbc3 100644 --- a/src/core/server/config/index.ts +++ b/src/core/server/config/index.ts @@ -22,5 +22,5 @@ export { RawConfigService } from './raw_config_service'; export { Config, ConfigPath } from './config'; /** @internal */ export { ObjectToConfigAdapter } from './object_to_config_adapter'; -export { Env, CliArgs } from './env'; +export { Env, CliArgs, PackageInfo } from './env'; export { ConfigWithSchema } from './config_with_schema'; diff --git a/src/core/server/config/schema/internals/index.ts b/src/core/server/config/schema/internals/index.ts deleted file mode 100644 index f97fcf8b4c1f0..0000000000000 --- a/src/core/server/config/schema/internals/index.ts +++ /dev/null @@ -1,288 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import * as Joi from 'joi'; -import { - AnySchema, - JoiRoot, - Reference, - Rules, - SchemaLike, - State, - ValidationErrorItem, - ValidationOptions, -} from 'joi'; -import { isPlainObject } from 'lodash'; -import { isDuration } from 'moment'; -import { ByteSizeValue, ensureByteSizeValue } from '../byte_size_value'; -import { ensureDuration } from '../duration'; - -export { AnySchema, Reference, SchemaLike, ValidationErrorItem }; - -function isMap(o: any): o is Map { - return o instanceof Map; -} - -const anyCustomRule: Rules = { - name: 'custom', - params: { - validator: Joi.func() - .maxArity(1) - .required(), - }, - validate(params, value, state, options) { - let validationResultMessage; - try { - validationResultMessage = params.validator(value); - } catch (e) { - validationResultMessage = e.message || e; - } - - if (typeof validationResultMessage === 'string') { - return this.createError( - 'any.custom', - { value, message: validationResultMessage }, - state, - options - ); - } - - return value; - }, -}; - -export const internals = Joi.extend([ - { - name: 'any', - - rules: [anyCustomRule], - }, - { - name: 'boolean', - - base: Joi.boolean(), - coerce(value: any, state: State, options: ValidationOptions) { - // If value isn't defined, let Joi handle default value if it's defined. - if (value !== undefined && typeof value !== 'boolean') { - return this.createError('boolean.base', { value }, state, options); - } - - return value; - }, - rules: [anyCustomRule], - }, - { - name: 'string', - - base: Joi.string(), - rules: [anyCustomRule], - }, - { - name: 'bytes', - - coerce(value: any, state: State, options: ValidationOptions) { - try { - if (typeof value === 'string') { - return ByteSizeValue.parse(value); - } - - if (typeof value === 'number') { - return new ByteSizeValue(value); - } - } catch (e) { - return this.createError('bytes.parse', { value, message: e.message }, state, options); - } - - return value; - }, - pre(value: any, state: State, options: ValidationOptions) { - // If value isn't defined, let Joi handle default value if it's defined. - if (value instanceof ByteSizeValue) { - return value as any; - } - - return this.createError('bytes.base', { value }, state, options); - }, - rules: [ - anyCustomRule, - { - name: 'min', - params: { - limit: Joi.alternatives([Joi.number(), Joi.string()]).required(), - }, - validate(params, value, state, options) { - const limit = ensureByteSizeValue(params.limit); - if (value.isLessThan(limit)) { - return this.createError('bytes.min', { value, limit }, state, options); - } - - return value; - }, - }, - { - name: 'max', - params: { - limit: Joi.alternatives([Joi.number(), Joi.string()]).required(), - }, - validate(params, value, state, options) { - const limit = ensureByteSizeValue(params.limit); - if (value.isGreaterThan(limit)) { - return this.createError('bytes.max', { value, limit }, state, options); - } - - return value; - }, - }, - ], - }, - { - name: 'duration', - - coerce(value: any, state: State, options: ValidationOptions) { - try { - if (typeof value === 'string' || typeof value === 'number') { - return ensureDuration(value); - } - } catch (e) { - return this.createError('duration.parse', { value, message: e.message }, state, options); - } - - return value; - }, - pre(value: any, state: State, options: ValidationOptions) { - if (!isDuration(value)) { - return this.createError('duration.base', { value }, state, options); - } - - return value; - }, - rules: [anyCustomRule], - }, - { - name: 'number', - - base: Joi.number(), - coerce(value: any, state: State, options: ValidationOptions) { - // If value isn't defined, let Joi handle default value if it's defined. - if (value === undefined) { - return value; - } - - // Do we want to allow strings that can be converted, e.g. "2"? (Joi does) - // (this can for example be nice in http endpoints with query params) - // - // From Joi docs on `Joi.number`: - // > Generates a schema object that matches a number data type (as well as - // > strings that can be converted to numbers) - const coercedValue: any = typeof value === 'string' ? Number(value) : value; - if (typeof coercedValue !== 'number' || isNaN(coercedValue)) { - return this.createError('number.base', { value }, state, options); - } - - return value; - }, - rules: [anyCustomRule], - }, - { - name: 'object', - - base: Joi.object(), - coerce(value: any, state: State, options: ValidationOptions) { - // If value isn't defined, let Joi handle default value if it's defined. - if (value !== undefined && !isPlainObject(value)) { - return this.createError('object.base', { value }, state, options); - } - - return value; - }, - rules: [anyCustomRule], - }, - { - name: 'map', - - coerce(value: any, state: State, options: ValidationOptions) { - if (isPlainObject(value)) { - return new Map(Object.entries(value)); - } - - return value; - }, - pre(value: any, state: State, options: ValidationOptions) { - if (!isMap(value)) { - return this.createError('map.base', { value }, state, options); - } - - return value as any; - }, - rules: [ - anyCustomRule, - { - name: 'entries', - params: { - key: Joi.object().schema(), - value: Joi.object().schema(), - }, - validate(params, value, state, options) { - const result = new Map(); - for (const [entryKey, entryValue] of value) { - const { value: validatedEntryKey, error: keyError } = Joi.validate( - entryKey, - params.key - ); - - if (keyError) { - return this.createError('map.key', { entryKey, reason: keyError }, state, options); - } - - const { value: validatedEntryValue, error: valueError } = Joi.validate( - entryValue, - params.value - ); - - if (valueError) { - return this.createError( - 'map.value', - { entryKey, reason: valueError }, - state, - options - ); - } - - result.set(validatedEntryKey, validatedEntryValue); - } - - return result as any; - }, - }, - ], - }, - { - name: 'array', - - base: Joi.array(), - coerce(value: any, state: State, options: ValidationOptions) { - // If value isn't defined, let Joi handle default value if it's defined. - if (value !== undefined && !Array.isArray(value)) { - return this.createError('array.base', { value }, state, options); - } - - return value; - }, - rules: [anyCustomRule], - }, -]) as JoiRoot; diff --git a/src/core/server/config/schema/internals/internals_schema.d.ts b/src/core/server/config/schema/internals/internals_schema.d.ts deleted file mode 100644 index 41fa611ac205c..0000000000000 --- a/src/core/server/config/schema/internals/internals_schema.d.ts +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import * as Joi from 'joi'; -import { ByteSizeValue } from '../byte_size_value'; - -declare module 'joi' { - interface BytesSchema extends AnySchema { - min(limit: number | string | ByteSizeValue): this; - max(limit: number | string | ByteSizeValue): this; - } - - interface MapSchema extends AnySchema { - entries(key: AnySchema, value: AnySchema): this; - } - - // In more recent Joi types we can use `Root` type instead of `typeof Joi`. - export type JoiRoot = typeof Joi & { - bytes: () => BytesSchema; - duration: () => AnySchema; - map: () => MapSchema; - }; - - interface AnySchema { - custom(validator: (value: any) => string | void): this; - } - - // Joi types don't include `schema` function even though it's supported. - interface ObjectSchema { - schema(): this; - } - - // Joi types define only signature with single extension, but Joi supports - // an array form as well. It's fixed in more recent Joi types. - function extend(extension: Joi.Extension | Joi.Extension[]): any; -} diff --git a/src/core/server/dev/dev_config.ts b/src/core/server/dev/dev_config.ts index 5c8aca3ce3c51..174b108883792 100644 --- a/src/core/server/dev/dev_config.ts +++ b/src/core/server/dev/dev_config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema, TypeOf } from '../config/schema'; +import { schema, TypeOf } from '@kbn/config-schema'; const createDevSchema = schema.object({ basePathProxyTarget: schema.number({ diff --git a/src/core/server/http/__snapshots__/http_server.test.ts.snap b/src/core/server/http/__snapshots__/http_server.test.ts.snap index 8e868e803602f..d3ddb6e0cff69 100644 --- a/src/core/server/http/__snapshots__/http_server.test.ts.snap +++ b/src/core/server/http/__snapshots__/http_server.test.ts.snap @@ -10,12 +10,15 @@ Object { "maxBytes": 1024, }, "validate": Object { + "failAction": [Function], "options": Object { "abortEarly": false, }, }, }, "state": Object { + "isHttpOnly": true, + "isSameSite": false, "strictHeader": false, }, } diff --git a/src/core/server/http/base_path_proxy_server.ts b/src/core/server/http/base_path_proxy_server.ts index b0c2144d7189a..705445a46c83d 100644 --- a/src/core/server/http/base_path_proxy_server.ts +++ b/src/core/server/http/base_path_proxy_server.ts @@ -17,10 +17,10 @@ * under the License. */ -import { Server } from 'hapi-latest'; +import { ByteSizeValue } from '@kbn/config-schema'; +import { Server } from 'hapi'; import { Agent as HttpsAgent, ServerOptions as TlsOptions } from 'https'; import { sample } from 'lodash'; -import { ByteSizeValue } from '../config/schema'; import { DevConfig } from '../dev'; import { Logger } from '../logging'; import { HttpConfig } from './http_config'; @@ -66,7 +66,7 @@ export class BasePathProxyServer { // Register hapi plugin that adds proxying functionality. It can be configured // through the route configuration object (see { handler: { proxy: ... } }). - await this.server.register({ plugin: require('h2o2-latest') }); + await this.server.register({ plugin: require('h2o2') }); if (this.httpConfig.ssl.enabled) { const tlsOptions = serverOptions.tls as TlsOptions; diff --git a/src/core/server/http/http_config.ts b/src/core/server/http/http_config.ts index 67578ecc1559c..e681d9634abb5 100644 --- a/src/core/server/http/http_config.ts +++ b/src/core/server/http/http_config.ts @@ -17,8 +17,8 @@ * under the License. */ +import { ByteSizeValue, schema, TypeOf } from '@kbn/config-schema'; import { Env } from '../config'; -import { ByteSizeValue, schema, TypeOf } from '../config/schema'; import { SslConfig } from './ssl_config'; const validBasePathRegex = /(^$|^\/.*[^\/]$)/; diff --git a/src/core/server/http/http_server.test.ts b/src/core/server/http/http_server.test.ts index 704a6ddf97aba..c5f5bb1341249 100644 --- a/src/core/server/http/http_server.test.ts +++ b/src/core/server/http/http_server.test.ts @@ -26,8 +26,8 @@ jest.mock('fs', () => ({ import Chance from 'chance'; import supertest from 'supertest'; +import { ByteSizeValue } from '@kbn/config-schema'; import { HttpConfig, Router } from '.'; -import { ByteSizeValue } from '../config/schema'; import { logger } from '../logging/__mocks__'; import { HttpServer } from './http_server'; diff --git a/src/core/server/http/http_server.ts b/src/core/server/http/http_server.ts index c828ff4df5408..7b7e415415b30 100644 --- a/src/core/server/http/http_server.ts +++ b/src/core/server/http/http_server.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Server, ServerOptions } from 'hapi-latest'; +import { Server, ServerOptions } from 'hapi'; import { modifyUrl } from '../../utils'; import { Logger } from '../logging'; diff --git a/src/core/server/http/http_tools.test.ts b/src/core/server/http/http_tools.test.ts new file mode 100644 index 0000000000000..c062b71f3c521 --- /dev/null +++ b/src/core/server/http/http_tools.test.ts @@ -0,0 +1,59 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Request, ResponseToolkit } from 'hapi'; +import Joi from 'joi'; +import { defaultValidationErrorHandler, HapiValidationError } from './http_tools'; + +const emptyOutput = { + statusCode: 400, + headers: {}, + payload: { + statusCode: 400, + error: '', + validation: { + source: '', + keys: [], + }, + }, +}; + +describe('defaultValidationErrorHandler', () => { + it('formats value validation errors correctly', () => { + expect.assertions(1); + const schema = Joi.array().items( + Joi.object({ + type: Joi.string().required(), + }).required() + ); + + const error = schema.validate([{}], { abortEarly: false }).error as HapiValidationError; + + // Emulate what Hapi v17 does by default + error.output = { ...emptyOutput }; + error.output.payload.validation.keys = ['0.type', '']; + + try { + defaultValidationErrorHandler({} as Request, {} as ResponseToolkit, error); + } catch (err) { + // Verify the empty string gets corrected to 'value' + expect(err.output.payload.validation.keys).toEqual(['0.type', 'value']); + } + }); +}); diff --git a/src/core/server/http/http_tools.ts b/src/core/server/http/http_tools.ts index 4f88588a552a3..faf7ba4e94542 100644 --- a/src/core/server/http/http_tools.ts +++ b/src/core/server/http/http_tools.ts @@ -18,8 +18,10 @@ */ import { readFileSync } from 'fs'; -import { Server, ServerOptions } from 'hapi-latest'; +import { Lifecycle, Request, ResponseToolkit, Server, ServerOptions, Util } from 'hapi'; +import Hoek from 'hoek'; import { ServerOptions as TLSOptions } from 'https'; +import { ValidationError } from 'joi'; import { HttpConfig } from './http_config'; /** @@ -39,6 +41,7 @@ export function getServerOptions(config: HttpConfig, { configureTLS = true } = { maxBytes: config.maxPayload.getValueInBytes(), }, validate: { + failAction: defaultValidationErrorHandler, options: { abortEarly: false, }, @@ -46,6 +49,8 @@ export function getServerOptions(config: HttpConfig, { configureTLS = true } = { }, state: { strictHeader: false, + isHttpOnly: true, + isSameSite: false, // necessary to allow using Kibana inside an iframe }, }; @@ -88,3 +93,55 @@ export function createServer(options: ServerOptions) { return server; } + +/** + * Hapi extends the ValidationError interface to add this output key with more data. + */ +export interface HapiValidationError extends ValidationError { + output: { + statusCode: number; + headers: Util.Dictionary; + payload: { + statusCode: number; + error: string; + message?: string; + validation: { + source: string; + keys: string[]; + }; + }; + }; +} + +/** + * Used to replicate Hapi v16 and below's validation responses. Should be used in the routes.validate.failAction key. + */ +export function defaultValidationErrorHandler( + request: Request, + h: ResponseToolkit, + err?: Error +): Lifecycle.ReturnValue { + // Newer versions of Joi don't format the key for missing params the same way. This shim + // provides backwards compatibility. Unfortunately, Joi doesn't export it's own Error class + // in JS so we have to rely on the `name` key before we can cast it. + // + // The Hapi code we're 'overwriting' can be found here: + // https://github.com/hapijs/hapi/blob/master/lib/validation.js#L102 + if (err && err.name === 'ValidationError' && err.hasOwnProperty('output')) { + const validationError: HapiValidationError = err as HapiValidationError; + const validationKeys: string[] = []; + + validationError.details.forEach(detail => { + if (detail.path.length > 0) { + validationKeys.push(Hoek.escapeHtml(detail.path.join('.'))); + } else { + // If no path, use the value sigil to signal the entire value had an issue. + validationKeys.push('value'); + } + }); + + validationError.output.payload.validation.keys = validationKeys; + } + + throw err; +} diff --git a/src/core/server/http/https_redirect_server.test.ts b/src/core/server/http/https_redirect_server.test.ts index 6d9443335a62b..a9fd8ec12e155 100644 --- a/src/core/server/http/https_redirect_server.test.ts +++ b/src/core/server/http/https_redirect_server.test.ts @@ -25,8 +25,8 @@ import Chance from 'chance'; import { Server } from 'http'; import supertest from 'supertest'; +import { ByteSizeValue } from '@kbn/config-schema'; import { HttpConfig } from '.'; -import { ByteSizeValue } from '../config/schema'; import { logger } from '../logging/__mocks__'; import { HttpsRedirectServer } from './https_redirect_server'; diff --git a/src/core/server/http/https_redirect_server.ts b/src/core/server/http/https_redirect_server.ts index b2664c5e24b55..789b3890c0112 100644 --- a/src/core/server/http/https_redirect_server.ts +++ b/src/core/server/http/https_redirect_server.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Request, ResponseToolkit, Server } from 'hapi-latest'; +import { Request, ResponseToolkit, Server } from 'hapi'; import { format as formatUrl } from 'url'; import { Logger } from '../logging'; diff --git a/src/core/server/http/router/request.ts b/src/core/server/http/router/request.ts index 87f8e5d866158..8ee07eac2cca3 100644 --- a/src/core/server/http/router/request.ts +++ b/src/core/server/http/router/request.ts @@ -17,8 +17,8 @@ * under the License. */ -import { Request } from 'hapi-latest'; -import { ObjectType, TypeOf } from '../../config/schema'; +import { ObjectType, TypeOf } from '@kbn/config-schema'; +import { Request } from 'hapi'; import { filterHeaders, Headers } from './headers'; import { RouteSchemas } from './route'; diff --git a/src/core/server/http/router/route.ts b/src/core/server/http/router/route.ts index a8647815c4ed1..64ed67e8f940b 100644 --- a/src/core/server/http/router/route.ts +++ b/src/core/server/http/router/route.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ObjectType, Schema } from '../../config/schema'; +import { ObjectType, Schema } from '@kbn/config-schema'; export type RouteMethod = 'GET' | 'POST' | 'PUT' | 'DELETE'; export interface RouteConfig

{ diff --git a/src/core/server/http/router/router.ts b/src/core/server/http/router/router.ts index 89296e1f06125..37bfe053f8181 100644 --- a/src/core/server/http/router/router.ts +++ b/src/core/server/http/router/router.ts @@ -17,8 +17,8 @@ * under the License. */ -import { Request, ResponseObject, ResponseToolkit } from 'hapi-latest'; -import { ObjectType, schema, TypeOf } from '../../config/schema'; +import { ObjectType, schema, TypeOf } from '@kbn/config-schema'; +import { Request, ResponseObject, ResponseToolkit } from 'hapi'; import { KibanaRequest } from './request'; import { KibanaResponse, ResponseFactory, responseFactory } from './response'; diff --git a/src/core/server/http/ssl_config.ts b/src/core/server/http/ssl_config.ts index f7be7ab05d410..fb36cbe584724 100644 --- a/src/core/server/http/ssl_config.ts +++ b/src/core/server/http/ssl_config.ts @@ -17,8 +17,8 @@ * under the License. */ +import { schema, TypeOf } from '@kbn/config-schema'; import crypto from 'crypto'; -import { schema, TypeOf } from '../config/schema'; // `crypto` type definitions doesn't currently include `crypto.constants`, see // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/fa5baf1733f49cf26228a4e509914572c1b74adf/types/node/v6/index.d.ts#L3412 diff --git a/src/core/server/index.test.ts b/src/core/server/index.test.ts index d6bd19d36ce3c..7d604efcb98e8 100644 --- a/src/core/server/index.test.ts +++ b/src/core/server/index.test.ts @@ -22,6 +22,11 @@ jest.mock('./http/http_service', () => ({ HttpService: jest.fn(() => mockHttpService), })); +const mockPluginsService = { start: jest.fn(), stop: jest.fn() }; +jest.mock('./plugins/plugins_service', () => ({ + PluginsService: jest.fn(() => mockPluginsService), +})); + const mockLegacyService = { start: jest.fn(), stop: jest.fn() }; jest.mock('./legacy_compat/legacy_service', () => ({ LegacyService: jest.fn(() => mockLegacyService), @@ -45,6 +50,8 @@ afterEach(() => { mockConfigService.atPath.mockReset(); mockHttpService.start.mockReset(); mockHttpService.stop.mockReset(); + mockPluginsService.start.mockReset(); + mockPluginsService.stop.mockReset(); mockLegacyService.start.mockReset(); mockLegacyService.stop.mockReset(); }); @@ -56,11 +63,13 @@ test('starts services on "start"', async () => { const server = new Server(mockConfigService as any, logger, env); expect(mockHttpService.start).not.toHaveBeenCalled(); + expect(mockPluginsService.start).not.toHaveBeenCalled(); expect(mockLegacyService.start).not.toHaveBeenCalled(); await server.start(); expect(mockHttpService.start).toHaveBeenCalledTimes(1); + expect(mockPluginsService.start).toHaveBeenCalledTimes(1); expect(mockLegacyService.start).toHaveBeenCalledTimes(1); expect(mockLegacyService.start).toHaveBeenCalledWith(mockHttpServiceStartContract); }); @@ -112,10 +121,12 @@ test('stops services on "stop"', async () => { await server.start(); expect(mockHttpService.stop).not.toHaveBeenCalled(); + expect(mockPluginsService.stop).not.toHaveBeenCalled(); expect(mockLegacyService.stop).not.toHaveBeenCalled(); await server.stop(); expect(mockHttpService.stop).toHaveBeenCalledTimes(1); + expect(mockPluginsService.stop).toHaveBeenCalledTimes(1); expect(mockLegacyService.stop).toHaveBeenCalledTimes(1); }); diff --git a/src/core/server/index.ts b/src/core/server/index.ts index ac645b2280041..0c9518f87e010 100644 --- a/src/core/server/index.ts +++ b/src/core/server/index.ts @@ -17,6 +17,8 @@ * under the License. */ +import { PluginsModule } from './plugins'; + export { bootstrap } from './bootstrap'; import { first } from 'rxjs/operators'; @@ -27,6 +29,7 @@ import { Logger, LoggerFactory } from './logging'; export class Server { private readonly http: HttpModule; + private readonly plugins: PluginsModule; private readonly legacy: LegacyCompatModule; private readonly log: Logger; @@ -38,6 +41,7 @@ export class Server { this.log = logger.get('server'); this.http = new HttpModule(configService.atPath('server', HttpConfig), logger); + this.plugins = new PluginsModule(configService, logger, env); this.legacy = new LegacyCompatModule(configService, logger, env); } @@ -54,6 +58,7 @@ export class Server { httpServerInfo = await this.http.service.start(); } + await this.plugins.service.start(); await this.legacy.service.start(httpServerInfo); const unhandledConfigPaths = await this.configService.getUnusedPaths(); @@ -70,6 +75,7 @@ export class Server { this.log.debug('stopping server'); await this.legacy.service.stop(); + await this.plugins.service.stop(); await this.http.service.stop(); } } diff --git a/src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap b/src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap index ea64afb06caf7..1734a88912aec 100644 --- a/src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap +++ b/src/core/server/legacy_compat/__snapshots__/legacy_service.test.ts.snap @@ -6,6 +6,7 @@ Array [ Object { "basePath": true, "dev": true, + "open": false, "optimize": false, "quiet": true, "repl": false, @@ -59,6 +60,7 @@ Array [ Object { "basePath": false, "dev": true, + "open": false, "optimize": false, "quiet": false, "repl": false, diff --git a/src/core/server/legacy_compat/legacy_service.ts b/src/core/server/legacy_compat/legacy_service.ts index 092057874fa73..6531c51b161b0 100644 --- a/src/core/server/legacy_compat/legacy_service.ts +++ b/src/core/server/legacy_compat/legacy_service.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Server as HapiServer } from 'hapi-latest'; +import { Server as HapiServer } from 'hapi'; import { combineLatest, ConnectableObservable, EMPTY, Subscription } from 'rxjs'; import { first, map, mergeMap, publishReplay, tap } from 'rxjs/operators'; import { CoreService } from '../../types/core_service'; diff --git a/src/core/server/legacy_compat/logging/appenders/legacy_appender.ts b/src/core/server/legacy_compat/logging/appenders/legacy_appender.ts index a890d1620def8..011dfae8a5cef 100644 --- a/src/core/server/legacy_compat/logging/appenders/legacy_appender.ts +++ b/src/core/server/legacy_compat/logging/appenders/legacy_appender.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../../../config/schema'; +import { schema } from '@kbn/config-schema'; import { DisposableAppender } from '../../../logging/appenders/appenders'; import { LogRecord } from '../../../logging/log_record'; import { LegacyLoggingServer } from '../legacy_logging_server'; diff --git a/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts b/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts index ab74c250abb4d..70256392023f3 100644 --- a/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts +++ b/src/core/server/legacy_compat/logging/legacy_logging_server.test.ts @@ -26,7 +26,7 @@ import { LegacyLoggingServer } from './legacy_logging_server'; test('correctly forwards log records.', () => { const loggingServer = new LegacyLoggingServer({ events: {} }); const onLogMock = jest.fn(); - loggingServer.on('log', onLogMock); + loggingServer.events.on('log', onLogMock); const timestamp = 1554433221100; const firstLogRecord = { diff --git a/src/core/server/legacy_compat/logging/legacy_logging_server.ts b/src/core/server/legacy_compat/logging/legacy_logging_server.ts index 5a31fb366a5ed..784983a3bb609 100644 --- a/src/core/server/legacy_compat/logging/legacy_logging_server.ts +++ b/src/core/server/legacy_compat/logging/legacy_logging_server.ts @@ -17,7 +17,8 @@ * under the License. */ -import { EventEmitter } from 'events'; +import { ServerExtType } from 'hapi'; +import Podium from 'podium'; // @ts-ignore: implicit any for JS file import { Config, transformDeprecations } from '../../../../server/config'; // @ts-ignore: implicit any for JS file @@ -25,12 +26,11 @@ import { setupLogging } from '../../../../server/logging'; import { LogRecord } from '../../logging/log_record'; interface PluginRegisterParams { - register: { + plugin: { register: ( server: LegacyLoggingServer, - options: PluginRegisterParams['options'], - cb: () => void - ) => void; + options: PluginRegisterParams['options'] + ) => Promise; }; options: Record; } @@ -41,12 +41,14 @@ interface PluginRegisterParams { * same as the rest of the records generated by the "legacy" Kibana. But to reduce * overhead of having full blown Hapi server instance we create our own "light" version. */ -export class LegacyLoggingServer extends EventEmitter { +export class LegacyLoggingServer { public connections = []; + // Emulates Hapi's usage of the podium event bus. + public events: Podium = new Podium(['log', 'request', 'response']); - constructor(legacyLoggingConfig: Readonly>) { - super(); + private onPostStopCallback?: () => void; + constructor(legacyLoggingConfig: Readonly>) { // We set `ops.interval` to max allowed number and `ops` filter to value // that doesn't exist to avoid logging of ops at all, if turned on it will be // logged by the "legacy" Kibana. @@ -64,12 +66,12 @@ export class LegacyLoggingServer extends EventEmitter { setupLogging(this, Config.withDefaultSchema(transformDeprecations(config))); } - public register({ register: plugin, options }: PluginRegisterParams, cb: () => void) { - plugin.register(this, options, cb); + public register({ plugin: { register }, options }: PluginRegisterParams): Promise { + return register(this, options); } public log({ level, context, message, error, timestamp, meta = {} }: LogRecord) { - this.emit('log', { + this.events.emit('log', { data: error || message, tags: [level.id.toLowerCase(), ...context.split('.'), ...(meta.tags || [])], timestamp: timestamp.getTime(), @@ -77,7 +79,18 @@ export class LegacyLoggingServer extends EventEmitter { } public stop() { - this.emit('stop'); + // Tell the plugin we're stopping. + if (this.onPostStopCallback !== undefined) { + this.onPostStopCallback(); + } + } + + public ext(eventName: ServerExtType, callback: () => void) { + // method is called by plugin that's being registered. + if (eventName === 'onPostStop') { + this.onPostStopCallback = callback; + } + // We don't care about any others the plugin resgisters } public expose() { diff --git a/src/core/server/logging/appenders/appenders.test.ts b/src/core/server/logging/appenders/appenders.test.ts index 2103f9d8187b2..dea4b117b7d40 100644 --- a/src/core/server/logging/appenders/appenders.test.ts +++ b/src/core/server/logging/appenders/appenders.test.ts @@ -19,7 +19,7 @@ const mockCreateLayout = jest.fn(); jest.mock('../layouts/layouts', () => { - const { schema } = require('../../config/schema'); + const { schema } = require('@kbn/config-schema'); return { Layouts: { configSchema: schema.object({ kind: schema.literal('mock') }), diff --git a/src/core/server/logging/appenders/appenders.ts b/src/core/server/logging/appenders/appenders.ts index 69ff6f5684548..5639899fde2b1 100644 --- a/src/core/server/logging/appenders/appenders.ts +++ b/src/core/server/logging/appenders/appenders.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema, TypeOf } from '../../config/schema'; +import { schema, TypeOf } from '@kbn/config-schema'; import { assertNever } from '../../../utils'; import { LegacyAppender } from '../../legacy_compat/logging/appenders/legacy_appender'; diff --git a/src/core/server/logging/appenders/console/console_appender.test.ts b/src/core/server/logging/appenders/console/console_appender.test.ts index fe5602a809699..9763ebe19ef29 100644 --- a/src/core/server/logging/appenders/console/console_appender.test.ts +++ b/src/core/server/logging/appenders/console/console_appender.test.ts @@ -18,7 +18,7 @@ */ jest.mock('../../layouts/layouts', () => { - const { schema } = require('../../../config/schema'); + const { schema } = require('@kbn/config-schema'); return { Layouts: { configSchema: schema.object({ diff --git a/src/core/server/logging/appenders/console/console_appender.ts b/src/core/server/logging/appenders/console/console_appender.ts index 63d78496bbaad..67d0ea4d1837a 100644 --- a/src/core/server/logging/appenders/console/console_appender.ts +++ b/src/core/server/logging/appenders/console/console_appender.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../../../config/schema'; +import { schema } from '@kbn/config-schema'; import { Layout, Layouts } from '../../layouts/layouts'; import { LogRecord } from '../../log_record'; diff --git a/src/core/server/logging/appenders/file/file_appender.test.ts b/src/core/server/logging/appenders/file/file_appender.test.ts index cc8f0196bff7c..1d9ef33995955 100644 --- a/src/core/server/logging/appenders/file/file_appender.test.ts +++ b/src/core/server/logging/appenders/file/file_appender.test.ts @@ -18,7 +18,7 @@ */ jest.mock('../../layouts/layouts', () => { - const { schema } = require('../../../config/schema'); + const { schema } = require('@kbn/config-schema'); return { Layouts: { configSchema: schema.object({ diff --git a/src/core/server/logging/appenders/file/file_appender.ts b/src/core/server/logging/appenders/file/file_appender.ts index ac8c18bc72c81..3aca59fb3f42c 100644 --- a/src/core/server/logging/appenders/file/file_appender.ts +++ b/src/core/server/logging/appenders/file/file_appender.ts @@ -17,8 +17,8 @@ * under the License. */ +import { schema } from '@kbn/config-schema'; import { createWriteStream, WriteStream } from 'fs'; -import { schema } from '../../../config/schema'; import { Layout, Layouts } from '../../layouts/layouts'; import { LogRecord } from '../../log_record'; diff --git a/src/core/server/logging/index.ts b/src/core/server/logging/index.ts index eb31691028e1c..51268cb646288 100644 --- a/src/core/server/logging/index.ts +++ b/src/core/server/logging/index.ts @@ -19,5 +19,7 @@ export { Logger } from './logger'; export { LoggerFactory } from './logger_factory'; +/** @internal */ export { LoggingConfig } from './logging_config'; +/** @internal */ export { LoggingService } from './logging_service'; diff --git a/src/core/server/logging/layouts/json_layout.ts b/src/core/server/logging/layouts/json_layout.ts index 7983cfc992284..1dcc3fc3ebcf6 100644 --- a/src/core/server/logging/layouts/json_layout.ts +++ b/src/core/server/logging/layouts/json_layout.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema, TypeOf } from '../../config/schema'; +import { schema, TypeOf } from '@kbn/config-schema'; import { LogRecord } from '../log_record'; import { Layout } from './layouts'; diff --git a/src/core/server/logging/layouts/layouts.ts b/src/core/server/logging/layouts/layouts.ts index 85726aaf60903..0e6a6360cab2e 100644 --- a/src/core/server/logging/layouts/layouts.ts +++ b/src/core/server/logging/layouts/layouts.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema } from '../../config/schema'; +import { schema } from '@kbn/config-schema'; import { assertNever } from '../../../utils'; import { LogRecord } from '../log_record'; diff --git a/src/core/server/logging/layouts/pattern_layout.ts b/src/core/server/logging/layouts/pattern_layout.ts index 5f21328e6c7db..c259a29dc6867 100644 --- a/src/core/server/logging/layouts/pattern_layout.ts +++ b/src/core/server/logging/layouts/pattern_layout.ts @@ -17,8 +17,8 @@ * under the License. */ +import { schema, TypeOf } from '@kbn/config-schema'; import chalk from 'chalk'; -import { schema, TypeOf } from '../../config/schema'; import { LogLevel } from '../log_level'; import { LogRecord } from '../log_record'; diff --git a/src/core/server/logging/logging_config.ts b/src/core/server/logging/logging_config.ts index b23d32f5e9b3c..64de8ed1de216 100644 --- a/src/core/server/logging/logging_config.ts +++ b/src/core/server/logging/logging_config.ts @@ -17,7 +17,7 @@ * under the License. */ -import { schema, TypeOf } from '../config/schema'; +import { schema, TypeOf } from '@kbn/config-schema'; import { AppenderConfigType, Appenders } from './appenders/appenders'; // We need this helper for the types to be correct diff --git a/src/core/server/logging/logging_service.ts b/src/core/server/logging/logging_service.ts index 966bd74a0df41..7934ed4afe76e 100644 --- a/src/core/server/logging/logging_service.ts +++ b/src/core/server/logging/logging_service.ts @@ -26,6 +26,7 @@ import { LoggerConfigType, LoggingConfig } from './logging_config'; /** * Service that is responsible for maintaining loggers and logger appenders. + * @internal */ export class LoggingService implements LoggerFactory { private config?: LoggingConfig; diff --git a/src/core/server/plugins/discovery/index.ts b/src/core/server/plugins/discovery/index.ts new file mode 100644 index 0000000000000..768112cf7f6fe --- /dev/null +++ b/src/core/server/plugins/discovery/index.ts @@ -0,0 +1,21 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { PluginDiscoveryErrorType } from './plugin_discovery_error'; +export { discover } from './plugins_discovery'; diff --git a/src/core/server/plugins/discovery/plugin_discovery.test.ts b/src/core/server/plugins/discovery/plugin_discovery.test.ts new file mode 100644 index 0000000000000..d1e4f22c495fc --- /dev/null +++ b/src/core/server/plugins/discovery/plugin_discovery.test.ts @@ -0,0 +1,159 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +const mockReaddir = jest.fn(); +const mockReadFile = jest.fn(); +const mockStat = jest.fn(); +jest.mock('fs', () => ({ + readdir: mockReaddir, + readFile: mockReadFile, + stat: mockStat, +})); + +import { resolve } from 'path'; +import { map, toArray } from 'rxjs/operators'; +import { logger } from '../../logging/__mocks__'; +import { discover } from './plugins_discovery'; + +const TEST_PATHS = { + scanDirs: { + nonEmpty: resolve('scan', 'non-empty'), + nonEmpty2: resolve('scan', 'non-empty-2'), + nonExistent: resolve('scan', 'non-existent'), + empty: resolve('scan', 'empty'), + }, + paths: { + existentDir: resolve('path', 'existent-dir'), + existentDir2: resolve('path', 'existent-dir-2'), + nonDir: resolve('path', 'non-dir'), + nonExistent: resolve('path', 'non-existent'), + }, +}; + +beforeEach(() => { + mockReaddir.mockImplementation((path, cb) => { + if (path === TEST_PATHS.scanDirs.nonEmpty) { + cb(null, ['1', '2-no-manifest', '3', '4-incomplete-manifest']); + } else if (path === TEST_PATHS.scanDirs.nonEmpty2) { + cb(null, ['5-invalid-manifest', '6', '7-non-dir', '8-incompatible-manifest']); + } else if (path === TEST_PATHS.scanDirs.nonExistent) { + cb(new Error('ENOENT')); + } else { + cb(null, []); + } + }); + + mockStat.mockImplementation((path, cb) => { + if (path.includes('non-existent')) { + cb(new Error('ENOENT')); + } else { + cb(null, { isDirectory: () => !path.includes('non-dir') }); + } + }); + + mockReadFile.mockImplementation((path, cb) => { + if (path.includes('no-manifest')) { + cb(new Error('ENOENT')); + } else if (path.includes('invalid-manifest')) { + cb(null, Buffer.from('not-json')); + } else if (path.includes('incomplete-manifest')) { + cb(null, Buffer.from(JSON.stringify({ version: '1' }))); + } else if (path.includes('incompatible-manifest')) { + cb(null, Buffer.from(JSON.stringify({ id: 'plugin', version: '1' }))); + } else { + cb(null, Buffer.from(JSON.stringify({ id: 'plugin', version: '1', kibanaVersion: '1.2.3' }))); + } + }); +}); + +afterEach(() => { + jest.clearAllMocks(); +}); + +test('properly scans folders and paths', async () => { + const { plugin$, error$ } = discover( + { + initialize: true, + scanDirs: Object.values(TEST_PATHS.scanDirs), + paths: Object.values(TEST_PATHS.paths), + }, + { + branch: 'master', + buildNum: 1, + buildSha: '', + version: '1.2.3', + }, + logger.get() + ); + + await expect(plugin$.pipe(toArray()).toPromise()).resolves.toEqual( + [ + resolve(TEST_PATHS.scanDirs.nonEmpty, '1'), + resolve(TEST_PATHS.scanDirs.nonEmpty, '3'), + resolve(TEST_PATHS.scanDirs.nonEmpty2, '6'), + resolve(TEST_PATHS.paths.existentDir), + resolve(TEST_PATHS.paths.existentDir2), + ].map(path => ({ + manifest: { + id: 'plugin', + version: '1', + kibanaVersion: '1.2.3', + optionalPlugins: [], + requiredPlugins: [], + ui: false, + }, + path, + })) + ); + + await expect( + error$ + .pipe( + map(error => error.toString()), + toArray() + ) + .toPromise() + ).resolves.toEqual([ + `Error: ENOENT (invalid-scan-dir, ${resolve(TEST_PATHS.scanDirs.nonExistent)})`, + `Error: ${resolve(TEST_PATHS.paths.nonDir)} is not a directory. (invalid-plugin-dir, ${resolve( + TEST_PATHS.paths.nonDir + )})`, + `Error: ENOENT (invalid-plugin-dir, ${resolve(TEST_PATHS.paths.nonExistent)})`, + `Error: ENOENT (missing-manifest, ${resolve( + TEST_PATHS.scanDirs.nonEmpty, + '2-no-manifest', + 'kibana.json' + )})`, + `Error: Plugin manifest must contain an "id" property. (invalid-manifest, ${resolve( + TEST_PATHS.scanDirs.nonEmpty, + '4-incomplete-manifest', + 'kibana.json' + )})`, + `Error: Unexpected token o in JSON at position 1 (invalid-manifest, ${resolve( + TEST_PATHS.scanDirs.nonEmpty2, + '5-invalid-manifest', + 'kibana.json' + )})`, + `Error: Plugin "plugin" is only compatible with Kibana version "1", but used Kibana version is "1.2.3". (incompatible-version, ${resolve( + TEST_PATHS.scanDirs.nonEmpty2, + '8-incompatible-manifest', + 'kibana.json' + )})`, + ]); +}); diff --git a/src/core/server/plugins/discovery/plugin_discovery_error.ts b/src/core/server/plugins/discovery/plugin_discovery_error.ts new file mode 100644 index 0000000000000..d513091ac4505 --- /dev/null +++ b/src/core/server/plugins/discovery/plugin_discovery_error.ts @@ -0,0 +1,65 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export enum PluginDiscoveryErrorType { + IncompatibleVersion = 'incompatible-version', + InvalidScanDirectory = 'invalid-scan-dir', + InvalidPluginDirectory = 'invalid-plugin-dir', + InvalidManifest = 'invalid-manifest', + MissingManifest = 'missing-manifest', +} + +export class PluginDiscoveryError extends Error { + public static incompatibleVersion(path: string, cause: Error) { + return new PluginDiscoveryError(PluginDiscoveryErrorType.IncompatibleVersion, path, cause); + } + + public static invalidScanDirectory(path: string, cause: Error) { + return new PluginDiscoveryError(PluginDiscoveryErrorType.InvalidScanDirectory, path, cause); + } + + public static invalidPluginDirectory(path: string, cause: Error) { + return new PluginDiscoveryError(PluginDiscoveryErrorType.InvalidPluginDirectory, path, cause); + } + + public static invalidManifest(path: string, cause: Error) { + return new PluginDiscoveryError(PluginDiscoveryErrorType.InvalidManifest, path, cause); + } + + public static missingManifest(path: string, cause: Error) { + return new PluginDiscoveryError(PluginDiscoveryErrorType.MissingManifest, path, cause); + } + + /** + * @param type Type of the discovery error (invalid directory, invalid manifest etc.) + * @param path Path at which discovery error occurred. + * @param cause "Raw" error object that caused discovery error. + */ + constructor( + public readonly type: PluginDiscoveryErrorType, + public readonly path: string, + public readonly cause: Error + ) { + super(`${cause.message} (${type}, ${path})`); + + // Set the prototype explicitly, see: + // https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work + Object.setPrototypeOf(this, PluginDiscoveryError.prototype); + } +} diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts new file mode 100644 index 0000000000000..1f73855511c24 --- /dev/null +++ b/src/core/server/plugins/discovery/plugin_manifest_parser.test.ts @@ -0,0 +1,215 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { PluginDiscoveryErrorType } from './plugin_discovery_error'; + +const mockReadFile = jest.fn(); +jest.mock('fs', () => ({ readFile: mockReadFile })); + +import { resolve } from 'path'; +import { parseManifest } from './plugin_manifest_parser'; + +const pluginPath = resolve('path', 'existent-dir'); +const pluginManifestPath = resolve(pluginPath, 'kibana.json'); +const packageInfo = { + branch: 'master', + buildNum: 1, + buildSha: '', + version: '7.0.0-alpha1', +}; + +afterEach(() => { + jest.clearAllMocks(); +}); + +test('return error when manifest is empty', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from('')); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Unexpected end of JSON input (invalid-manifest, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.InvalidManifest, + path: pluginManifestPath, + }); +}); + +test('return error when manifest content is null', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from('null')); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Plugin manifest must contain a JSON encoded object. (invalid-manifest, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.InvalidManifest, + path: pluginManifestPath, + }); +}); + +test('return error when manifest content is not a valid JSON', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from('not-json')); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Unexpected token o in JSON at position 1 (invalid-manifest, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.InvalidManifest, + path: pluginManifestPath, + }); +}); + +test('return error when plugin id is missing', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from(JSON.stringify({ version: 'some-version' }))); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Plugin manifest must contain an "id" property. (invalid-manifest, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.InvalidManifest, + path: pluginManifestPath, + }); +}); + +test('return error when plugin version is missing', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from(JSON.stringify({ id: 'some-id' }))); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Plugin manifest for "some-id" must contain a "version" property. (invalid-manifest, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.InvalidManifest, + path: pluginManifestPath, + }); +}); + +test('return error when plugin expected Kibana version is lower than actual version', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from(JSON.stringify({ id: 'some-id', version: '6.4.2' }))); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Plugin "some-id" is only compatible with Kibana version "6.4.2", but used Kibana version is "7.0.0-alpha1". (incompatible-version, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.IncompatibleVersion, + path: pluginManifestPath, + }); +}); + +test('return error when plugin expected Kibana version is higher than actual version', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from(JSON.stringify({ id: 'some-id', version: '7.0.1' }))); + }); + + await expect(parseManifest(pluginPath, packageInfo)).rejects.toMatchObject({ + message: `Plugin "some-id" is only compatible with Kibana version "7.0.1", but used Kibana version is "7.0.0-alpha1". (incompatible-version, ${pluginManifestPath})`, + type: PluginDiscoveryErrorType.IncompatibleVersion, + path: pluginManifestPath, + }); +}); + +test('set defaults for all missing optional fields', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb(null, Buffer.from(JSON.stringify({ id: 'some-id', version: '7.0.0' }))); + }); + + await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({ + id: 'some-id', + version: '7.0.0', + kibanaVersion: '7.0.0', + optionalPlugins: [], + requiredPlugins: [], + ui: false, + }); +}); + +test('return all set optional fields as they are in manifest', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb( + null, + Buffer.from( + JSON.stringify({ + id: 'some-id', + version: 'some-version', + kibanaVersion: '7.0.0', + requiredPlugins: ['some-required-plugin', 'some-required-plugin-2'], + optionalPlugins: ['some-optional-plugin'], + ui: true, + }) + ) + ); + }); + + await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({ + id: 'some-id', + version: 'some-version', + kibanaVersion: '7.0.0', + optionalPlugins: ['some-optional-plugin'], + requiredPlugins: ['some-required-plugin', 'some-required-plugin-2'], + ui: true, + }); +}); + +test('return manifest when plugin expected Kibana version matches actual version', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb( + null, + Buffer.from( + JSON.stringify({ + id: 'some-id', + version: 'some-version', + kibanaVersion: '7.0.0-alpha2', + requiredPlugins: ['some-required-plugin'], + }) + ) + ); + }); + + await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({ + id: 'some-id', + version: 'some-version', + kibanaVersion: '7.0.0-alpha2', + optionalPlugins: [], + requiredPlugins: ['some-required-plugin'], + ui: false, + }); +}); + +test('return manifest when plugin expected Kibana version is `kibana`', async () => { + mockReadFile.mockImplementation((path, cb) => { + cb( + null, + Buffer.from( + JSON.stringify({ + id: 'some-id', + version: 'some-version', + kibanaVersion: 'kibana', + requiredPlugins: ['some-required-plugin'], + }) + ) + ); + }); + + await expect(parseManifest(pluginPath, packageInfo)).resolves.toEqual({ + id: 'some-id', + version: 'some-version', + kibanaVersion: 'kibana', + optionalPlugins: [], + requiredPlugins: ['some-required-plugin'], + ui: false, + }); +}); diff --git a/src/core/server/plugins/discovery/plugin_manifest_parser.ts b/src/core/server/plugins/discovery/plugin_manifest_parser.ts new file mode 100644 index 0000000000000..4152d22fc5906 --- /dev/null +++ b/src/core/server/plugins/discovery/plugin_manifest_parser.ts @@ -0,0 +1,176 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { readFile } from 'fs'; +import { resolve } from 'path'; +import { promisify } from 'util'; +import { PackageInfo } from '../../config'; +import { PluginDiscoveryError } from './plugin_discovery_error'; + +const fsReadFileAsync = promisify(readFile); + +/** + * Describes the set of required and optional properties plugin can define in its + * mandatory JSON manifest file. + */ +export interface PluginManifest { + /** + * Identifier of the plugin. + */ + readonly id: string; + + /** + * Version of the plugin. + */ + readonly version: string; + + /** + * The version of Kibana the plugin is compatible with, defaults to "version". + */ + readonly kibanaVersion: string; + + /** + * An optional list of the other plugins that **must be** installed and enabled + * for this plugin to function properly. + */ + readonly requiredPlugins: ReadonlyArray; + + /** + * An optional list of the other plugins that if installed and enabled **may be** + * leveraged by this plugin for some additional functionality but otherwise are + * not required for this plugin to work properly. + */ + readonly optionalPlugins: ReadonlyArray; + + /** + * Specifies whether plugin includes some client/browser specific functionality + * that should be included into client bundle via `public/ui_plugin.js` file. + */ + readonly ui: boolean; +} + +/** + * Name of the JSON manifest file that should be located in the plugin directory. + */ +const MANIFEST_FILE_NAME = 'kibana.json'; + +/** + * The special "kibana" version can be used by the plugins to be always compatible. + */ +const ALWAYS_COMPATIBLE_VERSION = 'kibana'; + +/** + * Regular expression used to extract semantic version part from the plugin or + * kibana version, e.g. `1.2.3` ---> `1.2.3` and `7.0.0-alpha1` ---> `7.0.0`. + */ +const SEM_VER_REGEX = /\d+\.\d+\.\d+/; + +/** + * Tries to load and parse the plugin manifest file located at the provided plugin + * directory path and produces an error result if it fails to do so or plugin manifest + * isn't valid. + * @param pluginPath Path to the plugin directory where manifest should be loaded from. + * @param packageInfo Kibana package info. + */ +export async function parseManifest(pluginPath: string, packageInfo: PackageInfo) { + const manifestPath = resolve(pluginPath, MANIFEST_FILE_NAME); + + let manifestContent; + try { + manifestContent = await fsReadFileAsync(manifestPath); + } catch (err) { + throw PluginDiscoveryError.missingManifest(manifestPath, err); + } + + let manifest: Partial; + try { + manifest = JSON.parse(manifestContent.toString()); + } catch (err) { + throw PluginDiscoveryError.invalidManifest(manifestPath, err); + } + + if (!manifest || typeof manifest !== 'object') { + throw PluginDiscoveryError.invalidManifest( + manifestPath, + new Error('Plugin manifest must contain a JSON encoded object.') + ); + } + + if (!manifest.id || typeof manifest.id !== 'string') { + throw PluginDiscoveryError.invalidManifest( + manifestPath, + new Error('Plugin manifest must contain an "id" property.') + ); + } + + if (!manifest.version || typeof manifest.version !== 'string') { + throw PluginDiscoveryError.invalidManifest( + manifestPath, + new Error(`Plugin manifest for "${manifest.id}" must contain a "version" property.`) + ); + } + + const expectedKibanaVersion = + typeof manifest.kibanaVersion === 'string' && manifest.kibanaVersion + ? manifest.kibanaVersion + : manifest.version; + if (!isVersionCompatible(expectedKibanaVersion, packageInfo.version)) { + throw PluginDiscoveryError.incompatibleVersion( + manifestPath, + new Error( + `Plugin "${ + manifest.id + }" is only compatible with Kibana version "${expectedKibanaVersion}", but used Kibana version is "${ + packageInfo.version + }".` + ) + ); + } + + return { + id: manifest.id, + version: manifest.version, + kibanaVersion: expectedKibanaVersion, + requiredPlugins: Array.isArray(manifest.requiredPlugins) ? manifest.requiredPlugins : [], + optionalPlugins: Array.isArray(manifest.optionalPlugins) ? manifest.optionalPlugins : [], + ui: typeof manifest.ui === 'boolean' ? manifest.ui : false, + }; +} + +/** + * Checks whether plugin expected Kibana version is compatible with the used Kibana version. + * @param expectedKibanaVersion Kibana version expected by the plugin. + * @param actualKibanaVersion Used Kibana version. + */ +function isVersionCompatible(expectedKibanaVersion: string, actualKibanaVersion: string) { + if (expectedKibanaVersion === ALWAYS_COMPATIBLE_VERSION) { + return true; + } + + return extractSemVer(actualKibanaVersion) === extractSemVer(expectedKibanaVersion); +} + +/** + * Tries to extract semantic version part from the full version string. + * @param version + */ +function extractSemVer(version: string) { + const semVerMatch = version.match(SEM_VER_REGEX); + return semVerMatch === null ? version : semVerMatch[0]; +} diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts new file mode 100644 index 0000000000000..7ecfaa38b3826 --- /dev/null +++ b/src/core/server/plugins/discovery/plugins_discovery.ts @@ -0,0 +1,156 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { readdir, stat } from 'fs'; +import { resolve } from 'path'; +import { bindNodeCallback, from, merge, Observable, throwError } from 'rxjs'; +import { catchError, map, mergeMap, shareReplay } from 'rxjs/operators'; +import { PackageInfo } from '../../config'; +import { Logger } from '../../logging'; +import { PluginsConfig } from '../plugins_config'; +import { PluginDiscoveryError } from './plugin_discovery_error'; +import { parseManifest, PluginManifest } from './plugin_manifest_parser'; + +const fsReadDir$ = bindNodeCallback(readdir); +const fsStat$ = bindNodeCallback(stat); + +interface DiscoveryResult { + plugin?: { path: string; manifest: PluginManifest }; + error?: PluginDiscoveryError; +} + +/** + * Tries to discover all possible plugins based on the provided plugin config. + * Discovery result consists of two separate streams, the one (`plugin$`) is + * for the successfully discovered plugins and the other one (`error$`) is for + * all the errors that occurred during discovery process. + * + * @param config Plugin config instance. + * @param packageInfo Kibana package info. + * @param log Plugin discovery logger instance. + */ +export function discover(config: PluginsConfig, packageInfo: PackageInfo, log: Logger) { + log.debug('Discovering plugins...'); + + const discoveryResults$ = merge( + processScanDirs$(config.scanDirs, log), + processPaths$(config.paths, log) + ).pipe( + mergeMap(pluginPathOrError => { + return typeof pluginPathOrError === 'string' + ? createPlugin$(pluginPathOrError, packageInfo, log) + : [pluginPathOrError]; + }), + shareReplay() + ); + + return { + plugin$: discoveryResults$.pipe( + mergeMap(entry => (entry.plugin !== undefined ? [entry.plugin] : [])) + ), + error$: discoveryResults$.pipe( + mergeMap(entry => (entry.error !== undefined ? [entry.error] : [])) + ), + }; +} + +/** + * Iterates over every entry in `scanDirs` and returns a merged stream of all + * sub-directories. If directory cannot be read or it's impossible to get stat + * for any of the nested entries then error is added into the stream instead. + * @param scanDirs List of the top-level directories to process. + * @param log Plugin discovery logger instance. + */ +function processScanDirs$(scanDirs: string[], log: Logger) { + return from(scanDirs).pipe( + mergeMap(dir => { + log.debug(`Scanning "${dir}" for plugin sub-directories...`); + + return fsReadDir$(dir).pipe( + mergeMap(subDirs => subDirs.map(subDir => resolve(dir, subDir))), + mergeMap(path => + fsStat$(path).pipe( + // Filter out non-directory entries from target directories, it's expected that + // these directories may contain files (e.g. `README.md` or `package.json`). + // We shouldn't silently ignore the entries we couldn't get stat for though. + mergeMap(pathStat => (pathStat.isDirectory() ? [path] : [])), + catchError(err => [wrapError(PluginDiscoveryError.invalidPluginDirectory(path, err))]) + ) + ), + catchError(err => [wrapError(PluginDiscoveryError.invalidScanDirectory(dir, err))]) + ); + }) + ); +} + +/** + * Iterates over every entry in `paths` and returns a stream of all paths that + * are directories. If path is not a directory or it's impossible to get stat + * for this path then error is added into the stream instead. + * @param paths List of paths to process. + * @param log Plugin discovery logger instance. + */ +function processPaths$(paths: string[], log: Logger) { + return from(paths).pipe( + mergeMap(path => { + log.debug(`Including "${path}" into the plugin path list.`); + + return fsStat$(path).pipe( + // Since every path is specifically provided we should treat non-directory + // entries as mistakes we should report of. + mergeMap(pathStat => { + return pathStat.isDirectory() + ? [path] + : throwError(new Error(`${path} is not a directory.`)); + }), + catchError(err => [wrapError(PluginDiscoveryError.invalidPluginDirectory(path, err))]) + ); + }) + ); +} + +/** + * Tries to load and parse the plugin manifest file located at the provided plugin + * directory path and produces an error result if it fails to do so or plugin manifest + * isn't valid. + * @param path Path to the plugin directory where manifest should be loaded from. + * @param packageInfo Kibana package info. + * @param log Plugin discovery logger instance. + */ +function createPlugin$( + path: string, + packageInfo: PackageInfo, + log: Logger +): Observable { + return from(parseManifest(path, packageInfo)).pipe( + map(manifest => { + log.debug(`Successfully discovered plugin "${manifest.id}" at "${path}"`); + return { plugin: { path, manifest } }; + }), + catchError(err => [wrapError(err)]) + ); +} + +/** + * Wraps `PluginDiscoveryError` into `DiscoveryResult` entry. + * @param error Instance of the `PluginDiscoveryError` error. + */ +function wrapError(error: PluginDiscoveryError): DiscoveryResult { + return { error }; +} diff --git a/src/core/server/plugins/index.ts b/src/core/server/plugins/index.ts new file mode 100644 index 0000000000000..6ed7870b86c6d --- /dev/null +++ b/src/core/server/plugins/index.ts @@ -0,0 +1,30 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { ConfigService, Env } from '../config'; +import { LoggerFactory } from '../logging'; +import { PluginsService } from './plugins_service'; + +export class PluginsModule { + public readonly service: PluginsService; + + constructor(private readonly configService: ConfigService, logger: LoggerFactory, env: Env) { + this.service = new PluginsService(env, logger, this.configService); + } +} diff --git a/src/core/server/plugins/plugins_config.ts b/src/core/server/plugins/plugins_config.ts new file mode 100644 index 0000000000000..ad86581653310 --- /dev/null +++ b/src/core/server/plugins/plugins_config.ts @@ -0,0 +1,58 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { schema, TypeOf } from '@kbn/config-schema'; + +const pluginsSchema = schema.object({ + initialize: schema.boolean({ defaultValue: true }), + scanDirs: schema.arrayOf(schema.string(), { + defaultValue: [], + }), + paths: schema.arrayOf(schema.string(), { + defaultValue: [], + }), +}); + +type PluginsConfigType = TypeOf; + +/** @internal */ +export class PluginsConfig { + public static schema = pluginsSchema; + + /** + * Indicates whether or not plugins should be initialized. + */ + public readonly initialize: boolean; + + /** + * Defines directories that we should scan for the plugin subdirectories. + */ + public readonly scanDirs: string[]; + + /** + * Defines direct paths to specific plugin directories that we should initialize. + */ + public readonly paths: string[]; + + constructor(config: PluginsConfigType) { + this.initialize = config.initialize; + this.scanDirs = config.scanDirs; + this.paths = config.paths; + } +} diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts new file mode 100644 index 0000000000000..4d448226e16f9 --- /dev/null +++ b/src/core/server/plugins/plugins_service.test.ts @@ -0,0 +1,146 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +const mockPackage = new Proxy({ raw: {} as any }, { get: (obj, prop) => obj.raw[prop] }); +jest.mock('../../../utils/package_json', () => ({ pkg: mockPackage })); + +const mockDiscover = jest.fn(); +jest.mock('./discovery/plugins_discovery', () => ({ discover: mockDiscover })); + +import { BehaviorSubject, from } from 'rxjs'; + +import { Config, ConfigService, Env, ObjectToConfigAdapter } from '../config'; +import { getEnvOptions } from '../config/__mocks__/env'; +import { logger } from '../logging/__mocks__'; +import { PluginDiscoveryError } from './discovery/plugin_discovery_error'; +import { PluginsService } from './plugins_service'; + +let pluginsService: PluginsService; +let configService: ConfigService; +let env: Env; +beforeEach(() => { + mockPackage.raw = { + branch: 'feature-v1', + version: 'v1', + build: { + distributable: true, + number: 100, + sha: 'feature-v1-build-sha', + }, + }; + + env = Env.createDefault(getEnvOptions()); + + configService = new ConfigService( + new BehaviorSubject( + new ObjectToConfigAdapter({ + plugins: { + initialize: true, + scanDirs: ['one', 'two'], + paths: ['three', 'four'], + }, + }) + ), + env, + logger + ); + pluginsService = new PluginsService(env, logger, configService); +}); + +afterEach(() => { + jest.clearAllMocks(); +}); + +test('properly invokes `discover` on `start`.', async () => { + mockDiscover.mockReturnValue({ + error$: from([ + PluginDiscoveryError.invalidManifest('path-1', new Error('Invalid JSON')), + PluginDiscoveryError.missingManifest('path-2', new Error('No manifest')), + PluginDiscoveryError.invalidScanDirectory('dir-1', new Error('No dir')), + PluginDiscoveryError.incompatibleVersion('path-3', new Error('Incompatible version')), + ]), + + plugin$: from([ + { + path: 'path-4', + manifest: { + id: 'some-id', + version: 'some-version', + kibanaVersion: '7.0.0', + requiredPlugins: ['some-required-plugin', 'some-required-plugin-2'], + optionalPlugins: ['some-optional-plugin'], + ui: true, + }, + }, + { + path: 'path-5', + manifest: { + id: 'some-other-id', + version: 'some-other-version', + kibanaVersion: '7.0.0', + requiredPlugins: ['some-required-plugin'], + optionalPlugins: [], + ui: false, + }, + }, + ]), + }); + + await pluginsService.start(); + + expect(mockDiscover).toHaveBeenCalledTimes(1); + expect(mockDiscover).toHaveBeenCalledWith( + { initialize: true, paths: ['three', 'four'], scanDirs: ['one', 'two'] }, + { branch: 'feature-v1', buildNum: 100, buildSha: 'feature-v1-build-sha', version: 'v1' }, + expect.objectContaining({ + debug: expect.any(Function), + error: expect.any(Function), + info: expect.any(Function), + }) + ); + + expect(logger.mockCollect()).toMatchInlineSnapshot(` +Object { + "debug": Array [ + Array [ + "starting plugins service", + ], + Array [ + "Marking config path as handled: plugins", + ], + Array [ + "Discovered 2 plugins.", + ], + ], + "error": Array [ + Array [ + [Error: Invalid JSON (invalid-manifest, path-1)], + ], + Array [ + [Error: Incompatible version (incompatible-version, path-3)], + ], + ], + "fatal": Array [], + "info": Array [], + "log": Array [], + "trace": Array [], + "warn": Array [], +} +`); +}); diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts new file mode 100644 index 0000000000000..602a801ccd300 --- /dev/null +++ b/src/core/server/plugins/plugins_service.ts @@ -0,0 +1,77 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { filter, first, map, tap, toArray } from 'rxjs/operators'; +import { CoreService } from '../../types/core_service'; +import { ConfigService, Env } from '../config'; +import { Logger, LoggerFactory } from '../logging'; +import { discover, PluginDiscoveryErrorType } from './discovery'; +import { PluginsConfig } from './plugins_config'; + +export class PluginsService implements CoreService { + private readonly log: Logger; + + constructor( + private readonly env: Env, + private readonly logger: LoggerFactory, + private readonly configService: ConfigService + ) { + this.log = logger.get('plugins', 'service'); + } + + public async start() { + this.log.debug('starting plugins service'); + + // At this stage we report only errors that can occur when new platform plugin + // manifest is present, otherwise we can't be sure that the plugin is for the new + // platform and let legacy platform to handle it. + const errorTypesToReport = [ + PluginDiscoveryErrorType.IncompatibleVersion, + PluginDiscoveryErrorType.InvalidManifest, + ]; + + const { error$, plugin$ } = await this.configService + .atPath('plugins', PluginsConfig) + .pipe( + first(), + map(config => + discover(config, this.env.packageInfo, this.logger.get('plugins', 'discovery')) + ) + ) + .toPromise(); + + await error$ + .pipe( + filter(error => errorTypesToReport.includes(error.type)), + tap(invalidManifestError => this.log.error(invalidManifestError)) + ) + .toPromise(); + + await plugin$ + .pipe( + toArray(), + tap(plugins => this.log.debug(`Discovered ${plugins.length} plugins.`)) + ) + .toPromise(); + } + + public async stop() { + this.log.debug('stopping plugins service'); + } +} diff --git a/src/core_plugins/console/api_server/es_6_0/ingest.js b/src/core_plugins/console/api_server/es_6_0/ingest.js index 2aaa41f9bd7ff..04f2f12e003ed 100644 --- a/src/core_plugins/console/api_server/es_6_0/ingest.js +++ b/src/core_plugins/console/api_server/es_6_0/ingest.js @@ -17,6 +17,15 @@ * under the License. */ +const commonPipelineParams = { + on_failure: [], + ignore_failure: { + __one_of: [ false, true ] + }, + if: '', + tag: '' +}; + // Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/append-processor.html const appendProcessorDefinition = { append: { @@ -25,7 +34,23 @@ const appendProcessorDefinition = { value: [] }, field: '', - value: [] + value: [], + ...commonPipelineParams + } +}; + +// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/bytes-processor.html +const bytesProcessorDefinition = { + bytes: { + __template: { + field: '' + }, + field: '', + target_field: '', + ignore_missing: { + __one_of: [ false, true ] + }, + ...commonPipelineParams } }; @@ -43,7 +68,8 @@ const convertProcessorDefinition = { target_field: '', ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -58,7 +84,8 @@ const dateProcessorDefinition = { target_field: '@timestamp', formats: [], timezone: 'UTC', - locale: 'ENGLISH' + locale: 'ENGLISH', + ...commonPipelineParams } }; @@ -76,7 +103,45 @@ const dateIndexNameProcessorDefinition = { date_formats: [], timezone: 'UTC', locale: 'ENGLISH', - index_name_format: 'yyyy-MM-dd' + index_name_format: 'yyyy-MM-dd', + ...commonPipelineParams + } +}; + +// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/dissect-processor.html +const dissectProcessorDefinition = { + dissect: { + __template: { + field: '', + pattern: '' + }, + field: '', + pattern: '', + append_separator: '', + ignore_missing: { + __one_of: [ false, true ] + }, + ...commonPipelineParams + } +}; + +// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/dot-expand-processor.html +const dotExpanderProcessorDefinition = { + dot_expander: { + __template: { + field: '' + }, + field: '', + path: '', + ...commonPipelineParams + } +}; + +// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/drop-processor.html +const dropProcessorDefinition = { + drop: { + __template: {}, + ...commonPipelineParams } }; @@ -86,7 +151,8 @@ const failProcessorDefinition = { __template: { message: '' }, - message: '' + message: '', + ...commonPipelineParams } }; @@ -100,7 +166,8 @@ const foreachProcessorDefinition = { field: '', processor: { __scope_link: '_processor' - } + }, + ...commonPipelineParams } }; @@ -119,7 +186,8 @@ const grokProcessorDefinition = { }, ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -133,7 +201,8 @@ const gsubProcessorDefinition = { }, field: '', pattern: '', - replacement: '' + replacement: '', + ...commonPipelineParams } }; @@ -145,7 +214,8 @@ const joinProcessorDefinition = { separator: '' }, field: '', - separator: '' + separator: '', + ...commonPipelineParams } }; @@ -159,7 +229,8 @@ const jsonProcessorDefinition = { target_field: '', add_to_root: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -178,7 +249,8 @@ const kvProcessorDefinition = { include_keys: [], ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -191,7 +263,19 @@ const lowercaseProcessorDefinition = { field: '', ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams + } +}; + +// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/pipeline-processor.html +const pipelineProcessorDefinition = { + pipeline: { + __template: { + name: '' + }, + name: '', + ...commonPipelineParams } }; @@ -201,7 +285,8 @@ const removeProcessorDefinition = { __template: { field: '' }, - field: '' + field: '', + ...commonPipelineParams } }; @@ -216,7 +301,8 @@ const renameProcessorDefinition = { target_field: '', ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -227,8 +313,9 @@ const scriptProcessorDefinition = { lang: 'painless', file: '', id: '', - inline: '', - params: {} + source: '', + params: {}, + ...commonPipelineParams } }; @@ -243,7 +330,8 @@ const setProcessorDefinition = { value: '', override: { __one_of: [ true, false ] - } + }, + ...commonPipelineParams } }; @@ -258,7 +346,8 @@ const splitProcessorDefinition = { separator: '', ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -269,7 +358,8 @@ const sortProcessorDefinition = { field: '' }, field: '', - order: 'asc' + order: 'asc', + ...commonPipelineParams } }; @@ -282,7 +372,8 @@ const trimProcessorDefinition = { field: '', ignore_missing: { __one_of: [ false, true ] - } + }, + ...commonPipelineParams } }; @@ -295,27 +386,21 @@ const uppercaseProcessorDefinition = { field: '', ignore_missing: { __one_of: [ false, true ] - } - } -}; - -// Based on https://www.elastic.co/guide/en/elasticsearch/reference/master/dot-expand-processor.html -const dotExpanderProcessorDefinition = { - dot_expander: { - __template: { - field: '' }, - field: '', - path: '' + ...commonPipelineParams } }; const processorDefinition = { __one_of: [ appendProcessorDefinition, + bytesProcessorDefinition, convertProcessorDefinition, dateProcessorDefinition, dateIndexNameProcessorDefinition, + dissectProcessorDefinition, + dotExpanderProcessorDefinition, + dropProcessorDefinition, failProcessorDefinition, foreachProcessorDefinition, grokProcessorDefinition, @@ -324,6 +409,7 @@ const processorDefinition = { jsonProcessorDefinition, kvProcessorDefinition, lowercaseProcessorDefinition, + pipelineProcessorDefinition, removeProcessorDefinition, renameProcessorDefinition, scriptProcessorDefinition, @@ -331,8 +417,7 @@ const processorDefinition = { splitProcessorDefinition, sortProcessorDefinition, trimProcessorDefinition, - uppercaseProcessorDefinition, - dotExpanderProcessorDefinition + uppercaseProcessorDefinition ] }; @@ -344,7 +429,6 @@ const pipelineDefinition = { version: 123, }; - export default function (api) { // Note: this isn't an actual API endpoint. It exists so the forEach processor's "processor" field diff --git a/src/core_plugins/console/api_server/server.js b/src/core_plugins/console/api_server/server.js index 6697dbe4d37a7..b9a42a457b90d 100644 --- a/src/core_plugins/console/api_server/server.js +++ b/src/core_plugins/console/api_server/server.js @@ -19,15 +19,19 @@ import _ from 'lodash'; -export function resolveApi(senseVersion, apis, reply) { +const KNOWN_APIS = ['es_6_0']; + +export function resolveApi(senseVersion, apis, h) { const result = {}; _.each(apis, function (name) { { - // for now we ignore sense_version. might add it in the api name later - const api = require('./' + name); - result[name] = api.asJson(); + if (KNOWN_APIS.includes(name)) { + // for now we ignore sense_version. might add it in the api name later + const api = require('./' + name); + result[name] = api.asJson(); + } } }); - return reply(result).type('application/json'); + return h.response(result).type('application/json'); } diff --git a/src/core_plugins/console/api_server/server.test.js b/src/core_plugins/console/api_server/server.test.js new file mode 100644 index 0000000000000..ea78611a6060e --- /dev/null +++ b/src/core_plugins/console/api_server/server.test.js @@ -0,0 +1,51 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { resolveApi } from './server'; + +describe('resolveApi', () => { + it('allows known APIs to be resolved', () => { + const mockReply = jest.fn((result) => ({ type: () => result })); + const result = resolveApi('Sense Version', ['es_6_0'], { response: mockReply }); + expect(result).toMatchObject({ + es_6_0: { + endpoints: expect.any(Object), + globals: expect.any(Object), + name: expect.any(String), + } + }); + }); + + it('does not resolve APIs that are not known', () => { + const mockReply = jest.fn((result) => ({ type: () => result })); + const result = resolveApi('Sense Version', ['unknown'], { response: mockReply }); + expect(result).toEqual({}); + }); + + it('handles request for apis that are known and unknown', () => { + const mockReply = jest.fn((result) => ({ type: () => result })); + const result = resolveApi('Sense Version', ['es_6_0'], { response: mockReply }); + expect(result).toMatchObject({ + es_6_0: { + endpoints: expect.any(Object), + globals: expect.any(Object), + name: expect.any(String), + } + }); + }); +}); diff --git a/src/core_plugins/console/api_server/spec/generated/ingest.delete_pipeline.json b/src/core_plugins/console/api_server/spec/generated/ingest.delete_pipeline.json index a1c628e1e5116..c56d3840b2000 100644 --- a/src/core_plugins/console/api_server/spec/generated/ingest.delete_pipeline.json +++ b/src/core_plugins/console/api_server/spec/generated/ingest.delete_pipeline.json @@ -10,6 +10,6 @@ "patterns": [ "_ingest/pipeline/{id}" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-pipeline-api.html" } } diff --git a/src/core_plugins/console/api_server/spec/generated/ingest.get_pipeline.json b/src/core_plugins/console/api_server/spec/generated/ingest.get_pipeline.json index cf3fb455d2ed3..cffcbb1261f90 100644 --- a/src/core_plugins/console/api_server/spec/generated/ingest.get_pipeline.json +++ b/src/core_plugins/console/api_server/spec/generated/ingest.get_pipeline.json @@ -10,6 +10,6 @@ "_ingest/pipeline", "_ingest/pipeline/{id}" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-pipeline-api.html" } } diff --git a/src/core_plugins/console/api_server/spec/generated/ingest.processor_grok.json b/src/core_plugins/console/api_server/spec/generated/ingest.processor_grok.json index 42c593a1b88b4..7c7011c1e7571 100644 --- a/src/core_plugins/console/api_server/spec/generated/ingest.processor_grok.json +++ b/src/core_plugins/console/api_server/spec/generated/ingest.processor_grok.json @@ -6,6 +6,6 @@ "patterns": [ "_ingest/processor/grok" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/grok-processor.html#grok-processor-rest-get" } } diff --git a/src/core_plugins/console/api_server/spec/generated/ingest.put_pipeline.json b/src/core_plugins/console/api_server/spec/generated/ingest.put_pipeline.json index 0e7f7cab9ad6a..037c7bbfc3a31 100644 --- a/src/core_plugins/console/api_server/spec/generated/ingest.put_pipeline.json +++ b/src/core_plugins/console/api_server/spec/generated/ingest.put_pipeline.json @@ -10,6 +10,6 @@ "patterns": [ "_ingest/pipeline/{id}" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-pipeline-api.html" } } diff --git a/src/core_plugins/console/api_server/spec/generated/ingest.simulate.json b/src/core_plugins/console/api_server/spec/generated/ingest.simulate.json index 2bb84486c4696..ac9d94b3f7df6 100644 --- a/src/core_plugins/console/api_server/spec/generated/ingest.simulate.json +++ b/src/core_plugins/console/api_server/spec/generated/ingest.simulate.json @@ -11,6 +11,6 @@ "_ingest/pipeline/_simulate", "_ingest/pipeline/{id}/_simulate" ], - "documentation": "https://www.elastic.co/guide/en/elasticsearch/plugins/master/ingest.html" + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/master/simulate-pipeline-api.html" } } diff --git a/src/core_plugins/console/index.js b/src/core_plugins/console/index.js index 420f6db2b3dc5..ad3881f825004 100644 --- a/src/core_plugins/console/index.js +++ b/src/core_plugins/console/index.js @@ -113,14 +113,13 @@ export default function (kibana) { server.route({ path: '/api/console/api_server', method: ['GET', 'POST'], - handler: function (req, reply) { + handler: function (req, h) { const { sense_version: version, apis } = req.query; if (!apis) { - reply(Boom.badRequest('"apis" is a required param.')); - return; + throw Boom.badRequest('"apis" is a required param.'); } - return resolveApi(version, apis.split(','), reply); + return resolveApi(version, apis.split(','), h); } }); }, @@ -129,6 +128,7 @@ export default function (kibana) { apps: apps, hacks: ['plugins/console/hacks/register'], devTools: ['plugins/console/console'], + styleSheetPaths: `${__dirname}/public/index.scss`, injectDefaultVars(server) { return { diff --git a/src/core_plugins/console/public/_ace_overrides.scss b/src/core_plugins/console/public/_ace_overrides.scss new file mode 100644 index 0000000000000..f11979d18cca4 --- /dev/null +++ b/src/core_plugins/console/public/_ace_overrides.scss @@ -0,0 +1,66 @@ +.conApp, +.conHelp__example, +.conHistory__viewer { + + .ace-tm { + .ace_gutter { + background-color: $euiColorEmptyShade; + color: $euiColorMediumShade; + } + + .ace_gutter-active-line, + .ace_marker-layer .ace_active-line { + background-color: transparentize($euiColorLightShade, .3); + } + } + + .ace_snippet-marker { + width: 100%; + background-color: tintOrShade($euiColorLightShade, 50%, 0); + border: none; + } + + .ace_search { + z-index: $euiZLevel1 + 1; + } + + .ace_layer.ace_marker-layer { + overflow: visible; + } + + .ace_scroller { + border-left: $euiBorderThin; + } + + // SASSTODO: Coloring uses EUI code block variables. + // However, the naming does not currently line up (selector to variable). + // This is so that there is no drastic visual difference for the user. + // Eventually, we can update this to match all other editors. + + .ace_warning { + color: $euiColorDanger; + } + + .ace_method { + color: $euiCodeBlockStringColor; + } + + .ace_url, + .ace_start_triple_quote, + .ace_end_triple_quote { + color: $euiCodeBlockNumberColor; + } + + .ace_variable { + color: $euiCodeBlockTypeColor; + } + + .ace_string, + .ace_multi_string { + color: $euiCodeBlockRegexpColor; + } + + .ace_multi_string { + font-style: italic; + } +} diff --git a/src/core_plugins/console/public/_app.scss b/src/core_plugins/console/public/_app.scss new file mode 100644 index 0000000000000..16e3bb33caa59 --- /dev/null +++ b/src/core_plugins/console/public/_app.scss @@ -0,0 +1,64 @@ +.conApp { + display: flex; + flex: 1 1 auto; + position: relative; + padding: $euiSizeS; + background-color: $euiColorLightestShade; + // Make sure the editor actions don't create scrollbars on this container + // SASSTODO: Uncomment when tooltips are EUI-ified (inside portals) + // overflow: hidden; +} + +.conApp__editor { + // Default size of left side is half the large breakpoint + // but this is inline overridden by the resizer + width: map-get($euiBreakpoints, "l") / 2; + display: flex; + flex: 0 0 auto; + position: relative; +} + +.conApp__output { + display: flex; + flex: 1 1 1px; +} + +.conApp__editorContent, +.conApp__outputContent { + flex: 1 1 1px; +} + +.conApp__editorActions { + position: absolute; + z-index: $euiZLevel1; + top: 0; + // Adjust for possible scrollbars + right: $euiSize; + line-height: 1; +} + +.conApp__editorActionButton { + padding: 0 $euiSizeXS; + appearance: none; + border: none; + background: none; +} + +.conApp__editorActionButton--success { + color: $euiColorSuccess; +} + +.conApp__resizer { + @include kibana-resizer; +} + +// SASSTODO: This component seems to not be used anymore? +// Possibly replaced by the Ace version +.conApp__autoComplete { + position: absolute; + left: -1000px; + visibility: hidden; + /* by pass any other element in ace and resize bar, but not modal popups */ + z-index: $euiZLevel1 + 2; + margin-top: 22px; +} diff --git a/src/core_plugins/console/public/console.js b/src/core_plugins/console/public/console.js index d6096d136abd6..1b586162f4501 100644 --- a/src/core_plugins/console/public/console.js +++ b/src/core_plugins/console/public/console.js @@ -27,7 +27,6 @@ require('ui/modules').get('kibana', ['sense.ui.bootstrap']); require('ui/tooltip'); require('ui/autoload/styles'); -require('./css/sense.less'); require('./src/controllers/sense_controller'); require('./src/directives/sense_history'); require('./src/directives/sense_settings'); diff --git a/src/core_plugins/console/public/css/sense.less b/src/core_plugins/console/public/css/sense.less deleted file mode 100644 index 61b6fecefae8f..0000000000000 --- a/src/core_plugins/console/public/css/sense.less +++ /dev/null @@ -1,207 +0,0 @@ -@import (reference) "~ui/styles/variables"; - -nav.navbar .logo.hidden-sm { - display: block !important; -} - -sense-help-example, -sense-history-viewer, -#editor_output_container { - @import "./sense.light.less"; -} - -#editor_output_container { - display: flex; - flex: 1 1 auto; - position: relative; - padding: 10px; - font-size: 16px; - - .ace-tm .ace_gutter { - background: @white; - color: #A0A0A0; - } - - .ace-tm .ace_gutter-active-line { - background-color: #e6e6e8; - } - - .ace-tm .ace_marker-layer .ace_active-line { - background-color: #dbdcdd; - } - - .ace_snippet-marker { - background-color: #e8e8e8; - border: 0; - } -} - -#editor_container { - display: flex; - flex: 0 0 auto; - width: 468px; - position: relative; - - #autocomplete { - position: absolute; - left: -1000px; - } - - #editor_actions { - position: absolute; - } - - #editor { - flex: 1 1 1px; - } - - .ace_search { - z-index: 1006; - } -} - -#editor_resizer { - display: flex; - flex: 0 0 13px; - cursor: ew-resize; - background-color: @globalColorLightestGray; - align-items: center; - margin: -10px 0; - - &:hover { - background-color: lighten(@globalColorBlue, 50%); - } - - &.active { - background-color: @globalColorBlue; - } -} - -#output_container { - display: flex; - flex: 1 1 1px; - - #output { - flex: 1 1 1px; - } -} - -#editor_actions { - position: absolute; - top: 0; - right: 0; - line-height: 1; - padding: 1px 3px 0 0; - /* by pass any other element in ace and resize bar, but not modal popups */ - z-index: 1005; - - .editor_action { - padding: 2px 4px; - appearance: none; - border: none; - background: none; - } - - .fa-wrench { - color: rgb(51, 51, 51); - } - - .fa-play { - color: rgb(112, 186, 86); - } -} - -#autocomplete { - visibility: hidden; - position: absolute; - /* by pass any other element in ace and resize bar, but not modal popups */ - z-index: 1003; - margin-top: 22px; - /*font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;*/ - /*font-size: 12px;*/ - /*max-height: 100px;*/ - /*overflow-y: auto;*/ - /* prevent horizontal scrollbar */ - /*overflow-x: hidden;*/ -} - -.ui-state-focus { - margin: auto !important; -} - -sense-help-example { - display: block; - height: 11em; - margin: 1em 0; -} - -.history-body { - display: flex; - height: 300px; - - .history-reqs, - .history-viewer { - flex: 0 0 50%; - } - - .history-reqs { - overflow: auto; - margin: 0 25px 0 0; - } - - .history-req { - display: flex; - - &.selected { - background-color: #DCDCDC; - } - - .history-req-icon { - flex: 1 0 auto; - text-align: right; - .fa-chevron-right { - opacity: .25; - } - } - } -} - -.history-footer { - text-align: right; - padding-top: 10px; -} - -.ui-autocomplete { - z-index: 400 !important; -} - -.ace_editor { - line-height: normal; -} - -.ace_layer.ace_marker-layer { - overflow: visible; -} - -.ace_snippet-marker { - position: absolute; - width: 100% !important; -} - -// .ui-resizable-e { -// cursor: ew-resize; -// width: 13px; -// right: -14px; -// top: -1px; -// bottom: -2px; -// background-color: transparent; -// position: absolute; -// } -// -// .ui-resizable-e:hover { -// background-color: #DCDCDC; -// } - -.ui-resizable-e.active { - background-color: rgba(194, 193, 208, 100); -} diff --git a/src/core_plugins/console/public/css/sense.light.less b/src/core_plugins/console/public/css/sense.light.less deleted file mode 100644 index 966198d21a164..0000000000000 --- a/src/core_plugins/console/public/css/sense.light.less +++ /dev/null @@ -1,49 +0,0 @@ -.ace_method { - color: #E64A3A; -} - -.ace_url { - color: #40B0D3; -} - -.ace_variable { - color: #006E8A; -} - -.ace_string { - color: #166555; -} - -.ace_warning { - color: #E64A3A; -} - -.ace_scroller { - border-left: 1px solid @globalColorLightGray; -} - -.ace_multi_string { - color: #166555; - font-style: italic; -} - -.ace_start_triple_quote, .ace_end_triple_quote { - color: #40B0D3; -} - -.ace_snippet-marker { - background: rgba(194, 193, 208, 0.20); - border-top: dotted 1px rgba(194, 193, 208, 0.80); - border-bottom: dotted 1px rgba(194, 193, 208, 0.80); - margin-top: -1px; /* compensate for background */ -} - -.ui-menu { - background-color: white; - border: 1px solid #CCC; -} - -.ui-state-focus { - color: white; - background-color: #08C; -} diff --git a/src/core_plugins/console/public/index.html b/src/core_plugins/console/public/index.html index 31b02421a40d3..30ebcf70b33be 100644 --- a/src/core_plugins/console/public/index.html +++ b/src/core_plugins/console/public/index.html @@ -1,11 +1,11 @@ -

-
-
    -
    - +
    +
    +
      +
      + @@ -28,27 +28,36 @@ aria-labelledby="consoleRequestOptions" >
    • - +
    • - +
    • - +
    • -
      GET _search +
      GET _search { "query": { "match_all": {} } }
      -
      -
      -
      {}
      +
      +
      +
      {}
      diff --git a/src/core_plugins/console/public/index.scss b/src/core_plugins/console/public/index.scss new file mode 100644 index 0000000000000..6e3e8b0fcc9b8 --- /dev/null +++ b/src/core_plugins/console/public/index.scss @@ -0,0 +1,12 @@ +@import 'ui/public/styles/styling_constants'; + +// Prefix all styles with "con" to avoid conflicts. +// Examples +// conChart +// conChart__legend +// conChart__legend--small +// conChart__legend-isLoading + +@import './app'; +@import './ace_overrides'; +@import './src/directives/index'; diff --git a/src/core_plugins/console/public/src/autocomplete.js b/src/core_plugins/console/public/src/autocomplete.js index 3daf2a326b44b..8275813ea2b98 100644 --- a/src/core_plugins/console/public/src/autocomplete.js +++ b/src/core_plugins/console/public/src/autocomplete.js @@ -29,6 +29,7 @@ import { URL_PATH_END_MARKER } from './autocomplete/components'; import _ from 'lodash'; import ace from 'brace'; import 'brace/ext/language_tools'; +import { i18n } from '@kbn/i18n'; const AceRange = ace.acequire('ace/range').Range; @@ -738,7 +739,7 @@ export default function (editor) { context.autoCompleteSet = ['GET', 'PUT', 'POST', 'DELETE', 'HEAD'].map((m, i) => ({ name: m, score: -i, - meta: 'method' + meta: i18n.translate('console.autocomplete.addMethodMetaText', { defaultMessage: 'method' }), })); } diff --git a/src/core_plugins/console/public/src/controllers/sense_controller.js b/src/core_plugins/console/public/src/controllers/sense_controller.js index 760207eb91136..9f1c9be68f9cc 100644 --- a/src/core_plugins/console/public/src/controllers/sense_controller.js +++ b/src/core_plugins/console/public/src/controllers/sense_controller.js @@ -44,10 +44,10 @@ module.controller('SenseController', function SenseController(Private, $scope, $ let input; let output; $timeout(async () => { - output = initializeOutput($('#output')); - input = initializeInput($('#editor'), $('#editor_actions'), $('#copy_as_curl'), output, $scope.openDocumentation); + output = initializeOutput($('#ConAppOutput')); + input = initializeInput($('#ConAppEditor'), $('#ConAppEditorActions'), $('#ConCopyAsCurl'), output, $scope.openDocumentation); init(input, output, $location.search().load_from); - kbnUiAceKeyboardModeService.initialize($scope, $('#editor')); + kbnUiAceKeyboardModeService.initialize($scope, $('#ConAppEditor')); const session = input.getSession(); session.getSelection().on('changeCursor', () => { $scope.getDocumentation(); @@ -67,7 +67,8 @@ module.controller('SenseController', function SenseController(Private, $scope, $ if (endpoint && endpoint.documentation && endpoint.documentation.indexOf('http') !== -1) { - $scope.documentation = endpoint.documentation.replace('master', DOC_LINK_VERSION); + $scope.documentation = endpoint.documentation.replace('/master/', `/${DOC_LINK_VERSION}/`); + $scope.documentation = $scope.documentation.replace('/current/', `/${DOC_LINK_VERSION}/`); $scope.$apply(); } else { $scope.documentation = null; diff --git a/src/core_plugins/console/public/src/controllers/sense_top_nav_controller.js b/src/core_plugins/console/public/src/controllers/sense_top_nav_controller.js index 967a0d9817171..390d223501b28 100644 --- a/src/core_plugins/console/public/src/controllers/sense_top_nav_controller.js +++ b/src/core_plugins/console/public/src/controllers/sense_top_nav_controller.js @@ -20,7 +20,7 @@ import { KbnTopNavControllerProvider } from 'ui/kbn_top_nav/kbn_top_nav_controller'; import storage from '../storage'; -export function SenseTopNavController(Private) { +export function SenseTopNavController(Private, i18n) { const KbnTopNavController = Private(KbnTopNavControllerProvider); const controller = new KbnTopNavController([ @@ -32,19 +32,25 @@ export function SenseTopNavController(Private) { }, { key: 'history', - description: 'History', + description: i18n('console.topNav.historyTabDescription', { + defaultMessage: 'History', + }), template: ``, testId: 'consoleHistoryButton', }, { key: 'settings', - description: 'Settings', + description: i18n('console.topNav.settingsTabDescription', { + defaultMessage: 'Settings', + }), template: ``, testId: 'consoleSettingsButton', }, { key: 'help', - description: 'Help', + description: i18n('console.topNav.helpTabDescription', { + defaultMessage: 'Help', + }), template: ``, testId: 'consoleHelpButton', }, diff --git a/src/core_plugins/console/public/src/directives/_help.scss b/src/core_plugins/console/public/src/directives/_help.scss new file mode 100644 index 0000000000000..594bcfd1db311 --- /dev/null +++ b/src/core_plugins/console/public/src/directives/_help.scss @@ -0,0 +1,5 @@ +.conHelp__example { + display: block; + height: $euiSize * 8; // 8 lines of code + margin: $euiSize 0; +} diff --git a/src/core_plugins/console/public/src/directives/_history.scss b/src/core_plugins/console/public/src/directives/_history.scss new file mode 100644 index 0000000000000..982669b44656d --- /dev/null +++ b/src/core_plugins/console/public/src/directives/_history.scss @@ -0,0 +1,33 @@ +.conHistory__body { + display: flex; + height: $euiSizeXL * 10; +} + + +.conHistory__footer { + text-align: right; + padding-top: $euiSize; +} + +.conHistory__reqs, +.conHistory__viewer { + flex: 0 0 50%; +} + +.conHistory__reqs { + overflow: auto; + margin-right: $euiSizeL; +} + +.conHistory__req { + display: flex; + justify-content: space-between; + + &-selected { + background-color: $euiColorLightestShade; + } +} + +.conHistory__reqIcon { + color: $euiColorMediumShade; +} diff --git a/src/core_plugins/console/public/src/directives/_index.scss b/src/core_plugins/console/public/src/directives/_index.scss new file mode 100644 index 0000000000000..56bd7ed20bda4 --- /dev/null +++ b/src/core_plugins/console/public/src/directives/_index.scss @@ -0,0 +1,2 @@ +@import './help'; +@import './history'; diff --git a/src/core_plugins/console/public/src/directives/help.html b/src/core_plugins/console/public/src/directives/help.html index 51d7e4761c292..11cb5c254b9ac 100644 --- a/src/core_plugins/console/public/src/directives/help.html +++ b/src/core_plugins/console/public/src/directives/help.html @@ -1,39 +1,94 @@ -

      Help

      +

      -

      Request format

      +

      - You can type one or more requests in the white editor. Console understands requests in a compact format: - + +
      -

      Keyboard commands

      +

      Ctrl/Cmd + I
      -
      Auto indent current request
      +
      Ctrl/Cmd + /
      -
      Open documentation for current request
      +
      Ctrl + Space
      -
      Open Auto complete (even if not typing)
      +
      Ctrl/Cmd + Enter
      -
      Submit request
      +
      Ctrl/Cmd + Up/Down
      -
      Jump to the previous/next request start or end.
      +
      Ctrl/Cmd + Alt + L
      -
      Collapse/expand current scope.
      +
      Ctrl/Cmd + Option + 0
      -
      Collapse all scopes but the current one. Expand by adding a shift.
      +
      Down arrow
      -
      Switch focus to auto-complete menu. Use arrows to further select a term
      +
      Enter/Tab
      -
      Select the currently selected or the top most term in auto-complete menu
      +
      Esc
      -
      Close auto-complete menu
      +
      diff --git a/src/core_plugins/console/public/src/directives/history.html b/src/core_plugins/console/public/src/directives/history.html index 630ab2b264578..25d72ae009931 100644 --- a/src/core_plugins/console/public/src/directives/history.html +++ b/src/core_plugins/console/public/src/directives/history.html @@ -1,43 +1,53 @@ -

      History

      +

      -
      +
      • {{ history.describeReq(req) }} - +
      - +
      - Settings ng-model="settings.vals.wrapMode" aria-describedby="consoleFontSize" > - - Wrap long lines - + @@ -46,9 +52,9 @@

      Settings

      - Autocomplete - + i18n-id="console.settingsPage.autocompleteLabel" + i18n-default-message="Autocomplete" + >
      @@ -95,17 +107,17 @@

      Settings

      + i18n-id="console.settingsPage.cancelButtonLabel" + i18n-default-message="Cancel" + > + i18n-id="console.settingsPage.saveButtonLabel" + i18n-default-message="Save" + >
      diff --git a/src/core_plugins/console/public/src/directives/welcome.html b/src/core_plugins/console/public/src/directives/welcome.html index bad5efa578ca0..7fba7d21a9160 100644 --- a/src/core_plugins/console/public/src/directives/welcome.html +++ b/src/core_plugins/console/public/src/directives/welcome.html @@ -1,28 +1,66 @@
      -

      Welcome to Console

      +

      -

      Quick intro to the UI

      +

      + +

      -

      The Console UI is split into two panes: an editor pane (left) and a response pane (right). +

      -

      Console understands requests in a compact format, similar to cURL: +

      -

      While typing a request, Console will make suggestions which you can then accept by hitting Enter/Tab. - These suggestions are made based on the request structure as well as your indices and types. +

      -

      A few quick tips, while I have your attention

      +

      + + +

        -
      • Submit requests to ES using the green triangle button.
      • -
      • Use the wrench menu for other useful things.
      • -
      • You can paste requests in cURL format and they will be translated to the Console syntax.
      • -
      • You can resize the editor and output panes by dragging the separator between them.
      • -
      • Study the keyboard shortcuts under the Help button. Good stuff in there!
      • +
      • +
      • +
      • +
      • +
      diff --git a/src/core_plugins/console/public/src/input.js b/src/core_plugins/console/public/src/input.js index 3adddcd7b41f3..68b54ab9ecda1 100644 --- a/src/core_plugins/console/public/src/input.js +++ b/src/core_plugins/console/public/src/input.js @@ -173,7 +173,7 @@ export function initializeInput($el, $actionsEl, $copyAsCurlEl, output, openDocu if (mode === null || mode === 'application/json') { // assume json - auto pretty try { - value = utils.expandLiteralStrings(JSON.stringify(JSON.parse(value), null, 2)); + value = utils.expandLiteralStrings(value); } catch (e) { // nothing to do here diff --git a/src/core_plugins/console/public/src/input_resize.js b/src/core_plugins/console/public/src/input_resize.js index 1a79832400a2f..1afc952f699f4 100644 --- a/src/core_plugins/console/public/src/input_resize.js +++ b/src/core_plugins/console/public/src/input_resize.js @@ -37,7 +37,7 @@ export default function (input, output) { $left.width(editorWidth); } - const $resizer = $('#editor_resizer'); + const $resizer = $('#ConAppResizer'); $resizer .on('mousedown', function (event) { $resizer.addClass('active'); diff --git a/src/core_plugins/console/public/tests/src/editor.test.js b/src/core_plugins/console/public/tests/src/editor.test.js index 33420193c8e4e..ef1b1fb2dd65c 100644 --- a/src/core_plugins/console/public/tests/src/editor.test.js +++ b/src/core_plugins/console/public/tests/src/editor.test.js @@ -37,15 +37,15 @@ describe('Editor', () => { // Set up our document body document.body.innerHTML = `
      -
      -
      -
      +
      +
      +
      `; input = initializeInput( - $('#editor'), - $('#editor_actions'), - $('#copy_as_curl'), + $('#ConAppEditor'), + $('#ConAppEditorActions'), + $('#ConCopyAsCurl'), null ); input.$el.show(); diff --git a/src/core_plugins/console/public/tests/src/input_tokenization.test.js b/src/core_plugins/console/public/tests/src/input_tokenization.test.js index 0b92a4a3ede22..914bd4854e8c4 100644 --- a/src/core_plugins/console/public/tests/src/input_tokenization.test.js +++ b/src/core_plugins/console/public/tests/src/input_tokenization.test.js @@ -31,18 +31,18 @@ describe('Input Tokenization', () => { // Set up our document body document.body.innerHTML = `
      -
      -
      -
      +
      +
      +
      `; input = initializeInput( - $('#editor'), - $('#editor_actions'), - $('#copy_as_curl'), + $('#ConAppEditor'), + $('#ConAppEditorActions'), + $('#ConCopyAsCurl'), null ); - input = initializeInput($('#editor'), $('#editor_actions'), $('#copy_as_curl'), null); + input = initializeInput($('#ConAppEditor'), $('#ConAppEditorActions'), $('#ConCopyAsCurl'), null); input.$el.show(); input.autocomplete._test.removeChangeListener(); }); diff --git a/src/core_plugins/console/public/tests/src/integration.test.js b/src/core_plugins/console/public/tests/src/integration.test.js index 410e933dfafd3..cfb6e56bf5efa 100644 --- a/src/core_plugins/console/public/tests/src/integration.test.js +++ b/src/core_plugins/console/public/tests/src/integration.test.js @@ -33,12 +33,12 @@ describe('Integration', () => { beforeEach(() => { // Set up our document body document.body.innerHTML = - '
      '; + '
      '; input = initializeInput( - $('#editor'), - $('#editor_actions'), - $('#copy_as_curl'), + $('#ConAppEditor'), + $('#ConAppEditorActions'), + $('#ConCopyAsCurl'), null ); input.$el.show(); diff --git a/src/core_plugins/console/public/tests/src/output_tokenization.test.js b/src/core_plugins/console/public/tests/src/output_tokenization.test.js index 04b5cbdb0a6b0..36c081f5ef923 100644 --- a/src/core_plugins/console/public/tests/src/output_tokenization.test.js +++ b/src/core_plugins/console/public/tests/src/output_tokenization.test.js @@ -31,7 +31,7 @@ const tokenIterator = ace.acequire('ace/token_iterator'); describe('Output Tokenization', () => { beforeEach(() => { - output = initializeOutput($('#output')); + output = initializeOutput($('#ConAppOutput')); output.$el.show(); }); afterEach(() => { diff --git a/src/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js b/src/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js index 3a721bb18dfac..79821f6ff54e7 100644 --- a/src/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js +++ b/src/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js @@ -18,11 +18,15 @@ */ import expect from 'expect.js'; +import fs from 'fs'; +import { promisify } from 'bluebird'; import { getElasticsearchProxyConfig } from '../elasticsearch_proxy_config'; import https from 'https'; import http from 'http'; import sinon from 'sinon'; +const readFileAsync = promisify(fs.readFile, fs); + describe('plugins/console', function () { describe('#getElasticsearchProxyConfig', function () { @@ -118,22 +122,73 @@ describe('plugins/console', function () { expect(agent.options.ca).to.contain('test ca certificate\n'); }); - it(`doesn't set cert and key when certificate and key paths are specified`, function () { - setElasticsearchConfig('ssl.certificate', __dirname + '/fixtures/cert.crt'); - setElasticsearchConfig('ssl.key', __dirname + '/fixtures/cert.key'); - - const { agent } = getElasticsearchProxyConfig(server); - expect(agent.options.cert).to.be(undefined); - expect(agent.options.key).to.be(undefined); + describe('when alwaysPresentCertificate is false', () => { + it(`doesn't set cert and key when certificate and key paths are specified`, function () { + setElasticsearchConfig('ssl.alwaysPresentCertificate', false); + setElasticsearchConfig('ssl.certificate', __dirname + '/fixtures/cert.crt'); + setElasticsearchConfig('ssl.key', __dirname + '/fixtures/cert.key'); + + const { agent } = getElasticsearchProxyConfig(server); + expect(agent.options.cert).to.be(undefined); + expect(agent.options.key).to.be(undefined); + }); + + it(`doesn't set passphrase when certificate, key and keyPassphrase are specified`, function () { + setElasticsearchConfig('ssl.alwaysPresentCertificate', false); + setElasticsearchConfig('ssl.certificate', __dirname + '/fixtures/cert.crt'); + setElasticsearchConfig('ssl.key', __dirname + '/fixtures/cert.key'); + setElasticsearchConfig('ssl.keyPassphrase', 'secret'); + + const { agent } = getElasticsearchProxyConfig(server); + expect(agent.options.passphrase).to.be(undefined); + }); }); - it(`doesn't set passphrase when certificate, key and keyPassphrase are specified`, function () { - setElasticsearchConfig('ssl.certificate', __dirname + '/fixtures/cert.crt'); - setElasticsearchConfig('ssl.key', __dirname + '/fixtures/cert.key'); - setElasticsearchConfig('ssl.keyPassphrase', 'secret'); + describe('when alwaysPresentCertificate is true', () => { + it(`sets cert and key when certificate and key paths are specified`, async function () { + const certificatePath = __dirname + '/fixtures/cert.crt'; + const keyPath = __dirname + '/fixtures/cert.key'; + setElasticsearchConfig('ssl.alwaysPresentCertificate', true); + setElasticsearchConfig('ssl.certificate', certificatePath); + setElasticsearchConfig('ssl.key', keyPath); + + const { agent } = getElasticsearchProxyConfig(server); + expect(agent.options.cert).to.be(await readFileAsync(certificatePath, 'utf8')); + expect(agent.options.key).to.be(await readFileAsync(keyPath, 'utf8')); + }); + + it(`sets passphrase when certificate, key and keyPassphrase are specified`, function () { + setElasticsearchConfig('ssl.alwaysPresentCertificate', true); + setElasticsearchConfig('ssl.certificate', __dirname + '/fixtures/cert.crt'); + setElasticsearchConfig('ssl.key', __dirname + '/fixtures/cert.key'); + setElasticsearchConfig('ssl.keyPassphrase', 'secret'); + + const { agent } = getElasticsearchProxyConfig(server); + expect(agent.options.passphrase).to.be('secret'); + }); + + it(`doesn't set cert when only certificate path is specified`, async function () { + const certificatePath = __dirname + '/fixtures/cert.crt'; + setElasticsearchConfig('ssl.alwaysPresentCertificate', true); + setElasticsearchConfig('ssl.certificate', certificatePath); + setElasticsearchConfig('ssl.key', undefined); + + const { agent } = getElasticsearchProxyConfig(server); + expect(agent.options.cert).to.be(undefined); + expect(agent.options.key).to.be(undefined); + }); + + it(`doesn't set key when only key path is specified`, async function () { + const keyPath = __dirname + '/fixtures/cert.key'; + setElasticsearchConfig('ssl.alwaysPresentCertificate', true); + setElasticsearchConfig('ssl.certificate', undefined); + setElasticsearchConfig('ssl.key', keyPath); + + const { agent } = getElasticsearchProxyConfig(server); + expect(agent.options.cert).to.be(undefined); + expect(agent.options.key).to.be(undefined); + }); - const { agent } = getElasticsearchProxyConfig(server); - expect(agent.options.passphrase).to.be(undefined); }); }); }); diff --git a/src/core_plugins/console/server/__tests__/proxy_route/body.js b/src/core_plugins/console/server/__tests__/proxy_route/body.js index 28ad08d72ab6a..9dae2ec8047ff 100644 --- a/src/core_plugins/console/server/__tests__/proxy_route/body.js +++ b/src/core_plugins/console/server/__tests__/proxy_route/body.js @@ -36,8 +36,6 @@ describe('Console Proxy Route', () => { sandbox.stub(Wreck, 'request').callsFake(createWreckResponseStub(response)); const server = new Server(); - - server.connection({ port: 0 }); server.route(createProxyRoute({ baseUrl: 'http://localhost:9200' })); diff --git a/src/core_plugins/console/server/__tests__/proxy_route/headers.js b/src/core_plugins/console/server/__tests__/proxy_route/headers.js index 3bf32ce78871a..2d3ddf11e020f 100644 --- a/src/core_plugins/console/server/__tests__/proxy_route/headers.js +++ b/src/core_plugins/console/server/__tests__/proxy_route/headers.js @@ -38,8 +38,6 @@ describe('Console Proxy Route', () => { setup = () => { const server = new Server(); - - server.connection({ port: 0 }); server.route(createProxyRoute({ baseUrl: 'http://localhost:9200' })); diff --git a/src/core_plugins/console/server/__tests__/proxy_route/params.js b/src/core_plugins/console/server/__tests__/proxy_route/params.js index 2fb1370555946..4ceccc8855d6a 100644 --- a/src/core_plugins/console/server/__tests__/proxy_route/params.js +++ b/src/core_plugins/console/server/__tests__/proxy_route/params.js @@ -38,7 +38,6 @@ describe('Console Proxy Route', () => { setup = () => { const server = new Server(); - server.connection({ port: 0 }); teardowns.push(() => server.stop()); return { server }; }; @@ -126,7 +125,7 @@ describe('Console Proxy Route', () => { expect(args[0]).to.have.property('path', '/api/console/proxy'); expect(args[0]).to.have.property('method', 'post'); expect(args[0]).to.have.property('query').eql({ method: 'HEAD', path: '/index/type/id' }); - expect(args[1]).to.be('/index/type/id'); + expect(args[1]).to.be('/index/type/id?pretty'); }); it('sends the returned timeout, rejectUnauthorized, agent, and base headers to Wreck', async () => { diff --git a/src/core_plugins/console/server/__tests__/proxy_route/query_string.js b/src/core_plugins/console/server/__tests__/proxy_route/query_string.js index 9276ec3b5ef35..c5b44cf39713d 100644 --- a/src/core_plugins/console/server/__tests__/proxy_route/query_string.js +++ b/src/core_plugins/console/server/__tests__/proxy_route/query_string.js @@ -36,8 +36,6 @@ describe('Console Proxy Route', () => { request = async (method, path) => { const server = new Server(); - - server.connection({ port: 0 }); server.route(createProxyRoute({ baseUrl: 'http://localhost:9200' })); @@ -66,7 +64,7 @@ describe('Console Proxy Route', () => { await request('GET', 'http://evil.com/test'); sinon.assert.calledOnce(Wreck.request); const args = Wreck.request.getCall(0).args; - expect(args[1]).to.be('http://localhost:9200/http://evil.com/test'); + expect(args[1]).to.be('http://localhost:9200/http://evil.com/test?pretty'); }); }); describe('is missing', () => { @@ -87,14 +85,14 @@ describe('Console Proxy Route', () => { it('combines well with the base url', async () => { await request('GET', '/index/type/id'); sinon.assert.calledOnce(Wreck.request); - expect(Wreck.request.getCall(0).args[1]).to.be('http://localhost:9200/index/type/id'); + expect(Wreck.request.getCall(0).args[1]).to.be('http://localhost:9200/index/type/id?pretty'); }); }); describe(`doesn't start with a slash`, () => { it('combines well with the base url', async () => { await request('GET', 'index/type/id'); sinon.assert.calledOnce(Wreck.request); - expect(Wreck.request.getCall(0).args[1]).to.be('http://localhost:9200/index/type/id'); + expect(Wreck.request.getCall(0).args[1]).to.be('http://localhost:9200/index/type/id?pretty'); }); }); }); diff --git a/src/core_plugins/console/server/__tests__/proxy_route/stubs.js b/src/core_plugins/console/server/__tests__/proxy_route/stubs.js index 3318f7a4b2740..78efef84c9750 100644 --- a/src/core_plugins/console/server/__tests__/proxy_route/stubs.js +++ b/src/core_plugins/console/server/__tests__/proxy_route/stubs.js @@ -20,7 +20,7 @@ import { Readable } from 'stream'; export function createWreckResponseStub(response) { - return (...args) => { + return async () => { const resp = new Readable({ read() { if (response) { @@ -37,6 +37,6 @@ export function createWreckResponseStub(response) { 'content-length': String(response ? response.length : 0) }; - args.pop()(null, resp); + return resp; }; } diff --git a/src/core_plugins/console/server/elasticsearch_proxy_config.js b/src/core_plugins/console/server/elasticsearch_proxy_config.js index 86fb37eb86eb7..b1ece31d9e3d9 100644 --- a/src/core_plugins/console/server/elasticsearch_proxy_config.js +++ b/src/core_plugins/console/server/elasticsearch_proxy_config.js @@ -55,6 +55,16 @@ const createAgent = (server) => { agentOptions.ca = config.get('elasticsearch.ssl.certificateAuthorities').map(readFile); } + if ( + config.get('elasticsearch.ssl.alwaysPresentCertificate') && + config.get('elasticsearch.ssl.certificate') && + config.get('elasticsearch.ssl.key') + ) { + agentOptions.cert = readFile(config.get('elasticsearch.ssl.certificate')); + agentOptions.key = readFile(config.get('elasticsearch.ssl.key')); + agentOptions.passphrase = config.get('elasticsearch.ssl.keyPassphrase'); + } + return new https.Agent(agentOptions); }; diff --git a/src/core_plugins/console/server/proxy_route.js b/src/core_plugins/console/server/proxy_route.js index cdae847f0e702..a7062133dcd36 100644 --- a/src/core_plugins/console/server/proxy_route.js +++ b/src/core_plugins/console/server/proxy_route.js @@ -23,7 +23,16 @@ import Wreck from 'wreck'; import { trimLeft, trimRight } from 'lodash'; function resolveUri(base, path) { - return `${trimRight(base, '/')}/${trimLeft(path, '/')}`; + let pathToUse = `${trimRight(base, '/')}/${trimLeft(path, '/')}`; + const questionMarkIndex = pathToUse.indexOf('?'); + // no query string in pathToUse, append '?pretty' + if (questionMarkIndex === -1) { + pathToUse = `${pathToUse}?pretty`; + } else { + // pathToUse has query string, append '&pretty' + pathToUse = `${pathToUse}&pretty`; + } + return pathToUse; } function extendCommaList(obj, property, value) { @@ -37,7 +46,7 @@ function getProxyHeaders(req) { // see https://git.io/vytQ7 extendCommaList(headers, 'x-forwarded-for', req.info.remoteAddress); extendCommaList(headers, 'x-forwarded-port', req.info.remotePort); - extendCommaList(headers, 'x-forwarded-proto', req.connection.info.protocol); + extendCommaList(headers, 'x-forwarded-proto', req.server.info.protocol); extendCommaList(headers, 'x-forwarded-host', req.info.host); } @@ -73,21 +82,21 @@ export const createProxyRoute = ({ }, pre: [ - function filterPath(req, reply) { + function filterPath(req) { const { path } = req.query; - if (!pathFilters.some(re => re.test(path))) { - const err = Boom.forbidden(); - err.output.payload = `Error connecting to '${path}':\n\nUnable to send requests to that path.`; - err.output.headers['content-type'] = 'text/plain'; - reply(err); - } else { - reply(); + if (pathFilters.some(re => re.test(path))) { + return null; } + + const err = Boom.forbidden(); + err.output.payload = `Error connecting to '${path}':\n\nUnable to send requests to that path.`; + err.output.headers['content-type'] = 'text/plain'; + throw err; }, ], - handler(req, reply) { + handler: async (req, h) => { const { payload, query } = req; const { path, method } = query; const uri = resolveUri(baseUrl, path); @@ -110,23 +119,18 @@ export const createProxyRoute = ({ }, }; - Wreck.request(method, uri, wreckOptions, (err, esResponse) => { - if (err) { - return reply(err); - } - - if (method.toUpperCase() !== 'HEAD') { - reply(esResponse) - .code(esResponse.statusCode) - .header('warning', esResponse.headers.warning); - return; - } + const esResponse = await Wreck.request(method, uri, wreckOptions); - reply(`${esResponse.statusCode} - ${esResponse.statusMessage}`) + if (method.toUpperCase() !== 'HEAD') { + return h.response(esResponse) .code(esResponse.statusCode) - .type('text/plain') .header('warning', esResponse.headers.warning); - }); + } + + return h.response(`${esResponse.statusCode} - ${esResponse.statusMessage}`) + .code(esResponse.statusCode) + .type('text/plain') + .header('warning', esResponse.headers.warning); } } }); diff --git a/src/core_plugins/elasticsearch/index.js b/src/core_plugins/elasticsearch/index.js index 87af4ace6a668..7536a8d4813d4 100644 --- a/src/core_plugins/elasticsearch/index.js +++ b/src/core_plugins/elasticsearch/index.js @@ -35,33 +35,32 @@ export default function (kibana) { return new kibana.Plugin({ require: ['kibana'], config(Joi) { - const { array, boolean, number, object, string, ref } = Joi; - - const sslSchema = object({ - verificationMode: string().valid('none', 'certificate', 'full').default('full'), - certificateAuthorities: array().single().items(string()), - certificate: string(), - key: string(), - keyPassphrase: string() + const sslSchema = Joi.object({ + verificationMode: Joi.string().valid('none', 'certificate', 'full').default('full'), + certificateAuthorities: Joi.array().single().items(Joi.string()), + certificate: Joi.string(), + key: Joi.string(), + keyPassphrase: Joi.string(), + alwaysPresentCertificate: Joi.boolean().default(false), }).default(); - return object({ - enabled: boolean().default(true), - url: string().uri({ scheme: ['http', 'https'] }).default('http://localhost:9200'), - preserveHost: boolean().default(true), - username: string(), - password: string(), - shardTimeout: number().default(30000), - requestTimeout: number().default(30000), - requestHeadersWhitelist: array().items().single().default(DEFAULT_REQUEST_HEADERS), - customHeaders: object().default({}), - pingTimeout: number().default(ref('requestTimeout')), - startupTimeout: number().default(5000), - logQueries: boolean().default(false), + return Joi.object({ + enabled: Joi.boolean().default(true), + url: Joi.string().uri({ scheme: ['http', 'https'] }).default('http://localhost:9200'), + preserveHost: Joi.boolean().default(true), + username: Joi.string(), + password: Joi.string(), + shardTimeout: Joi.number().default(30000), + requestTimeout: Joi.number().default(30000), + requestHeadersWhitelist: Joi.array().items().single().default(DEFAULT_REQUEST_HEADERS), + customHeaders: Joi.object().default({}), + pingTimeout: Joi.number().default(Joi.ref('requestTimeout')), + startupTimeout: Joi.number().default(5000), + logQueries: Joi.boolean().default(false), ssl: sslSchema, apiVersion: Joi.string().default('master'), - healthCheck: object({ - delay: number().default(2500) + healthCheck: Joi.object({ + delay: Joi.number().default(2500) }).default(), }).default(); }, diff --git a/src/core_plugins/elasticsearch/lib/__tests__/create_clusters.js b/src/core_plugins/elasticsearch/lib/__tests__/create_clusters.js index ce9ebc739a651..c10e8e6ebae0e 100644 --- a/src/core_plugins/elasticsearch/lib/__tests__/create_clusters.js +++ b/src/core_plugins/elasticsearch/lib/__tests__/create_clusters.js @@ -36,7 +36,9 @@ describe('plugins/elasticsearch', function () { elasticsearch: {} }, expose: sinon.mock(), - on: sinon.stub(), + events: { + on: sinon.stub(), + } }; clusters = createClusters(server); @@ -86,7 +88,6 @@ describe('plugins/elasticsearch', function () { it('closes all clusters', async () => { const server = new Hapi.Server(); - server.connection({ port: 0 }); const clusters = createClusters(server); const cluster = clusters.create('name', { config: true }); expect(cluster).to.have.property('stub', true); diff --git a/src/core_plugins/elasticsearch/lib/__tests__/health_check.js b/src/core_plugins/elasticsearch/lib/__tests__/health_check.js index 50cbe34a8985a..bc3dae10b99c3 100644 --- a/src/core_plugins/elasticsearch/lib/__tests__/health_check.js +++ b/src/core_plugins/elasticsearch/lib/__tests__/health_check.js @@ -114,13 +114,10 @@ describe('plugins/elasticsearch', () => { sinon.assert.calledOnce(server.ext); sinon.assert.calledWithExactly(server.ext, sinon.match.string, sinon.match.func); - // call the server extension - const reply = sinon.stub(); const [, handler] = server.ext.firstCall.args; - handler({}, reply); + handler(); // this should be health.stop - // ensure that the handler called reply and unregistered the time - sinon.assert.calledOnce(reply); + // ensure that the handler unregistered the timer expect(getTimerCount()).to.be(0); }); diff --git a/src/core_plugins/elasticsearch/lib/cluster.js b/src/core_plugins/elasticsearch/lib/cluster.js index 52644e5a8b3e2..be6399257cd10 100644 --- a/src/core_plugins/elasticsearch/lib/cluster.js +++ b/src/core_plugins/elasticsearch/lib/cluster.js @@ -34,7 +34,10 @@ export class Cluster { this._clients = new Set(); this._client = this.createClient(); - this._noAuthClient = this.createClient({ auth: false }, { ignoreCertAndKey: true }); + this._noAuthClient = this.createClient( + { auth: false }, + { ignoreCertAndKey: !this.getSsl().alwaysPresentCertificate } + ); return this; } diff --git a/src/core_plugins/elasticsearch/lib/create_agent.js b/src/core_plugins/elasticsearch/lib/create_agent.js index 6bce56b27032b..f636c9edcc1b8 100644 --- a/src/core_plugins/elasticsearch/lib/create_agent.js +++ b/src/core_plugins/elasticsearch/lib/create_agent.js @@ -29,5 +29,6 @@ export default function (config) { if (!/^https/.test(target.protocol)) return new http.Agent(); - return new https.Agent(parseConfig(config, { ignoreCertAndKey: true }).ssl); + const ignoreCertAndKey = !get(config, 'ssl.alwaysPresentCertificate'); + return new https.Agent(parseConfig(config, { ignoreCertAndKey }).ssl); } diff --git a/src/core_plugins/elasticsearch/lib/create_clusters.js b/src/core_plugins/elasticsearch/lib/create_clusters.js index e5a5c60b91612..8847e46647848 100644 --- a/src/core_plugins/elasticsearch/lib/create_clusters.js +++ b/src/core_plugins/elasticsearch/lib/create_clusters.js @@ -22,7 +22,7 @@ import { Cluster } from './cluster'; export function createClusters(server) { const clusters = new Map(); - server.on('stop', () => { + server.events.on('stop', () => { for (const [name, cluster] of clusters) { cluster.close(); clusters.delete(name); diff --git a/src/core_plugins/elasticsearch/lib/create_proxy.js b/src/core_plugins/elasticsearch/lib/create_proxy.js index 64f5f94fe71b4..2ddfaa4c6c789 100644 --- a/src/core_plugins/elasticsearch/lib/create_proxy.js +++ b/src/core_plugins/elasticsearch/lib/create_proxy.js @@ -33,10 +33,9 @@ export function createProxy(server, method, path, config) { ['/elasticsearch', server.plugins.elasticsearch.getCluster('data')], ]); - const responseHandler = function (err, upstreamResponse, request, reply) { + const responseHandler = function (err, upstreamResponse) { if (err) { - reply(err); - return; + throw err; } if (upstreamResponse.headers.location) { @@ -44,7 +43,7 @@ export function createProxy(server, method, path, config) { upstreamResponse.headers.location = encodeURI(upstreamResponse.headers.location); } - reply(null, upstreamResponse); + return upstreamResponse; }; for (const [proxyPrefix, cluster] of proxies) { diff --git a/src/core_plugins/elasticsearch/lib/health_check.js b/src/core_plugins/elasticsearch/lib/health_check.js index 7395c305df76b..167cb3044b4a1 100644 --- a/src/core_plugins/elasticsearch/lib/health_check.js +++ b/src/core_plugins/elasticsearch/lib/health_check.js @@ -95,10 +95,7 @@ export default function (plugin, server) { return true; } - server.ext('onPreStop', (request, reply) => { - stopChecking(); - reply(); - }); + server.ext('onPreStop', stopChecking); return { waitUntilReady: waitUntilReady, @@ -107,5 +104,4 @@ export default function (plugin, server) { stop: stopChecking, isRunning: function () { return !!timeoutId; }, }; - } diff --git a/src/core_plugins/elasticsearch/lib/map_uri.js b/src/core_plugins/elasticsearch/lib/map_uri.js index 11c9b99c6da3b..8d127d6658a5b 100644 --- a/src/core_plugins/elasticsearch/lib/map_uri.js +++ b/src/core_plugins/elasticsearch/lib/map_uri.js @@ -27,7 +27,7 @@ export default function mapUri(cluster, proxyPrefix) { return trimRight(pathA, '/') + '/' + trimLeft(pathB, '/'); } - return function (request, done) { + return function (request) { const { protocol: esUrlProtocol, slashes: esUrlHasSlashes, @@ -60,6 +60,6 @@ export default function mapUri(cluster, proxyPrefix) { const filteredHeaders = filterHeaders(request.headers, cluster.getRequestHeadersWhitelist()); const mappedHeaders = setHeaders(filteredHeaders, cluster.getCustomHeaders()); const mappedUrl = formatUrl(mappedUrlComponents); - done(null, mappedUrl, mappedHeaders); + return { uri: mappedUrl, headers: mappedHeaders }; }; } diff --git a/src/core_plugins/input_control_vis/index.js b/src/core_plugins/input_control_vis/index.js index 8a172d0734e11..d664ad0135d56 100644 --- a/src/core_plugins/input_control_vis/index.js +++ b/src/core_plugins/input_control_vis/index.js @@ -22,7 +22,8 @@ export default function (kibana) { uiExports: { visTypes: [ 'plugins/input_control_vis/register_vis' - ] + ], + styleSheetPaths: `${__dirname}/public/index.scss`, } }); } diff --git a/src/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap b/src/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap index bae4d46bfbdca..e05bfac6fd803 100644 --- a/src/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap +++ b/src/core_plugins/input_control_vis/public/components/editor/__snapshots__/list_control_editor.test.js.snap @@ -19,14 +19,26 @@ exports[`renders dynamic options should display disabled dynamic options with to describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Allow multiple selection" + helpText={ + + } id="multiselect-0" key="multiselect" > + } onChange={[Function]} /> @@ -34,7 +46,13 @@ exports[`renders dynamic options should display disabled dynamic options with to describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Only available for \\"string\\" fields" + helpText={ + + } id="dynamicOptions-0" key="dynamicOptions" > @@ -42,7 +60,13 @@ exports[`renders dynamic options should display disabled dynamic options with to checked={true} data-test-subj="listControlDynamicOptionsSwitch" disabled={true} - label="Dynamic Options" + label={ + + } onChange={[Function]} /> @@ -50,10 +74,22 @@ exports[`renders dynamic options should display disabled dynamic options with to describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Number of options" + helpText={ + + } id="size-0" key="size" - label="Size" + label={ + + } > + } id="multiselect-0" key="multiselect" > + } onChange={[Function]} /> @@ -102,7 +150,13 @@ exports[`renders dynamic options should display dynamic options for string field describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Update options in response to user input" + helpText={ + + } id="dynamicOptions-0" key="dynamicOptions" > @@ -110,7 +164,13 @@ exports[`renders dynamic options should display dynamic options for string field checked={true} data-test-subj="listControlDynamicOptionsSwitch" disabled={false} - label="Dynamic Options" + label={ + + } onChange={[Function]} /> @@ -136,14 +196,26 @@ exports[`renders dynamic options should display size field when dynamic options describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Allow multiple selection" + helpText={ + + } id="multiselect-0" key="multiselect" > + } onChange={[Function]} /> @@ -151,7 +223,13 @@ exports[`renders dynamic options should display size field when dynamic options describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Update options in response to user input" + helpText={ + + } id="dynamicOptions-0" key="dynamicOptions" > @@ -159,7 +237,13 @@ exports[`renders dynamic options should display size field when dynamic options checked={false} data-test-subj="listControlDynamicOptionsSwitch" disabled={false} - label="Dynamic Options" + label={ + + } onChange={[Function]} /> @@ -167,10 +251,22 @@ exports[`renders dynamic options should display size field when dynamic options describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Number of options" + helpText={ + + } id="size-0" key="size" - label="Size" + label={ + + } > + } id="parentSelect-0" key="parentSelect" - label="Parent control" + label={ + + } > + } id="multiselect-0" key="multiselect" > + } onChange={[Function]} /> @@ -252,7 +372,13 @@ exports[`renders should display chaining input when parents are provided 1`] = ` describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Update options in response to user input" + helpText={ + + } id="dynamicOptions-0" key="dynamicOptions" > @@ -260,7 +386,13 @@ exports[`renders should display chaining input when parents are provided 1`] = ` checked={false} data-test-subj="listControlDynamicOptionsSwitch" disabled={false} - label="Dynamic Options" + label={ + + } onChange={[Function]} /> @@ -268,10 +400,22 @@ exports[`renders should display chaining input when parents are provided 1`] = ` describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - helpText="Number of options" + helpText={ + + } id="size-0" key="size" - label="Size" + label={ + + } > } @@ -51,7 +51,7 @@ exports[`renders OptionsTab 1`] = ` label={ } diff --git a/src/core_plugins/input_control_vis/public/components/editor/_control_editor.scss b/src/core_plugins/input_control_vis/public/components/editor/_control_editor.scss new file mode 100644 index 0000000000000..41a68eea7436b --- /dev/null +++ b/src/core_plugins/input_control_vis/public/components/editor/_control_editor.scss @@ -0,0 +1,4 @@ +.icvControlEditor__panel { + z-index: 1; + margin-bottom: $euiSize; +} diff --git a/src/core_plugins/input_control_vis/public/components/editor/_index.scss b/src/core_plugins/input_control_vis/public/components/editor/_index.scss new file mode 100644 index 0000000000000..9af8f8d6e8222 --- /dev/null +++ b/src/core_plugins/input_control_vis/public/components/editor/_index.scss @@ -0,0 +1 @@ +@import './control_editor'; diff --git a/src/core_plugins/input_control_vis/public/components/editor/control_editor.js b/src/core_plugins/input_control_vis/public/components/editor/control_editor.js index e16f4921541a4..12003624f0b3c 100644 --- a/src/core_plugins/input_control_vis/public/components/editor/control_editor.js +++ b/src/core_plugins/input_control_vis/public/components/editor/control_editor.js @@ -17,7 +17,6 @@ * under the License. */ -import './control_editor.less'; import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { RangeControlEditor } from './range_control_editor'; @@ -152,7 +151,7 @@ class ControlEditorUi extends Component { render() { return ( - + } > 0) { const parentCandidatesOptions = [ { value: '', text: '' }, @@ -112,14 +112,11 @@ class ListControlEditorUi extends Component { options.push( } + helpText={} key="parentSelect" > } > } checked={this.props.controlParams.options.multiselect} onChange={(evt) => { this.props.handleCheckboxOptionChange(this.props.controlIndex, 'multiselect', evt); @@ -157,14 +151,17 @@ class ListControlEditorUi extends Component { ); const dynamicOptionsHelpText = this.state.isStringField - ? intl.formatMessage({ - id: 'inputControl.editor.listControl.dynamicOptions.updateDescription', - defaultMessage: 'Update options in response to user input' - }) - : intl.formatMessage({ - id: 'inputControl.editor.listControl.dynamicOptions.stringFieldDescription', - defaultMessage: 'Only available for "string" fields' - }); + ? ( + + ) : ( + + ); options.push( } checked={this.props.controlParams.options.dynamicOptions} onChange={(evt) => { this.props.handleCheckboxOptionChange(this.props.controlIndex, 'dynamicOptions', evt); @@ -191,15 +185,9 @@ class ListControlEditorUi extends Component { options.push( } key="size" - helpText={intl.formatMessage({ - id: 'inputControl.editor.listControl.sizeDescription', - defaultMessage: 'Number of options' - })} + helpText={} > { size: 5, } }; - const component = shallowWithIntl( { { value: '1', text: 'fieldA' }, { value: '2', text: 'fieldB' } ]; - const component = shallowWithIntl( { size: 5, } }; - const component = shallowWithIntl( { size: 5, } }; - const component = shallowWithIntl( { size: 5, } }; - const component = shallowWithIntl( { }); test('handleCheckboxOptionChange - multiselect', async () => { - const component = mountWithIntl( { }); test('handleNumberOptionChange - size', async () => { - const component = mountWithIntl( { return false; }, 'unexpected input event')); }); + +test('field name change', async () => { + const component = shallowWithIntl( + {}} + parentCandidates={[]} + /> + ); + + const update = async () => { + // Ensure all promises resolve + await new Promise(resolve => process.nextTick(resolve)); + // Ensure the state changes are reflected + component.update(); + }; + + // ensure that after async loading is complete the DynamicOptionsSwitch is not disabled + expect(component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')).toHaveLength(0); + await update(); + expect(component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')).toHaveLength(1); + + component.setProps({ + controlParams: { + ...controlParams, + fieldName: 'numberField', + }, + }); + + // ensure that after async loading is complete the DynamicOptionsSwitch is disabled, because this is not a "string" field + expect(component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=true]')).toHaveLength(0); + await update(); + expect(component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=true]')).toHaveLength(1); + + component.setProps({ + controlParams + }); + + // ensure that after async loading is complete the DynamicOptionsSwitch is not disabled again, because we switched to original "string" field + expect(component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')).toHaveLength(0); + await update(); + expect(component.find('[data-test-subj="listControlDynamicOptionsSwitch"][disabled=false]')).toHaveLength(1); +}); diff --git a/src/core_plugins/input_control_vis/public/components/editor/options_tab.js b/src/core_plugins/input_control_vis/public/components/editor/options_tab.js index da25916547ea4..46b0eae158d25 100644 --- a/src/core_plugins/input_control_vis/public/components/editor/options_tab.js +++ b/src/core_plugins/input_control_vis/public/components/editor/options_tab.js @@ -71,7 +71,7 @@ export class OptionsTab extends Component { > } checked={this.props.editorState.params.useTimeFilter} @@ -85,7 +85,7 @@ export class OptionsTab extends Component { > } checked={this.props.editorState.params.pinFilters} diff --git a/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap b/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap index 6950fbaf4dda3..bbc30723109ee 100644 --- a/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap +++ b/src/core_plugins/input_control_vis/public/components/vis/__snapshots__/input_control_vis.test.js.snap @@ -2,7 +2,7 @@ exports[`Apply and Cancel change btns enabled when there are changes 1`] = `
      +
      {this.renderControls()} diff --git a/src/core_plugins/input_control_vis/public/components/vis/range_control.js b/src/core_plugins/input_control_vis/public/components/vis/range_control.js index 6a7d6dc65c3ae..0fad0f0cb92d6 100644 --- a/src/core_plugins/input_control_vis/public/components/vis/range_control.js +++ b/src/core_plugins/input_control_vis/public/components/vis/range_control.js @@ -144,7 +144,7 @@ class RangeControlUi extends Component { error={this.state.errorMessage ? [this.state.errorMessage] : []} data-test-subj="rangeControlFormRow" > - + - + {}, + setField: () => {}, + fetch: async () => { + return { + aggregations: { + termsAgg: { + buckets: [ + { + key: 'Zurich Airport', + doc_count: 691, + }, + { + key: 'Xi an Xianyang International Airport', + doc_count: 526, + }, + ] + } + } + }; + } + }; +} + const mockKbnApi = { indexPatterns: { get: async () => { @@ -47,7 +72,8 @@ const mockKbnApi = { getGlobalFilters: () => { return []; } - } + }, + SearchSource: MockSearchSource, }; describe('hasValue', () => { @@ -77,3 +103,70 @@ describe('hasValue', () => { expect(listControl.hasValue()).toBe(true); }); }); + +describe('fetch', () => { + const controlParams = { + id: '1', + fieldName: 'myField', + options: {} + }; + const useTimeFilter = false; + + let listControl; + beforeEach(async () => { + listControl = await listControlFactory(controlParams, mockKbnApi, useTimeFilter); + }); + + test('should set selectOptions to results of terms aggregation', async () => { + await listControl.fetch(); + expect(listControl.selectOptions).toEqual([ + { + 'label': 'Xi an Xianyang International Airport', + 'value': 'Xi an Xianyang International Airport', + }, + { + 'label': 'Zurich Airport', + 'value': 'Zurich Airport', + } + ]); + }); +}); + +describe('fetch with ancestors', () => { + const controlParams = { + id: '1', + fieldName: 'myField', + options: {}, + }; + const useTimeFilter = false; + + + let listControl; + let parentControl; + beforeEach(async () => { + listControl = await listControlFactory(controlParams, mockKbnApi, useTimeFilter); + + const parentControlParams = { + id: 'parent', + fieldName: 'myField', + options: {}, + }; + parentControl = await listControlFactory(parentControlParams, mockKbnApi, useTimeFilter); + parentControl.clear(); + listControl.setAncestors([parentControl]); + }); + + describe('ancestor does not have value', () => { + + test('should disable control', async () => { + await listControl.fetch(); + expect(listControl.isEnabled()).toBe(false); + }); + + test('should reset lastAncestorValues', async () => { + listControl.lastAncestorValues = 'last ancestor value'; + await listControl.fetch(); + expect(listControl.lastAncestorValues).toBeUndefined(); + }); + }); +}); diff --git a/src/core_plugins/input_control_vis/public/control/range_control_factory.js b/src/core_plugins/input_control_vis/public/control/range_control_factory.js index 4e8cb18a82100..7e24bc883b167 100644 --- a/src/core_plugins/input_control_vis/public/control/range_control_factory.js +++ b/src/core_plugins/input_control_vis/public/control/range_control_factory.js @@ -65,7 +65,7 @@ class RangeControl extends Control { try { resp = await searchSource.fetch(); } catch(error) { - this.disable(i18n.translate('inputControl.rangeControl.unableToFetchTootip', { + this.disable(i18n.translate('inputControl.rangeControl.unableToFetchTooltip', { defaultMessage: 'Unable to fetch range min and max, error: {errorMessage}', values: { errorMessage: error.message } })); diff --git a/src/core_plugins/input_control_vis/public/images/icon-input-control.svg b/src/core_plugins/input_control_vis/public/images/icon-input-control.svg deleted file mode 100644 index 54e7ea826beb7..0000000000000 --- a/src/core_plugins/input_control_vis/public/images/icon-input-control.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/core_plugins/input_control_vis/public/index.scss b/src/core_plugins/input_control_vis/public/index.scss new file mode 100644 index 0000000000000..126227098b42d --- /dev/null +++ b/src/core_plugins/input_control_vis/public/index.scss @@ -0,0 +1,11 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "icv" to avoid conflicts. +// Examples +// icvChart +// icvChart__legend +// icvChart__legend--small +// icvChart__legend-isLoading + +@import './components/editor/index'; +@import './components/vis/index'; diff --git a/src/core_plugins/input_control_vis/public/register_vis.js b/src/core_plugins/input_control_vis/public/register_vis.js index 889ad1f645593..859ed40d9ed1a 100644 --- a/src/core_plugins/input_control_vis/public/register_vis.js +++ b/src/core_plugins/input_control_vis/public/register_vis.js @@ -17,7 +17,6 @@ * under the License. */ -import './vis.less'; import { CATEGORY } from 'ui/vis/vis_category'; import { VisFactoryProvider } from 'ui/vis/vis_factory'; import { VisTypesRegistryProvider } from 'ui/registry/vis_types'; diff --git a/src/core_plugins/input_control_vis/public/vis.less b/src/core_plugins/input_control_vis/public/vis.less deleted file mode 100644 index febec4bf3ff36..0000000000000 --- a/src/core_plugins/input_control_vis/public/vis.less +++ /dev/null @@ -1,34 +0,0 @@ -@import (reference) "~ui/styles/mixins.less"; - -.inputControlVis { - width: 100%; - margin: 0 5px; - - .inputRangeContainer { - display: inline-block; - margin: 30px 0 0 0; - min-width: 150px; - } - - input.kuiTextInput { - width: 15%; - } - - input[type=number]::-webkit-inner-spin-button, - input[type=number]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; - } - - // hide slider labels since they are displayed in inputs - .input-range__track { - .input-range__label-container { - display: none; - } - } - - // do not center min/max labels - otherwise the overflow slider sides - .input-range__label-container { - left: 0% !important; - } -} diff --git a/src/core_plugins/input_control_vis/public/vis_controller.js b/src/core_plugins/input_control_vis/public/vis_controller.js index 3a92c7e10b229..1327cd51a4ba1 100644 --- a/src/core_plugins/input_control_vis/public/vis_controller.js +++ b/src/core_plugins/input_control_vis/public/vis_controller.js @@ -147,10 +147,11 @@ class VisController { this.vis.API.queryFilter.addFilters(newFilters, this.vis.params.pinFilters); } - clearControls = () => { + clearControls = async () => { this.controls.forEach((control) => { control.clear(); }); + await this.updateNestedControls(); this.drawVis(); } diff --git a/src/core_plugins/inspector_views/index.js b/src/core_plugins/inspector_views/index.js index da2eb567bc947..2dc5c6b7a9832 100644 --- a/src/core_plugins/inspector_views/index.js +++ b/src/core_plugins/inspector_views/index.js @@ -21,8 +21,9 @@ export default function (kibana) { return new kibana.Plugin({ uiExports: { inspectorViews: [ - 'plugins/inspector_views/register_views' - ] + 'plugins/inspector_views/register_views', + ], + styleSheetPaths: `${__dirname}/public/index.scss`, } }); } diff --git a/src/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap b/src/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap index 86ba5ce7cd2bf..e191cee3f91a9 100644 --- a/src/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap +++ b/src/core_plugins/inspector_views/public/data/__snapshots__/data_view.test.js.snap @@ -54,6 +54,7 @@ exports[`Inspector Data View component should render empty state 1`] = ` >

      The element did not provide any data.

      - -
      -
      @@ -179,9 +174,10 @@ exports[`Inspector Data View component should render loading state 1`] = `

      Gathering data diff --git a/src/core_plugins/inspector_views/public/data/_data_table.scss b/src/core_plugins/inspector_views/public/data/_data_table.scss new file mode 100644 index 0000000000000..4a7b5ea20704c --- /dev/null +++ b/src/core_plugins/inspector_views/public/data/_data_table.scss @@ -0,0 +1,8 @@ +.insDataTableFormat__filter { + opacity: 0; +} + +.insDataTableFormat__table tr:hover .insDataTableFormat__filter, +.insDataTableFormat__filter:focus { + opacity: 1; +} diff --git a/src/core_plugins/inspector_views/public/data/data_table.js b/src/core_plugins/inspector_views/public/data/data_table.js index 2a607d9cc9d50..2280171a0f01a 100644 --- a/src/core_plugins/inspector_views/public/data/data_table.js +++ b/src/core_plugins/inspector_views/public/data/data_table.js @@ -20,8 +20,6 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import './data_table.less'; - import { EuiButtonIcon, EuiFlexGroup, @@ -60,7 +58,7 @@ class DataTableFormat extends Component { iconType="plusInCircle" color="text" aria-label="Filter for value" - className="inspector-table__filter" + className="insDataTableFormat__filter" onClick={() => col.filter(value)} /> @@ -75,7 +73,7 @@ class DataTableFormat extends Component { iconType="minusInCircle" color="text" aria-label="Filter out value" - className="inspector-table__filter" + className="insDataTableFormat__filter" onClick={() => col.filterOut(value)} /> @@ -128,6 +126,7 @@ class DataTableFormat extends Component { - + { stat.description && } @@ -88,7 +88,6 @@ class RequestSelector extends Component { iconType="arrowDown" iconSide="right" size="s" - className="inspector-request-chooser__request-title" onClick={this.togglePopover} > {this.props.selectedRequest.name} @@ -103,9 +102,10 @@ class RequestSelector extends Component { closePopover={this.closePopover} panelPaddingSize="none" anchorPosition="downLeft" + repositionOnScroll > @@ -121,13 +121,12 @@ class RequestSelector extends Component { > - Request: + Request: {requests.length <= 1 && -

      +
      {selectedRequest.name}
      } diff --git a/src/core_plugins/inspector_views/public/requests/requests_inspector.less b/src/core_plugins/inspector_views/public/requests/requests_inspector.less deleted file mode 100644 index db8e57de67972..0000000000000 --- a/src/core_plugins/inspector_views/public/requests/requests_inspector.less +++ /dev/null @@ -1,27 +0,0 @@ -.requests-details__description { - padding: 16px; -} - -.requests-stats__icon { - margin-right: 8px; -} - -.inspector-request-chooser__menu-panel { - min-width: 300px; -} - -.inspector-request-chooser__request-title { - font-size: 1.2em; -} - -.inspector-request-chooser__single-request { - .inspector-request-chooser__request-title(); - height: 30px; // height of EuiEmptyButton small - padding: 0 8px; - display: flex; - align-items: center; -} - -.inspector-request-chooser__menu-spinner { - margin-left: 8px; -} diff --git a/src/core_plugins/inspector_views/public/requests/requests_view.js b/src/core_plugins/inspector_views/public/requests/requests_view.js index ba08b0ea6afba..c857244321491 100644 --- a/src/core_plugins/inspector_views/public/requests/requests_view.js +++ b/src/core_plugins/inspector_views/public/requests/requests_view.js @@ -32,8 +32,6 @@ import { RequestStatus } from 'ui/inspector/adapters'; import { RequestSelector } from './request_selector'; import { RequestDetails } from './request_details'; -import './requests_inspector.less'; - class RequestsViewComponent extends Component { constructor(props) { diff --git a/src/core_plugins/kbn_vislib_vis_types/public/area.js b/src/core_plugins/kbn_vislib_vis_types/public/area.js index 4fc5b79a5f542..22910838e4258 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/area.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/area.js @@ -22,14 +22,14 @@ import { Schemas } from 'ui/vis/editors/default/schemas'; import { CATEGORY } from 'ui/vis/vis_category'; import pointSeriesTemplate from './editors/point_series.html'; -export default function PointSeriesVisType(Private) { +export default function PointSeriesVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'area', - title: 'Area', + title: i18n('kbnVislibVisTypes.area.areaTitle', { defaultMessage: 'Area' }), icon: 'visArea', - description: 'Emphasize the quantity beneath a line chart', + description: i18n('kbnVislibVisTypes.area.areaDescription', { defaultMessage: 'Emphasize the quantity beneath a line chart' }), category: CATEGORY.BASIC, visConfig: { defaults: { @@ -140,7 +140,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'metric', - title: 'Y-Axis', + title: i18n('kbnVislibVisTypes.area.metricsTitle', { defaultMessage: 'Y-Axis' }), aggFilter: ['!geo_centroid', '!geo_bounds'], min: 1, defaults: [ @@ -150,7 +150,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'radius', - title: 'Dot Size', + title: i18n('kbnVislibVisTypes.area.radiusTitle', { defaultMessage: 'Dot Size' }), min: 0, max: 1, aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'] @@ -158,7 +158,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'segment', - title: 'X-Axis', + title: i18n('kbnVislibVisTypes.area.segmentTitle', { defaultMessage: 'X-Axis' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] @@ -166,7 +166,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'group', - title: 'Split Series', + title: i18n('kbnVislibVisTypes.area.groupTitle', { defaultMessage: 'Split Series' }), min: 0, max: 3, aggFilter: ['!geohash_grid', '!filter'] @@ -174,7 +174,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'split', - title: 'Split Chart', + title: i18n('kbnVislibVisTypes.area.splitTitle', { defaultMessage: 'Split Chart' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html index 451d2d280e128..0d9c1334ef69c 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.html @@ -1,8 +1,11 @@
      - +
      - +
       
      - +
      @@ -51,27 +63,36 @@
      - +
      - +
      - +
      - +
        @@ -115,9 +139,11 @@ ng-class="{ 'fa-caret-down': showColorRange, 'fa-caret-right': !showColorRange }" class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret" > - - Ranges - +
      @@ -126,10 +152,18 @@ @@ -171,17 +205,26 @@

      - Required: You must specify at least one range. +

      - Add Range -
      + class="kuiButton kuiButton--primary kuiButton--fullWidth" + i18n-id="kbnVislibVisTypes.controls.gaugeOptions.addRangeTitle" + i18n-default-message="Add Range" + >
      -
      Note: colors can be changed in the legend
      +
      @@ -203,32 +246,46 @@ }" class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret" > - - Color Options - +
      - +
      -
      reset colors
      +
      - +
      @@ -255,9 +312,11 @@ }" class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret" > - - Style - +
      @@ -265,17 +324,23 @@
      - +
      - +
      @@ -283,9 +348,12 @@
      - +
      - +
      diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js index e6ccd228faa8b..7da9d16b7f74a 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/gauge_options.js @@ -22,7 +22,7 @@ import gaugeOptionsTemplate from './gauge_options.html'; import _ from 'lodash'; const module = uiModules.get('kibana'); -module.directive('gaugeOptions', function () { +module.directive('gaugeOptions', function (i18n) { return { restrict: 'E', template: gaugeOptionsTemplate, @@ -107,6 +107,10 @@ module.directive('gaugeOptions', function () { $scope.customColors = true; }); + $scope.requiredText = i18n('kbnVislibVisTypes.controls.gaugeOptions.requiredText', { + defaultMessage: 'Required:' + }); + } }; }); diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html index a427f32cdff7d..2f3e7ca882a2c 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/heatmap_options.html @@ -1,14 +1,17 @@
      - +
      - reset colors -
      + i18n-id="kbnVislibVisTypes.controls.heatmapOptions.resetColorsTitle" + i18n-default-message="reset colors" + >
      - +
      - +
      - +
      - +
      - - Custom Ranges - +
      @@ -163,21 +191,29 @@
      - + - +
      - + - +
      -

      - - Required: You must specify at least one range. -

      +

      + i18n-id="kbnVislibVisTypes.controls.heatmapOptions.addRangeButtonLabel" + i18n-default-message="Add Range" + >
      -
      Note: colors can be changed in the legend
      +
      @@ -198,9 +234,11 @@ }" class="kuiIcon fa-caret-right kuiSideBarCollapsibleTitle__caret" > - - Show Labels - +
      - +
      - +
      - +
      { $scope.customColors = true; }); + + $scope.requiredText = i18n('kbnVislibVisTypes.controls.heatmapOptions.requiredText', { + defaultMessage: 'Required:' + }); } }; }); diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html index a7d28b2186d62..97c5c58166074 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/category_axis.html @@ -1,25 +1,33 @@
      -
      - X-Axis -
      +
      - +
      - +
      - +
      - +
      - - Grid - +
      @@ -23,18 +25,24 @@
      - +
      - +
      diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html index 74d3da4409c52..48c4e92d53265 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/point_series/series.html @@ -1,8 +1,10 @@
      -
      - Metrics -
      +
      - +
      - +
      - +
      - +
      - +
      -
      - Y-Axes -
      +
      @@ -11,6 +12,7 @@ type="button" class="kuiButton kuiButton--basic kuiButton--small" ng-model="agg.params.row" + data-test-subj="splitBy-column" btn-radio="false"> Columns diff --git a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html index 58bf2d36ac221..dcb8a800799cc 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/controls/vislib_basic_options.html @@ -1,8 +1,11 @@
      - +
      diff --git a/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html b/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html index f0c42c1a92f2c..9cce236e748fd 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html +++ b/src/core_plugins/kbn_vislib_vis_types/public/editors/heatmap.html @@ -1,32 +1,43 @@
      -
      - Basic Settings -
      +
      - +
      - +
      - +
      -
      - Labels Settings -
      +
      - +
      - +
      - +
      - +
      -
      - Settings -
      +
      - +
      - +
      - +
      diff --git a/src/core_plugins/kbn_vislib_vis_types/public/gauge.js b/src/core_plugins/kbn_vislib_vis_types/public/gauge.js index 09b9262fcabcd..d89ffabfc5711 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/gauge.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/gauge.js @@ -23,15 +23,16 @@ import { CATEGORY } from 'ui/vis/vis_category'; import gaugeTemplate from './editors/gauge.html'; import { vislibColorMaps } from 'ui/vislib/components/color/colormaps'; -export default function GaugeVisType(Private) { +export default function GaugeVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'gauge', - title: 'Gauge', + title: i18n('kbnVislibVisTypes.gauge.gaugeTitle', { defaultMessage: 'Gauge' }), icon: 'visGauge', - description: `Gauges indicate the status of a metric. Use it to show how a metric's value relates - to reference threshold values.`, + description: i18n('kbnVislibVisTypes.gauge.gaugeDescription', { + defaultMessage: 'Gauges indicate the status of a metric. Use it to show how a metric\'s value relates to reference threshold values.' + }), category: CATEGORY.DATA, visConfig: { defaults: { @@ -84,14 +85,14 @@ export default function GaugeVisType(Private) { gaugeTypes: ['Arc', 'Circle'], gaugeColorMode: ['None', 'Labels', 'Background'], scales: ['linear', 'log', 'square root'], - colorSchemas: Object.keys(vislibColorMaps), + colorSchemas: Object.values(vislibColorMaps).map(value => ({ id: value.id, label: value.label })), }, optionsTemplate: gaugeTemplate, schemas: new Schemas([ { group: 'metrics', name: 'metric', - title: 'Metric', + title: i18n('kbnVislibVisTypes.gauge.metricTitle', { defaultMessage: 'Metric' }), min: 1, aggFilter: [ '!std_dev', '!geo_centroid', '!percentiles', '!percentile_ranks', @@ -103,7 +104,7 @@ export default function GaugeVisType(Private) { { group: 'buckets', name: 'group', - title: 'Split Group', + title: i18n('kbnVislibVisTypes.gauge.groupTitle', { defaultMessage: 'Split Group' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/goal.js b/src/core_plugins/kbn_vislib_vis_types/public/goal.js index 1a52764387d31..78e6b9e17e61f 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/goal.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/goal.js @@ -23,14 +23,16 @@ import { CATEGORY } from 'ui/vis/vis_category'; import gaugeTemplate from './editors/gauge.html'; import { vislibColorMaps } from 'ui/vislib/components/color/colormaps'; -export default function GoalVisType(Private) { +export default function GoalVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'goal', - title: 'Goal', + title: i18n('kbnVislibVisTypes.goal.goalTitle', { defaultMessage: 'Goal' }), icon: 'visGoal', - description: 'A goal chart indicates how close you are to your final goal.', + description: i18n('kbnVislibVisTypes.goal.goalDescription', { + defaultMessage: 'A goal chart indicates how close you are to your final goal.' + }), category: CATEGORY.DATA, visConfig: { defaults: { @@ -79,14 +81,14 @@ export default function GoalVisType(Private) { gaugeTypes: ['Arc', 'Circle'], gaugeColorMode: ['None', 'Labels', 'Background'], scales: ['linear', 'log', 'square root'], - colorSchemas: Object.keys(vislibColorMaps), + colorSchemas: Object.values(vislibColorMaps).map(value => ({ id: value.id, label: value.label })), }, optionsTemplate: gaugeTemplate, schemas: new Schemas([ { group: 'metrics', name: 'metric', - title: 'Metric', + title: i18n('kbnVislibVisTypes.goal.metricTitle', { defaultMessage: 'Metric' }), min: 1, aggFilter: [ '!std_dev', '!geo_centroid', '!percentiles', '!percentile_ranks', @@ -98,7 +100,7 @@ export default function GoalVisType(Private) { { group: 'buckets', name: 'group', - title: 'Split Group', + title: i18n('kbnVislibVisTypes.goal.groupTitle', { defaultMessage: 'Split Group' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js b/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js index e124283a083e9..f8a5a64a26300 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/heatmap.js @@ -23,14 +23,14 @@ import { CATEGORY } from 'ui/vis/vis_category'; import heatmapTemplate from './editors/heatmap.html'; import { vislibColorMaps } from 'ui/vislib/components/color/colormaps'; -export default function HeatmapVisType(Private) { +export default function HeatmapVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'heatmap', - title: 'Heat Map', + title: i18n('kbnVislibVisTypes.heatmap.heatmapTitle', { defaultMessage: 'Heat Map' }), icon: 'visHeatmap', - description: 'Shade cells within a matrix', + description: i18n('kbnVislibVisTypes.heatmap.heatmapDescription', { defaultMessage: 'Shade cells within a matrix' }), category: CATEGORY.BASIC, visConfig: { defaults: { @@ -79,14 +79,14 @@ export default function HeatmapVisType(Private) { text: 'bottom', }], scales: ['linear', 'log', 'square root'], - colorSchemas: Object.keys(vislibColorMaps), + colorSchemas: Object.values(vislibColorMaps).map(value => ({ id: value.id, label: value.label })), }, optionsTemplate: heatmapTemplate, schemas: new Schemas([ { group: 'metrics', name: 'metric', - title: 'Value', + title: i18n('kbnVislibVisTypes.heatmap.metricTitle', { defaultMessage: 'Value' }), min: 1, max: 1, aggFilter: ['count', 'avg', 'median', 'sum', 'min', 'max', 'cardinality', 'std_dev', 'top_hits'], @@ -97,7 +97,7 @@ export default function HeatmapVisType(Private) { { group: 'buckets', name: 'segment', - title: 'X-Axis', + title: i18n('kbnVislibVisTypes.heatmap.segmentTitle', { defaultMessage: 'X-Axis' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] @@ -105,7 +105,7 @@ export default function HeatmapVisType(Private) { { group: 'buckets', name: 'group', - title: 'Y-Axis', + title: i18n('kbnVislibVisTypes.heatmap.groupTitle', { defaultMessage: 'Y-Axis' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] @@ -113,7 +113,7 @@ export default function HeatmapVisType(Private) { { group: 'buckets', name: 'split', - title: 'Split Chart', + title: i18n('kbnVislibVisTypes.heatmap.splitTitle', { defaultMessage: 'Split Chart' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js index 68a269ec1c423..5aa5ad8246bea 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/histogram.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/histogram.js @@ -22,14 +22,16 @@ import { Schemas } from 'ui/vis/editors/default/schemas'; import { CATEGORY } from 'ui/vis/vis_category'; import pointSeriesTemplate from './editors/point_series.html'; -export default function PointSeriesVisType(Private) { +export default function PointSeriesVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'histogram', - title: 'Vertical Bar', + title: i18n('kbnVislibVisTypes.histogram.histogramTitle', { defaultMessage: 'Vertical Bar' }), icon: 'visBarVertical', - description: 'Assign a continuous variable to each axis', + description: i18n('kbnVislibVisTypes.histogram.histogramDescription', + { defaultMessage: 'Assign a continuous variable to each axis' } + ), category: CATEGORY.BASIC, visConfig: { defaults: { @@ -141,7 +143,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'metric', - title: 'Y-Axis', + title: i18n('kbnVislibVisTypes.histogram.metricTitle', { defaultMessage: 'Y-Axis' }), min: 1, aggFilter: ['!geo_centroid', '!geo_bounds'], defaults: [ @@ -151,7 +153,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'radius', - title: 'Dot Size', + title: i18n('kbnVislibVisTypes.histogram.radiusTitle', { defaultMessage: 'Dot Size' }), min: 0, max: 1, aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'] @@ -159,7 +161,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'segment', - title: 'X-Axis', + title: i18n('kbnVislibVisTypes.histogram.segmentTitle', { defaultMessage: 'X-Axis' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] @@ -167,7 +169,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'group', - title: 'Split Series', + title: i18n('kbnVislibVisTypes.histogram.groupTitle', { defaultMessage: 'Split Series' }), min: 0, max: 3, aggFilter: ['!geohash_grid', '!filter'] @@ -175,7 +177,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'split', - title: 'Split Chart', + title: i18n('kbnVislibVisTypes.histogram.splitTitle', { defaultMessage: 'Split Chart' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js b/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js index b679256924b2a..3bb14019b217c 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/horizontal_bar.js @@ -22,14 +22,16 @@ import { Schemas } from 'ui/vis/editors/default/schemas'; import { CATEGORY } from 'ui/vis/vis_category'; import pointSeriesTemplate from './editors/point_series.html'; -export default function PointSeriesVisType(Private) { +export default function PointSeriesVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'horizontal_bar', - title: 'Horizontal Bar', + title: i18n('kbnVislibVisTypes.horizontalBar.horizontalBarTitle', { defaultMessage: 'Horizontal Bar' }), icon: 'visBarHorizontal', - description: 'Assign a continuous variable to each axis', + description: i18n('kbnVislibVisTypes.horizontalBar.horizontalBarDescription', + { defaultMessage: 'Assign a continuous variable to each axis' } + ), category: CATEGORY.BASIC, visConfig: { defaults: { @@ -143,7 +145,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'metric', - title: 'Y-Axis', + title: i18n('kbnVislibVisTypes.horizontalBar.metricTitle', { defaultMessage: 'Y-Axis' }), min: 1, aggFilter: ['!geo_centroid', '!geo_bounds'], defaults: [ @@ -153,7 +155,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'radius', - title: 'Dot Size', + title: i18n('kbnVislibVisTypes.horizontalBar.radiusTitle', { defaultMessage: 'Dot Size' }), min: 0, max: 1, aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality'] @@ -161,7 +163,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'segment', - title: 'X-Axis', + title: i18n('kbnVislibVisTypes.horizontalBar.segmentTitle', { defaultMessage: 'X-Axis' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] @@ -169,7 +171,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'group', - title: 'Split Series', + title: i18n('kbnVislibVisTypes.horizontalBar.groupTitle', { defaultMessage: 'Split Series' }), min: 0, max: 3, aggFilter: ['!geohash_grid', '!filter'] @@ -177,7 +179,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'split', - title: 'Split Chart', + title: i18n('kbnVislibVisTypes.horizontalBar.splitTitle', { defaultMessage: 'Split Chart' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-area.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-area.svg deleted file mode 100644 index b7469195dae17..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-area.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icon-area - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-donut.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-donut.svg deleted file mode 100644 index 8067fcc3e9359..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-donut.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-gauge.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-gauge.svg deleted file mode 100644 index 8bb387312a26f..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-gauge.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icon-gauge - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-goal.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-goal.svg deleted file mode 100644 index 6274d8e891798..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-goal.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - icon goal - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-heatmap.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-heatmap.svg deleted file mode 100644 index a480d4435f8b6..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-heatmap.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - Group 2 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-horizontal.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-horizontal.svg deleted file mode 100644 index bc779f9ab0c73..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-horizontal.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - icon-horizontal - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-line.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-line.svg deleted file mode 100644 index c46e5f56e88c2..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-line.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icon-line - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-number.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-number.svg deleted file mode 100644 index 3168ce0d90aad..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-number.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - 42 - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-pie.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-pie.svg deleted file mode 100644 index a2ddb72d7a6bd..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-pie.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon-pie - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-tilemap.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-tilemap.svg deleted file mode 100644 index 0888ce38f05a2..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-tilemap.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon-tilemap - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-vertical.svg b/src/core_plugins/kbn_vislib_vis_types/public/images/icon-vertical.svg deleted file mode 100644 index 78bf5661942f5..0000000000000 --- a/src/core_plugins/kbn_vislib_vis_types/public/images/icon-vertical.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - icon-vertical - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/kbn_vislib_vis_types/public/line.js b/src/core_plugins/kbn_vislib_vis_types/public/line.js index c6cae66982075..886439eb57244 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/line.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/line.js @@ -22,14 +22,14 @@ import { Schemas } from 'ui/vis/editors/default/schemas'; import { CATEGORY } from 'ui/vis/vis_category'; import pointSeriesTemplate from './editors/point_series.html'; -export default function PointSeriesVisType(Private) { +export default function PointSeriesVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'line', - title: 'Line', + title: i18n('kbnVislibVisTypes.line.lineTitle', { defaultMessage: 'Line' }), icon: 'visLine', - description: 'Emphasize trends', + description: i18n('kbnVislibVisTypes.line.lineDescription', { defaultMessage: 'Emphasize trends' }), category: CATEGORY.BASIC, visConfig: { defaults: { @@ -141,7 +141,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'metric', - title: 'Y-Axis', + title: i18n('kbnVislibVisTypes.line.metricTitle', { defaultMessage: 'Y-Axis' }), min: 1, aggFilter: ['!geo_centroid', '!geo_bounds'], defaults: [ @@ -151,7 +151,7 @@ export default function PointSeriesVisType(Private) { { group: 'metrics', name: 'radius', - title: 'Dot Size', + title: i18n('kbnVislibVisTypes.line.radiusTitle', { defaultMessage: 'Dot Size' }), min: 0, max: 1, aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality', 'top_hits'] @@ -159,7 +159,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'segment', - title: 'X-Axis', + title: i18n('kbnVislibVisTypes.line.segmentTitle', { defaultMessage: 'X-Axis' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] @@ -167,7 +167,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'group', - title: 'Split Series', + title: i18n('kbnVislibVisTypes.line.groupTitle', { defaultMessage: 'Split Series' }), min: 0, max: 3, aggFilter: ['!geohash_grid', '!filter'] @@ -175,7 +175,7 @@ export default function PointSeriesVisType(Private) { { group: 'buckets', name: 'split', - title: 'Split Chart', + title: i18n('kbnVislibVisTypes.line.splitTitle', { defaultMessage: 'Split Chart' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/kbn_vislib_vis_types/public/pie.js b/src/core_plugins/kbn_vislib_vis_types/public/pie.js index 665d065fa83c6..59f62deb0641e 100644 --- a/src/core_plugins/kbn_vislib_vis_types/public/pie.js +++ b/src/core_plugins/kbn_vislib_vis_types/public/pie.js @@ -22,14 +22,14 @@ import { Schemas } from 'ui/vis/editors/default/schemas'; import { CATEGORY } from 'ui/vis/vis_category'; import pieTemplate from './editors/pie.html'; -export default function HistogramVisType(Private) { +export default function HistogramVisType(Private, i18n) { const VisFactory = Private(VisFactoryProvider); return VisFactory.createVislibVisualization({ name: 'pie', - title: 'Pie', + title: i18n('kbnVislibVisTypes.pie.pieTitle', { defaultMessage: 'Pie' }), icon: 'visPie', - description: 'Compare parts of a whole', + description: i18n('kbnVislibVisTypes.pie.pieDescription', { defaultMessage: 'Compare parts of a whole' }), category: CATEGORY.BASIC, visConfig: { defaults: { @@ -67,7 +67,7 @@ export default function HistogramVisType(Private) { { group: 'metrics', name: 'metric', - title: 'Slice Size', + title: i18n('kbnVislibVisTypes.pie.metricTitle', { defaultMessage: 'Slice Size' }), min: 1, max: 1, aggFilter: ['sum', 'count', 'cardinality', 'top_hits'], @@ -79,7 +79,7 @@ export default function HistogramVisType(Private) { group: 'buckets', name: 'segment', icon: 'fa fa-scissors', - title: 'Split Slices', + title: i18n('kbnVislibVisTypes.pie.segmentTitle', { defaultMessage: 'Split Slices' }), min: 0, max: Infinity, aggFilter: ['!geohash_grid', '!filter'] @@ -88,7 +88,7 @@ export default function HistogramVisType(Private) { group: 'buckets', name: 'split', icon: 'fa fa-th', - title: 'Split Chart', + title: i18n('kbnVislibVisTypes.pie.splitTitle', { defaultMessage: 'Split Chart' }), mustBeFirst: true, min: 0, max: 1, diff --git a/src/core_plugins/kibana/common/lib/get_space_id_for_beats_tutorial.js b/src/core_plugins/kibana/common/lib/get_space_id_for_beats_tutorial.js new file mode 100644 index 0000000000000..f7da589526003 --- /dev/null +++ b/src/core_plugins/kibana/common/lib/get_space_id_for_beats_tutorial.js @@ -0,0 +1,32 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * Returns valid configuration for a beat.yml file for adding the space id + * if there is an active space and that space is not the default one. + * + * @param {object} context - Context object generated from tutorial factory (see #22760) + */ +export function getSpaceIdForBeatsTutorial(context) { + if (!context || !context.spaceId || context.isInDefaultSpace) { + return ''; + } + + return ` space.id: "${context.spaceId}"`; +} diff --git a/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js b/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js index b96f1f6b1b7d0..e4c846531d174 100644 --- a/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/filebeat_instructions.js @@ -20,8 +20,9 @@ import { i18n } from '@kbn/i18n'; import { INSTRUCTION_VARIANT } from './instruction_variant'; import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions'; +import { getSpaceIdForBeatsTutorial } from '../lib/get_space_id_for_beats_tutorial'; -export const createFilebeatInstructions = () => ({ +export const createFilebeatInstructions = context => ({ INSTALL: { OSX: { title: i18n.translate('kbn.common.tutorials.filebeatInstructions.install.osxTitle', { @@ -158,7 +159,7 @@ export const createFilebeatInstructions = () => ({ defaultMessage: 'The `setup` command loads the Kibana dashboards. If the dashboards are already set up, omit this command.', }), commands: [ - 'PS C:\\Program Files\\Filebeat> filebeat.exe setup', + 'PS C:\\Program Files\\Filebeat> .\\filebeat.exe setup', 'PS C:\\Program Files\\Filebeat> Start-Service filebeat', ], }, @@ -181,6 +182,7 @@ export const createFilebeatInstructions = () => ({ ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.filebeatInstructions.config.osxTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -209,6 +211,7 @@ and {kibanaUrlTemplate} is the URL of Kibana.', ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.filebeatInstructions.config.debTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -237,6 +240,7 @@ and {kibanaUrlTemplate} is the URL of Kibana.', ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.filebeatInstructions.config.rpmTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -265,6 +269,7 @@ and {kibanaUrlTemplate} is the URL of Kibana.', ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.filebeatInstructions.config.windowsTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -484,8 +489,8 @@ export function filebeatStatusCheck(moduleName) { }; } -export function onPremInstructions(moduleName, platforms, geoipRequired, uaRequired) { - const FILEBEAT_INSTRUCTIONS = createFilebeatInstructions(); +export function onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context) { + const FILEBEAT_INSTRUCTIONS = createFilebeatInstructions(context); const variants = []; for (let i = 0; i < platforms.length; i++) { diff --git a/src/core_plugins/kibana/common/tutorials/functionbeat_instructions.js b/src/core_plugins/kibana/common/tutorials/functionbeat_instructions.js new file mode 100644 index 0000000000000..47e47ab3d8267 --- /dev/null +++ b/src/core_plugins/kibana/common/tutorials/functionbeat_instructions.js @@ -0,0 +1,466 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; +import { INSTRUCTION_VARIANT } from './instruction_variant'; +import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions'; +import { getSpaceIdForBeatsTutorial } from '../lib/get_space_id_for_beats_tutorial'; + +export const createFunctionbeatInstructions = context => ({ + INSTALL: { + OSX: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.install.osxTitle', { + defaultMessage: 'Download and install Functionbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.install.osxTextPre', { + defaultMessage: 'First time using Functionbeat? See the [Getting Started Guide]({link}).', + values: { link: '{config.docs.beats.functionbeat}/functionbeat-getting-started.html' }, + }), + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/beats/functionbeat/functionbeat-{config.kibana.version}-darwin-x86_64.tar.gz', + 'tar xzvf functionbeat-{config.kibana.version}-darwin-x86_64.tar.gz', + 'cd functionbeat-{config.kibana.version}-darwin-x86_64/', + ], + }, + LINUX: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.install.linuxTitle', { + defaultMessage: 'Download and install Functionbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.install.linuxTextPre', { + defaultMessage: 'First time using Functionbeat? See the [Getting Started Guide]({link}).', + values: { link: '{config.docs.beats.functionbeat}/functionbeat-getting-started.html' }, + }), + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/beats/functionbeat/functionbeat-{config.kibana.version}-linux-x86_64.tar.gz', + 'tar xzvf functionbeat-{config.kibana.version}-linux-x86_64.tar.gz', + 'cd functionbeat-{config.kibana.version}-linux-x86_64/', + ], + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.install.windowsTitle', { + defaultMessage: 'Download and install Functionbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.install.windowsTextPre', { + defaultMessage: 'First time using Functionbeat? See the [Getting Started Guide]({functionbeatLink}).\n\ + 1. Download the Functionbeat Windows zip file from the [Download]({elasticLink}) page.\n\ + 2. Extract the contents of the zip file into {folderPath}.\n\ + 3. Rename the {directoryName} directory to `Functionbeat`.\n\ + 4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select \ +**Run As Administrator**). If you are running Windows XP, you might need to download and install PowerShell.\n\ + 5. From the PowerShell prompt, go to the Functionbeat directory:', + values: { + directoryName: '`functionbeat-{config.kibana.version}-windows`', + folderPath: '`C:\\Program Files`', + functionbeatLink: '{config.docs.beats.functionbeat}/functionbeat-getting-started.html', + elasticLink: 'https://www.elastic.co/downloads/beats/functionbeat', + }, + }), + commands: [ + 'PS > cd C:\\Program Files\\Functionbeat', + ], + } + }, + DEPLOY: { + OSX_LINUX: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.deploy.osxTitle', { + defaultMessage: 'Deploy Functionbeat to AWS Lambda', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.deploy.osxTextPre', { + defaultMessage: 'This installs Functionbeat as a Lambda function.\ +The `setup` command checks the Elasticsearch configuration and loads the \ +Kibana index pattern. It is normally safe to omit this command.', + }), + commands: [ + './functionbeat setup', + './functionbeat deploy fn_cloudwatch_logs', + ] + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.deploy.windowsTitle', { + defaultMessage: 'Deploy Functionbeat to AWS Lambda', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.deploy.windowsTextPre', { + defaultMessage: 'This installs Functionbeat as a Lambda function.\ +The `setup` command checks the Elasticsearch configuration and loads the \ +Kibana index pattern. It is normally safe to omit this command.', + }), + commands: [ + 'PS C:\\Program Files\\Functionbeat> functionbeat.exe setup', + 'PS C:\\Program Files\\Functionbeat> functionbeat.exe deploy fn_cloudwatch_logs', + ], + }, + }, + CONFIG: { + OSX_LINUX: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.config.osxTitle', { + defaultMessage: 'Configure the Elastic cluster', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.config.osxTextPre', { + defaultMessage: 'Modify {path} to set the connection information:', + values: { + path: '`functionbeat.yml`', + }, + }), + commands: [ + 'output.elasticsearch:', + ' hosts: [""]', + ' username: "elastic"', + ' password: ""', + 'setup.kibana:', + ' host: ""', + getSpaceIdForBeatsTutorial(context) + ], + textPost: i18n.translate('kbn.common.tutorials.functionbeatInstructions.config.osxTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ +and {kibanaUrlTemplate} is the URL of Kibana.', + values: { + passwordTemplate: '``', + esUrlTemplate: '``', + kibanaUrlTemplate: '``', + }, + }), + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.functionbeatInstructions.config.windowsTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatInstructions.config.windowsTextPre', { + defaultMessage: 'Modify {path} to set the connection information:', + values: { + path: '`C:\\Program Files\\Functionbeat\\functionbeat.yml`', + }, + }), + commands: [ + 'output.elasticsearch:', + ' hosts: [""]', + ' username: "elastic"', + ' password: ""', + 'setup.kibana:', + ' host: ""', + getSpaceIdForBeatsTutorial(context) + ], + textPost: i18n.translate('kbn.common.tutorials.functionbeatInstructions.config.windowsTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ +and {kibanaUrlTemplate} is the URL of Kibana.', + values: { + passwordTemplate: '``', + esUrlTemplate: '``', + kibanaUrlTemplate: '``', + }, + }), + } + } +}); + +export const createFunctionbeatCloudInstructions = () => ({ + CONFIG: { + OSX_LINUX: { + title: i18n.translate('kbn.common.tutorials.functionbeatCloudInstructions.config.osxTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPre', { + defaultMessage: 'Modify {path} to set the connection information for Elastic Cloud:', + values: { + path: '`functionbeat.yml`', + }, + }), + commands: [ + 'cloud.id: "{config.cloud.id}"', + 'cloud.auth: "elastic:"' + ], + textPost: i18n.translate('kbn.common.tutorials.functionbeatCloudInstructions.config.osxTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.', + values: { passwordTemplate: '``' }, + }), + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPre', { + defaultMessage: 'Modify {path} to set the connection information for Elastic Cloud:', + values: { + path: '`C:\\Program Files\\Functionbeat\\functionbeat.yml`', + }, + }), + commands: [ + 'cloud.id: "{config.cloud.id}"', + 'cloud.auth: "elastic:"' + ], + textPost: i18n.translate('kbn.common.tutorials.functionbeatCloudInstructions.config.windowsTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.', + values: { passwordTemplate: '``' }, + }), + } + } +}); + +export function functionbeatEnableInstructions() { + const defaultTitle = i18n.translate('kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTitle', { + defaultMessage: 'Configure the Cloudwatch log group', + }); + const defaultCommands = [ + 'functionbeat.provider.aws.functions:', + ' - name: fn_cloudwatch_logs', + ' enabled: true', + ' type: cloudwatch_logs', + ' triggers:', + ' - log_group_name: ', + 'functionbeat.provider.aws.deploy_bucket: ', + ]; + const defaultTextPost = i18n.translate('kbn.common.tutorials.functionbeatEnableOnPremInstructions.defaultTextPost', { + defaultMessage: 'Where `` is the name of the log group you want to ingest, \ +and `` is a valid S3 bucket name which will be used for staging the \ +Functionbeat deploy.' + }); + return { + OSX_LINUX: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.functionbeatEnableOnPremInstructionsOSXLinux.textPre', { + defaultMessage: 'Modify the settings in the `functionbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + WINDOWS: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.functionbeatEnableOnPremInstructionsWindows.textPre', { + defaultMessage: 'Modify the settings in the {path} file.', + values: { + path: '`C:\\Program Files\\Functionbeat\\functionbeat.yml`', + } + }), + commands: defaultCommands, + textPost: defaultTextPost + } + }; +} + +export function functionbeatAWSInstructions() { + const defaultTitle = i18n.translate('kbn.common.tutorials.functionbeatAWSInstructions.title', { + defaultMessage: 'Set AWS credentials', + }); + const defaultPre = i18n.translate('kbn.common.tutorials.functionbeatAWSInstructions.textPre', { + defaultMessage: 'Set your AWS account credentials in the environment:', + }); + const defaultPost = i18n.translate('kbn.common.tutorials.functionbeatAWSInstructions.textPost', { + defaultMessage: 'Where `` and `` are your account credentials and \ +`us-east-1` is the desired region.', + }); + + return { + OSX_LINUX: { + title: defaultTitle, + textPre: defaultPre, + commands: [ + 'export AWS_ACCESS_KEY_ID=', + 'export AWS_SECRET_ACCESS_KEY=', + 'export AWS_DEFAULT_REGION=us-east-1', + ], + textPost: defaultPost, + }, + WINDOWS: { + title: defaultTitle, + textPre: defaultPre, + commands: [ + 'set AWS_ACCESS_KEY_ID=', + 'set AWS_SECRET_ACCESS_KEY=', + 'set AWS_DEFAULT_REGION=us-east-1', + ], + textPost: defaultPost, + }, + }; +} + + +export function functionbeatStatusCheck() { + return { + title: i18n.translate('kbn.common.tutorials.functionbeatStatusCheck.title', { + defaultMessage: 'Functionbeat status', + }), + text: i18n.translate('kbn.common.tutorials.functionbeatStatusCheck.text', { + defaultMessage: 'Check that data is received from Functionbeat', + }), + btnLabel: i18n.translate('kbn.common.tutorials.functionbeatStatusCheck.buttonLabel', { + defaultMessage: 'Check data', + }), + success: i18n.translate('kbn.common.tutorials.functionbeatStatusCheck.successText', { + defaultMessage: 'Data successfully received from Functionbeat', + }), + error: i18n.translate('kbn.common.tutorials.functionbeatStatusCheck.errorText', { + defaultMessage: 'No data has been received from Functionbeat yet', + }), + esHitsCheck: { + index: 'functionbeat-*', + query: { + match_all: {}, + }, + }, + }; +} + +export function onPremInstructions(platforms, geoipRequired, uaRequired, context) { + const FUNCTIONBEAT_INSTRUCTIONS = createFunctionbeatInstructions(context); + + return { + instructionSets: [ + { + title: i18n.translate('kbn.common.tutorials.functionbeat.premInstructions.gettingStarted.title', { + defaultMessage: 'Getting Started', + }), + instructionVariants: [ + { + id: INSTRUCTION_VARIANT.OSX, + instructions: [ + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.OSX, + functionbeatAWSInstructions().OSX_LINUX, + functionbeatEnableInstructions().OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.CONFIG.OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.OSX_LINUX, + ], + }, + { + id: INSTRUCTION_VARIANT.LINUX, + instructions: [ + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.LINUX, + functionbeatAWSInstructions().OSX_LINUX, + functionbeatEnableInstructions().OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.CONFIG.OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.OSX_LINUX, + ], + }, + { + id: INSTRUCTION_VARIANT.WINDOWS, + instructions: [ + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.WINDOWS, + functionbeatAWSInstructions().WINDOWS, + functionbeatEnableInstructions().WINDOWS, + FUNCTIONBEAT_INSTRUCTIONS.CONFIG.WINDOWS, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.WINDOWS, + ], + }, + ], + statusCheck: functionbeatStatusCheck(), + }, + ], + }; +} + +export function onPremCloudInstructions() { + const TRYCLOUD_OPTION1 = createTrycloudOption1(); + const TRYCLOUD_OPTION2 = createTrycloudOption2(); + const FUNCTIONBEAT_INSTRUCTIONS = createFunctionbeatInstructions(); + + return { + instructionSets: [ + { + title: i18n.translate('kbn.common.tutorials.functionbeat.premCloudInstructions.gettingStarted.title', { + defaultMessage: 'Getting Started', + }), + instructionVariants: [ + { + id: INSTRUCTION_VARIANT.OSX, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.OSX, + functionbeatAWSInstructions().OSX_LINUX, + functionbeatEnableInstructions().OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.CONFIG.OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.OSX_LINUX, + ], + }, + { + id: INSTRUCTION_VARIANT.LINUX, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.LINUX, + functionbeatAWSInstructions().OSX_LINUX, + functionbeatEnableInstructions().OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.CONFIG.OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.OSX_LINUX, + ], + }, + { + id: INSTRUCTION_VARIANT.WINDOWS, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + functionbeatAWSInstructions().WINDOWS, + functionbeatEnableInstructions().WINDOWS, + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.WINDOWS, + FUNCTIONBEAT_INSTRUCTIONS.CONFIG.WINDOWS, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.WINDOWS, + ], + }, + ], + statusCheck: functionbeatStatusCheck(), + }, + ], + }; +} + +export function cloudInstructions() { + const FUNCTIONBEAT_INSTRUCTIONS = createFunctionbeatInstructions(); + const FUNCTIONBEAT_CLOUD_INSTRUCTIONS = createFunctionbeatCloudInstructions(); + + return { + instructionSets: [ + { + title: i18n.translate('kbn.common.tutorials.functionbeat.cloudInstructions.gettingStarted.title', { + defaultMessage: 'Getting Started', + }), + instructionVariants: [ + { + id: INSTRUCTION_VARIANT.OSX, + instructions: [ + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.OSX, + functionbeatAWSInstructions().OSX_LINUX, + functionbeatEnableInstructions().OSX_LINUX, + FUNCTIONBEAT_CLOUD_INSTRUCTIONS.CONFIG.OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.OSX_LINUX, + ], + }, + { + id: INSTRUCTION_VARIANT.LINUX, + instructions: [ + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.LINUX, + functionbeatAWSInstructions().OSX_LINUX, + functionbeatEnableInstructions().OSX_LINUX, + FUNCTIONBEAT_CLOUD_INSTRUCTIONS.CONFIG.OSX_LINUX, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.OSX_LINUX, + ], + }, + { + id: INSTRUCTION_VARIANT.WINDOWS, + instructions: [ + FUNCTIONBEAT_INSTRUCTIONS.INSTALL.WINDOWS, + functionbeatAWSInstructions().WINDOWS, + functionbeatEnableInstructions().WINDOWS, + FUNCTIONBEAT_CLOUD_INSTRUCTIONS.CONFIG.WINDOWS, + FUNCTIONBEAT_INSTRUCTIONS.DEPLOY.WINDOWS, + ], + }, + ], + statusCheck: functionbeatStatusCheck(), + }, + ], + }; +} diff --git a/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js b/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js new file mode 100644 index 0000000000000..9107dd509067d --- /dev/null +++ b/src/core_plugins/kibana/common/tutorials/heartbeat_instructions.js @@ -0,0 +1,649 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; +import { INSTRUCTION_VARIANT } from './instruction_variant'; +import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions'; +import { getSpaceIdForBeatsTutorial } from '../lib/get_space_id_for_beats_tutorial'; + +export const createHeartbeatInstructions = context => ({ + INSTALL: { + OSX: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.osxTitle', { + defaultMessage: 'Download and install Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.osxTextPre', { + defaultMessage: 'First time using Heartbeat? See the [Getting Started Guide]({link}).', + values: { link: '{config.docs.beats.heartbeat}/heartbeat-getting-started.html' }, + }), + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{config.kibana.version}-darwin-x86_64.tar.gz', + 'tar xzvf heartbeat-{config.kibana.version}-darwin-x86_64.tar.gz', + 'cd heartbeat-{config.kibana.version}-darwin-x86_64/', + ], + }, + DEB: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.debTitle', { + defaultMessage: 'Download and install Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.debTextPre', { + defaultMessage: 'First time using Heartbeat? See the [Getting Started Guide]({link}).', + values: { link: '{config.docs.beats.heartbeat}/heartbeat-getting-started.html' }, + }), + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{config.kibana.version}-amd64.deb', + 'sudo dpkg -i heartbeat-{config.kibana.version}-amd64.deb', + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.debTextPost', { + defaultMessage: 'Looking for the 32-bit packages? See the [Download page]({link}).', + values: { link: 'https://www.elastic.co/downloads/beats/heartbeat' }, + }), + }, + RPM: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.rpmTitle', { + defaultMessage: 'Download and install Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.rpmTextPre', { + defaultMessage: 'First time using Heartbeat? See the [Getting Started Guide]({link}).', + values: { link: '{config.docs.beats.heartbeat}/heartbeat-getting-started.html' }, + }), + commands: [ + 'curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{config.kibana.version}-x86_64.rpm', + 'sudo rpm -vi heartbeat-{config.kibana.version}-x86_64.rpm', + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.debTextPost', { + defaultMessage: 'Looking for the 32-bit packages? See the [Download page]({link}).', + values: { link: 'https://www.elastic.co/downloads/beats/heartbeat' }, + }), + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.windowsTitle', { + defaultMessage: 'Download and install Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.install.windowsTextPre', { + defaultMessage: 'First time using Heartbeat? See the [Getting Started Guide]({heartbeatLink}).\n\ + 1. Download the Heartbeat Windows zip file from the [Download]({elasticLink}) page.\n\ + 2. Extract the contents of the zip file into {folderPath}.\n\ + 3. Rename the {directoryName} directory to `Heartbeat`.\n\ + 4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select \ +**Run As Administrator**). If you are running Windows XP, you might need to download and install PowerShell.\n\ + 5. From the PowerShell prompt, run the following commands to install Heartbeat as a Windows service.', + values: { + directoryName: '`heartbeat-{config.kibana.version}-windows`', + folderPath: '`C:\\Program Files`', + heartbeatLink: '{config.docs.beats.heartbeat}/heartbeat-getting-started.html', + elasticLink: 'https://www.elastic.co/downloads/beats/heartbeat', + }, + }), + commands: [ + 'PS > cd C:\\Program Files\\Heartbeat', + 'PS C:\\Program Files\\Heartbeat> .\\install-service-heartbeat.ps1', + ], + } + }, + START: { + OSX: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.osxTitle', { + defaultMessage: 'Start Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.osxTextPre', { + defaultMessage: 'The `setup` command loads the Kibana dashboards. If the dashboards are already set up, omit this command.', + }), + commands: [ + './heartbeat setup', + './heartbeat -e', + ] + }, + DEB: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.debTitle', { + defaultMessage: 'Start Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.debTextPre', { + defaultMessage: 'The `setup` command loads the Kibana dashboards. If the dashboards are already set up, omit this command.', + }), + commands: [ + 'sudo heartbeat setup', + 'sudo service heartbeat-elastic start', + ] + }, + RPM: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.rpmTitle', { + defaultMessage: 'Start Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.rpmTextPre', { + defaultMessage: 'The `setup` command loads the Kibana dashboards. If the dashboards are already set up, omit this command.', + }), + commands: [ + 'sudo heartbeat setup', + 'sudo service heartbeat-elastic start', + ], + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.windowsTitle', { + defaultMessage: 'Start Heartbeat', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.start.windowsTextPre', { + defaultMessage: 'The `setup` command loads the Kibana dashboards. If the dashboards are already set up, omit this command.', + }), + commands: [ + 'PS C:\\Program Files\\Heartbeat> .\\heartbeat.exe setup', + 'PS C:\\Program Files\\Heartbeat> Start-Service heartbeat', + ], + }, + }, + CONFIG: { + OSX: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.osxTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.osxTextPre', { + defaultMessage: 'Modify {path} to set the connection information:', + values: { + path: '`heartbeat.yml`', + }, + }), + commands: [ + 'output.elasticsearch:', + ' hosts: [""]', + ' username: "elastic"', + ' password: ""', + 'setup.kibana:', + ' host: ""', + getSpaceIdForBeatsTutorial(context) + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.osxTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ +and {kibanaUrlTemplate} is the URL of Kibana.', + values: { + passwordTemplate: '``', + esUrlTemplate: '``', + kibanaUrlTemplate: '``', + }, + }), + }, + DEB: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.debTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.debTextPre', { + defaultMessage: 'Modify {path} to set the connection information:', + values: { + path: '`/etc/heartbeat/heartbeat.yml`', + }, + }), + commands: [ + 'output.elasticsearch:', + ' hosts: [""]', + ' username: "elastic"', + ' password: ""', + 'setup.kibana:', + ' host: ""', + getSpaceIdForBeatsTutorial(context) + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.debTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ +and {kibanaUrlTemplate} is the URL of Kibana.', + values: { + passwordTemplate: '``', + esUrlTemplate: '``', + kibanaUrlTemplate: '``', + }, + }), + }, + RPM: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.rpmTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.rpmTextPre', { + defaultMessage: 'Modify {path} to set the connection information:', + values: { + path: '`/etc/heartbeat/heartbeat.yml`', + }, + }), + commands: [ + 'output.elasticsearch:', + ' hosts: [""]', + ' username: "elastic"', + ' password: ""', + 'setup.kibana:', + ' host: ""', + getSpaceIdForBeatsTutorial(context) + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.rpmTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ +and {kibanaUrlTemplate} is the URL of Kibana.', + values: { + passwordTemplate: '``', + esUrlTemplate: '``', + kibanaUrlTemplate: '``', + }, + }), + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.windowsTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.windowsTextPre', { + defaultMessage: 'Modify {path} to set the connection information:', + values: { + path: '`C:\\Program Files\\Heartbeat\\heartbeat.yml`', + }, + }), + commands: [ + 'output.elasticsearch:', + ' hosts: [""]', + ' username: "elastic"', + ' password: ""', + 'setup.kibana:', + ' host: ""', + getSpaceIdForBeatsTutorial(context) + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatInstructions.config.windowsTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ +and {kibanaUrlTemplate} is the URL of Kibana.', + values: { + passwordTemplate: '``', + esUrlTemplate: '``', + kibanaUrlTemplate: '``', + }, + }), + } + } +}); + +export const createHeartbeatCloudInstructions = () => ({ + CONFIG: { + OSX: { + title: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.osxTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPre', { + defaultMessage: 'Modify {path} to set the connection information for Elastic Cloud:', + values: { + path: '`heartbeat.yml`', + }, + }), + commands: [ + 'cloud.id: "{config.cloud.id}"', + 'cloud.auth: "elastic:"' + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.osxTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.', + values: { passwordTemplate: '``' }, + }), + }, + DEB: { + title: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.debTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPre', { + defaultMessage: 'Modify {path} to set the connection information for Elastic Cloud:', + values: { + path: '`/etc/heartbeat/heartbeat.yml`', + }, + }), + commands: [ + 'cloud.id: "{config.cloud.id}"', + 'cloud.auth: "elastic:"' + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.debTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.', + values: { passwordTemplate: '``' }, + }), + }, + RPM: { + title: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPre', { + defaultMessage: 'Modify {path} to set the connection information for Elastic Cloud:', + values: { + path: '`/etc/heartbeat/heartbeat.yml`', + }, + }), + commands: [ + 'cloud.id: "{config.cloud.id}"', + 'cloud.auth: "elastic:"' + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.rpmTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.', + values: { passwordTemplate: '``' }, + }), + }, + WINDOWS: { + title: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTitle', { + defaultMessage: 'Edit the configuration', + }), + textPre: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPre', { + defaultMessage: 'Modify {path} to set the connection information for Elastic Cloud:', + values: { + path: '`C:\\Program Files\\Heartbeat\\heartbeat.yml`', + }, + }), + commands: [ + 'cloud.id: "{config.cloud.id}"', + 'cloud.auth: "elastic:"' + ], + textPost: i18n.translate('kbn.common.tutorials.heartbeatCloudInstructions.config.windowsTextPost', { + defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user.', + values: { passwordTemplate: '``' }, + }), + } + } +}); + +export function heartbeatEnableInstructionsOnPrem() { + const defaultTitle = i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTitle', { + defaultMessage: 'Edit the configuration - Add monitors', + }); + const defaultCommands = [ + 'heartbeat.monitors:', + '- type: http', + ' urls: [""]', + ' schedule: "@every 10s"' + ]; + const defaultTextPost = i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.defaultTextPost', { + defaultMessage: 'Where {hostTemplate} is your monitored URL, For more details on how to configure Monitors in \ + Heartbeat, read the [Heartbeat configuration docs.]({configureLink})', + values: { + configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html', + hostTemplate: '``' + } + }); + return { + OSX: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.osxTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + DEB: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.debTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + RPM: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.rpmTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + WINDOWS: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableOnPremInstructions.windowsTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + } + }; +} + +export function heartbeatEnableInstructionsCloud() { + const defaultTitle = i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTitle', { + defaultMessage: 'Edit the configuration - Add monitors', + }); + const defaultCommands = [ + 'heartbeat.monitors:', + '- type: http', + ' urls: ["http://elastic.co"]', + ' schedule: "@every 10s"' + ]; + const defaultTextPost = i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.defaultTextPost', { + defaultMessage: 'For more details on how to configure Monitors in Heartbeat, read the [Heartbeat configuration docs.]({configureLink})', + values: { configureLink: '{config.docs.beats.heartbeat}/heartbeat-configuration.html' } + }); + return { + OSX: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.osxTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + DEB: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.debTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + RPM: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.rpmTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + }, + WINDOWS: { + title: defaultTitle, + textPre: i18n.translate('kbn.common.tutorials.heartbeatEnableCloudInstructions.windowsTextPre', { + defaultMessage: 'Edit the `heartbeat.monitors` setting in the `heartbeat.yml` file.', + }), + commands: defaultCommands, + textPost: defaultTextPost + } + }; +} + +export function heartbeatStatusCheck() { + return { + title: i18n.translate('kbn.common.tutorials.heartbeatStatusCheck.title', { + defaultMessage: 'Heartbeat status', + }), + text: i18n.translate('kbn.common.tutorials.heartbeatStatusCheck.text', { + defaultMessage: 'Check that data is received from Heartbeat', + }), + btnLabel: i18n.translate('kbn.common.tutorials.heartbeatStatusCheck.buttonLabel', { + defaultMessage: 'Check data', + }), + success: i18n.translate('kbn.common.tutorials.heartbeatStatusCheck.successText', { + defaultMessage: 'Data successfully received from Heartbeat', + }), + error: i18n.translate('kbn.common.tutorials.heartbeatStatusCheck.errorText', { + defaultMessage: 'No data has been received from Heartbeat yet', + }), + esHitsCheck: { + index: 'heartbeat-*', + query: { + match_all: {}, + }, + }, + }; +} + +export function onPremInstructions(platforms, geoipRequired, uaRequired, context) { + const HEARTBEAT_INSTRUCTIONS = createHeartbeatInstructions(context); + + return { + instructionSets: [ + { + title: i18n.translate('kbn.common.tutorials.heartbeat.premInstructions.gettingStarted.title', { + defaultMessage: 'Getting Started', + }), + instructionVariants: [ + { + id: INSTRUCTION_VARIANT.OSX, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.OSX, + HEARTBEAT_INSTRUCTIONS.CONFIG.OSX, + heartbeatEnableInstructionsOnPrem().OSX, + HEARTBEAT_INSTRUCTIONS.START.OSX, + ], + }, + { + id: INSTRUCTION_VARIANT.DEB, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.DEB, + HEARTBEAT_INSTRUCTIONS.CONFIG.DEB, + heartbeatEnableInstructionsOnPrem().DEB, + HEARTBEAT_INSTRUCTIONS.START.DEB, + ], + }, + { + id: INSTRUCTION_VARIANT.RPM, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.RPM, + HEARTBEAT_INSTRUCTIONS.CONFIG.RPM, + heartbeatEnableInstructionsOnPrem().RPM, + HEARTBEAT_INSTRUCTIONS.START.RPM, + ], + }, + { + id: INSTRUCTION_VARIANT.WINDOWS, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.WINDOWS, + HEARTBEAT_INSTRUCTIONS.CONFIG.WINDOWS, + heartbeatEnableInstructionsOnPrem().WINDOWS, + HEARTBEAT_INSTRUCTIONS.START.WINDOWS, + ], + }, + ], + statusCheck: heartbeatStatusCheck(), + }, + ], + }; +} + +export function onPremCloudInstructions() { + const TRYCLOUD_OPTION1 = createTrycloudOption1(); + const TRYCLOUD_OPTION2 = createTrycloudOption2(); + const HEARTBEAT_INSTRUCTIONS = createHeartbeatInstructions(); + + return { + instructionSets: [ + { + title: i18n.translate('kbn.common.tutorials.heartbeat.premCloudInstructions.gettingStarted.title', { + defaultMessage: 'Getting Started', + }), + instructionVariants: [ + { + id: INSTRUCTION_VARIANT.OSX, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + HEARTBEAT_INSTRUCTIONS.INSTALL.OSX, + HEARTBEAT_INSTRUCTIONS.CONFIG.OSX, + heartbeatEnableInstructionsCloud().OSX, + HEARTBEAT_INSTRUCTIONS.START.OSX, + ], + }, + { + id: INSTRUCTION_VARIANT.DEB, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + HEARTBEAT_INSTRUCTIONS.INSTALL.DEB, + HEARTBEAT_INSTRUCTIONS.CONFIG.DEB, + heartbeatEnableInstructionsCloud().DEB, + HEARTBEAT_INSTRUCTIONS.START.DEB, + ], + }, + { + id: INSTRUCTION_VARIANT.RPM, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + HEARTBEAT_INSTRUCTIONS.INSTALL.RPM, + HEARTBEAT_INSTRUCTIONS.CONFIG.RPM, + heartbeatEnableInstructionsCloud().RPM, + HEARTBEAT_INSTRUCTIONS.START.RPM, + ], + }, + { + id: INSTRUCTION_VARIANT.WINDOWS, + instructions: [ + TRYCLOUD_OPTION1, + TRYCLOUD_OPTION2, + HEARTBEAT_INSTRUCTIONS.INSTALL.WINDOWS, + HEARTBEAT_INSTRUCTIONS.CONFIG.WINDOWS, + heartbeatEnableInstructionsCloud().WINDOWS, + HEARTBEAT_INSTRUCTIONS.START.WINDOWS, + ], + }, + ], + statusCheck: heartbeatStatusCheck(), + }, + ], + }; +} + +export function cloudInstructions() { + const HEARTBEAT_INSTRUCTIONS = createHeartbeatInstructions(); + const HEARTBEAT_CLOUD_INSTRUCTIONS = createHeartbeatCloudInstructions(); + + return { + instructionSets: [ + { + title: i18n.translate('kbn.common.tutorials.heartbeat.cloudInstructions.gettingStarted.title', { + defaultMessage: 'Getting Started', + }), + instructionVariants: [ + { + id: INSTRUCTION_VARIANT.OSX, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.OSX, + HEARTBEAT_CLOUD_INSTRUCTIONS.CONFIG.OSX, + heartbeatEnableInstructionsCloud().OSX, + HEARTBEAT_INSTRUCTIONS.START.OSX, + ], + }, + { + id: INSTRUCTION_VARIANT.DEB, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.DEB, + HEARTBEAT_CLOUD_INSTRUCTIONS.CONFIG.DEB, + heartbeatEnableInstructionsCloud().DEB, + HEARTBEAT_INSTRUCTIONS.START.DEB, + ], + }, + { + id: INSTRUCTION_VARIANT.RPM, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.RPM, + HEARTBEAT_CLOUD_INSTRUCTIONS.CONFIG.RPM, + heartbeatEnableInstructionsCloud().RPM, + HEARTBEAT_INSTRUCTIONS.START.RPM, + ], + }, + { + id: INSTRUCTION_VARIANT.WINDOWS, + instructions: [ + HEARTBEAT_INSTRUCTIONS.INSTALL.WINDOWS, + HEARTBEAT_CLOUD_INSTRUCTIONS.CONFIG.WINDOWS, + heartbeatEnableInstructionsCloud().WINDOWS, + HEARTBEAT_INSTRUCTIONS.START.WINDOWS, + ], + }, + ], + statusCheck: heartbeatStatusCheck(), + }, + ], + }; +} diff --git a/src/core_plugins/kibana/common/tutorials/instruction_variant.js b/src/core_plugins/kibana/common/tutorials/instruction_variant.js index 529ca0e3e5800..10f0233abb742 100644 --- a/src/core_plugins/kibana/common/tutorials/instruction_variant.js +++ b/src/core_plugins/kibana/common/tutorials/instruction_variant.js @@ -31,6 +31,7 @@ export const INSTRUCTION_VARIANT = { JS: 'js', GO: 'go', JAVA: 'java', + LINUX: 'linux', }; const DISPLAY_MAP = { @@ -47,6 +48,7 @@ const DISPLAY_MAP = { [INSTRUCTION_VARIANT.JS]: 'RUM (JS)', [INSTRUCTION_VARIANT.GO]: 'Go', [INSTRUCTION_VARIANT.JAVA]: 'Java', + [INSTRUCTION_VARIANT.LINUX]: 'Linux', }; /** diff --git a/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js b/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js index b15d3aaab1e7e..93d88e9ee4b9e 100644 --- a/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js +++ b/src/core_plugins/kibana/common/tutorials/metricbeat_instructions.js @@ -20,8 +20,9 @@ import { i18n } from '@kbn/i18n'; import { INSTRUCTION_VARIANT } from './instruction_variant'; import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions'; +import { getSpaceIdForBeatsTutorial } from '../lib/get_space_id_for_beats_tutorial'; -export const createMetricbeatInstructions = () => ({ +export const createMetricbeatInstructions = context => ({ INSTALL: { OSX: { title: i18n.translate('kbn.common.tutorials.metricbeatInstructions.install.osxTitle', { @@ -145,7 +146,7 @@ export const createMetricbeatInstructions = () => ({ defaultMessage: 'The `setup` command loads the Kibana dashboards. If the dashboards are already set up, omit this command.', }), commands: [ - 'PS C:\\Program Files\\Metricbeat> metricbeat.exe setup', + 'PS C:\\Program Files\\Metricbeat> .\\metricbeat.exe setup', 'PS C:\\Program Files\\Metricbeat> Start-Service metricbeat', ], }, @@ -168,6 +169,7 @@ export const createMetricbeatInstructions = () => ({ ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.metricbeatInstructions.config.osxTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -196,6 +198,7 @@ and {kibanaUrlTemplate} is the URL of Kibana.', ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.metricbeatInstructions.config.debTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -224,6 +227,7 @@ and {kibanaUrlTemplate} is the URL of Kibana.', ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.metricbeatInstructions.config.rpmTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -252,6 +256,7 @@ and {kibanaUrlTemplate} is the URL of Kibana.', ' password: ""', 'setup.kibana:', ' host: ""', + getSpaceIdForBeatsTutorial(context) ], textPost: i18n.translate('kbn.common.tutorials.metricbeatInstructions.config.windowsTextPost', { defaultMessage: 'Where {passwordTemplate} is the password of the `elastic` user, {esUrlTemplate} is the URL of Elasticsearch, \ @@ -444,8 +449,8 @@ export function metricbeatStatusCheck(moduleName) { }; } -export function onPremInstructions(moduleName) { - const METRICBEAT_INSTRUCTIONS = createMetricbeatInstructions(); +export function onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context) { + const METRICBEAT_INSTRUCTIONS = createMetricbeatInstructions(context); return { instructionSets: [ diff --git a/src/core_plugins/kibana/index.js b/src/core_plugins/kibana/index.js index 91bc29d6097f4..c7a44ac2b04bd 100644 --- a/src/core_plugins/kibana/index.js +++ b/src/core_plugins/kibana/index.js @@ -29,13 +29,15 @@ import { homeApi } from './server/routes/api/home'; import { managementApi } from './server/routes/api/management'; import { scriptsApi } from './server/routes/api/scripts'; import { registerSuggestionsApi } from './server/routes/api/suggestions'; +import { registerKqlTelemetryApi } from './server/routes/api/kql_telemetry'; +import { registerClustersRoute } from './server/routes/api/remote_info'; import { registerFieldFormats } from './server/field_formats/register'; import { registerTutorials } from './server/tutorials/register'; import * as systemApi from './server/lib/system_api'; import handleEsError from './server/lib/handle_es_error'; import mappings from './mappings.json'; import { getUiSettingDefaults } from './ui_setting_defaults'; - +import { makeKQLUsageCollector } from './server/lib/kql_usage_collector'; import { injectVars } from './inject_vars'; const mkdirp = Promise.promisify(mkdirpNode); @@ -76,6 +78,7 @@ export default function (kibana) { url: `${kbnBaseUrl}#/discover`, description: 'interactively explore your data', icon: 'plugins/kibana/assets/discover.svg', + euiIconType: 'discoverApp', }, { id: 'kibana:visualize', title: 'Visualize', @@ -83,6 +86,7 @@ export default function (kibana) { url: `${kbnBaseUrl}#/visualize`, description: 'design data visualizations', icon: 'plugins/kibana/assets/visualize.svg', + euiIconType: 'visualizeApp', }, { id: 'kibana:dashboard', title: 'Dashboard', @@ -96,13 +100,15 @@ export default function (kibana) { subUrlBase: `${kbnBaseUrl}#/dashboard`, description: 'compose visualizations for much win', icon: 'plugins/kibana/assets/dashboard.svg', + euiIconType: 'dashboardApp', }, { id: 'kibana:dev_tools', title: 'Dev Tools', order: 9001, url: '/app/kibana#/dev_tools', description: 'development tools', - icon: 'plugins/kibana/assets/wrench.svg' + icon: 'plugins/kibana/assets/wrench.svg', + euiIconType: 'devToolsApp', }, { id: 'kibana:management', title: 'Management', @@ -110,10 +116,17 @@ export default function (kibana) { url: `${kbnBaseUrl}#/management`, description: 'define index patterns, change config, and more', icon: 'plugins/kibana/assets/settings.svg', + euiIconType: 'managementApp', linkToLastSubUrl: false }, ], + savedObjectSchemas: { + 'kql-telemetry': { + isNamespaceAgnostic: true, + }, + }, + injectDefaultVars(server, options) { return { kbnIndex: options.index, @@ -151,8 +164,11 @@ export default function (kibana) { homeApi(server); managementApi(server); registerSuggestionsApi(server); + registerKqlTelemetryApi(server); registerFieldFormats(server); registerTutorials(server); + makeKQLUsageCollector(server); + registerClustersRoute(server); server.expose('systemApi', systemApi); server.expose('handleEsError', handleEsError); server.injectUiAppVars('kibana', () => injectVars(server)); diff --git a/src/core_plugins/kibana/mappings.json b/src/core_plugins/kibana/mappings.json index 471cee57da565..155742b15c8a7 100644 --- a/src/core_plugins/kibana/mappings.json +++ b/src/core_plugins/kibana/mappings.json @@ -21,6 +21,12 @@ }, "title": { "type": "text" + }, + "type": { + "type": "keyword" + }, + "typeMeta": { + "type": "keyword" } } }, @@ -167,5 +173,15 @@ "type": "keyword" } } + }, + "kql-telemetry": { + "properties": { + "optInCount": { + "type": "long" + }, + "optOutCount": { + "type": "long" + } + } } } diff --git a/src/core_plugins/kibana/public/context/_index.scss b/src/core_plugins/kibana/public/context/_index.scss new file mode 100644 index 0000000000000..b605bc3d6edea --- /dev/null +++ b/src/core_plugins/kibana/public/context/_index.scss @@ -0,0 +1,8 @@ +// Prefix all styles with "cxt" to avoid conflicts. +// Examples +// cxtChart +// cxtChart__legend +// cxtChart__legend--small +// cxtChart__legend-isLoading + +@import 'components/size_picker/index'; diff --git a/src/core_plugins/kibana/public/context/components/size_picker/_index.scss b/src/core_plugins/kibana/public/context/components/size_picker/_index.scss new file mode 100644 index 0000000000000..6a7ffa7201919 --- /dev/null +++ b/src/core_plugins/kibana/public/context/components/size_picker/_index.scss @@ -0,0 +1 @@ +@import './size_picker'; diff --git a/src/core_plugins/kibana/public/context/components/size_picker/_size_picker.scss b/src/core_plugins/kibana/public/context/components/size_picker/_size_picker.scss new file mode 100644 index 0000000000000..3e9b05a2872ca --- /dev/null +++ b/src/core_plugins/kibana/public/context/components/size_picker/_size_picker.scss @@ -0,0 +1,14 @@ +/** + * 1. Hide increment and decrement buttons for type="number" input. + */ +.cxtSizePicker { + appearance: textfield; + text-align: center; + width: $euiSize * 5; + + &::-webkit-outer-spin-button, + &::-webkit-inner-spin-button { + appearance: none; /* 1 */ + margin: 0; /* 1 */ + } +} diff --git a/src/core_plugins/kibana/public/context/components/size_picker/size_picker.html b/src/core_plugins/kibana/public/context/components/size_picker/size_picker.html index 6d1516279cb5d..d3bda3268310a 100644 --- a/src/core_plugins/kibana/public/context/components/size_picker/size_picker.html +++ b/src/core_plugins/kibana/public/context/components/size_picker/size_picker.html @@ -1,5 +1,5 @@ { - - describe('with query bar', () => { - let Private; - let getAppState; - let getDashboardContext; - beforeEach(() => { - Private = sinon.stub().returns({ - getFilters() { - return []; - } - }); - }); - - it('should return an empty must and must not when there are no filters or queries', () => { - getAppState = sinon.stub().returns({ - query: { - language: 'lucene', - query: null - } - }); - getDashboardContext = dashboardContextProvider(Private, getAppState); - const context = getDashboardContext(); - expect(context).to.eql({ - bool: { - must: [], - must_not: [] - } - }); - }); - - it('should add a valid query to must', () => { - getAppState = sinon.stub().returns({ - query: { - language: 'lucene', - query: '*' - } - }); - getDashboardContext = dashboardContextProvider(Private, getAppState); - const context = getDashboardContext(); - expect(context).to.eql({ - bool: { - must: [ - { - query_string: { - query: '*' - } - } - ], - must_not: [] - } - }); - }); - - }); - - describe('with filter bar', () => { - let Private; - let getAppState; - let getDashboardContext; - beforeEach(() => { - getAppState = sinon.stub().returns({ query: { language: 'something-else' } }); - }); - - afterEach(() => { - getAppState.resetHistory(); - }); - - it('should add a valid filter to must', () => { - Private = sinon.stub().returns({ - getFilters() { - return [ - { meta: { negate: false }, term: { foo: 'bar' } } - ]; - } - }); - getDashboardContext = dashboardContextProvider(Private, getAppState); - const context = getDashboardContext(); - expect(context).to.eql({ - bool: { - must: [{ term: { foo: 'bar' } }], - must_not: [] - } - }); - }); - - it('should add a valid filter to must_not', () => { - Private = sinon.stub().returns({ - getFilters() { - return [ - { meta: { negate: true }, term: { foo: 'bar' } } - ]; - } - }); - getDashboardContext = dashboardContextProvider(Private, getAppState); - const context = getDashboardContext(); - expect(context).to.eql({ - bool: { - must: [], - must_not: [{ term: { foo: 'bar' } }] - } - }); - }); - - it('should not add a disabled filter', () => { - Private = sinon.stub().returns({ - getFilters() { - return [ - { meta: { negate: true, disabled: true }, term: { foo: 'bar' } } - ]; - } - }); - getDashboardContext = dashboardContextProvider(Private, getAppState); - const context = getDashboardContext(); - expect(context).to.eql({ - bool: { - must: [], - must_not: [] - } - }); - }); - - }); - -}); - - diff --git a/src/core_plugins/kibana/public/dashboard/_hacks.scss b/src/core_plugins/kibana/public/dashboard/_hacks.scss index 3f4fbff4d5703..8257566a35a75 100644 --- a/src/core_plugins/kibana/public/dashboard/_hacks.scss +++ b/src/core_plugins/kibana/public/dashboard/_hacks.scss @@ -24,8 +24,8 @@ dashboard-listing { // Yes, this is a hack because bootstrap will be removed and everything must move to EUI theming // Can't reliably remove all/any of these because of embeddables -.tab-dashboard.theme-dark { - @import './../../../../../node_modules/@elastic/eui/src/themes/k6/k6_colors_dark'; +.theme-dark { + @import '@elastic/eui/src/themes/k6/k6_colors_dark'; // /src/ui/public/styles/bootstrap/scaffolding.less a { diff --git a/src/core_plugins/kibana/public/dashboard/_index.scss b/src/core_plugins/kibana/public/dashboard/_index.scss index 26d0c85e9f882..de00e0d670d22 100644 --- a/src/core_plugins/kibana/public/dashboard/_index.scss +++ b/src/core_plugins/kibana/public/dashboard/_index.scss @@ -14,16 +14,16 @@ // dshChart__legend-isLoading /** - * 1. Don't duplicate styles in dark mode - */ -.tab-dashboard.theme-light { /* 1 */ + * 1. Don't duplicate styles in dark mode + */ +.theme-light { /* 1 */ @import 'dashboard_app'; @import 'grid/index'; @import 'panel/index'; @import 'viewport/index'; } -// Imports outside of .tab-dashboard selector don't change between light/dark modes +// Imports outside of theme selector don't change between light/dark modes @import 'components/index'; // Must be outside of theme selector because it lives in a portal @@ -31,13 +31,18 @@ // DARK THEME // EUI global scope -- dark -@import './../../../../../node_modules/@elastic/eui/src/themes/k6/k6_colors_dark'; +@import '@elastic/eui/src/themes/k6/k6_colors_dark'; -.tab-dashboard.theme-dark { +.theme-dark { background-color: $euiColorEmptyShade; @import 'dashboard_app'; @import 'grid/index'; @import 'panel/index'; @import 'viewport/index'; + + // Vis imports -- will have some duplicate styling + // because they will be imported via ui/public as well + // (without .theme-[] prefix) + @import 'src/ui/public/vis/map/index'; } diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_app.html b/src/core_plugins/kibana/public/dashboard/dashboard_app.html index 76326d2f26652..cc020f33e3dba 100644 --- a/src/core_plugins/kibana/public/dashboard/dashboard_app.html +++ b/src/core_plugins/kibana/public/dashboard/dashboard_app.html @@ -7,30 +7,30 @@
      -
      -
      - Dashboard +
      +
      +
      + Dashboard +
      +
      + {{ getDashTitle() }} +
      +
      -
      - {{ getDashTitle() }} -
      -
      - + >
      diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_app.js b/src/core_plugins/kibana/public/dashboard/dashboard_app.js index a230249aca828..13f6c1006c956 100644 --- a/src/core_plugins/kibana/public/dashboard/dashboard_app.js +++ b/src/core_plugins/kibana/public/dashboard/dashboard_app.js @@ -46,7 +46,7 @@ import { DashboardSaveModal } from './top_nav/save_modal'; import { showAddPanel } from './top_nav/show_add_panel'; import { showOptionsPopover } from './top_nav/show_options_popover'; import { showShareContextMenu, ShareContextMenuExtensionsRegistryProvider } from 'ui/share'; -import { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery'; +import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query'; import * as filterActions from 'ui/doc_table/actions/filter'; import { FilterManagerProvider } from 'ui/filter_manager'; import { EmbeddableFactoriesRegistryProvider } from 'ui/embeddable/embeddable_factories_registry'; @@ -56,6 +56,7 @@ import { timefilter } from 'ui/timefilter'; import { getUnhashableStatesProvider } from 'ui/state_management/state_hashing'; import { DashboardViewportProvider } from './viewport/dashboard_viewport_provider'; +import { i18n } from '@kbn/i18n'; const app = uiModules.get('app/dashboard', [ 'elasticsearch', @@ -63,7 +64,6 @@ const app = uiModules.get('app/dashboard', [ 'react', 'kibana/courier', 'kibana/config', - 'kibana/typeahead', ]); app.directive('dashboardViewportProvider', function (reactDirective) { @@ -81,7 +81,17 @@ app.directive('dashboardApp', function ($injector) { return { restrict: 'E', controllerAs: 'dashboardApp', - controller: function ($scope, $rootScope, $route, $routeParams, $location, getAppState, dashboardConfig, localStorage) { + controller: function ( + $scope, + $rootScope, + $route, + $routeParams, + $location, + getAppState, + dashboardConfig, + localStorage, + breadcrumbState + ) { const filterManager = Private(FilterManagerProvider); const filterBar = Private(FilterBarQueryFilterProvider); const docTitle = Private(DocTitleProvider); @@ -169,6 +179,23 @@ app.directive('dashboardApp', function ($injector) { dashboardStateManager.getTitle(), dashboardStateManager.getViewMode(), dashboardStateManager.getIsDirty(timefilter)); + + // Push breadcrumbs to new header navigation + const updateBreadcrumbs = () => { + breadcrumbState.set([ + { + text: i18n.translate('kbn.dashboard.dashboardAppBreadcrumbsTitle', { + defaultMessage: 'Dashboard', + }), + href: $scope.landingPageUrl() + }, + { text: $scope.getDashTitle() } + ]); + }; + updateBreadcrumbs(); + dashboardStateManager.registerChangeListener(updateBreadcrumbs); + config.watch('k7design', (val) => $scope.showPluginBreadcrumbs = !val); + $scope.newDashboard = () => { kbnUrl.change(DashboardConstants.CREATE_NEW_DASHBOARD_URL, {}); }; $scope.saveState = () => dashboardStateManager.saveState(); $scope.getShouldShowEditHelp = () => ( diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_context.js b/src/core_plugins/kibana/public/dashboard/dashboard_context.js deleted file mode 100644 index d3b4c64b327f5..0000000000000 --- a/src/core_plugins/kibana/public/dashboard/dashboard_context.js +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -// This file is used by Timelion and TSVB -import _ from 'lodash'; -import { FilterBarQueryFilterProvider } from 'ui/filter_bar/query_filter'; -import 'ui/state_management/app_state'; -import { luceneStringToDsl, migrateFilter } from 'ui/courier'; - -export function dashboardContextProvider(Private, getAppState) { - return () => { - const appState = getAppState(); - const queryFilter = Private(FilterBarQueryFilterProvider); - const bool = { must: [], must_not: [] }; - if (!appState) { return { bool: bool }; } - const filterBarFilters = queryFilter.getFilters(); - const queryBarQuery = appState.query; - - if (queryBarQuery.language === 'lucene') { - // Add the query bar filter, its handled differently. - const query = luceneStringToDsl(queryBarQuery.query); - if (query) { bool.must.push(query); } - } - - // Add each of the filter bar filters - _.each(filterBarFilters, function (filter) { - const esFilter = _.omit(filter, function (val, key) { - if (key === 'meta' || key[0] === '$') { return true; } - return false; - }); - - if (filter.meta.disabled) { return; } - if (filter.meta.negate) { - bool.must_not = bool.must_not || []; - if (esFilter.query || esFilter) { bool.must_not.push(migrateFilter(esFilter.query || esFilter)); } - } else { - bool.must = bool.must || []; - if (esFilter.query || esFilter) { bool.must.push(migrateFilter(esFilter.query || esFilter)); } - } - }); - - return { bool: bool }; - }; -} diff --git a/src/core_plugins/kibana/public/dashboard/dashboard_state_manager.js b/src/core_plugins/kibana/public/dashboard/dashboard_state_manager.js index 3b7c759967ec0..a9a9372318592 100644 --- a/src/core_plugins/kibana/public/dashboard/dashboard_state_manager.js +++ b/src/core_plugins/kibana/public/dashboard/dashboard_state_manager.js @@ -37,6 +37,7 @@ import { clearStagedFilters, updateFilters, updateQuery, + closeContextMenu, } from './actions'; import { stateMonitorFactory } from 'ui/state_management/state_monitor_factory'; import { createPanelState } from './panel'; @@ -101,6 +102,8 @@ export class DashboardStateManager { this.createStateMonitor(); + store.dispatch(closeContextMenu()); + // Always start out with all panels minimized when a dashboard is first loaded. store.dispatch(minimizePanel()); this._pushAppStateChangesToStore(); diff --git a/src/core_plugins/kibana/public/dashboard/grid/_dashboard_grid.scss b/src/core_plugins/kibana/public/dashboard/grid/_dashboard_grid.scss index 232d12f51bc8b..46479536aaff6 100644 --- a/src/core_plugins/kibana/public/dashboard/grid/_dashboard_grid.scss +++ b/src/core_plugins/kibana/public/dashboard/grid/_dashboard_grid.scss @@ -35,7 +35,7 @@ } /** - * .dshLayout-withMargins only affects the panel styles themselves, see ../panel + * .dshLayout-withoutMargins only affects the panel styles themselves, see ../panel */ /** @@ -53,14 +53,12 @@ width: 100% !important; /* 1 */ top: 0 !important; /* 1 */ left: 0 !important; /* 1 */ + + // Altered panel styles can be found in ../panel } // REACT-GRID -.react-grid-layout .dshPanel { - overflow: visible; -} - .react-grid-item { /** * Disable transitions from the library on each grid element. @@ -87,6 +85,7 @@ } &.react-draggable-dragging { + transition: box-shadow $euiAnimSpeedFast $euiAnimSlightResistance; @include euiBottomShadowLarge; border-radius: $euiBorderRadius; // keeps shadow within bounds } diff --git a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js index 9e36600ec8526..ccb22b4e533cb 100644 --- a/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js +++ b/src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js @@ -70,7 +70,7 @@ function ResponsiveGrid({ 'dshLayout--viewing': isViewMode, 'dshLayout--editing': !isViewMode, 'dshLayout-isMaximizedPanel': maximizedPanelId !== undefined, - 'dshLayout-withMargins': useMargins, + 'dshLayout-withoutMargins': !useMargins, }); const MARGINS = useMargins ? 8 : 0; diff --git a/src/core_plugins/kibana/public/dashboard/index.js b/src/core_plugins/kibana/public/dashboard/index.js index 6c9e3bb510fe6..3c302ec41bb67 100644 --- a/src/core_plugins/kibana/public/dashboard/index.js +++ b/src/core_plugins/kibana/public/dashboard/index.js @@ -34,6 +34,7 @@ import { recentlyAccessed } from 'ui/persisted_log'; import { SavedObjectRegistryProvider } from 'ui/saved_objects/saved_object_registry'; import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing'; import { uiModules } from 'ui/modules'; +import { i18n } from '@kbn/i18n'; const app = uiModules.get('app/dashboard', [ 'ngRoute', @@ -50,7 +51,7 @@ uiRoutes }) .when(DashboardConstants.LANDING_PAGE_PATH, { template: dashboardListingTemplate, - controller($injector, $location, $scope, Private, config) { + controller($injector, $location, $scope, Private, config, breadcrumbState) { const services = Private(SavedObjectRegistryProvider).byLoaderPropertiesName; const dashboardConfig = $injector.get('dashboardConfig'); @@ -63,6 +64,11 @@ uiRoutes }; $scope.hideWriteControls = dashboardConfig.getHideWriteControls(); $scope.initialFilter = ($location.search()).filter || EMPTY_FILTER; + breadcrumbState.set([{ + text: i18n.translate('kbn.dashboard.dashboardBreadcrumbsTitle', { + defaultMessage: 'Dashboards', + }), + }]); }, resolve: { dash: function ($route, Private, redirectWhenMissing, kbnUrl) { diff --git a/src/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap b/src/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap index 45517f756370f..cd45b2ae64b10 100644 --- a/src/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap +++ b/src/core_plugins/kibana/public/dashboard/listing/__snapshots__/dashboard_listing.test.js.snap @@ -15,6 +15,7 @@ exports[`after fetch hideWriteControls 1`] = ` >

      Dashboards @@ -273,6 +275,7 @@ exports[`after fetch renders table rows 1`] = ` >

      Dashboards @@ -426,6 +429,7 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = ` >

      Dashboards diff --git a/src/core_plugins/kibana/public/dashboard/panel/__snapshots__/dashboard_panel.test.js.snap b/src/core_plugins/kibana/public/dashboard/panel/__snapshots__/dashboard_panel.test.js.snap index 1680ef4c5b1f2..a141793e52f0a 100644 --- a/src/core_plugins/kibana/public/dashboard/panel/__snapshots__/dashboard_panel.test.js.snap +++ b/src/core_plugins/kibana/public/dashboard/panel/__snapshots__/dashboard_panel.test.js.snap @@ -2,69 +2,66 @@ exports[`DashboardPanel matches snapshot 1`] = `
      + + my embeddable title +
      - - my embeddable title -
      -
      - -
      + + + +
      -
      +
      `; diff --git a/src/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss b/src/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss index 36130cd183747..6efb9d4f25b0d 100644 --- a/src/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss +++ b/src/core_plugins/kibana/public/dashboard/panel/_dashboard_panel.scss @@ -12,7 +12,7 @@ flex: 1 1 100%; height: auto; z-index: 1; - background-color: inherit; + min-height: 0; // Absolute must for Firefox to scroll contents } // SASSTODO: Pretty sure this doesn't do anything since the flex-basis 100%, @@ -24,64 +24,48 @@ /** * 1. We want the doc-table-container to scroll only when embedded in a dashboard panel * 2. Fix overflow of vis's specifically for inside dashboard panels, lets the panel decide the overflow + * 3. Force a better looking scrollbar */ .doc-table-container { flex: 1 1 0; /* 1 */ overflow: auto; /* 1 */ } + .visualization { + @include euiScrollBar; /* 3 */ + } + .visualization .vis-container { overflow: visible; /* 2 */ } } -// CONTENT +.dshPanel--editing { + transition: all $euiAnimSpeedFast $euiAnimSlightResistance; -.dshPanel__panel { - background-color: $euiColorEmptyShade; - border: 1px solid $euiColorEmptyShade; - overflow: hidden; - - // maintain the 100% height of the panel - height: 100%; - flex: 1; - - // flex layout allows us to define the visualize element as "fill available space" - display: flex; - flex-direction: column; - justify-content: flex-start; -} - -.dshPanel__panel--editing { - // SASSTOD: Change this back $euiBorderColor, when EUI adds !default to borders - border-color: $euiColorLightShade; - - &:hover { + &:hover, + &:focus { border-color: $euiColorPrimary; + @include euiSlightShadowHover; } } -// Adjust borders/margin/etc... for spaced out panels -.dshLayout-withMargins { - .dshPanel__panel { - @include euiBottomShadowSmall; - // SASSTOD: Change this back $euiBorderColor, when EUI adds !default to borders - border-color: $euiColorLightShade; - border-radius: $euiBorderRadius; - } +// LAYOUT MODES - .dshPanel__panel--editing { - transition: all $euiAnimSpeedFast $euiAnimSlightResistance; +// Adjust borders/etc... for non-spaced out and expanded panels +.dshLayout-withoutMargins, +.dshDashboardGrid__item--expanded { + // Remove border color unless in editing mode + .dshPanel:not(.dshPanel--editing) { + border-color: transparent; + } - &:hover, - &:focus { - border-color: $euiColorPrimary; - @include euiSlightShadowHover; - } + .dshPanel { + box-shadow: none; + border-radius: 0; } } - // HEADER .dshPanel__header { @@ -91,12 +75,6 @@ display: flex; border: none; transition: background-color $euiAnimSpeedFast $euiAnimSlightResistance; - - // Add a rounded corner to stay within the bordered panel - .dshLayout-withMargins & { - border-top-left-radius: $euiBorderRadius - 1px; - border-top-right-radius: $euiBorderRadius - 1px; - } } .dshPanel__title { @@ -111,7 +89,7 @@ display: inline-block; } -.dshPanel__panel--editing:hover { +.dshPanel--editing:hover { .dshPanel__header { background-color: rgba($euiColorFullShade,.05) !important; cursor: move; diff --git a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js index 6e09f64e85b41..684fe6c54a223 100644 --- a/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js +++ b/src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js @@ -25,6 +25,10 @@ import _ from 'lodash'; import { PanelHeader } from './panel_header'; import { PanelError } from './panel_error'; +import { + EuiPanel, +} from '@elastic/eui'; + export class DashboardPanel extends React.Component { constructor(props) { super(props); @@ -125,28 +129,24 @@ export class DashboardPanel extends React.Component { render() { const { viewOnlyMode, panel } = this.props; - const classes = classNames('dshPanel__panel', this.props.className, { - 'dshPanel__panel--editing': !viewOnlyMode + const classes = classNames('dshPanel', this.props.className, { + 'dshPanel--editing': !viewOnlyMode }); return ( -
      -
      - - - {this.renderContent()} - -
      -
      + + + {this.renderContent()} + ); } } diff --git a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_actions/get_edit_panel_action.tsx b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_actions/get_edit_panel_action.tsx index 0b7bda9d1dfbf..88bc0001a9ac1 100644 --- a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_actions/get_edit_panel_action.tsx +++ b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_actions/get_edit_panel_action.tsx @@ -40,9 +40,9 @@ export function getEditPanelAction() { isDisabled: ({ embeddable }) => !embeddable || !embeddable.metadata || !embeddable.metadata.editUrl, isVisible: ({ containerState }) => containerState.viewMode === DashboardViewMode.EDIT, - onClick: ({ embeddable }) => { + getHref: ({ embeddable }) => { if (embeddable && embeddable.metadata.editUrl) { - window.location.href = embeddable.metadata.editUrl; + return embeddable.metadata.editUrl; } }, } diff --git a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx index 300f3a346091b..983a235a719f2 100644 --- a/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx +++ b/src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx @@ -61,6 +61,9 @@ export function PanelOptionsMenu({ closePopover={closeContextMenu} panelPaddingSize="none" anchorPosition="downRight" + data-test-subj={ + isPopoverOpen ? 'dashboardPanelContextMenuOpen' : 'dashboardPanelContextMenuClosed' + } withTitle > diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/add_panel.test.js.snap b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/add_panel.test.js.snap index 85684aecc461f..d976372dd2bf3 100644 --- a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/add_panel.test.js.snap +++ b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/add_panel.test.js.snap @@ -13,6 +13,7 @@ exports[`render 1`] = `

      Add Panels diff --git a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap index 3d31ffb7957d5..80fb7a7ed275c 100644 --- a/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap +++ b/src/core_plugins/kibana/public/dashboard/top_nav/__snapshots__/clone_modal.test.js.snap @@ -16,6 +16,7 @@ exports[`renders DashboardCloneModal 1`] = `

      Please enter a new name for your dashboard. diff --git a/src/core_plugins/kibana/public/dev_tools/_index.scss b/src/core_plugins/kibana/public/dev_tools/_index.scss new file mode 100644 index 0000000000000..563b140fd2ead --- /dev/null +++ b/src/core_plugins/kibana/public/dev_tools/_index.scss @@ -0,0 +1,18 @@ +// Prefix all styles with "dev" to avoid conflicts. +// Examples +// devChart +// devChart__legend +// devChart__legend--small +// devChart__legend-isLoading + +.devApp__container, +.devApp { + flex: 1 1 auto; + display: flex; + flex-direction: column; + + > * { + flex-shrink: 0; + } +} + diff --git a/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js b/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js index e53959ec5df6a..1f39cdf458216 100644 --- a/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js +++ b/src/core_plugins/kibana/public/dev_tools/directives/dev_tools_app.js @@ -20,7 +20,6 @@ import { uiModules } from 'ui/modules'; import { DevToolsRegistryProvider } from 'ui/registry/dev_tools'; import template from '../partials/dev_tools_app.html'; -import '../styles/dev_tools_app.less'; import 'ui/kbn_top_nav'; uiModules diff --git a/src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html b/src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html index 2d38a3c69164f..8fae6fd9efde9 100644 --- a/src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html +++ b/src/core_plugins/kibana/public/dev_tools/partials/dev_tools_app.html @@ -1,4 +1,4 @@ -

      +
      @@ -29,5 +29,5 @@
      -
      +
      diff --git a/src/core_plugins/kibana/public/dev_tools/styles/dev_tools_app.less b/src/core_plugins/kibana/public/dev_tools/styles/dev_tools_app.less deleted file mode 100644 index 7612c226651aa..0000000000000 --- a/src/core_plugins/kibana/public/dev_tools/styles/dev_tools_app.less +++ /dev/null @@ -1,10 +0,0 @@ -@import (reference) "~ui/styles/mixins.less"; -@import (reference) "~ui/styles/variables.less"; - -.dev-tools__container { - .flex-parent; -} - -.dev-tools__app-container { - .flex-parent; -} diff --git a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js index 3b81065186446..c9c29d2fc3542 100644 --- a/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js +++ b/src/core_plugins/kibana/public/discover/components/field_chooser/lib/field_calculator.js @@ -59,8 +59,8 @@ function getFieldValueCounts(params) { if (params.hits.length - missing === 0) { return { - error: 'This field is present in your elasticsearch mapping' + - ' but not in any documents in the search results.' + + error: 'This field is present in your Elasticsearch mapping' + + ' but not in the ' + params.hits.length + ' documents shown in the doc table.' + ' You may still be able to visualize or search on it.' }; } diff --git a/src/core_plugins/kibana/public/discover/controllers/discover.js b/src/core_plugins/kibana/public/discover/controllers/discover.js index 14ffacf8773d5..bc483e0c110bc 100644 --- a/src/core_plugins/kibana/public/discover/controllers/discover.js +++ b/src/core_plugins/kibana/public/discover/controllers/discover.js @@ -46,7 +46,7 @@ import uiRoutes from 'ui/routes'; import { uiModules } from 'ui/modules'; import indexTemplate from '../index.html'; import { StateProvider } from 'ui/state_management/state'; -import { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery'; +import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query'; import { FilterManagerProvider } from 'ui/filter_manager'; import { SavedObjectsClientProvider } from 'ui/saved_objects'; import { visualizationLoader } from 'ui/visualize/loader/visualization_loader'; @@ -63,6 +63,7 @@ import { showOpenSearchPanel } from '../top_nav/show_open_search_panel'; import { tabifyAggResponse } from 'ui/agg_response/tabify'; import { showSaveModal } from 'ui/saved_objects/show_saved_object_save_modal'; import { SavedObjectSaveModal } from 'ui/saved_objects/components/saved_object_save_modal'; +import { i18n } from '@kbn/i18n'; const app = uiModules.get('apps/discover', [ 'kibana/notify', @@ -155,8 +156,8 @@ function discoverController( courier, kbnUrl, localStorage, + breadcrumbState ) { - const Vis = Private(VisProvider); const docTitle = Private(DocTitleProvider); const HitSortFn = Private(PluginsKibanaDiscoverHitSortFnProvider); @@ -278,17 +279,38 @@ function discoverController( .setField('highlightAll', true) .setField('version', true); + // Even when searching rollups, we want to use the default strategy so that we get back a + // document-like response. + $scope.searchSource.setPreferredSearchStrategyId('default'); + // searchSource which applies time range const timeRangeSearchSource = savedSearch.searchSource.create(); - timeRangeSearchSource.setField('filter', () => { - return timefilter.createFilter($scope.indexPattern); - }); + if(isDefaultTypeIndexPattern($scope.indexPattern)) { + timeRangeSearchSource.setField('filter', () => { + return timefilter.createFilter($scope.indexPattern); + }); + } $scope.searchSource.setParent(timeRangeSearchSource); const pageTitleSuffix = savedSearch.id && savedSearch.title ? `: ${savedSearch.title}` : ''; docTitle.change(`Discover${pageTitleSuffix}`); + const discoverBreadcrumbsTitle = i18n.translate('kbn.discover.discoverBreadcrumbsTitle', { + defaultMessage: 'Discover', + }); + + if (savedSearch.id && savedSearch.title) { + breadcrumbState.set([{ + text: discoverBreadcrumbsTitle, + href: '#/discover' + }, { text: savedSearch.title }]); + } else { + breadcrumbState.set([{ + text: discoverBreadcrumbsTitle, + }]); + } + let stateMonitor; const $state = $scope.state = new AppState(getStateDefaults()); @@ -387,7 +409,7 @@ function discoverController( $scope.opts = { // number of records to fetch, then paginate through sampleSize: config.get('discover:sampleSize'), - timefield: $scope.indexPattern.timeFieldName, + timefield: isDefaultTypeIndexPattern($scope.indexPattern) && $scope.indexPattern.timeFieldName, savedSearch: savedSearch, indexPatternList: $route.current.locals.ip.list, }; diff --git a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap index 56d7135b157fa..633d996b45490 100644 --- a/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap +++ b/src/core_plugins/kibana/public/discover/directives/__snapshots__/no_results.test.js.snap @@ -50,7 +50,7 @@ Array [ class="euiSpacer euiSpacer--xl" />

      Refine your query @@ -78,7 +78,7 @@ Array [ class="euiDescriptionList__title" >
      Find requests that contain the number 200, in any field @@ -102,7 +102,7 @@ Array [ class="euiDescriptionList__title" >
      Find 200 in the status field @@ -126,7 +126,7 @@ Array [ class="euiDescriptionList__title" >
      Find all status codes between 400-499 @@ -150,7 +150,7 @@ Array [ class="euiDescriptionList__title" >
      Find status codes 400-499 with the extension php @@ -174,7 +174,7 @@ Array [ class="euiDescriptionList__title" >
      Find status codes 400-499 with the extension php or html @@ -304,7 +304,7 @@ Array [ class="euiSpacer euiSpacer--xl" />

      Address shard failures @@ -423,7 +423,7 @@ Array [ class="euiSpacer euiSpacer--xl" />

      Expand your time range diff --git a/src/core_plugins/kibana/public/discover/index.html b/src/core_plugins/kibana/public/discover/index.html index 7a6fdbdbbff23..4735b852a96e0 100644 --- a/src/core_plugins/kibana/public/discover/index.html +++ b/src/core_plugins/kibana/public/discover/index.html @@ -26,11 +26,10 @@

      - + >

      diff --git a/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap b/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap index e35d7fc76868e..4ddf453c5a819 100644 --- a/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap +++ b/src/core_plugins/kibana/public/discover/top_nav/__snapshots__/open_search_panel.test.js.snap @@ -13,6 +13,7 @@ exports[`render 1`] = `

      Open Search diff --git a/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap b/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap index eeb15bf787751..77aa1b7018e8a 100644 --- a/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/__snapshots__/add_data.test.js.snap @@ -21,6 +21,7 @@ exports[`apmUiEnabled 1`] = ` >

      @@ -204,14 +206,10 @@ exports[`apmUiEnabled 1`] = ` margin="l" size="full" /> - @@ -239,7 +238,8 @@ exports[`apmUiEnabled 1`] = ` href="#/home/tutorial_directory/sampleData" style={ Object { - "marginLeft": 8, + "display": "block", + "textAlign": "center", } } type="button" @@ -259,6 +259,7 @@ exports[`apmUiEnabled 1`] = ` > @@ -278,7 +279,8 @@ exports[`apmUiEnabled 1`] = ` href="#/management/kibana/index" style={ Object { - "marginLeft": 8, + "display": "block", + "textAlign": "center", } } type="button" @@ -291,7 +293,7 @@ exports[`apmUiEnabled 1`] = ` - + `; @@ -316,6 +318,7 @@ exports[`isNewKibanaInstance 1`] = ` >

      @@ -463,14 +467,10 @@ exports[`isNewKibanaInstance 1`] = ` margin="l" size="full" /> - @@ -498,7 +499,8 @@ exports[`isNewKibanaInstance 1`] = ` href="#/home/tutorial_directory/sampleData" style={ Object { - "marginLeft": 8, + "display": "block", + "textAlign": "center", } } type="button" @@ -518,6 +520,7 @@ exports[`isNewKibanaInstance 1`] = ` > @@ -537,7 +540,8 @@ exports[`isNewKibanaInstance 1`] = ` href="#/management/kibana/index" style={ Object { - "marginLeft": 8, + "display": "block", + "textAlign": "center", } } type="button" @@ -550,11 +554,11 @@ exports[`isNewKibanaInstance 1`] = ` - + `; -exports[`render 1`] = ` +exports[`mlEnabled 1`] = `

      + + + + + } + icon={ + + } + layout="vertical" + textAlign="center" + title="APM" + titleElement="span" + /> + @@ -722,14 +764,312 @@ exports[`render 1`] = ` margin="l" size="full" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +`; + +exports[`render 1`] = ` + + + +

      + +

      + + +

      + +

      +
      + + + + + + + + + } + icon={ + + } + layout="vertical" + textAlign="center" + title="Logging" + titleElement="span" + /> + + + + + + } + icon={ + + } + layout="vertical" + textAlign="center" + title="Metrics" + titleElement="span" + /> + + + + + + } + icon={ + + } + layout="vertical" + textAlign="center" + title="Security analytics" + titleElement="span" + /> + + + + @@ -757,7 +1098,8 @@ exports[`render 1`] = ` href="#/home/tutorial_directory/sampleData" style={ Object { - "marginLeft": 8, + "display": "block", + "textAlign": "center", } } type="button" @@ -777,6 +1119,7 @@ exports[`render 1`] = ` > @@ -796,7 +1139,8 @@ exports[`render 1`] = ` href="#/management/kibana/index" style={ Object { - "marginLeft": 8, + "display": "block", + "textAlign": "center", } } type="button" @@ -809,6 +1153,6 @@ exports[`render 1`] = ` - + `; diff --git a/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap b/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap index 1781469eacfef..6e269053be21b 100644 --- a/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap @@ -11,6 +11,7 @@ exports[`home directories should not render directory entry when showOnHomePage

      @@ -32,6 +33,7 @@ exports[`props iconType 1`] = `

      Great tutorial @@ -40,6 +42,7 @@ exports[`props iconType 1`] = `

      Great tutorial @@ -96,6 +100,7 @@ exports[`props iconUrl 1`] = `

      Great tutorial @@ -142,6 +148,7 @@ exports[`props isBeta 1`] = `

      Great tutorial @@ -188,6 +196,7 @@ exports[`render 1`] = `

      { +/* istanbul ignore next */ +const basePath = chrome.getBasePath(); + +const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => { const renderCards = () => { const apmTitle = intl.formatMessage({ @@ -61,7 +66,7 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl }) => { defaultMessage: 'Collect metrics from the operating system and services running on your servers.' }); const securityTitle = intl.formatMessage({ - id: 'kbn.home.addData.security.nameTitle', defaultMessage: 'Security Analytics' + id: 'kbn.home.addData.security.nameTitle', defaultMessage: 'Security analytics' }); const securityDescription = intl.formatMessage({ id: 'kbn.home.addData.security.nameDescription', @@ -189,17 +194,17 @@ const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl }) => { - + { + {mlEnabled !== false ? + + + + + + + + + + + : null + } { - - - - + ); }; AddDataUi.propTypes = { apmUiEnabled: PropTypes.bool.isRequired, + mlEnabled: PropTypes.bool.isRequired, isNewKibanaInstance: PropTypes.bool.isRequired, }; diff --git a/src/core_plugins/kibana/public/home/components/add_data.test.js b/src/core_plugins/kibana/public/home/components/add_data.test.js index 549990eb99ffa..d7c8e9daa99da 100644 --- a/src/core_plugins/kibana/public/home/components/add_data.test.js +++ b/src/core_plugins/kibana/public/home/components/add_data.test.js @@ -20,27 +20,52 @@ import React from 'react'; import { AddData } from './add_data'; import { shallowWithIntl } from 'test_utils/enzyme_helpers'; +import chrome from 'ui/chrome'; + +jest.mock( + 'ui/chrome', + () => ({ + getBasePath: jest.fn(() => 'path'), + }), + { virtual: true } +); test('render', () => { const component = shallowWithIntl(); + expect(component).toMatchSnapshot(); // eslint-disable-line + expect(chrome.getBasePath).toHaveBeenCalledTimes(1); +}); + +test('mlEnabled', () => { + const component = shallowWithIntl(); expect(component).toMatchSnapshot(); // eslint-disable-line + expect(chrome.getBasePath).toHaveBeenCalledTimes(1); }); test('apmUiEnabled', () => { const component = shallowWithIntl(); expect(component).toMatchSnapshot(); // eslint-disable-line + expect(chrome.getBasePath).toHaveBeenCalledTimes(1); }); test('isNewKibanaInstance', () => { const component = shallowWithIntl(); expect(component).toMatchSnapshot(); // eslint-disable-line + expect(chrome.getBasePath).toHaveBeenCalledTimes(1); }); diff --git a/src/core_plugins/kibana/public/home/components/home.js b/src/core_plugins/kibana/public/home/components/home.js index 4bcd66ca56a32..f3937933b6039 100644 --- a/src/core_plugins/kibana/public/home/components/home.js +++ b/src/core_plugins/kibana/public/home/components/home.js @@ -129,7 +129,7 @@ export class Home extends Component { }; renderNormal() { - const { apmUiEnabled, recentlyAccessed } = this.props; + const { apmUiEnabled, recentlyAccessed, mlEnabled } = this.props; let recentlyAccessedPanel; if (recentlyAccessed.length > 0) { @@ -148,6 +148,7 @@ export class Home extends Component { @@ -263,4 +264,5 @@ Home.propTypes = { find: PropTypes.func.isRequired, localStorage: PropTypes.object.isRequired, urlBasePath: PropTypes.string.isRequired, + mlEnabled: PropTypes.bool.isRequired, }; diff --git a/src/core_plugins/kibana/public/home/components/home.test.js b/src/core_plugins/kibana/public/home/components/home.test.js index 8c901f34be1ac..37558ddd5d18c 100644 --- a/src/core_plugins/kibana/public/home/components/home.test.js +++ b/src/core_plugins/kibana/public/home/components/home.test.js @@ -23,6 +23,15 @@ import { shallow } from 'enzyme'; import { Home } from './home'; import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; +jest.mock( + 'ui/chrome', + () => ({ + getBasePath: jest.fn(() => 'path'), + getInjected: jest.fn(() => ''), + }), + { virtual: true } +); + describe('home', () => { let defaultProps; @@ -31,6 +40,7 @@ describe('home', () => { recentlyAccessed: [], directories: [], apmUiEnabled: true, + mlEnabled: true, kibanaVersion: '99.2.1', addBasePath(url) { return `base_path/${url}`; diff --git a/src/core_plugins/kibana/public/home/components/home_app.js b/src/core_plugins/kibana/public/home/components/home_app.js index e27356b06196d..bb01836e64808 100644 --- a/src/core_plugins/kibana/public/home/components/home_app.js +++ b/src/core_plugins/kibana/public/home/components/home_app.js @@ -35,27 +35,21 @@ import { recentlyAccessedShape } from './recently_accessed'; import { I18nProvider } from '@kbn/i18n/react'; export function HomeApp({ - addBasePath, directories, recentlyAccessed, - getConfig, - setConfig, - clearIndexPatternsCache, }) { const isCloudEnabled = chrome.getInjected('isCloudEnabled', false); const apmUiEnabled = chrome.getInjected('apmUiEnabled', true); + const mlEnabled = chrome.getInjected('mlEnabled', false); const savedObjectsClient = chrome.getSavedObjectsClient(); const renderTutorialDirectory = (props) => { return ( ); }; @@ -63,7 +57,7 @@ export function HomeApp({ const renderTutorial = (props) => { return ( @@ -97,9 +91,10 @@ export function HomeApp({ path="/home" > { - const { - getConfig, - setConfig, - clearIndexPatternsCache, - } = this.props; - const targetSampleDataSet = this.state.sampleDataSets.find((sampleDataSet) => { return sampleDataSet.id === id; }); @@ -105,7 +99,7 @@ export class SampleDataSetCards extends React.Component { })); try { - await installSampleDataSet(id, targetSampleDataSet.defaultIndex, getConfig, setConfig, clearIndexPatternsCache); + await installSampleDataSet(id, targetSampleDataSet.defaultIndex); } catch (fetchError) { if (this._isMounted) { this.setState((prevState) => ({ @@ -121,15 +115,18 @@ export class SampleDataSetCards extends React.Component { return; } - this.setState((prevState) => ({ - processingStatus: { ...prevState.processingStatus, [id]: false }, - sampleDataSets: prevState.sampleDataSets.map(sampleDataSet => { - if (sampleDataSet.id === id) { - sampleDataSet.status = INSTALLED_STATUS; - } - return sampleDataSet; - }), - })); + if (this._isMounted) { + this.setState((prevState) => ({ + processingStatus: { ...prevState.processingStatus, [id]: false }, + sampleDataSets: prevState.sampleDataSets.map(sampleDataSet => { + if (sampleDataSet.id === id) { + sampleDataSet.status = INSTALLED_STATUS; + } + return sampleDataSet; + }), + })); + } + toastNotifications.addSuccess({ title: i18n.translate('kbn.home.sampleDataSet.installedLabel', { defaultMessage: '{name} installed', values: { name: targetSampleDataSet.name } } @@ -139,12 +136,6 @@ export class SampleDataSetCards extends React.Component { } uninstall = async (id) => { - const { - getConfig, - setConfig, - clearIndexPatternsCache, - } = this.props; - const targetSampleDataSet = this.state.sampleDataSets.find((sampleDataSet) => { return sampleDataSet.id === id; }); @@ -154,7 +145,7 @@ export class SampleDataSetCards extends React.Component { })); try { - await uninstallSampleDataSet(id, targetSampleDataSet.defaultIndex, getConfig, setConfig, clearIndexPatternsCache); + await uninstallSampleDataSet(id, targetSampleDataSet.defaultIndex); } catch (fetchError) { if (this._isMounted) { this.setState((prevState) => ({ @@ -170,15 +161,18 @@ export class SampleDataSetCards extends React.Component { return; } - this.setState((prevState) => ({ - processingStatus: { ...prevState.processingStatus, [id]: false }, - sampleDataSets: prevState.sampleDataSets.map(sampleDataSet => { - if (sampleDataSet.id === id) { - sampleDataSet.status = UNINSTALLED_STATUS; - } - return sampleDataSet; - }), - })); + if (this._isMounted) { + this.setState((prevState) => ({ + processingStatus: { ...prevState.processingStatus, [id]: false }, + sampleDataSets: prevState.sampleDataSets.map(sampleDataSet => { + if (sampleDataSet.id === id) { + sampleDataSet.status = UNINSTALLED_STATUS; + } + return sampleDataSet; + }), + })); + } + toastNotifications.addSuccess({ title: i18n.translate('kbn.home.sampleDataSet.uninstalledLabel', { defaultMessage: '{name} uninstalled', values: { name: targetSampleDataSet.name } } @@ -216,8 +210,5 @@ export class SampleDataSetCards extends React.Component { } SampleDataSetCards.propTypes = { - getConfig: PropTypes.func.isRequired, - setConfig: PropTypes.func.isRequired, - clearIndexPatternsCache: PropTypes.func.isRequired, addBasePath: PropTypes.func.isRequired, }; diff --git a/src/core_plugins/kibana/public/home/components/synopsis.js b/src/core_plugins/kibana/public/home/components/synopsis.js index ddcee7e3cfcf1..5f3f60118b820 100644 --- a/src/core_plugins/kibana/public/home/components/synopsis.js +++ b/src/core_plugins/kibana/public/home/components/synopsis.js @@ -46,6 +46,7 @@ export function Synopsis({ description, iconUrl, iconType, title, url, wrapInPan diff --git a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap index e72aadd0bcae7..51af1e92a211f 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/footer.test.js.snap @@ -21,6 +21,7 @@ exports[`render 1`] = ` >

      Great tutorial @@ -115,6 +116,7 @@ exports[`props iconType 1`] = ` >

      Great tutorial @@ -167,6 +169,7 @@ exports[`props isBeta 1`] = ` >

      Great tutorial @@ -223,6 +226,7 @@ exports[`props previewUrl 1`] = ` >

      Great tutorial @@ -284,6 +288,7 @@ exports[`render 1`] = ` >

      Great tutorial diff --git a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap index f5ae01470c77e..794af7b7c0931 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap +++ b/src/core_plugins/kibana/public/home/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap @@ -5,216 +5,84 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1 bulkCreate={[Function]} intl={ Object { - "formatDate": [MockFunction], - "formatHTMLMessage": [MockFunction], - "formatMessage": [MockFunction] { - "calls": Array [ - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.defaultButtonLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.defaultButtonLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "{savedObjectsLength} saved objects successfully added", - "id": "kbn.home.tutorial.savedObject.addedLabel", - }, - Object { - "savedObjectsLength": 1, - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.defaultButtonLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Request failed, Error: {message}", - "id": "kbn.home.tutorial.savedObject.requestFailedErrorMessage", - }, - Object { - "message": "simulated bulkRequest error", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - ], - "results": Array [ - Object { - "isThrow": false, - "value": "Load Kibana objects", + "defaultFormats": Object { + "date": Object { + "full": Object { + "day": "numeric", + "month": "long", + "weekday": "long", + "year": "numeric", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", + "long": Object { + "day": "numeric", + "month": "long", + "year": "numeric", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + "medium": Object { + "day": "numeric", + "month": "short", + "year": "numeric", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + "short": Object { + "day": "numeric", + "month": "numeric", + "year": "2-digit", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", - }, - Object { - "isThrow": false, - "value": "Load Kibana objects", - }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", - }, - Object { - "isThrow": false, - "value": "Load Kibana objects", - }, - Object { - "isThrow": false, - "value": "{savedObjectsLength} saved objects successfully added", - }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", - }, - Object { - "isThrow": false, - "value": "Load Kibana objects", - }, - Object { - "isThrow": false, - "value": "Load Kibana objects", - }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", - }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + }, + "number": Object { + "currency": Object { + "style": "currency", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", + "percent": Object { + "style": "percent", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + }, + "time": Object { + "full": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", }, - Object { - "isThrow": false, - "value": "Request failed, Error: {message}", + "long": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", + "medium": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + "short": Object { + "hour": "numeric", + "minute": "numeric", }, - ], + }, + }, + "defaultLocale": "en", + "formatDate": [Function], + "formatHTMLMessage": [Function], + "formatMessage": [Function], + "formatNumber": [Function], + "formatPlural": [Function], + "formatRelative": [Function], + "formatTime": [Function], + "formats": Object {}, + "formatters": Object { + "getDateTimeFormat": [Function], + "getMessageFormat": [Function], + "getNumberFormat": [Function], + "getPluralFormat": [Function], + "getRelativeFormat": [Function], }, - "formatNumber": [MockFunction], - "formatPlural": [MockFunction], - "formatRelative": [MockFunction], - "formatTime": [MockFunction], - "now": [MockFunction], - "textComponent": "span", + "locale": "en", + "messages": Object {}, + "now": [Function], + "onError": [Function], + "textComponent": Symbol(react.fragment), + "timeZone": null, } } savedObjects={ @@ -249,6 +117,7 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1 >

      Imports index pattern, visualizations and pre-defined dashboards. @@ -279,7 +148,7 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1 color="warning" data-test-subj="loadSavedObjects_failed" size="m" - title="Request failed, Error: {message}" + title="Request failed, Error: simulated bulkRequest error" /> , "key": "installStep", @@ -323,6 +192,7 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1

      Imports index pattern, visualizations and pre-defined dashboards. @@ -413,7 +284,7 @@ exports[`bulkCreate should display error message when bulkCreate request fails 1 color="warning" data-test-subj="loadSavedObjects_failed" size="m" - title="Request failed, Error: {message}" + title="Request failed, Error: simulated bulkRequest error" >

      - Request failed, Error: {message} + Request failed, Error: simulated bulkRequest error
      @@ -443,133 +314,84 @@ exports[`bulkCreate should display success message when bulkCreate is successful bulkCreate={[Function]} intl={ Object { - "formatDate": [MockFunction], - "formatHTMLMessage": [MockFunction], - "formatMessage": [MockFunction] { - "calls": Array [ - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.defaultButtonLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.defaultButtonLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - Array [ - Object { - "defaultMessage": "{savedObjectsLength} saved objects successfully added", - "id": "kbn.home.tutorial.savedObject.addedLabel", - }, - Object { - "savedObjectsLength": 1, - }, - ], - Array [ - Object { - "defaultMessage": "Imports index pattern, visualizations and pre-defined dashboards.", - "id": "kbn.home.tutorial.savedObject.installLabel", - }, - ], - Array [ - Object { - "defaultMessage": "Load Kibana objects", - "id": "kbn.home.tutorial.savedObject.loadTitle", - }, - ], - ], - "results": Array [ - Object { - "isThrow": false, - "value": "Load Kibana objects", + "defaultFormats": Object { + "date": Object { + "full": Object { + "day": "numeric", + "month": "long", + "weekday": "long", + "year": "numeric", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", + "long": Object { + "day": "numeric", + "month": "long", + "year": "numeric", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + "medium": Object { + "day": "numeric", + "month": "short", + "year": "numeric", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + "short": Object { + "day": "numeric", + "month": "numeric", + "year": "2-digit", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", - }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + }, + "number": Object { + "currency": Object { + "style": "currency", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", + "percent": Object { + "style": "percent", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + }, + "time": Object { + "full": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", }, - Object { - "isThrow": false, - "value": "{savedObjectsLength} saved objects successfully added", + "long": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", + "timeZoneName": "short", }, - Object { - "isThrow": false, - "value": "Imports index pattern, visualizations and pre-defined dashboards.", + "medium": Object { + "hour": "numeric", + "minute": "numeric", + "second": "numeric", }, - Object { - "isThrow": false, - "value": "Load Kibana objects", + "short": Object { + "hour": "numeric", + "minute": "numeric", }, - ], + }, }, - "formatNumber": [MockFunction], - "formatPlural": [MockFunction], - "formatRelative": [MockFunction], - "formatTime": [MockFunction], - "now": [MockFunction], - "textComponent": "span", + "defaultLocale": "en", + "formatDate": [Function], + "formatHTMLMessage": [Function], + "formatMessage": [Function], + "formatNumber": [Function], + "formatPlural": [Function], + "formatRelative": [Function], + "formatTime": [Function], + "formats": Object {}, + "formatters": Object { + "getDateTimeFormat": [Function], + "getMessageFormat": [Function], + "getNumberFormat": [Function], + "getPluralFormat": [Function], + "getRelativeFormat": [Function], + }, + "locale": "en", + "messages": Object {}, + "now": [Function], + "onError": [Function], + "textComponent": Symbol(react.fragment), + "timeZone": null, } } savedObjects={ @@ -604,6 +426,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful >

      Imports index pattern, visualizations and pre-defined dashboards. @@ -634,7 +457,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful color="success" data-test-subj="loadSavedObjects_success" size="m" - title="{savedObjectsLength} saved objects successfully added" + title="1 saved objects successfully added" /> , "key": "installStep", @@ -718,6 +541,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful

      Imports index pattern, visualizations and pre-defined dashboards. @@ -808,7 +633,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful color="success" data-test-subj="loadSavedObjects_success" size="m" - title="{savedObjectsLength} saved objects successfully added" + title="1 saved objects successfully added" >

      - {savedObjectsLength} saved objects successfully added + 1 saved objects successfully added
      @@ -856,6 +681,7 @@ exports[`renders 1`] = ` >

      Imports index pattern, visualizations and pre-defined dashboards. diff --git a/src/core_plugins/kibana/public/home/components/tutorial/instruction.js b/src/core_plugins/kibana/public/home/components/tutorial/instruction.js index b8cf63c171dbb..da3bf16238ace 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/instruction.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/instruction.js @@ -67,7 +67,7 @@ export function Instruction({ commands, paramValues, textPost, textPre, replaceT size="s" onClick={copy} > - + )} diff --git a/src/core_plugins/kibana/public/home/components/tutorial/instruction_set.js b/src/core_plugins/kibana/public/home/components/tutorial/instruction_set.js index d3b5ea4744177..1675c2e19cb02 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/instruction_set.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/instruction_set.js @@ -97,7 +97,7 @@ class InstructionSetUi extends React.Component { case StatusCheckStates.HAS_DATA: message = this.props.statusCheckConfig.success ? this.props.statusCheckConfig.success - : this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instractionSet.successLabel', + : this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instructionSet.successLabel', defaultMessage: 'Success' }); color = 'success'; break; @@ -105,7 +105,7 @@ class InstructionSetUi extends React.Component { case StatusCheckStates.NO_DATA: message = this.props.statusCheckConfig.error ? this.props.statusCheckConfig.error - : this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instractionSet.noDataLabel', + : this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instructionSet.noDataLabel', defaultMessage: 'No data found' }); color = 'warning'; break; @@ -154,7 +154,7 @@ class InstructionSetUi extends React.Component { isLoading={statusCheckState === StatusCheckStates.FETCHING} > {statusCheckConfig.btnLabel || } @@ -168,7 +168,7 @@ class InstructionSetUi extends React.Component { ); return { - title: statusCheckConfig.title || this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instractionSet.statusCheckTitle', + title: statusCheckConfig.title || this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instructionSet.statusCheckTitle', defaultMessage: 'Status Check' }), status: this.getStepStatus(statusCheckState), @@ -221,7 +221,7 @@ class InstructionSetUi extends React.Component { 'fa-caret-right': !this.state.isParamFormVisible, 'fa-caret-down': this.state.isParamFormVisible }); - const ariaLabel = this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instractionSet.toggleAriaLabel', + const ariaLabel = this.props.intl.formatMessage({ id: 'kbn.home.tutorial.instructionSet.toggleAriaLabel', defaultMessage: 'toggle command parameters visibility' }); paramsVisibilityToggle = ( @@ -234,7 +234,7 @@ class InstructionSetUi extends React.Component { diff --git a/src/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js b/src/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js index 66a210b9ca40f..da3c23ecf987c 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/replace_template_strings.js @@ -52,7 +52,8 @@ export function replaceTemplateStrings(text, params = {}) { base_url: ELASTIC_WEBSITE_URL, beats: { filebeat: documentationLinks.filebeat.base, - metricbeat: documentationLinks.metricbeat.base + metricbeat: documentationLinks.metricbeat.base, + heartbeat: documentationLinks.heartbeat.base }, logstash: documentationLinks.logstash.base, version: DOC_LINK_VERSION diff --git a/src/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js b/src/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js index 69aaa716f3619..608f7d5d4612d 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/saved_objects_installer.js @@ -111,9 +111,9 @@ Click \'Confirm overwrite\' to import and overwrite existing objects. Any change const statusMsg = hasErrors ? this.props.intl.formatMessage( { id: 'kbn.home.tutorial.savedObject.unableToAddErrorMessage', - defaultMessage: 'Unable to add {errorsLength} of {savedObjectsLength} kibana objects, Error: ${errors[0].error.message}' + defaultMessage: 'Unable to add {errorsLength} of {savedObjectsLength} kibana objects, Error: {errorMessage}' }, - { errorsLength: errors.length, savedObjectsLength: this.props.savedObjects.length }) + { errorsLength: errors.length, savedObjectsLength: this.props.savedObjects.length, errorMessage: errors[0].error.message }) : this.props.intl.formatMessage( { id: 'kbn.home.tutorial.savedObject.addedLabel', defaultMessage: '{savedObjectsLength} saved objects successfully added' diff --git a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js index cf6745cf9445a..76b57643724f6 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js +++ b/src/core_plugins/kibana/public/home/components/tutorial/tutorial.test.js @@ -18,7 +18,6 @@ */ import React from 'react'; -import { findTestSubject } from '@elastic/eui/lib/test'; import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers'; import { @@ -64,22 +63,22 @@ const replaceTemplateStrings = (text) => { }; describe('isCloudEnabled is false', () => { - test('should render ON_PREM instructions with instruction toggle', () => { + test('should render ON_PREM instructions with instruction toggle', async () => { const component = shallowWithIntl( {}} + bulkCreate={() => { }} />); - loadTutorialPromise.then(() => { - component.update(); - expect(component).toMatchSnapshot(); // eslint-disable-line - }); + await loadTutorialPromise; + + component.update(); + expect(component).toMatchSnapshot(); }); - test('should not render instruction toggle when ON_PREM_ELASTIC_CLOUD instructions are not provided', () => { + test('should not render instruction toggle when ON_PREM_ELASTIC_CLOUD instructions are not provided', async () => { const loadBasicTutorialPromise = Promise.resolve({ name: 'jest test tutorial', longDescription: 'tutorial used to drive jest tests', @@ -95,43 +94,41 @@ describe('isCloudEnabled is false', () => { getTutorial={getBasicTutorial} replaceTemplateStrings={replaceTemplateStrings} tutorialId={'my_testing_tutorial'} - bulkCreate={() => {}} + bulkCreate={() => { }} />); - loadBasicTutorialPromise.then(() => { - component.update(); - expect(component).toMatchSnapshot(); // eslint-disable-line - }); + await loadBasicTutorialPromise; + component.update(); + expect(component).toMatchSnapshot(); }); - test('should display ON_PREM_ELASTIC_CLOUD instructions when toggle is clicked', () => { + test('should display ON_PREM_ELASTIC_CLOUD instructions when toggle is clicked', async () => { const component = mountWithIntl( {}} + bulkCreate={() => { }} />); - loadTutorialPromise.then(() => { - component.update(); - findTestSubject(component, 'onPremElasticCloudBtn').simulate('click'); - expect(component.state('visibleInstructions')).toBe('onPremElasticCloud'); - }); + await loadTutorialPromise; + component.update(); + component.find('button#onPremElasticCloud').closest('div').find('input').simulate('change'); + component.update(); + expect(component.state('visibleInstructions')).toBe('onPremElasticCloud'); }); }); -test('should render ELASTIC_CLOUD instructions when isCloudEnabled is true', () => { +test('should render ELASTIC_CLOUD instructions when isCloudEnabled is true', async () => { const component = shallowWithIntl( {}} + bulkCreate={() => { }} />); - loadTutorialPromise.then(() => { - component.update(); - expect(component).toMatchSnapshot(); // eslint-disable-line - }); + await loadTutorialPromise; + component.update(); + expect(component).toMatchSnapshot(); // eslint-disable-line }); diff --git a/src/core_plugins/kibana/public/home/components/tutorial_directory.js b/src/core_plugins/kibana/public/home/components/tutorial_directory.js index af869c93aaf5a..63e0ca2d71a8b 100644 --- a/src/core_plugins/kibana/public/home/components/tutorial_directory.js +++ b/src/core_plugins/kibana/public/home/components/tutorial_directory.js @@ -58,10 +58,10 @@ class TutorialDirectoryUi extends React.Component { name: this.props.intl.formatMessage({ id: 'kbn.home.tutorial.tabs.metricsTitle', defaultMessage: 'Metrics' }), }, { id: 'security', - name: this.props.intl.formatMessage({ id: 'kbn.home.tutorial.tabs.securityAnalyticsTitle', defaultMessage: 'Security Analytics' }), + name: this.props.intl.formatMessage({ id: 'kbn.home.tutorial.tabs.securityAnalyticsTitle', defaultMessage: 'Security analytics' }), }, { id: SAMPLE_DATA_TAB_ID, - name: this.props.intl.formatMessage({ id: 'kbn.home.tutorial.tabs.sampleDataTitle', defaultMessage: 'Sample Data' }), + name: this.props.intl.formatMessage({ id: 'kbn.home.tutorial.tabs.sampleDataTitle', defaultMessage: 'Sample data' }), }]; let openTab = ALL_TAB_ID; @@ -148,9 +148,6 @@ class TutorialDirectoryUi extends React.Component { if (this.state.selectedTabId === SAMPLE_DATA_TAB_ID) { return ( ); @@ -222,9 +219,6 @@ TutorialDirectoryUi.propTypes = { addBasePath: PropTypes.func.isRequired, openTab: PropTypes.string, isCloudEnabled: PropTypes.bool.isRequired, - getConfig: PropTypes.func.isRequired, - setConfig: PropTypes.func.isRequired, - clearIndexPatternsCache: PropTypes.func.isRequired, }; export const TutorialDirectory = injectI18n(TutorialDirectoryUi); diff --git a/src/core_plugins/kibana/public/home/home_ng_wrapper.html b/src/core_plugins/kibana/public/home/home_ng_wrapper.html index e0baaefe64bc0..2a046a0549cb5 100644 --- a/src/core_plugins/kibana/public/home/home_ng_wrapper.html +++ b/src/core_plugins/kibana/public/home/home_ng_wrapper.html @@ -1,8 +1,4 @@ diff --git a/src/core_plugins/kibana/public/home/index.js b/src/core_plugins/kibana/public/home/index.js index d2855a8b8e9cf..663f357a8ba06 100644 --- a/src/core_plugins/kibana/public/home/index.js +++ b/src/core_plugins/kibana/public/home/index.js @@ -37,18 +37,11 @@ function getRoute() { return { template, controller($scope, config, indexPatterns, Private) { - $scope.addBasePath = chrome.addBasePath; $scope.directories = Private(FeatureCatalogueRegistryProvider).inTitleOrder; $scope.recentlyAccessed = recentlyAccessed.get().map(item => { item.link = chrome.addBasePath(item.link); return item; }); - $scope.getConfig = (...args) => config.get(...args); - $scope.setConfig = (...args) => config.set(...args); - $scope.clearIndexPatternsCache = () => { - const getter = indexPatterns.getIds; - getter.clearCache(); - }; } }; } diff --git a/src/core_plugins/kibana/public/home/kibana_services.js b/src/core_plugins/kibana/public/home/kibana_services.js new file mode 100644 index 0000000000000..fc06a61ae343d --- /dev/null +++ b/src/core_plugins/kibana/public/home/kibana_services.js @@ -0,0 +1,26 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { uiModules } from 'ui/modules'; + +export let indexPatternService; + +uiModules.get('kibana').run(($injector) => { + indexPatternService = $injector.get('indexPatterns'); +}); diff --git a/src/core_plugins/kibana/public/home/sample_data_client.js b/src/core_plugins/kibana/public/home/sample_data_client.js new file mode 100644 index 0000000000000..943eedb290f8c --- /dev/null +++ b/src/core_plugins/kibana/public/home/sample_data_client.js @@ -0,0 +1,53 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { kfetch } from 'ui/kfetch'; +import chrome from 'ui/chrome'; +import { indexPatternService } from './kibana_services'; + +const sampleDataUrl = '/api/sample_data'; + +function clearIndexPatternsCache() { + indexPatternService.getIds.clearCache(); +} + +export async function listSampleDataSets() { + return await kfetch({ method: 'GET', pathname: sampleDataUrl }); +} + +export async function installSampleDataSet(id, sampleDataDefaultIndex) { + await kfetch({ method: 'POST', pathname: `${sampleDataUrl}/${id}` }); + + if (chrome.getUiSettingsClient().isDefault('defaultIndex')) { + chrome.getUiSettingsClient().set('defaultIndex', sampleDataDefaultIndex); + } + + clearIndexPatternsCache(); +} + +export async function uninstallSampleDataSet(id, sampleDataDefaultIndex) { + await kfetch({ method: 'DELETE', pathname: `${sampleDataUrl}/${id}` }); + + if (!chrome.getUiSettingsClient().isDefault('defaultIndex') + && chrome.getUiSettingsClient().get('defaultIndex') === sampleDataDefaultIndex) { + chrome.getUiSettingsClient().set('defaultIndex', null); + } + + clearIndexPatternsCache(); +} diff --git a/src/core_plugins/kibana/public/home/sample_data_resources/ecommerce/dashboard.png b/src/core_plugins/kibana/public/home/sample_data_resources/ecommerce/dashboard.png new file mode 100644 index 0000000000000..9c833e92bee5a Binary files /dev/null and b/src/core_plugins/kibana/public/home/sample_data_resources/ecommerce/dashboard.png differ diff --git a/src/core_plugins/kibana/public/home/sample_data_sets.js b/src/core_plugins/kibana/public/home/sample_data_sets.js deleted file mode 100644 index 84823e1c01fca..0000000000000 --- a/src/core_plugins/kibana/public/home/sample_data_sets.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { kfetch } from 'ui/kfetch'; - -const sampleDataUrl = '/api/sample_data'; - -export async function listSampleDataSets() { - return await kfetch({ method: 'GET', pathname: sampleDataUrl }); -} - -export async function installSampleDataSet(id, defaultIndex, getConfig, setConfig, clearIndexPatternsCache) { - await kfetch({ method: 'POST', pathname: `${sampleDataUrl}/${id}` }); - - const existingDefaultIndex = await getConfig('defaultIndex'); - if (existingDefaultIndex === null) { - await setConfig('defaultIndex', defaultIndex); - } - - clearIndexPatternsCache(); -} - -export async function uninstallSampleDataSet(id, defaultIndex, getConfig, setConfig, clearIndexPatternsCache) { - await kfetch({ method: 'DELETE', pathname: `${sampleDataUrl}/${id}` }); - - const existingDefaultIndex = await getConfig('defaultIndex'); - if (existingDefaultIndex && existingDefaultIndex === defaultIndex) { - await setConfig('defaultIndex', null); - } - - clearIndexPatternsCache(); -} diff --git a/src/core_plugins/kibana/public/home/tutorial_resources/suricata_logs/screenshot.png b/src/core_plugins/kibana/public/home/tutorial_resources/suricata_logs/screenshot.png new file mode 100644 index 0000000000000..68193524d8748 Binary files /dev/null and b/src/core_plugins/kibana/public/home/tutorial_resources/suricata_logs/screenshot.png differ diff --git a/src/core_plugins/kibana/public/home/tutorial_resources/uptime_monitors/screenshot.png b/src/core_plugins/kibana/public/home/tutorial_resources/uptime_monitors/screenshot.png new file mode 100644 index 0000000000000..9983667c83ec2 Binary files /dev/null and b/src/core_plugins/kibana/public/home/tutorial_resources/uptime_monitors/screenshot.png differ diff --git a/src/core_plugins/kibana/public/index.scss b/src/core_plugins/kibana/public/index.scss index 36774e9ae9bc9..390694b0a52c2 100644 --- a/src/core_plugins/kibana/public/index.scss +++ b/src/core_plugins/kibana/public/index.scss @@ -1,5 +1,13 @@ @import 'ui/public/styles/styling_constants'; +@import 'ui/public/query_bar/index'; + +// Context styles +@import './context/index'; + +// Dev tools styles +@import './dev_tools/index'; + // Discover styles @import './discover/index'; @@ -10,10 +18,8 @@ @import './visualize/index'; @import 'ui/public/vis/index'; -// Also import Timelion in case of embedding chart into dashboard -// SASSTODO: Remove once the pipeline imports all compiled CSS files always -@import '../../timelion/public/directives/index'; -@import '../../timelion/public/vis/index'; +// Management styles +@import './management/index'; // Dashboard styles // MUST STAY AT THE BOTTOM BECAUSE OF DARK THEME IMPORTS diff --git a/src/core_plugins/kibana/public/kibana.js b/src/core_plugins/kibana/public/kibana.js index 7daafbf6411a9..ed88791241d13 100644 --- a/src/core_plugins/kibana/public/kibana.js +++ b/src/core_plugins/kibana/public/kibana.js @@ -37,6 +37,7 @@ import 'uiExports/fieldFormatEditors'; import 'uiExports/navbarExtensions'; import 'uiExports/contextMenuActions'; import 'uiExports/managementSections'; +import 'uiExports/indexManagement'; import 'uiExports/devTools'; import 'uiExports/docViews'; import 'uiExports/embeddableFactories'; diff --git a/src/core_plugins/kibana/public/management/_hacks.scss b/src/core_plugins/kibana/public/management/_hacks.scss new file mode 100644 index 0000000000000..7ee656ca90c64 --- /dev/null +++ b/src/core_plugins/kibana/public/management/_hacks.scss @@ -0,0 +1,46 @@ +// SASSTODO: figure out why this is needed +kbn-management-app, +kbn-management-landing, +kbn-management-indices, +kbn-management-indices-edit, +kbn-management-indices-create, +kbn-management-advanced, +kbn-management-objects, +kbn-management-objects-view { + display: block; +} + +// SASSTODO: Remove when Kibana has a proper background color +.tab-account, .tab-management { + background-color: $euiColorEmptyShade; +} + +// SASSTODO: Remove when Kibana has a proper background color +kbn-management-objects, kbn-management-app { + background: $euiColorLightestShade; + min-height: 100vh; +} + +.kbn-management-tab:first-letter { + text-transform: capitalize; +} + +// SASSTODO: Remove when this is replaced with EuiCode +kbn-management-objects-view { + .ace_editor { height: 300px; } +} + +// SASSTODO: These are some dragula settings. +.gu-handle { + cursor: move; + cursor: grab; + cursor: -moz-grab; + cursor: -webkit-grab; +} + +.gu-mirror, +.gu-mirror .gu-handle { + cursor: grabbing; + cursor: -moz-grabbing; + cursor: -webkit-grabbing; +} \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/_management_app.scss b/src/core_plugins/kibana/public/management/_management_app.scss new file mode 100644 index 0000000000000..8fbc3c27dec9d --- /dev/null +++ b/src/core_plugins/kibana/public/management/_management_app.scss @@ -0,0 +1,55 @@ +.mgtPanel { + margin-bottom: $euiSize; + background: $euiColorEmptyShade; +} + +// SASSTODO: Remove when this is replaced by the side nav +.mgtPanel__link { + @include euiFontSizeL; + + line-height: 2; // Give some buffer for when they wrap + + &.mgtPanel__link--disabled { + opacity: $euiColorDarkShade; + cursor: default; + + &:hover, &:visited { + color: $euiColorPrimary; + } + } +} + +// SASSTODO: Remove when this form is replaced by EUI +kbn-management-objects { + form { + margin-bottom: $euiSize; + } + .list-unstyled { + li { + border-bottom: $euiBorderThin; + padding: $euiSizeS; + } + } + .empty { + color: $euiColorDarkShade; + } + + .item { + padding: $euiSizeM; + + .item-title { + margin-left: $euiSizeL; + } + + .actions { + margin-top: $euiSizeXS; + } + } + + .header { + .title, .controls { + padding-right: 1em; + display: inline-block; + } + } +} \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/index.js b/src/core_plugins/kibana/public/management/index.js index e7e99e10cb836..a73a5485653d5 100644 --- a/src/core_plugins/kibana/public/management/index.js +++ b/src/core_plugins/kibana/public/management/index.js @@ -18,7 +18,6 @@ */ import './sections'; -import './styles/main.less'; import 'ui/filters/start_from'; import 'ui/field_editor'; import uiRoutes from 'ui/routes'; diff --git a/src/core_plugins/kibana/public/management/index.scss b/src/core_plugins/kibana/public/management/index.scss new file mode 100644 index 0000000000000..db0e0162832e2 --- /dev/null +++ b/src/core_plugins/kibana/public/management/index.scss @@ -0,0 +1,15 @@ +// This file is imported into src/core_plugings/kibana/publix/index.scss + +// Prefix all styles with "dsh" to avoid conflicts. +// Examples +// mgtChart +// mgtChart__legend +// mgtChart__legend--small +// mgtChart__legend-isLoading + +@import 'hacks'; + +// Core +@import 'management_app'; +@import 'sections/settings/advanced_settings'; +@import 'sections/indices/index'; diff --git a/src/core_plugins/kibana/public/management/landing.html b/src/core_plugins/kibana/public/management/landing.html index 60c01123ac97b..7e0d81e7177a4 100644 --- a/src/core_plugins/kibana/public/management/landing.html +++ b/src/core_plugins/kibana/public/management/landing.html @@ -11,12 +11,10 @@ ng-repeat="section in sections" class="page-row" > -

      +
      -
      +

      {{::section.display}}

      @@ -32,8 +30,8 @@

      > -
      +
      +
      + +
      + - -

      + `; exports[`CreateIndexPatternWizard renders index pattern step when there are indices 1`] = ` -
      -
      - +
      +
      + +
      + -
      + `; exports[`CreateIndexPatternWizard renders the empty state when there are no indices 1`] = ` -
      -
      - +
      +
      + +
      + -
      + `; exports[`CreateIndexPatternWizard renders time field step when step is set to 2 1`] = ` -
      -
      +
      +
      + +
      + - +`; + +exports[`CreateIndexPatternWizard renders when there are no indices but there are remote clusters 1`] = ` + +
      +
      + +
      + -
      + `; exports[`CreateIndexPatternWizard shows system indices even if there are no other indices if the include system indices is toggled 1`] = ` -
      -
      - +
      +
      + +
      + -
      + `; diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/create_index_pattern_wizard.test.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/create_index_pattern_wizard.test.js index 3963f9826871a..e95a5c7fa8448 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/create_index_pattern_wizard.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/create_index_pattern_wizard.test.js @@ -21,7 +21,15 @@ import React from 'react'; import { shallow } from 'enzyme'; import { CreateIndexPatternWizard } from '../create_index_pattern_wizard'; - +const mockIndexPatternCreationType = { + getIndexPatternType: () => 'default', + getIndexPatternName: () => 'name', + getIsBeta: () => false, + checkIndicesForErrors: () => false, + getShowSystemIndices: () => false, + renderPrompt: () => {}, + getIndexPatternMappings: () => { return {}; } +}; jest.mock('../components/step_index_pattern', () => ({ StepIndexPattern: 'StepIndexPattern' })); jest.mock('../components/step_time_field', () => ({ StepTimeField: 'StepTimeField' })); jest.mock('../components/header', () => ({ Header: 'Header' })); @@ -34,6 +42,9 @@ jest.mock('../lib/get_indices', () => ({ ]; }, })); +jest.mock('ui/chrome', () => ({ + addBasePath: () => { }, +})); const loadingDataDocUrl = ''; const initialQuery = ''; @@ -44,6 +55,7 @@ const services = { config: {}, changeUrl: () => {}, scopeApply: () => {}, + indexPatternCreationType: mockIndexPatternCreationType, }; describe('CreateIndexPatternWizard', () => { @@ -71,6 +83,26 @@ describe('CreateIndexPatternWizard', () => { component.setState({ isInitiallyLoadingIndices: false, allIndices: [], + remoteClustersExist: false + }); + + await component.update(); + expect(component).toMatchSnapshot(); + }); + + it('renders when there are no indices but there are remote clusters', async () => { + const component = shallow( + + ); + + component.setState({ + isInitiallyLoadingIndices: false, + allIndices: [], + remoteClustersExist: true }); await component.update(); @@ -154,6 +186,7 @@ describe('CreateIndexPatternWizard', () => { cache: { clear } }, changeUrl, + indexPatternCreationType: mockIndexPatternCreationType }} /> ); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/render.test.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/render.test.js index 9ef4a3e38ee9b..dd9ac07c5199e 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/render.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/__jest__/render.test.js @@ -32,6 +32,7 @@ jest.mock('ui/chrome', () => ({ getUiSettingsClient: () => ({ get: () => '', }), + addBasePath: () => { }, })); const { renderCreateIndexPatternWizard, destroyCreateIndexPatternWizard } = require('../render'); @@ -52,6 +53,7 @@ describe('CreateIndexPatternWizardRender', () => { savedObjectsClient: {}, config: {}, changeUrl: () => {}, + indexPatternCreationType: {}, } ); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap index 8fae8c92fd817..d95632a2154c8 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/empty_state/__jest__/__snapshots__/empty_state.test.js.snap @@ -21,6 +21,7 @@ exports[`EmptyState should render normally 1`] = ` >

      -

      + + + +

      + + + +

      + Test prompt +
      + + +
      +`; + +exports[`Header should render normally 1`] = ` +
      + +

      + +

      +
      + - - } - onChange={[Function]} - /> + +

      + + + +

      +
      -

      @@ -101,6 +160,7 @@ exports[`Header should render without including system indices 1`] = ` >

      - - - } - onChange={[Function]} - /> - { expect(component).toMatchSnapshot(); }); + + it('should render a different name, prompt, and beta tag if provided', () => { + const component = shallow( +

      {}} + prompt={
      Test prompt
      } + indexPatternName="test index pattern" + isBeta={true} + /> + ); + + expect(component).toMatchSnapshot(); + }); }); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js index 0c7ba277ff6ab..cefd6141e63f5 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/header/header.js @@ -17,9 +17,10 @@ * under the License. */ -import React from 'react'; +import React, { Fragment } from 'react'; import { + EuiBetaBadge, EuiSpacer, EuiTitle, EuiFlexGroup, @@ -32,19 +33,30 @@ import { import { FormattedMessage } from '@kbn/i18n/react'; export const Header = ({ + prompt, + indexPatternName, + showSystemIndices, isIncludingSystemIndices, onChangeIncludingSystemIndices, + isBeta, }) => (
      -

      + { isBeta ? ( + + {' '} + + + ) : null }

      -
      @@ -59,18 +71,30 @@ export const Header = ({

      - - } - id="checkboxShowSystemIndices" - checked={isIncludingSystemIndices} - onChange={onChangeIncludingSystemIndices} - /> - + { + showSystemIndices ? ( + + } + id="checkboxShowSystemIndices" + checked={isIncludingSystemIndices} + onChange={onChangeIncludingSystemIndices} + /> + + ) : null + }
      + { + prompt ? ( + + + {prompt} + + ) : null + }
      ); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/loading_state/__jest__/__snapshots__/loading_state.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/loading_state/__jest__/__snapshots__/loading_state.test.js.snap index 7f69067cba07d..81c25fbf46f70 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/loading_state/__jest__/__snapshots__/loading_state.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/loading_state/__jest__/__snapshots__/loading_state.test.js.snap @@ -21,6 +21,7 @@ exports[`LoadingState should render normally 1`] = ` > , |", ] } goToNextStep={[Function]} @@ -16,44 +16,6 @@ Object { onQueryChanged={[Function]} query="?" />, - "i18n": Array [ - Array [ - Object { - "defaultMessage": "An index pattern cannot contain spaces or the characters: {characterList}", - "id": "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage", - }, - Object { - "characterList": "\\\\, /, ?, \\", <, >, |", - }, - ], - Array [ - Object { - "defaultMessage": "An index pattern cannot contain spaces or the characters: {characterList}", - "id": "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage", - }, - Object { - "characterList": "\\\\, /, ?, \\", <, >, |", - }, - ], - Array [ - Object { - "defaultMessage": "An index pattern cannot contain spaces or the characters: {characterList}", - "id": "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage", - }, - Object { - "characterList": "\\\\, /, ?, \\", <, >, |", - }, - ], - Array [ - Object { - "defaultMessage": "An index pattern cannot contain spaces or the characters: {characterList}", - "id": "kbn.management.createIndexPattern.step.invalidCharactersErrorMessage", - }, - Object { - "characterList": "\\\\, /, ?, \\", <, >, |", - }, - ], - ], } `; diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js index 37df9762b54df..6c7deefcc0a45 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/__jest__/step_index_pattern.test.js @@ -19,13 +19,18 @@ import React from 'react'; import { StepIndexPatternComponent } from '../step_index_pattern'; -import { shallowWithIntl, intl } from 'test_utils/enzyme_helpers'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; import { Header } from '../components/header'; jest.mock('../../../lib/ensure_minimum_time', () => ({ ensureMinimumTime: async (promises) => Array.isArray(promises) ? await Promise.all(promises) : await promises })); - +const mockIndexPatternCreationType = { + getIndexPatternType: () => 'default', + getIndexPatternName: () => 'name', + checkIndicesForErrors: () => false, + getShowSystemIndices: () => false +}; // If we don't mock this, Jest fails with the error `TypeError: Cannot redefine property: prototype // at Function.defineProperties`. jest.mock('ui/index_patterns', () => ({ @@ -36,10 +41,11 @@ jest.mock('ui/chrome', () => ({ getUiSettingsClient: () => ({ get: () => '', }), + addBasePath: () => { }, })); jest.mock('../../../lib/get_indices', () => ({ - getIndices: (service, query) => { + getIndices: (service, indexPatternCreationType, query) => { if (query.startsWith('e')) { return [ { name: 'es' }, @@ -57,7 +63,7 @@ const esService = {}; const savedObjectsClient = { find: () => ({ savedObjects: [] }) }; -const goToNextStep = () => {}; +const goToNextStep = () => { }; const createComponent = props => { return shallowWithIntl( @@ -67,14 +73,13 @@ const createComponent = props => { esService={esService} savedObjectsClient={savedObjectsClient} goToNextStep={goToNextStep} + indexPatternCreationType={mockIndexPatternCreationType} {...props} /> ); }; describe('StepIndexPattern', () => { - afterEach(() => intl.formatMessage.mockClear()); - it('renders the loading state', () => { const component = createComponent(); component.setState({ isLoadingIndices: true }); @@ -103,7 +108,6 @@ describe('StepIndexPattern', () => { component.update(); expect({ component: component.find('[data-test-subj="createIndexPatternStep1Header"]'), - i18n: intl.formatMessage.mock.calls, }).toMatchSnapshot(); }); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap index 56622bbf677e7..95c6b2f5bafdc 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/header/__jest__/__snapshots__/header.test.js.snap @@ -4,6 +4,7 @@ exports[`Header should mark the input as invalid 1`] = `

      kibana + es + @@ -134,6 +142,10 @@ exports[`IndicesList should change per page 1`] = ` > kibana + @@ -258,6 +270,10 @@ exports[`IndicesList should highlight the query in the matches 1`] = ` bana + es + @@ -377,6 +397,10 @@ exports[`IndicesList should render normally 1`] = ` > kibana + es + @@ -496,6 +524,10 @@ exports[`IndicesList updating props should render all new indices 1`] = ` > kibana + es + kibana + es + kibana + es + kibana + es + kibana + es + diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/indices_list.test.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/indices_list.test.js index f4dfae32a6a32..b958dbbf58122 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/indices_list.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/__jest__/indices_list.test.js @@ -22,8 +22,8 @@ import { IndicesList } from '../indices_list'; import { shallow } from 'enzyme'; const indices = [ - { name: 'kibana' }, - { name: 'es' } + { name: 'kibana', tags: [] }, + { name: 'es', tags: [] } ]; describe('IndicesList', () => { diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.js index c8a1f89b18458..df90abce00e48 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/indices_list/indices_list.js @@ -22,6 +22,7 @@ import PropTypes from 'prop-types'; import { PER_PAGE_INCREMENTS } from '../../../../constants'; import { + EuiBadge, EuiFlexGroup, EuiFlexItem, EuiSpacer, @@ -185,6 +186,13 @@ export class IndicesList extends Component { {this.highlightIndexName(index.name, queryWithoutWildcard)} + + {index.tags.map(tag => { + return ( + {tag.name} + ); + })} + ); }); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap index f5ffda2fa08c2..ddad76b12b74f 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/loading_indices/__jest__/__snapshots__/loading_indices.test.js.snap @@ -24,6 +24,7 @@ exports[`LoadingIndices should render normally 1`] = ` > diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js index a403925f24dd1..772d7ec900ec1 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_index_pattern/components/status_message/status_message.js @@ -35,6 +35,7 @@ export const StatusMessage = ({ }, isIncludingSystemIndices, query, + showSystemIndicies, }) => { let statusIcon; let statusMessage; @@ -58,7 +59,7 @@ export const StatusMessage = ({ ); } - else if (!isIncludingSystemIndices) { + else if (!isIncludingSystemIndices && showSystemIndicies) { statusMessage = ( { - const { esService } = this.props; + const { esService, indexPatternCreationType } = this.props; const { existingIndexPatterns } = this.state; if (existingIndexPatterns.includes(query)) { @@ -104,7 +108,7 @@ export class StepIndexPatternComponent extends Component { this.setState({ isLoadingIndices: true, indexPatternExists: false }); if (query.endsWith('*')) { - const exactMatchedIndices = await ensureMinimumTime(getIndices(esService, query, MAX_SEARCH_SIZE)); + const exactMatchedIndices = await ensureMinimumTime(getIndices(esService, indexPatternCreationType, query, MAX_SEARCH_SIZE)); // If the search changed, discard this state if (query !== this.lastQuery) { return; @@ -117,8 +121,8 @@ export class StepIndexPatternComponent extends Component { partialMatchedIndices, exactMatchedIndices, ] = await ensureMinimumTime([ - getIndices(esService, `${query}*`, MAX_SEARCH_SIZE), - getIndices(esService, query, MAX_SEARCH_SIZE), + getIndices(esService, indexPatternCreationType, `${query}*`, MAX_SEARCH_SIZE), + getIndices(esService, indexPatternCreationType, query, MAX_SEARCH_SIZE), ]); // If the search changed, discard this state @@ -167,6 +171,7 @@ export class StepIndexPatternComponent extends Component { } renderStatusMessage(matchedIndices) { + const { indexPatternCreationType } = this.props; const { query, isLoadingIndices, indexPatternExists, isIncludingSystemIndices } = this.state; if (isLoadingIndices || indexPatternExists) { @@ -176,6 +181,7 @@ export class StepIndexPatternComponent extends Component { return ( @@ -213,44 +219,41 @@ export class StepIndexPatternComponent extends Component { } iconType="help" color="warning" - > -

      - -

      -
      + /> ); } renderHeader({ exactMatchedIndices: indices }) { - const { goToNextStep, intl } = this.props; - const { query, showingIndexPatternQueryErrors, indexPatternExists } = this.state; + const { goToNextStep, indexPatternCreationType, intl } = this.props; + const { query, showingIndexPatternQueryErrors, indexPatternExists, indexPatternName } = this.state; let containsErrors = false; const errors = []; - const characterList = ILLEGAL_CHARACTERS.slice(0, ILLEGAL_CHARACTERS.length - 1).join(', '); + const characterList = this.ILLEGAL_CHARACTERS.slice(0, this.ILLEGAL_CHARACTERS.length - 1).join(', '); + const checkIndices = indexPatternCreationType.checkIndicesForErrors(indices); if (!query || !query.length || query === '.' || query === '..') { // This is an error scenario but do not report an error containsErrors = true; - } - else if (containsIllegalCharacters(query, ILLEGAL_CHARACTERS)) { + } else if (containsIllegalCharacters(query, ILLEGAL_CHARACTERS)) { const errorMessage = intl.formatMessage( { id: 'kbn.management.createIndexPattern.step.invalidCharactersErrorMessage', - defaultMessage: 'An index pattern cannot contain spaces or the characters: {characterList}' + defaultMessage: 'A {indexPatternName} cannot contain spaces or the characters: {characterList}' }, - { characterList }); + { characterList, indexPatternName } + ); errors.push(errorMessage); containsErrors = true; + } else if (checkIndices) { + errors.push(...checkIndices); + containsErrors = true; } const isInputInvalid = showingIndexPatternQueryErrors && containsErrors && errors.length > 0; diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap index 78b941d09c129..98f052372b81e 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/__jest__/__snapshots__/step_time_field.test.js.snap @@ -43,6 +43,7 @@ exports[`StepTimeField should render a loading state when creating the index pat >
      ({ ActionButtons: 'ActionButtons jest.mock('../../../lib/extract_time_fields', () => ({ extractTimeFields: fields => fields, })); +jest.mock('ui/chrome', () => ({ + addBasePath: () => { }, +})); +const mockIndexPatternCreationType = { + getIndexPatternType: () => 'default', + getIndexPatternName: () => 'name' +}; const noop = () => {}; const indexPatternsService = { fieldsFetcher: { @@ -45,6 +52,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -58,6 +66,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -78,6 +87,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -100,6 +110,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -128,6 +139,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -151,6 +163,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -174,6 +187,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -189,6 +203,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); @@ -207,6 +222,7 @@ describe('StepTimeField', () => { indexPatternsService={indexPatternsService} goToPreviousStep={noop} createIndexPattern={noop} + indexPatternCreationType={mockIndexPatternCreationType} /> ); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.js index 9ad692baf0e94..3126dcf5430f6 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/advanced_options/advanced_options.js @@ -61,17 +61,15 @@ export const AdvancedOptionsComponent = ({ { isVisible ? - } + label={} + helpText={} >

      ki* , + "indexPatternName": undefined, } } /> diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js index 1ccaf90f66484..67e8053eb6bbd 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/header/header.js @@ -29,6 +29,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; export const Header = ({ indexPattern, + indexPatternName, }) => (
      @@ -43,8 +44,11 @@ export const Header = ({ {indexPattern} }} + defaultMessage="You've defined {indexPattern} as your {indexPatternName}. Now you can specify some settings before we create it." + values={{ + indexPattern: {indexPattern}, + indexPatternName, + }} />
      diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap index 03fee7dd7278d..1014cf86962de 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/components/step_time_field/components/time_field/__jest__/__snapshots__/time_field.test.js.snap @@ -260,6 +260,7 @@ exports[`TimeField should render something if hiding time field 1`] = `

      { const { indexPatternsService, indexPattern } = this.props; + const { getFetchForWildcardOptions } = this.props.indexPatternCreationType; this.setState({ isFetchingTimeFields: true }); - const fields = await ensureMinimumTime(indexPatternsService.fieldsFetcher.fetchForWildcard(indexPattern)); + const fields = await ensureMinimumTime( + indexPatternsService.fieldsFetcher.fetchForWildcard(indexPattern, getFetchForWildcardOptions()) + ); const timeFields = extractTimeFields(fields); this.setState({ timeFields, isFetchingTimeFields: false }); @@ -113,6 +124,7 @@ export class StepTimeFieldComponent extends Component { indexPatternId, isCreating, isFetchingTimeFields, + indexPatternName, } = this.state; if (isCreating) { @@ -156,8 +168,11 @@ export class StepTimeFieldComponent extends Component { return ( -

      - +
      + { - this.setState({ allIndices: [], isInitiallyLoadingIndices: true }); + catchAndWarn = async (asyncFn, errorValue, errorMsg) => { + try { + return await asyncFn; + } catch (errors) { + this.setState(prevState => ({ + toasts: prevState.toasts.concat([{ + title: errorMsg, + id: errorMsg, + color: 'warning', + iconType: 'alert', + }]) + })); + return errorValue; + } + }; + + fetchData = async () => { const { services } = this.props; - const allIndices = await ensureMinimumTime(getIndices(services.es, `*`, MAX_SEARCH_SIZE)); - this.setState({ allIndices, isInitiallyLoadingIndices: false }); + + this.setState({ + allIndices: [], + isInitiallyLoadingIndices: true, + remoteClustersExist: false + }); + + const indicesFailMsg = (); + + const clustersFailMsg = (); + + const [allIndices, remoteClusters] = await ensureMinimumTime([ + this.catchAndWarn(getIndices(services.es, this.indexPatternCreationType, `*`, MAX_SEARCH_SIZE), [], indicesFailMsg), + this.catchAndWarn(getRemoteClusters(services.$http), [], clustersFailMsg) + ]); + + this.setState({ + allIndices, + isInitiallyLoadingIndices: false, + remoteClustersExist: remoteClusters.length !== 0 + }); } createIndexPattern = async (timeFieldName, indexPatternId) => { @@ -74,6 +126,7 @@ export class CreateIndexPatternWizard extends Component { id: indexPatternId, title: indexPattern, timeFieldName, + ...this.indexPatternCreationType.getIndexPatternMappings() }); const createdId = await emptyPattern.create(); @@ -105,8 +158,12 @@ export class CreateIndexPatternWizard extends Component { return (
      ); } @@ -118,6 +175,7 @@ export class CreateIndexPatternWizard extends Component { isIncludingSystemIndices, step, indexPattern, + remoteClustersExist } = this.state; if (isInitiallyLoadingIndices) { @@ -125,8 +183,10 @@ export class CreateIndexPatternWizard extends Component { } const hasDataIndices = allIndices.some(({ name }) => !name.startsWith('.')); - if (!hasDataIndices && !isIncludingSystemIndices) { - return ; + if (!hasDataIndices && + !isIncludingSystemIndices && + !remoteClustersExist) { + return ; } if (step === 1) { @@ -138,6 +198,7 @@ export class CreateIndexPatternWizard extends Component { isIncludingSystemIndices={isIncludingSystemIndices} esService={services.es} savedObjectsClient={services.savedObjectsClient} + indexPatternCreationType={this.indexPatternCreationType} goToNextStep={this.goToTimeFieldStep} /> ); @@ -151,6 +212,7 @@ export class CreateIndexPatternWizard extends Component { indexPatternsService={services.indexPatterns} goToPreviousStep={this.goToIndexPatternStep} createIndexPattern={this.createIndexPattern} + indexPatternCreationType={this.indexPatternCreationType} /> ); } @@ -158,15 +220,28 @@ export class CreateIndexPatternWizard extends Component { return null; } + removeToast = (removedToast) => { + this.setState(prevState => ({ + toasts: prevState.toasts.filter(toast => toast.id !== removedToast.id), + })); + }; + render() { const header = this.renderHeader(); const content = this.renderContent(); return ( -
      - {header} - {content} -
      + +
      + {header} + {content} +
      + +
      ); } } diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js index 2b5c3987af420..0fc80ee769b52 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/index.js @@ -21,6 +21,7 @@ import { SavedObjectsClientProvider } from 'ui/saved_objects'; import uiRoutes from 'ui/routes'; import angularTemplate from './angular_template.html'; import 'ui/index_patterns'; +import { IndexPatternCreationFactory } from 'ui/management/index_pattern_creation'; import { renderCreateIndexPatternWizard, destroyCreateIndexPatternWizard } from './render'; @@ -29,13 +30,18 @@ uiRoutes.when('/management/kibana/index', { controller: function ($scope, $injector) { // Wait for the directives to execute const kbnUrl = $injector.get('kbnUrl'); + const Private = $injector.get('Private'); $scope.$$postDigest(() => { const $routeParams = $injector.get('$routeParams'); + const indexPatternCreationProvider = Private(IndexPatternCreationFactory)($routeParams.type); + const indexPatternCreationType = indexPatternCreationProvider.getType(); const services = { config: $injector.get('config'), es: $injector.get('es'), indexPatterns: $injector.get('indexPatterns'), - savedObjectsClient: $injector.get('Private')(SavedObjectsClientProvider), + $http: $injector.get('$http'), + savedObjectsClient: Private(SavedObjectsClientProvider), + indexPatternCreationType, changeUrl: url => { $scope.$evalAsync(() => kbnUrl.changePath(url)); }, diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/__jest__/get_indices.test.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/__jest__/get_indices.test.js index f5dcccf6da50b..502111b457332 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/__jest__/get_indices.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/__jest__/get_indices.test.js @@ -21,6 +21,15 @@ import { getIndices } from '../get_indices'; import successfulResponse from './api/get_indices.success.json'; import errorResponse from './api/get_indices.error.json'; import exceptionResponse from './api/get_indices.exception.json'; +const mockIndexPatternCreationType = { + getIndexPatternType: () => 'default', + getIndexPatternName: () => 'name', + checkIndicesForErrors: () => false, + getShowSystemIndices: () => false, + renderPrompt: () => {}, + getIndexPatternMappings: () => { return {}; }, + getIndexTags: () => { return []; } +}; describe('getIndices', () => { it('should work in a basic case', async () => { @@ -28,20 +37,20 @@ describe('getIndices', () => { search: () => new Promise((resolve) => resolve(successfulResponse)) }; - const result = await getIndices(es, 'kibana', 1); + const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1); expect(result.length).toBe(2); expect(result[0].name).toBe('1'); expect(result[1].name).toBe('2'); }); it('should ignore ccs query-all', async () => { - expect((await getIndices(null, '*:')).length).toBe(0); + expect((await getIndices(null, mockIndexPatternCreationType, '*:')).length).toBe(0); }); it('should ignore a single comma', async () => { - expect((await getIndices(null, ',')).length).toBe(0); - expect((await getIndices(null, ',*')).length).toBe(0); - expect((await getIndices(null, ',foobar')).length).toBe(0); + expect((await getIndices(null, mockIndexPatternCreationType, ',')).length).toBe(0); + expect((await getIndices(null, mockIndexPatternCreationType, ',*')).length).toBe(0); + expect((await getIndices(null, mockIndexPatternCreationType, ',foobar')).length).toBe(0); }); it('should trim the input', async () => { @@ -52,7 +61,7 @@ describe('getIndices', () => { }), }; - await getIndices(es, 'kibana ', 1); + await getIndices(es, mockIndexPatternCreationType, 'kibana ', 1); expect(index).toBe('kibana'); }); @@ -64,7 +73,7 @@ describe('getIndices', () => { }), }; - await getIndices(es, 'kibana', 10); + await getIndices(es, mockIndexPatternCreationType, 'kibana', 10); expect(limit).toBe(10); }); @@ -74,7 +83,7 @@ describe('getIndices', () => { search: () => new Promise((resolve) => resolve(errorResponse)) }; - const result = await getIndices(es, 'kibana', 1); + const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1); expect(result.length).toBe(0); }); @@ -83,7 +92,7 @@ describe('getIndices', () => { search: () => { throw new Error('Fail'); } }; - await expect(getIndices(es, 'kibana', 1)).rejects.toThrow(); + await expect(getIndices(es, mockIndexPatternCreationType, 'kibana', 1)).rejects.toThrow(); }); it('should handle index_not_found_exception errors gracefully', async () => { @@ -91,12 +100,12 @@ describe('getIndices', () => { search: () => new Promise((resolve, reject) => reject(exceptionResponse)) }; - const result = await getIndices(es, 'kibana', 1); + const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1); expect(result.length).toBe(0); }); it('should throw an exception if no limit is provided', async () => { - await expect(getIndices({}, 'kibana')).rejects.toThrow(); + await expect(getIndices({}, mockIndexPatternCreationType, 'kibana')).rejects.toThrow(); }); }); }); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js index 7638daf1c5720..099f07a698cbf 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_indices.js @@ -19,7 +19,7 @@ import { get, sortBy } from 'lodash'; -export async function getIndices(es, rawPattern, limit) { +export async function getIndices(es, indexPatternCreationType, rawPattern, limit) { const pattern = rawPattern.trim(); // Searching for `*:` fails for CCS environments. The search request @@ -57,7 +57,7 @@ export async function getIndices(es, rawPattern, limit) { size: limit, } } - } + }, } }; @@ -67,11 +67,18 @@ export async function getIndices(es, rawPattern, limit) { return []; } - return sortBy(response.aggregations.indices.buckets.map(bucket => { - return { - name: bucket.key - }; - }), 'name'); + return sortBy( + response.aggregations.indices.buckets.map(bucket => { + return bucket.key; + }) + .map((indexName) => { + return { + name: indexName, + tags: indexPatternCreationType.getIndexTags(indexName) + }; + }) + , 'name' + ); } catch (err) { const type = get(err, 'body.error.caused_by.type'); diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_remote_clusters.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_remote_clusters.js new file mode 100644 index 0000000000000..f1cbd48ac1116 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/get_remote_clusters.js @@ -0,0 +1,26 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import chrome from 'ui/chrome'; +const apiPrefix = chrome.addBasePath('/api/kibana'); + +export async function getRemoteClusters($http) { + const response = await $http.get(`${apiPrefix}/clusters`); + return response.data; +} diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/index.js b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/index.js index 0930eb82514e1..edbab7360b433 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/index.js +++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/lib/index.js @@ -28,3 +28,5 @@ export { getMatchedIndices } from './get_matched_indices'; export { containsIllegalCharacters } from './contains_illegal_characters'; export { extractTimeFields } from './extract_time_fields'; + +export { getRemoteClusters } from './get_remote_clusters'; diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html index 47dcb7758d731..426a0600663e3 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.html @@ -3,9 +3,8 @@
      -

      - - - +

      + + + + + +   + + + {{tag.name}}

      +

      diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js index 80b1f9895b622..6a436a456d41f 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_index_pattern.js @@ -27,6 +27,7 @@ import uiRoutes from 'ui/routes'; import { uiModules } from 'ui/modules'; import template from './edit_index_pattern.html'; import { FieldWildcardProvider } from 'ui/field_wildcard'; +import { IndexPatternListFactory } from 'ui/management/index_pattern_list'; import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; import { SourceFiltersTable } from './source_filters_table'; @@ -54,7 +55,7 @@ function updateSourceFiltersTable($scope, $state) { filterFilter={$scope.fieldFilter} fieldWildcardMatcher={$scope.fieldWildcardMatcher} onAddOrRemoveFilter={() => { - $scope.editSections = $scope.editSectionsProvider($scope.indexPattern); + $scope.editSections = $scope.editSectionsProvider($scope.indexPattern, $scope.indexPatternListProvider); $scope.refreshFilters(); $scope.$apply(); }} @@ -96,7 +97,7 @@ function updateScriptedFieldsTable($scope, $state) { getRouteHref: (obj, route) => $scope.kbnUrl.getRouteHref(obj, route), }} onRemoveField={() => { - $scope.editSections = $scope.editSectionsProvider($scope.indexPattern); + $scope.editSections = $scope.editSectionsProvider($scope.indexPattern, $scope.indexPatternListProvider); $scope.refreshFilters(); }} /> @@ -135,6 +136,7 @@ function updateIndexedFieldsTable($scope, $state) { $scope.kbnUrl.redirectToRoute(obj, route); $scope.$apply(); }, + getFieldInfo: $scope.getFieldInfo, }} /> , @@ -184,11 +186,15 @@ uiModules.get('apps/management') $scope, $location, $route, config, indexPatterns, Private, AppState, docTitle, confirmModal) { const $state = $scope.state = new AppState(); const { fieldWildcardMatcher } = Private(FieldWildcardProvider); + const indexPatternListProvider = Private(IndexPatternListFactory)(); $scope.fieldWildcardMatcher = fieldWildcardMatcher; $scope.editSectionsProvider = Private(IndicesEditSectionsProvider); $scope.kbnUrl = Private(KbnUrlProvider); $scope.indexPattern = $route.current.locals.indexPattern; + $scope.indexPatternListProvider = indexPatternListProvider; + $scope.indexPattern.tags = indexPatternListProvider.getIndexPatternTags($scope.indexPattern); + $scope.getFieldInfo = indexPatternListProvider.getFieldInfo; docTitle.change($scope.indexPattern.title); const otherPatterns = _.filter($route.current.locals.indexPatterns, pattern => { @@ -196,7 +202,7 @@ uiModules.get('apps/management') }); $scope.$watch('indexPattern.fields', function () { - $scope.editSections = $scope.editSectionsProvider($scope.indexPattern); + $scope.editSections = $scope.editSectionsProvider($scope.indexPattern, indexPatternListProvider); $scope.refreshFilters(); $scope.fields = $scope.indexPattern.getNonScriptedFields(); updateIndexedFieldsTable($scope, $state); diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js index 20a8e49c7eee2..c7f53096bfa6e 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/edit_sections.js @@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n'; export function IndicesEditSectionsProvider() { - return function (indexPattern) { + return function (indexPattern, indexPatternListProvider) { const fieldCount = _.countBy(indexPattern.fields, function (field) { return (field.scripted) ? 'scripted' : 'indexed'; }); @@ -33,22 +33,28 @@ export function IndicesEditSectionsProvider() { sourceFilters: indexPattern.sourceFilters ? indexPattern.sourceFilters.length : 0, }); - return [ - { - title: i18n.translate('kbn.management.editIndexPattern.tabs.fieldsHeader', { defaultMessage: 'Fields' }), - index: 'indexedFields', - count: fieldCount.indexed - }, - { + const editSections = []; + + editSections.push({ + title: i18n.translate('kbn.management.editIndexPattern.tabs.fieldsHeader', { defaultMessage: 'Fields' }), + index: 'indexedFields', + count: fieldCount.indexed + }); + + if(indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) { + editSections.push({ title: i18n.translate('kbn.management.editIndexPattern.tabs.scriptedHeader', { defaultMessage: 'Scripted fields' }), index: 'scriptedFields', count: fieldCount.scripted - }, - { - title: i18n.translate('kbn.management.editIndexPattern.tabs.sourceHeader', { defaultMessage: 'Source filters' }), - index: 'sourceFilters', - count: fieldCount.sourceFilters - } - ]; + }); + } + + editSections.push({ + title: i18n.translate('kbn.management.editIndexPattern.tabs.sourceHeader', { defaultMessage: 'Source filters' }), + index: 'sourceFilters', + count: fieldCount.sourceFilters + }); + + return editSections; }; } diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/field_controls.html b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/field_controls.html index c5ab67cb37f2c..c14dcd3f3a8d5 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/field_controls.html +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/field_controls.html @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ ng-if="field.scripted" ng-click="remove(field)" class="kuiButton kuiButton--danger kuiButton--small" - aria-label="{{'kbn.management.editIndexPattern.deleteFieldButton' | i18n: { defaultMessage: 'Delete' } }}" + aria-label="{{::'kbn.management.editIndexPattern.deleteFieldButton' | i18n: { defaultMessage: 'Delete' } }}" > diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.html b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.html index 1b3b4379ec85b..bf61f95d72abd 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.html +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/index_header/index_header.html @@ -18,8 +18,8 @@

      diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/__snapshots__/call_outs.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/__snapshots__/call_outs.test.js.snap index d9113e01a783b..b93efb429bed8 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/__snapshots__/call_outs.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/__snapshots__/call_outs.test.js.snap @@ -6,7 +6,13 @@ exports[`CallOuts should render normally 1`] = ` color="danger" iconType="cross" size="m" - title="Deprecation languages in use" + title={ + + } >

      - Painless + , } } diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/call_outs.test.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/call_outs.test.js index 0fba18be79cff..2553400cbdd32 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/call_outs.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/__jest__/call_outs.test.js @@ -18,14 +18,14 @@ */ import React from 'react'; -import { shallowWithIntl } from 'test_utils/enzyme_helpers'; +import { shallow } from 'enzyme'; -import { CallOutsComponent } from '../call_outs'; +import { CallOuts } from '../call_outs'; describe('CallOuts', () => { it('should render normally', async () => { - const component = shallowWithIntl( - @@ -35,8 +35,8 @@ describe('CallOuts', () => { }); it('should render without any call outs', async () => { - const component = shallowWithIntl( - diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.js index b4ddf87bede12..e4271ec4811f3 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/call_outs/call_outs.js @@ -25,12 +25,11 @@ import { EuiSpacer, } from '@elastic/eui'; -import { injectI18n, FormattedMessage } from '@kbn/i18n/react'; +import { FormattedMessage } from '@kbn/i18n/react'; -export const CallOutsComponent = ({ +export const CallOuts = ({ deprecatedLangsInUse, painlessDocLink, - intl }) => { if (!deprecatedLangsInUse.length) { return null; @@ -39,9 +38,10 @@ export const CallOutsComponent = ({ return (

      } color="danger" iconType="cross" > @@ -54,8 +54,12 @@ export const CallOutsComponent = ({ deprecatedLangsInUse: deprecatedLangsInUse.join(', '), link: ( - Painless - ) + + + ) }} />

      @@ -64,5 +68,3 @@ export const CallOutsComponent = ({
      ); }; - -export const CallOuts = injectI18n(CallOutsComponent); diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap index 63d31137b9405..67613125b7bb6 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/scripted_fields_table/components/header/__jest__/__snapshots__/header.test.js.snap @@ -16,6 +16,7 @@ exports[`Header should render normally 1`] = ` >

      -

      - - - +
      + + +
      + + + } + confirmButtonText={ + + } + onCancel={[Function]} + onConfirm={[Function]} + title={ + } - saveFilter={[Function]} /> - - - - , - "i18n": Array [ - Array [ - Object { - "defaultMessage": "Delete source filter '{value}'?", - "id": "kbn.management.editIndexPattern.source.deleteSourceFilterLabel", - }, - Object { - "value": "tim*", - }, - ], - Array [ - Object { - "defaultMessage": "Cancel", - "id": "kbn.management.editIndexPattern.source.deleteFilter.cancelButton", - }, - ], - Array [ - Object { - "defaultMessage": "Delete", - "id": "kbn.management.editIndexPattern.source.deleteFilter.deleteButton", - }, - ], - ], -} + + `; exports[`SourceFiltersTable should update a filter 1`] = ` diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/__jest__/source_filters_table.test.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/__jest__/source_filters_table.test.js index d6047cb66d4e2..c2cda7f41b74c 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/__jest__/source_filters_table.test.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/__jest__/source_filters_table.test.js @@ -18,9 +18,9 @@ */ import React from 'react'; -import { shallowWithIntl, intl } from 'test_utils/enzyme_helpers'; +import { shallow } from 'enzyme'; -import { SourceFiltersTableComponent } from '../source_filters_table'; +import { SourceFiltersTable } from '../source_filters_table'; jest.mock('@elastic/eui', () => ({ EuiButton: 'eui-button', @@ -57,11 +57,9 @@ const indexPattern = { describe('SourceFiltersTable', () => { - afterEach(() => intl.formatMessage.mockClear()); - it('should render normally', async () => { - const component = shallowWithIntl( - {}} /> @@ -71,8 +69,8 @@ describe('SourceFiltersTable', () => { }); it('should filter based on the query bar', async () => { - const component = shallowWithIntl( - {}} /> @@ -83,8 +81,8 @@ describe('SourceFiltersTable', () => { }); it('should should a loading indicator when saving', async () => { - const component = shallowWithIntl( - { }); it('should show a delete modal', async () => { - const component = shallowWithIntl( - { component.instance().startDeleteFilter({ value: 'tim*' }); component.update(); // We are not calling `.setState` directly so we need to re-render - expect({ - component, - i18n: intl.formatMessage.mock.calls, - }).toMatchSnapshot(); + expect(component).toMatchSnapshot(); }); it('should remove a filter', async () => { const save = jest.fn(); - const component = shallowWithIntl( - { it('should add a filter', async () => { const save = jest.fn(); - const component = shallowWithIntl( - { it('should update a filter', async () => { const save = jest.fn(); - const component = shallowWithIntl( - @@ -82,7 +82,7 @@ exports[`AddFilter should render normally 1`] = ` > diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/add_filter/add_filter.js b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/add_filter/add_filter.js index 223f40e1274f6..47084161a484a 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/add_filter/add_filter.js +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/add_filter/add_filter.js @@ -69,7 +69,7 @@ export class AddFilterComponent extends Component { isDisabled={filter.length === 0} onClick={this.onAddFilter} > - + diff --git a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/header/__jest__/__snapshots__/header.test.js.snap b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/header/__jest__/__snapshots__/header.test.js.snap index 020b344832aa9..f3e0e3ae9496f 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/header/__jest__/__snapshots__/header.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/indices/edit_index_pattern/source_filters_table/components/header/__jest__/__snapshots__/header.test.js.snap @@ -4,6 +4,7 @@ exports[`Header should render normally 1`] = `

      } onCancel={this.hideDeleteConfirmationModal} onConfirm={this.deleteFilter} - cancelButtonText={intl.formatMessage({ - id: 'kbn.management.editIndexPattern.source.deleteFilter.cancelButton', defaultMessage: 'Cancel' })} - confirmButtonText={intl.formatMessage({ - id: 'kbn.management.editIndexPattern.source.deleteFilter.deleteButton', defaultMessage: 'Delete' })} + cancelButtonText={} + confirmButtonText={} defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON} /> @@ -204,5 +211,3 @@ export class SourceFiltersTableComponent extends Component { ); } } - -export const SourceFiltersTable = injectI18n(SourceFiltersTableComponent); diff --git a/src/core_plugins/kibana/public/management/sections/indices/index.html b/src/core_plugins/kibana/public/management/sections/indices/index.html index 51251c9af69d8..1c2c5faa6aea8 100644 --- a/src/core_plugins/kibana/public/management/sections/indices/index.html +++ b/src/core_plugins/kibana/public/management/sections/indices/index.html @@ -1,52 +1,13 @@ -

      @@ -78,14 +93,19 @@

      - - Proceed with caution! - +
      -
      - Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be. +
      @@ -143,20 +163,21 @@

      + i18n-id="kbn.management.objects.view.saveButtonLabel" + i18n-default-message="Save { title } Object" + i18n-values="{ title }" + > + i18n-id="kbn.management.objects.view.cancelButtonLabel" + i18n-default-message="Cancel" + >

      diff --git a/src/core_plugins/kibana/public/management/sections/objects/_view.js b/src/core_plugins/kibana/public/management/sections/objects/_view.js index 9c42073983529..86b2e0d5599c2 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/_view.js +++ b/src/core_plugins/kibana/public/management/sections/objects/_view.js @@ -38,7 +38,7 @@ uiRoutes }); uiModules.get('apps/management') - .directive('kbnManagementObjectsView', function (kbnIndex, confirmModal) { + .directive('kbnManagementObjectsView', function (kbnIndex, confirmModal, i18n) { return { restrict: 'E', controller: function ($scope, $injector, $routeParams, $location, $window, $rootScope, Private) { @@ -199,11 +199,17 @@ uiModules.get('apps/management') } const confirmModalOptions = { onConfirm: doDelete, - confirmButtonText: 'Delete', - title: 'Delete saved Kibana object?' + confirmButtonText: i18n('kbn.management.objects.confirmModalOptions.deleteButtonLabel', { + defaultMessage: 'Delete', + }), + title: i18n('kbn.management.objects.confirmModalOptions.modalTitle', { + defaultMessage: 'Delete saved Kibana object?' + }), }; confirmModal( - `You can't recover deleted objects`, + i18n('kbn.management.objects.confirmModalOptions.modalDescription', { + defaultMessage: 'You can\'t recover deleted objects', + }), confirmModalOptions ); }; diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap index 36cfb413e146f..d714e7506990d 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/__snapshots__/objects_table.test.js.snap @@ -3,15 +3,37 @@ exports[`ObjectsTable delete should show a confirm modal 1`] = ` + } + confirmButtonText={ + + } defaultFocusedButton="confirm" onCancel={[Function]} onConfirm={[Function]} - title="Delete saved objects" + title={ + + } >

      - This action will delete the following saved objects: +

      + } + confirmButtonText={ + + } defaultFocusedButton="confirm" onCancel={[Function]} onConfirm={[Function]} - title="Export 4 objects" + title={ + + } >

      - Select which types to export. The number in parentheses indicates how many of this type are available to export. +

      -

      ({ Header: () => 'Header', @@ -43,15 +45,6 @@ jest.mock('ui/chrome', () => ({ addBasePath: () => '' })); -jest.mock('../../../../indices/create_index_pattern_wizard/lib/ensure_minimum_time', () => ({ - ensureMinimumTime: async promises => { - if (Array.isArray(promises)) { - return await Promise.all(promises); - } - return await promises; - }, -})); - jest.mock('../../../lib/retrieve_and_export_docs', () => ({ retrieveAndExportDocs: jest.fn(), })); @@ -79,6 +72,8 @@ jest.mock('../../../lib/get_relationships', () => ({ getRelationships: jest.fn(), })); +jest.mock('ui/notify', () => ({})); + const allSavedObjects = [ { id: '1', @@ -151,14 +146,27 @@ const defaultProps = { goInApp: () => {}, }; +let addDangerMock; + describe('ObjectsTable', () => { beforeEach(() => { defaultProps.savedObjectsClient.find.mockClear(); + // mock _.debounce to fire immediately with no internal timer + require('lodash').debounce = function (func) { + function debounced(...args) { + return func.apply(this, args); + } + return debounced; + }; + addDangerMock = jest.fn(); + require('ui/notify').toastNotifications = { + addDanger: addDangerMock, + }; }); it('should render normally', async () => { - const component = shallow( - @@ -172,6 +180,28 @@ describe('ObjectsTable', () => { expect(component).toMatchSnapshot(); }); + it('should add danger toast when find fails', async () => { + const savedObjectsClientWithFindError = { + find: () => { + throw new Error('Simulated find error'); + } + }; + const customizedProps = { ...defaultProps, savedObjectsClient: savedObjectsClientWithFindError }; + const component = shallowWithIntl( + + ); + + // Ensure all promises resolve + await new Promise(resolve => process.nextTick(resolve)); + // Ensure the state changes are reflected + component.update(); + + expect(addDangerMock).toHaveBeenCalled(); + }); + describe('export', () => { it('should export selected objects', async () => { const mockSelectedSavedObjects = [ @@ -194,8 +224,8 @@ describe('ObjectsTable', () => { const { retrieveAndExportDocs } = require('../../../lib/retrieve_and_export_docs'); - const component = shallow( - @@ -216,8 +246,8 @@ describe('ObjectsTable', () => { }); it('should allow the user to choose when exporting all', async () => { - const component = shallow( - ); @@ -236,8 +266,8 @@ describe('ObjectsTable', () => { it('should export all', async () => { const { scanAllTypes } = require('../../../lib/scan_all_types'); const { saveToFile } = require('../../../lib/save_to_file'); - const component = shallow( - ); @@ -259,8 +289,8 @@ describe('ObjectsTable', () => { describe('import', () => { it('should show the flyout', async () => { - const component = shallow( - ); @@ -273,12 +303,12 @@ describe('ObjectsTable', () => { component.instance().showImportFlyout(); component.update(); - expect(component.find('Flyout')).toMatchSnapshot(); + expect(component.find(Flyout)).toMatchSnapshot(); }); it('should hide the flyout', async () => { - const component = shallow( - ); @@ -291,7 +321,7 @@ describe('ObjectsTable', () => { component.instance().hideImportFlyout(); component.update(); - expect(component.find('Flyout').length).toBe(0); + expect(component.find(Flyout).length).toBe(0); }); }); @@ -299,8 +329,8 @@ describe('ObjectsTable', () => { it('should fetch relationships', async () => { const { getRelationships } = require('../../../lib/get_relationships'); - const component = shallow( - ); @@ -315,8 +345,8 @@ describe('ObjectsTable', () => { }); it('should show the flyout', async () => { - const component = shallow( - ); @@ -329,15 +359,15 @@ describe('ObjectsTable', () => { component.instance().onShowRelationships('1', 'search', 'MySearch'); component.update(); - expect(component.find('Relationships')).toMatchSnapshot(); + expect(component.find(Relationships)).toMatchSnapshot(); expect(component.state('relationshipId')).toBe('1'); expect(component.state('relationshipType')).toBe('search'); expect(component.state('relationshipTitle')).toBe('MySearch'); }); it('should hide the flyout', async () => { - const component = shallow( - ); @@ -350,7 +380,7 @@ describe('ObjectsTable', () => { component.instance().onHideRelationships(); component.update(); - expect(component.find('Relationships').length).toBe(0); + expect(component.find(Relationships).length).toBe(0); expect(component.state('relationshipId')).toBe(undefined); expect(component.state('relationshipType')).toBe(undefined); expect(component.state('relationshipTitle')).toBe(undefined); @@ -359,8 +389,8 @@ describe('ObjectsTable', () => { describe('delete', () => { it('should show a confirm modal', async () => { - const component = shallow( - ); @@ -403,8 +433,8 @@ describe('ObjectsTable', () => { delete: jest.fn(), }; - const component = shallow( - diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap index 3464cbb2acba2..b9c44e519fbeb 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/__snapshots__/flyout.test.js.snap @@ -14,9 +14,14 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = ` >

      - Import saved objects +

      @@ -27,20 +32,34 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = ` color="warning" iconType="help" size="m" - title="Index Pattern Conflicts" + title={ + + } >

      - The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can - - - create a new index pattern - - - if necessary. + + + , + } + } + />

      @@ -123,7 +142,11 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = ` size="s" type="button" > - Cancel + - Confirm all changes + @@ -153,7 +180,13 @@ exports[`Flyout conflicts should handle errors 1`] = ` color="danger" iconType="cross" size="m" - title="Sorry, there was an error" + title={ + + } >

      foobar @@ -175,9 +208,14 @@ exports[`Flyout should render import step 1`] = ` >

      - Import saved objects +

      @@ -187,11 +225,23 @@ exports[`Flyout should render import step 1`] = ` describedByIds={Array []} fullWidth={false} hasEmptyLabelSpace={false} - label="Please select a JSON file to import" + label={ + + } > + } onChange={[Function]} /> @@ -203,7 +253,13 @@ exports[`Flyout should render import step 1`] = ` + } name="overwriteAll" onChange={[Function]} /> @@ -231,7 +287,11 @@ exports[`Flyout should render import step 1`] = ` size="s" type="button" > - Cancel + - Import + diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js index 68b7d46b18160..15ba70fa93b84 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/__jest__/flyout.test.js @@ -18,7 +18,7 @@ */ import React from 'react'; -import { shallow } from 'enzyme'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; import { Flyout } from '../flyout'; @@ -50,6 +50,8 @@ jest.mock('../../../../../lib/resolve_saved_objects', () => ({ saveObjects: jest.fn(), })); +jest.mock('ui/notify', () => ({})); + const defaultProps = { close: jest.fn(), done: jest.fn(), @@ -66,7 +68,7 @@ const mockFile = { describe('Flyout', () => { it('should render import step', async () => { - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); @@ -77,7 +79,7 @@ describe('Flyout', () => { }); it('should toggle the overwrite all control', async () => { - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); @@ -90,7 +92,7 @@ describe('Flyout', () => { }); it('should allow picking a file', async () => { - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); @@ -104,7 +106,7 @@ describe('Flyout', () => { it('should handle invalid files', async () => { const { importFile } = require('../../../../../lib/import_file'); - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); @@ -183,7 +185,7 @@ describe('Flyout', () => { }); it('should figure out conflicts', async () => { - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); @@ -226,7 +228,7 @@ describe('Flyout', () => { }); it('should allow conflict resolution', async () => { - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); @@ -270,7 +272,7 @@ describe('Flyout', () => { }); it('should handle errors', async () => { - const component = shallow(); + const component = shallowWithIntl(); // Ensure all promises resolve await new Promise(resolve => process.nextTick(resolve)); diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js index f70177c341039..6610b764589c3 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/flyout/flyout.js @@ -50,8 +50,9 @@ import { saveObjects, } from '../../../../lib/resolve_saved_objects'; import { INCLUDED_TYPES } from '../../objects_table'; +import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -export class Flyout extends Component { +class FlyoutUI extends Component { static propTypes = { close: PropTypes.func.isRequired, done: PropTypes.func.isRequired, @@ -102,7 +103,7 @@ export class Flyout extends Component { }; import = async () => { - const { services, indexPatterns } = this.props; + const { services, indexPatterns, intl } = this.props; const { file, isOverwriteAllChecked } = this.state; this.setState({ isLoading: true, error: undefined }); @@ -114,7 +115,10 @@ export class Flyout extends Component { } catch (e) { this.setState({ isLoading: false, - error: 'The file could not be processed.', + error: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.importFileErrorMessage', + defaultMessage: 'The file could not be processed.', + }), }); return; } @@ -122,7 +126,10 @@ export class Flyout extends Component { if (!Array.isArray(contents)) { this.setState({ isLoading: false, - error: 'Saved objects file format is invalid and cannot be imported.', + error: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage', + defaultMessage: 'Saved objects file format is invalid and cannot be imported.', + }), }); return; } @@ -211,7 +218,7 @@ export class Flyout extends Component { failedImports } = this.state; - const { services, indexPatterns } = this.props; + const { services, indexPatterns, intl } = this.props; this.setState({ error: undefined, @@ -226,7 +233,12 @@ export class Flyout extends Component { const resolutions = this.resolutions; // Do not Promise.all these calls as the order matters - this.setState({ loadingMessage: 'Resolving conflicts...' }); + this.setState({ + loadingMessage: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.confirmImport.resolvingConflictsLoadingMessage', + defaultMessage: 'Resolving conflicts…', + }), + }); if (resolutions.length) { importCount += await resolveIndexPatternConflicts( resolutions, @@ -234,13 +246,21 @@ export class Flyout extends Component { isOverwriteAllChecked ); } - this.setState({ loadingMessage: 'Saving conflicts...' }); + this.setState({ + loadingMessage: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.confirmImport.savingConflictsLoadingMessage', + defaultMessage: 'Saving conflicts…', + }), + }); importCount += await saveObjects( conflictedSavedObjectsLinkedToSavedSearches, isOverwriteAllChecked ); this.setState({ - loadingMessage: 'Ensure saved searches are linked properly...', + loadingMessage: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.confirmImport.savedSearchAreLinkedProperlyLoadingMessage', + defaultMessage: 'Ensure saved searches are linked properly…', + }), }); importCount += await resolveSavedSearches( conflictedSearchDocs, @@ -249,7 +269,10 @@ export class Flyout extends Component { isOverwriteAllChecked ); this.setState({ - loadingMessage: 'Retrying failed objects...', + loadingMessage: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.confirmImport.retryingFailedObjectsLoadingMessage', + defaultMessage: 'Retrying failed objects…', + }), }); importCount += await saveObjects( failedImports.map(({ obj }) => obj), @@ -293,6 +316,7 @@ export class Flyout extends Component { renderConflicts() { const { conflicts } = this.state; + const { intl } = this.props; if (!conflicts) { return null; @@ -301,22 +325,40 @@ export class Flyout extends Component { const columns = [ { field: 'existingIndexPatternId', - name: 'ID', - description: `ID of the index pattern`, + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdName', + defaultMessage: 'ID', + }), + description: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnIdDescription', + defaultMessage: 'ID of the index pattern', + }), sortable: true, }, { field: 'list', - name: 'Count', - description: `How many affected objects`, + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountName', + defaultMessage: 'Count', + }), + description: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnCountDescription', + defaultMessage: 'How many affected objects', + }), render: list => { return {list.length}; }, }, { field: 'list', - name: 'Sample of affected objects', - description: `Sample of affected objects`, + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsName', + defaultMessage: 'Sample of affected objects', + }), + description: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnSampleOfAffectedObjectsDescription', + defaultMessage: 'Sample of affected objects', + }), render: list => { return (
        @@ -327,7 +369,10 @@ export class Flyout extends Component { }, { field: 'existingIndexPatternId', - name: 'New index pattern', + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.flyout.renderConflicts.columnNewIndexPatternName', + defaultMessage: 'New index pattern', + }), render: id => { const options = this.state.indexPatterns.map(indexPattern => ({ text: indexPattern.get('title'), @@ -374,7 +419,9 @@ export class Flyout extends Component { return ( + )} color="danger" iconType="cross" > @@ -412,12 +459,18 @@ export class Flyout extends Component { if (failedImports.length && !this.hasConflicts) { return ( + )} color="warning" iconType="help" >

        - Failed to import {failedImports.length} of {importCount + failedImports.length} objects. +

        {failedImports.map(({ error }) => getField(error, 'body.message', error.message || '')).join(' ')} @@ -431,7 +484,12 @@ export class Flyout extends Component { return ( + )} color="primary" /> ); @@ -440,11 +498,22 @@ export class Flyout extends Component { return ( + )} color="success" iconType="check" > -

        Successfully imported {importCount} objects.

        +

        + +

        ); } @@ -455,16 +524,33 @@ export class Flyout extends Component { return ( - + + )} + > + )} onChange={this.setImportFile} /> + )} data-test-subj="importSavedObjectsOverwriteToggle" checked={isOverwriteAllChecked} onChange={this.changeOverwriteAll} @@ -488,7 +574,10 @@ export class Flyout extends Component { fill data-test-subj="importSavedObjectsDoneBtn" > - Done + ); } else if (this.hasConflicts) { @@ -500,7 +589,10 @@ export class Flyout extends Component { isLoading={isLoading} data-test-subj="importSavedObjectsConfirmBtn" > - Confirm all changes + ); } else { @@ -512,7 +604,10 @@ export class Flyout extends Component { isLoading={isLoading} data-test-subj="importSavedObjectsImportBtn" > - Import + ); } @@ -521,7 +616,10 @@ export class Flyout extends Component { - Cancel + {confirmButton} @@ -542,20 +640,32 @@ export class Flyout extends Component { + )} color="warning" iconType="help" >

        - The following saved objects use index patterns that do not exist. - Please select the index patterns you'd like re-associated with - them. You can{' '} - { - - create a new index pattern - - }{' '} - if necessary. + + + + ) + }} + />

        @@ -569,7 +679,12 @@ export class Flyout extends Component { -

        Import saved objects

        +

        + +

        {this.renderSubheader()}
        @@ -584,3 +699,5 @@ export class Flyout extends Component { ); } } + +export const Flyout = injectI18n(FlyoutUI); diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap index 8404ebc156f4b..ccb4101cb16f0 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/__jest__/__snapshots__/header.test.js.snap @@ -17,9 +17,14 @@ exports[`Header should render normally 1`] = ` >

        - Saved Objects +

        @@ -49,10 +54,15 @@ exports[`Header should render normally 1`] = ` size="s" type="button" > - Export - 2 - - objects + - Import + - Refresh +
        @@ -94,13 +112,18 @@ exports[`Header should render normally 1`] = ` />

        - From here you can delete saved objects, such as saved searches. You can also edit the raw data of saved objects. Typically objects are only modified via their associated application, which is probably what you should use instead of this screen. +

        diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js index 2ac10addbd4a2..a901af6413fe5 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/header/header.js @@ -29,6 +29,7 @@ import { EuiTextColor, EuiButtonEmpty, } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export const Header = ({ onExportAll, @@ -40,7 +41,12 @@ export const Header = ({ -

        Saved Objects

        +

        + +

        @@ -53,7 +59,13 @@ export const Header = ({ data-test-subj="exportAllObjects" onClick={onExportAll} > - Export {filteredCount} {filteredCount === 1 ? 'object' : 'objects'} + @@ -63,7 +75,10 @@ export const Header = ({ data-test-subj="importObjects" onClick={onImport} > - Import + @@ -72,7 +87,10 @@ export const Header = ({ iconType="refresh" onClick={onRefresh} > - Refresh +
        @@ -82,10 +100,13 @@ export const Header = ({

        - From here you can delete saved objects, such as saved searches. - You can also edit the raw data of saved objects. - Typically objects are only modified via their associated application, - which is probably what you should use instead of this screen. +

        diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap index 9f76af78a1000..44b2bbdfe3384 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/__snapshots__/relationships.test.js.snap @@ -14,6 +14,7 @@ exports[`Relationships should render dashboards normally 1`] = ` >

        + } >

        - Here are some visualizations used on this dashboard. You can - safely delete this dashboard and the visualizations will still - work properly. +

        @@ -65,8 +74,8 @@ exports[`Relationships should render dashboards normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", @@ -120,6 +129,7 @@ exports[`Relationships should render errors 1`] = ` >

        + } > foo @@ -164,6 +180,7 @@ exports[`Relationships should render index patterns normally 1`] = ` >

        - - - - -

        - Here are some saved searches that use this index pattern. If - you delete this index pattern, these saved searches will not - longer work properly. -

        -
        -
        - -
        - - - -

        - Here are some visualizations that use this index pattern. If - you delete this index pattern, these visualizations will not - longer work properly. -

        -
        -
        - -
        -
        +
        `; @@ -326,6 +221,7 @@ exports[`Relationships should render searches normally 1`] = ` >

        + } >

        - Here is the index pattern tied to this saved search. +

        @@ -375,8 +281,8 @@ exports[`Relationships should render searches normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", @@ -421,12 +327,20 @@ exports[`Relationships should render searches normally 1`] = ` + } >

        - Here are some visualizations that use this saved search. If - you delete this saved search, these visualizations will not - longer work properly. +

        @@ -434,8 +348,8 @@ exports[`Relationships should render searches normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", @@ -486,6 +400,7 @@ exports[`Relationships should render visualizations normally 1`] = ` >

        + } >

        - Here are some dashboards which contain this visualization. If - you delete this visualization, these dashboards will no longer - show them. +

        @@ -537,8 +460,8 @@ exports[`Relationships should render visualizations normally 1`] = ` columns={ Array [ Object { - "name": "Type", "render": [Function], + "width": 24, }, Object { "field": "title", diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js index 6e1e591fa9a9b..9eb269ea46440 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js @@ -18,7 +18,7 @@ */ import React from 'react'; -import { shallow } from 'enzyme'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; jest.mock('ui/errors', () => ({ SavedObjectNotFound: class SavedObjectNotFound extends Error { @@ -62,8 +62,8 @@ describe('Relationships', () => { close: jest.fn(), }; - const component = shallow( - ); @@ -102,8 +102,8 @@ describe('Relationships', () => { close: jest.fn(), }; - const component = shallow( - ); @@ -140,8 +140,8 @@ describe('Relationships', () => { close: jest.fn(), }; - const component = shallow( - ); @@ -178,8 +178,8 @@ describe('Relationships', () => { close: jest.fn(), }; - const component = shallow( - ); @@ -209,8 +209,8 @@ describe('Relationships', () => { close: jest.fn(), }; - const component = shallow( - ); diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js index 708a260ebbd43..c73f77d2687c9 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/relationships.js @@ -34,9 +34,10 @@ import { EuiInMemoryTable, EuiToolTip } from '@elastic/eui'; +import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; import { getSavedObjectIcon, getSavedObjectLabel } from '../../../../lib'; -export class Relationships extends Component { +class RelationshipsUI extends Component { static propTypes = { getRelationships: PropTypes.func.isRequired, id: PropTypes.string.isRequired, @@ -88,14 +89,19 @@ export class Relationships extends Component { } return ( - + + )} + color="danger" + > {error} ); } renderRelationships() { - const { getEditUrl, goInApp } = this.props; + const { getEditUrl, goInApp, intl } = this.props; const { relationships, isLoading, error } = this.state; if (error) { @@ -112,48 +118,78 @@ export class Relationships extends Component { if (list.length === 0) { items.push( - No {type} found. + ); } else { // let node; - let calloutTitle = 'Warning'; + let calloutTitle = (); let calloutColor = 'warning'; let calloutText; switch (this.props.type) { case 'dashboard': calloutColor = 'success'; - calloutTitle = 'Dashboard'; - calloutText = `Here are some visualizations used on this dashboard. You can - safely delete this dashboard and the visualizations will still - work properly.`; + calloutTitle = (); + calloutText = (); break; case 'search': if (type === 'visualizations') { - calloutText = `Here are some visualizations that use this saved search. If - you delete this saved search, these visualizations will not - longer work properly.`; + calloutText = (); } else { calloutColor = 'success'; - calloutTitle = 'Saved Search'; - calloutText = `Here is the index pattern tied to this saved search.`; + calloutTitle = (); + calloutText = (); } break; case 'visualization': - calloutText = `Here are some dashboards which contain this visualization. If - you delete this visualization, these dashboards will no longer - show them.`; + calloutText = (); break; case 'index-pattern': if (type === 'visualizations') { - calloutText = `Here are some visualizations that use this index pattern. If - you delete this index pattern, these visualizations will not - longer work properly.`; + calloutText = (); } else if (type === 'searches') { - calloutText = `Here are some saved searches that use this index pattern. If - you delete this index pattern, these saved searches will not - longer work properly.`; + calloutText = (); } break; } @@ -169,7 +205,7 @@ export class Relationships extends Component { items={list} columns={[ { - name: 'Type', + width: 24, render: () => ( ( @@ -193,11 +231,19 @@ export class Relationships extends Component { ), }, { - name: 'Actions', + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.relationships.columnActionsName', defaultMessage: 'Actions' + }), actions: [ { - name: 'In app', - description: 'View this saved object within Kibana', + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.relationships.columnActions.inAppName', + defaultMessage: 'In app' + }), + description: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.relationships.columnActions.inAppDescription', + defaultMessage: 'View this saved object within Kibana' + }), icon: 'eye', onClick: object => goInApp(object.id, type), }, @@ -240,3 +286,5 @@ export class Relationships extends Component { ); } } + +export const Relationships = injectI18n(RelationshipsUI); diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap index abd8ee272608f..d3ca955a95a54 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/__snapshots__/table.test.js.snap @@ -3,6 +3,11 @@ exports[`Table should render normally 1`] = ` - Delete + , - Export + , ] } diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js index 7a6d9f8296586..1228667a647f5 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/__jest__/table.test.js @@ -18,7 +18,9 @@ */ import React from 'react'; -import { shallow } from 'enzyme'; +import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers'; +import { findTestSubject } from '@elastic/eui/lib/test'; +import { keyCodes } from '@elastic/eui/lib/services'; jest.mock('ui/errors', () => ({ SavedObjectNotFound: class SavedObjectNotFound extends Error { @@ -39,37 +41,62 @@ jest.mock('ui/chrome', () => ({ import { Table } from '../table'; +const defaultProps = { + selectedSavedObjects: [1], + selectionConfig: { + onSelectionChange: () => {}, + }, + filterOptions: [{ value: 2 }], + onDelete: () => {}, + onExport: () => {}, + getEditUrl: () => {}, + goInApp: () => {}, + pageIndex: 1, + pageSize: 2, + items: [3], + itemId: 'id', + totalItemCount: 3, + onQueryChange: () => {}, + onTableChange: () => {}, + isSearching: false, + onShowRelationships: () => {}, +}; + describe('Table', () => { it('should render normally', () => { - const props = { - selectedSavedObjects: [1], - selectionConfig: { - onSelectionChange: () => {}, - }, - filterOptions: [{ value: 2 }], - onDelete: () => {}, - onExport: () => {}, - getEditUrl: () => {}, - goInApp: () => {}, + const component = shallowWithIntl( + + ); - pageIndex: 1, - pageSize: 2, - items: [3], - itemId: 'id', - totalItemCount: 3, - onQueryChange: () => {}, - onTableChange: () => {}, - isSearching: false, + expect(component).toMatchSnapshot(); + }); - onShowRelationships: () => {}, + it('should handle query parse error', () => { + const onQueryChangeMock = jest.fn(); + const customizedProps = { + ...defaultProps, + onQueryChange: onQueryChangeMock }; - const component = shallow( -

      ); + const searchBar = findTestSubject(component, 'savedObjectSearchBar'); - expect(component).toMatchSnapshot(); + // Send invalid query + searchBar.simulate('keyup', { keyCode: keyCodes.ENTER, target: { value: '?' } }); + expect(onQueryChangeMock).toHaveBeenCalledTimes(0); + expect(component.state().isSearchTextValid).toBe(false); + + onQueryChangeMock.mockReset(); + + // Send valid query to ensure component can recover from invalid query + searchBar.simulate('keyup', { keyCode: keyCodes.ENTER, target: { value: 'I am valid' } }); + expect(onQueryChangeMock).toHaveBeenCalledTimes(1); + expect(component.state().isSearchTextValid).toBe(true); }); }); diff --git a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js index f9a5dab7fef9b..09ba15cc16b4b 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js +++ b/src/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/table/table.js @@ -27,11 +27,13 @@ import { EuiIcon, EuiLink, EuiSpacer, - EuiToolTip + EuiToolTip, + EuiFormErrorText } from '@elastic/eui'; import { getSavedObjectLabel, getSavedObjectIcon } from '../../../../lib'; +import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -export class Table extends PureComponent { +class TableUI extends PureComponent { static propTypes = { selectedSavedObjects: PropTypes.array.isRequired, selectionConfig: PropTypes.shape({ @@ -60,6 +62,27 @@ export class Table extends PureComponent { onShowRelationships: PropTypes.func.isRequired, }; + state = { + isSearchTextValid: true, + parseErrorMessage: null, + } + + onChange = ({ query, error }) => { + if (error) { + this.setState({ + isSearchTextValid: false, + parseErrorMessage: error.message, + }); + return; + } + + this.setState({ + isSearchTextValid: true, + parseErrorMessage: null, + }); + this.props.onQueryChange({ query }); + } + render() { const { pageIndex, @@ -73,11 +96,11 @@ export class Table extends PureComponent { onDelete, onExport, selectedSavedObjects, - onQueryChange, onTableChange, goInApp, getEditUrl, onShowRelationships, + intl, } = this.props; const pagination = { @@ -91,7 +114,7 @@ export class Table extends PureComponent { { type: 'field_value_selection', field: 'type', - name: 'Type', + name: intl.formatMessage({ id: 'kbn.management.objects.objectsTable.table.typeFilterName', defaultMessage: 'Type' }), multiSelect: 'or', options: filterOptions, }, @@ -108,10 +131,13 @@ export class Table extends PureComponent { const columns = [ { field: 'type', - name: 'Type', + name: intl.formatMessage({ id: 'kbn.management.objects.objectsTable.table.columnTypeName', defaultMessage: 'Type' }), width: '50px', align: 'center', - description: `Type of the saved object`, + description: + intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.table.columnTypeDescription', defaultMessage: 'Type of the saved object' + }), sortable: false, render: type => { return ( @@ -130,8 +156,11 @@ export class Table extends PureComponent { }, { field: 'title', - name: 'Title', - description: `Title of the saved object`, + name: intl.formatMessage({ id: 'kbn.management.objects.objectsTable.table.columnTitleName', defaultMessage: 'Title' }), + description: + intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.table.columnTitleDescription', defaultMessage: 'Title of the saved object' + }), dataType: 'string', sortable: false, render: (title, object) => ( @@ -139,20 +168,32 @@ export class Table extends PureComponent { ), }, { - name: 'Actions', + name: intl.formatMessage({ id: 'kbn.management.objects.objectsTable.table.columnActionsName', defaultMessage: 'Actions' }), actions: [ { - name: 'In app', + name: intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.table.columnActions.viewInAppActionName', defaultMessage: 'In app' + }), description: - 'View this saved object within Kibana', + intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.table.columnActions.viewInAppActionDescription', + defaultMessage: 'View this saved object within Kibana' + }), type: 'icon', icon: 'eye', onClick: object => goInApp(object.id, object.type), }, { - name: 'Relationships', + name: + intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionName', + defaultMessage: 'Relationships' + }), description: - 'View the relationships this saved object has to other saved objects', + intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.table.columnActions.viewRelationshipsActionDescription', + defaultMessage: 'View the relationships this saved object has to other saved objects' + }), type: 'icon', icon: 'kqlSelector', onClick: object => @@ -162,11 +203,25 @@ export class Table extends PureComponent { }, ]; + let queryParseError; + if (!this.state.isSearchTextValid) { + const parseErrorMsg = intl.formatMessage({ + id: 'kbn.management.objects.objectsTable.searchBar.unableToParseQueryErrorMessage', + defaultMessage: 'Unable to parse query', + }); + queryParseError = ( + + {`${parseErrorMsg}. ${this.state.parseErrorMessage}`} + + ); + } + return ( - Delete + , - Export + , ]} /> + {queryParseError}
      { const { queryText, visibleTypes } = parseQuery(this.state.activeQuery); @@ -150,51 +157,68 @@ export class ObjectsTable extends Component { })); }; - fetchSavedObjects = async () => { - const { savedObjectsClient } = this.props; - const { activeQuery, page, perPage } = this.state; - - this.setState({ isSearching: true }); + fetchSavedObjects = () => { + this.setState({ + isSearching: true, + }, this.debouncedFetch); + } - const { queryText, visibleTypes } = parseQuery(activeQuery); + debouncedFetch = debounce(async () => { + const { savedObjectsClient } = this.props; + const { activeQuery: query, page, perPage } = this.state; + const { queryText, visibleTypes } = parseQuery(query); + const findOptions = { + search: queryText ? `${queryText}*` : undefined, + perPage, + page: page + 1, + fields: ['title', 'id'], + searchFields: ['title'], + type: INCLUDED_TYPES.filter( + type => !visibleTypes || visibleTypes.includes(type) + ), + }; + if (findOptions.type.length > 1) { + findOptions.sortField = 'type'; + } - let savedObjects = []; - let filteredItemCount = 0; + let resp; + try { + resp = await savedObjectsClient.find(findOptions); + } catch (error) { + if (this._isMounted) { + this.setState({ + isSearching: false, + }); + } + toastNotifications.addDanger({ + title: `Unable find saved objects`, + text: `${error}`, + }); + return; + } - const type = INCLUDED_TYPES.filter( - type => !visibleTypes || visibleTypes.includes(type) - ); + if (!this._isMounted) { + return; + } - // TODO: is there a good way to stop existing calls if the input changes? - await ensureMinimumTime( - (async () => { - const filteredSavedObjects = await savedObjectsClient.find({ - search: queryText ? `${queryText}*` : undefined, - perPage, - page: page + 1, - sortField: 'type', - fields: ['title', 'id'], - searchFields: ['title'], - type, - }); + this.setState(({ activeQuery }) => { + // ignore results for old requests + if (activeQuery.text !== query.text) { + return {}; + } - savedObjects = filteredSavedObjects.savedObjects.map(savedObject => ({ + return { + savedObjects: resp.savedObjects.map(savedObject => ({ title: savedObject.attributes.title, type: savedObject.type, id: savedObject.id, icon: getSavedObjectIcon(savedObject.type), - })); - - filteredItemCount = filteredSavedObjects.total; - })() - ); - - this.setState({ - savedObjects, - filteredItemCount, - isSearching: false, + })), + filteredItemCount: resp.total, + isSearching: false, + }; }); - }; + }, 300); refreshData = async () => { await Promise.all([this.fetchSavedObjects(), this.fetchCounts()]); @@ -383,6 +407,7 @@ export class ObjectsTable extends Component { isDeleting, selectedSavedObjects, } = this.state; + const { intl } = this.props; if (!isShowingDeleteConfirmModal) { return null; @@ -406,20 +431,47 @@ export class ObjectsTable extends Component { modal = ( + } onCancel={onCancel} onConfirm={onConfirm} - cancelButtonText="Cancel" - confirmButtonText={isDeleting ? 'Deleting...' : 'Delete'} + cancelButtonText={( + + )} + confirmButtonText={ + isDeleting + ? () + : () + } defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON} > -

      This action will delete the following saved objects:

      +

      + +

      ( )} onCancel={() => this.setState({ isShowingExportAllOptionsModal: false }) } onConfirm={this.onExportAll} - cancelButtonText="Cancel" - confirmButtonText="Export All" + cancelButtonText={( + + )} + confirmButtonText={( + + )} defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON} >

      - Select which types to export. The number in parentheses indicates - how many of this type are available to export. +

      - + {this.renderFlyout()} {this.renderRelationships()} {this.renderDeleteConfirmModal()} @@ -560,3 +634,5 @@ export class ObjectsTable extends Component { ); } } + +export const ObjectsTable = injectI18n(ObjectsTableUI); diff --git a/src/core_plugins/kibana/public/management/sections/objects/index.js b/src/core_plugins/kibana/public/management/sections/objects/index.js index b5deddc00e316..6cb8ef88aae7d 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/index.js +++ b/src/core_plugins/kibana/public/management/sections/objects/index.js @@ -17,6 +17,7 @@ * under the License. */ +import { i18n } from '@kbn/i18n'; import { management } from 'ui/management'; import './_view'; import './_objects'; @@ -29,7 +30,9 @@ import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/r uiModules.get('apps/management'); management.getSection('kibana').register('objects', { - display: 'Saved Objects', + display: i18n.translate('kbn.management.objects.savedObjectsSectionLabel', { + defaultMessage: 'Saved Objects', + }), order: 10, url: '#/management/kibana/objects' }); @@ -37,8 +40,12 @@ management.getSection('kibana').register('objects', { FeatureCatalogueRegistryProvider.register(() => { return { id: 'saved_objects', - title: 'Saved Objects', - description: 'Import, export, and manage your saved searches, visualizations, and dashboards.', + title: i18n.translate('kbn.management.objects.savedObjectsTitle', { + defaultMessage: 'Saved Objects', + }), + description: i18n.translate('kbn.management.objects.savedObjectsDescription', { + defaultMessage: 'Import, export, and manage your saved searches, visualizations, and dashboards.', + }), icon: 'savedObjectsApp', path: '/app/kibana#/management/kibana/objects', showOnHomePage: true, diff --git a/src/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.js b/src/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.js index bf2e91625c26c..952037a8b5374 100644 --- a/src/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.js +++ b/src/core_plugins/kibana/public/management/sections/objects/lib/resolve_saved_objects.js @@ -18,6 +18,7 @@ */ import { SavedObjectNotFound } from 'ui/errors'; +import { i18n } from '@kbn/i18n'; async function getSavedObject(doc, services) { const service = services.find(service => service.type === doc._type); @@ -36,22 +37,43 @@ function addJsonFieldToIndexPattern(target, sourceString, fieldName, indexName) try { target[fieldName] = JSON.parse(sourceString); } catch (error) { - throw new Error(`Error encountered parsing ${fieldName} for index pattern ${indexName}: ${error.message}`); + throw new Error( + i18n.translate('kbn.management.objects.parsingFieldErrorMessage', { + defaultMessage: 'Error encountered parsing {fieldName} for index pattern {indexName}: {errorMessage}', + values: { + fieldName, + indexName, + errorMessage: error.message, + } + }), + ); } } } async function importIndexPattern(doc, indexPatterns, overwriteAll) { // TODO: consolidate this is the code in create_index_pattern_wizard.js const emptyPattern = await indexPatterns.get(); - const { title, timeFieldName, fields, fieldFormatMap, sourceFilters } = doc._source; + const { + title, + timeFieldName, + fields, + fieldFormatMap, + sourceFilters, + type, + typeMeta, + } = doc._source; const importedIndexPattern = { id: doc._id, title, - timeFieldName + timeFieldName, }; + if (type) { + importedIndexPattern.type = type; + } addJsonFieldToIndexPattern(importedIndexPattern, fields, 'fields', title); addJsonFieldToIndexPattern(importedIndexPattern, fieldFormatMap, 'fieldFormatMap', title); addJsonFieldToIndexPattern(importedIndexPattern, sourceFilters, 'sourceFilters', title); + addJsonFieldToIndexPattern(importedIndexPattern, typeMeta, 'typeMeta', title); Object.assign(emptyPattern, importedIndexPattern); const newId = await emptyPattern.create(true, !overwriteAll); @@ -118,14 +140,11 @@ export async function resolveIndexPatternConflicts( export async function saveObjects(objs, overwriteAll) { let importCount = 0; - await awaitEachItemInParallel( - objs, - async obj => { - if (await saveObject(obj, overwriteAll)) { - importCount++; - } + await awaitEachItemInParallel(objs, async obj => { + if (await saveObject(obj, overwriteAll)) { + importCount++; } - ); + }); return importCount; } @@ -133,12 +152,7 @@ export async function saveObject(obj, overwriteAll) { return await obj.save({ confirmOverwrite: !overwriteAll }); } -export async function resolveSavedSearches( - savedSearches, - services, - indexPatterns, - overwriteAll -) { +export async function resolveSavedSearches(savedSearches, services, indexPatterns, overwriteAll) { let importCount = 0; await awaitEachItemInParallel(savedSearches, async searchDoc => { const obj = await getSavedObject(searchDoc, services); @@ -153,12 +167,7 @@ export async function resolveSavedSearches( return importCount; } -export async function resolveSavedObjects( - savedObjects, - overwriteAll, - services, - indexPatterns -) { +export async function resolveSavedObjects(savedObjects, overwriteAll, services, indexPatterns) { const docTypes = groupByType(savedObjects); // Keep track of how many we actually import because the user @@ -166,19 +175,20 @@ export async function resolveSavedObjects( let importedObjectCount = 0; const failedImports = []; // Start with the index patterns since everything is dependent on them - await awaitEachItemInParallel( - docTypes.indexPatterns, - async indexPatternDoc => { - try { - const importedIndexPatternId = await importIndexPattern(indexPatternDoc, indexPatterns, overwriteAll); - if (importedIndexPatternId) { - importedObjectCount++; - } - } catch (error) { - failedImports.push({ indexPatternDoc, error }); + await awaitEachItemInParallel(docTypes.indexPatterns, async indexPatternDoc => { + try { + const importedIndexPatternId = await importIndexPattern( + indexPatternDoc, + indexPatterns, + overwriteAll + ); + if (importedIndexPatternId) { + importedObjectCount++; } + } catch (error) { + failedImports.push({ indexPatternDoc, error }); } - ); + }); // We want to do the same for saved searches, but we want to keep them separate because they need // to be applied _first_ because other saved objects can be dependent on those saved searches existing diff --git a/src/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap index 85abe0571d116..ba88292d8d61d 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/settings/__snapshots__/advanced_settings.test.js.snap @@ -1,36 +1,316 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`AdvancedSettings should render normally 1`] = ` -
      - + - - - - - + + + + + + + + + + + + + - - - - - -
      - -
      +
      + + `; exports[`AdvancedSettings should render specific setting if given setting key 1`] = ` -
      - + - - - - - + + + + + + + + + + + + + - - - - - - - -
      + + + `; diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js index 7ce4341f59ed8..400626f5ae287 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js +++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.js @@ -25,6 +25,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, + EuiPage, Query, } from '@elastic/eui'; @@ -34,10 +35,16 @@ import { Form } from './components/form'; import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib'; -import './advanced_settings.less'; -import { registerDefaultComponents, PAGE_TITLE_COMPONENT, PAGE_FOOTER_COMPONENT } from './components/default_component_registry'; +import { + registerDefaultComponents, + PAGE_TITLE_COMPONENT, + PAGE_SUBTITLE_COMPONENT, + PAGE_FOOTER_COMPONENT +} from './components/default_component_registry'; import { getSettingsComponent } from './components/component_registry'; +import { I18nProvider } from '@kbn/i18n/react'; + export class AdvancedSettings extends Component { static propTypes = { config: PropTypes.object.isRequired, @@ -145,36 +152,42 @@ export class AdvancedSettings extends Component { const { filteredSettings, query, footerQueryMatched } = this.state; const PageTitle = getSettingsComponent(PAGE_TITLE_COMPONENT); + const PageSubtitle = getSettingsComponent(PAGE_SUBTITLE_COMPONENT); const PageFooter = getSettingsComponent(PAGE_FOOTER_COMPONENT); return ( -
      - - - - - - + +
      + + + + + + + + + + + + + - - - - - - - -
      + +
      + + ); } } diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less deleted file mode 100644 index 5201e5781595a..0000000000000 --- a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.less +++ /dev/null @@ -1,30 +0,0 @@ -@import (reference) '~ui/styles/variables/colors'; - -.advancedSettings { - padding: 20px; - background: @globalColorLightestGray; - min-height: calc(~"100vh - 70px"); - - > div { - max-width: 1000px; - margin: 0 auto; - } - - .advancedSettings__field { - + * { - margin-top: 24px; - } - - &__wrapper { - width: 720px; - } - - &__actions { - padding-top: 30px; - } - - .euiFormHelpText { - padding-bottom: 0; - } - } -} diff --git a/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss new file mode 100644 index 0000000000000..fac9b0e22686c --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/settings/advanced_settings.scss @@ -0,0 +1,19 @@ +.mgtAdvancedSettings { + padding: $euiSizeL; + background: $euiColorLightestShade; + min-height: calc(100vh - 70px); + + .mgtAdvancedSettings__field { + + * { + margin-top: $euiSize; + } + + &Wrapper { + width: 640px; + } + + &Actions { + padding-top: $euiSizeM; + } + } +} diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/__snapshots__/call_outs.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/__snapshots__/call_outs.test.js.snap index 07d2370841f96..e333c95f663fb 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/__snapshots__/call_outs.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/__snapshots__/call_outs.test.js.snap @@ -6,10 +6,20 @@ exports[`CallOuts should render normally 1`] = ` color="warning" iconType="bolt" size="m" - title="Caution: You can break stuff here" + title={ + + } >

      - Be careful in here, these settings are for very advanced users only. Tweaks you make here can break large portions of Kibana. Some of these settings may be undocumented, unsupported or experimental. If a field has a default value, blanking the field will reset it to its default which may be unacceptable given other configuration directives. Deleting a custom setting will permanently remove it from Kibana's config. +

      diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js index db9735d12fff6..0016023475632 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/call_outs/call_outs.js @@ -22,22 +22,31 @@ import React from 'react'; import { EuiCallOut, } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export const CallOuts = () => { return (
      + )} color="warning" iconType="bolt" >

      - Be careful in here, these settings are for very advanced users only. - Tweaks you make here can break large portions of Kibana. - Some of these settings may be undocumented, unsupported or experimental. - If a field has a default value, blanking the field will reset it to its default which may be - unacceptable given other configuration directives. - Deleting a custom setting will permanently remove it from Kibana's config. +

      diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.js b/src/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.js index 221f8c2f82bf8..41979d4bd66a6 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/default_component_registry.js @@ -19,12 +19,15 @@ import { tryRegisterSettingsComponent } from './component_registry'; import { PageTitle } from './page_title'; +import { PageSubtitle } from './page_subtitle'; import { PageFooter } from './page_footer'; export const PAGE_TITLE_COMPONENT = 'advanced_settings_page_title'; +export const PAGE_SUBTITLE_COMPONENT = 'advanced_settings_page_subtitle'; export const PAGE_FOOTER_COMPONENT = 'advanced_settings_page_footer'; export function registerDefaultComponents() { tryRegisterSettingsComponent(PAGE_TITLE_COMPONENT, PageTitle); + tryRegisterSettingsComponent(PAGE_SUBTITLE_COMPONENT, PageSubtitle); tryRegisterSettingsComponent(PAGE_FOOTER_COMPONENT, PageFooter); } \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap index ef827f9ca78d3..8d8a93aad3a71 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/settings/components/field/__snapshots__/field.test.js.snap @@ -3,7 +3,7 @@ exports[`Field for array setting should render as read only with help text if overridden 1`] = `
      - Default: - - default_value - + + default_value + , + } + } + /> @@ -69,7 +76,11 @@ exports[`Field for array setting should render as read only with help text if ov grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -99,7 +110,7 @@ exports[`Field for array setting should render as read only with help text if ov exports[`Field for array setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -177,7 +194,7 @@ exports[`Field for array setting should render custom setting icon if it is cust exports[`Field for array setting should render default value if there is no user value set 1`] = `
      - Default: - - default_value - + + default_value + , + } + } + /> @@ -321,7 +345,11 @@ exports[`Field for array setting should render user value if there is user value onClick={[Function]} type="button" > - Reset to default +     @@ -354,7 +382,7 @@ exports[`Field for array setting should render user value if there is user value exports[`Field for boolean setting should render as read only with help text if overridden 1`] = `
      - Default: - - true - + + true + , + } + } + /> @@ -420,7 +455,11 @@ exports[`Field for boolean setting should render as read only with help text if grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -448,7 +487,7 @@ exports[`Field for boolean setting should render as read only with help text if exports[`Field for boolean setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -524,7 +569,7 @@ exports[`Field for boolean setting should render custom setting icon if it is cu exports[`Field for boolean setting should render default value if there is no user value set 1`] = `
      - Default: - - true - + + true + , + } + } + /> @@ -666,7 +718,11 @@ exports[`Field for boolean setting should render user value if there is user val onClick={[Function]} type="button" > - Reset to default +     @@ -697,7 +753,7 @@ exports[`Field for boolean setting should render user value if there is user val exports[`Field for image setting should render as read only with help text if overridden 1`] = `
      - Default: - - null - + + null + , + } + } + /> @@ -763,7 +826,11 @@ exports[`Field for image setting should render as read only with help text if ov grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -790,7 +857,7 @@ exports[`Field for image setting should render as read only with help text if ov exports[`Field for image setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -866,7 +939,7 @@ exports[`Field for image setting should render custom setting icon if it is cust exports[`Field for image setting should render default value if there is no user value set 1`] = `
      - Default: - - null - + + null + , + } + } + /> @@ -1008,7 +1088,11 @@ exports[`Field for image setting should render user value if there is user value onClick={[Function]} type="button" > - Reset to default +     @@ -1020,7 +1104,11 @@ exports[`Field for image setting should render user value if there is user value onClick={[Function]} type="button" > - Change image + @@ -1049,7 +1137,7 @@ exports[`Field for image setting should render user value if there is user value exports[`Field for json setting should render as read only with help text if overridden 1`] = `
      - Default: - - {} - + + {} + , + } + } + /> @@ -1119,7 +1214,11 @@ exports[`Field for json setting should render as read only with help text if ove grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -1165,7 +1264,7 @@ exports[`Field for json setting should render as read only with help text if ove exports[`Field for json setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -1259,7 +1364,7 @@ exports[`Field for json setting should render custom setting icon if it is custo exports[`Field for json setting should render default value if there is no user value set 1`] = `
      - Default: - - {} - + + {} + , + } + } + /> @@ -1334,7 +1446,11 @@ exports[`Field for json setting should render default value if there is no user onClick={[Function]} type="button" > - Reset to default +     @@ -1383,7 +1499,7 @@ exports[`Field for json setting should render default value if there is no user exports[`Field for json setting should render user value if there is user value is set 1`] = `
      - Default: - - {} - + + {} + , + } + } + /> @@ -1458,7 +1581,11 @@ exports[`Field for json setting should render user value if there is user value onClick={[Function]} type="button" > - Reset to default +     @@ -1507,7 +1634,7 @@ exports[`Field for json setting should render user value if there is user value exports[`Field for markdown setting should render as read only with help text if overridden 1`] = `
      - Default: - - null - + + null + , + } + } + /> @@ -1573,7 +1707,11 @@ exports[`Field for markdown setting should render as read only with help text if grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -1619,7 +1757,7 @@ exports[`Field for markdown setting should render as read only with help text if exports[`Field for markdown setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -1713,7 +1857,7 @@ exports[`Field for markdown setting should render custom setting icon if it is c exports[`Field for markdown setting should render default value if there is no user value set 1`] = `
      - Default: - - null - + + null + , + } + } + /> @@ -1873,7 +2024,11 @@ exports[`Field for markdown setting should render user value if there is user va onClick={[Function]} type="button" > - Reset to default +     @@ -1922,7 +2077,7 @@ exports[`Field for markdown setting should render user value if there is user va exports[`Field for number setting should render as read only with help text if overridden 1`] = `
      - Default: - - 5 - + + 5 + , + } + } + /> @@ -1988,7 +2150,11 @@ exports[`Field for number setting should render as read only with help text if o grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -2018,7 +2184,7 @@ exports[`Field for number setting should render as read only with help text if o exports[`Field for number setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -2096,7 +2268,7 @@ exports[`Field for number setting should render custom setting icon if it is cus exports[`Field for number setting should render default value if there is no user value set 1`] = `
      - Default: - - 5 - + + 5 + , + } + } + /> @@ -2240,7 +2419,11 @@ exports[`Field for number setting should render user value if there is user valu onClick={[Function]} type="button" > - Reset to default +     @@ -2273,7 +2456,7 @@ exports[`Field for number setting should render user value if there is user valu exports[`Field for select setting should render as read only with help text if overridden 1`] = `
      - Default: - - orange - + + orange + , + } + } + /> @@ -2339,7 +2529,11 @@ exports[`Field for select setting should render as read only with help text if o grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -2386,7 +2580,7 @@ exports[`Field for select setting should render as read only with help text if o exports[`Field for select setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -2481,7 +2681,7 @@ exports[`Field for select setting should render custom setting icon if it is cus exports[`Field for select setting should render default value if there is no user value set 1`] = `
      - Default: - - orange - + + orange + , + } + } + /> @@ -2642,7 +2849,11 @@ exports[`Field for select setting should render user value if there is user valu onClick={[Function]} type="button" > - Reset to default +     @@ -2692,7 +2903,7 @@ exports[`Field for select setting should render user value if there is user valu exports[`Field for string setting should render as read only with help text if overridden 1`] = `
      - Default: - - null - + + null + , + } + } + /> @@ -2758,7 +2976,11 @@ exports[`Field for string setting should render as read only with help text if o grow={true} size="xs" > - This setting is overriden by the Kibana server and can not be changed. + } isInvalid={false} @@ -2788,7 +3010,7 @@ exports[`Field for string setting should render as read only with help text if o exports[`Field for string setting should render custom setting icon if it is custom 1`] = `
      + } type="asterisk" /> @@ -2866,7 +3094,7 @@ exports[`Field for string setting should render custom setting icon if it is cus exports[`Field for string setting should render default value if there is no user value set 1`] = `
      - Default: - - null - + + null + , + } + } + /> @@ -3010,7 +3245,11 @@ exports[`Field for string setting should render user value if there is user valu onClick={[Function]} type="button" > - Reset to default +     diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/field/field.js b/src/core_plugins/kibana/public/management/sections/settings/components/field/field.js index 074445a154e18..54b72c0d2fece 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/field/field.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/field/field.js @@ -49,7 +49,9 @@ import { import { isDefaultValue } from '../../lib'; -export class Field extends PureComponent { +import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; + +class FieldUI extends PureComponent { static propTypes = { setting: PropTypes.object.isRequired, @@ -141,7 +143,11 @@ export class Field extends PureComponent { JSON.parse(newUnsavedValue); } catch (e) { isInvalid = true; - error = 'Invalid JSON syntax'; + error = ( + ); } break; default: @@ -208,12 +214,23 @@ export class Field extends PureComponent { const isInvalid = !!(maxSize && maxSize.length && base64Image.length > maxSize.length); this.setState({ isInvalid, - error: isInvalid ? `Image is too large, maximum size is ${maxSize.description}` : null, + error: isInvalid + ? this.props.intl.formattedMessage({ + id: 'kbn.management.settings.field.imageTooLargeErrorMessage', + defaultMessage: 'Image is too large, maximum size is {maxSizeDescription}' + }, { + maxSizeDescription: maxSize.description + }) : null, changeImage: true, unsavedValue: base64Image, }); } catch (err) { - toastNotifications.addDanger('Image could not be saved'); + toastNotifications.addDanger( + this.props.intl.formatMessage({ + id: 'kbn.management.settings.field.imageChangeErrorMessage', + defaultMessage: 'Image could not be saved' + }) + ); this.cancelChangeImage(); } } @@ -299,7 +316,13 @@ export class Field extends PureComponent { this.cancelChangeImage(); } } catch (e) { - toastNotifications.addDanger(`Unable to save ${name}`); + toastNotifications.addDanger( + this.props.intl.formatMessage({ + id: 'kbn.management.settings.field.saveFieldErrorMessage', + defaultMessage: 'Unable to save {name}' + }, + { name }) + ); } this.setLoading(false); } @@ -312,7 +335,13 @@ export class Field extends PureComponent { this.cancelChangeImage(); this.clearError(); } catch (e) { - toastNotifications.addDanger(`Unable to reset ${name}`); + toastNotifications.addDanger( + this.props.intl.formatMessage({ + id: 'kbn.management.settings.field.resetFieldErrorMessage', + defaultMessage: 'Unable to reset {name}' + }, + { name }) + ); } this.setLoading(false); } @@ -432,7 +461,10 @@ export class Field extends PureComponent { if (setting.isOverridden) { return ( - This setting is overriden by the Kibana server and can not be changed. + ); } @@ -457,7 +489,18 @@ export class Field extends PureComponent {

      {setting.displayName || setting.name} {setting.isCustom ? - + )} + /> : ''}

      ); @@ -499,18 +542,31 @@ export class Field extends PureComponent { {type === 'json' ? ( - Default: - = 500 ? 300 : null} - > - {this.getDisplayedDefaultValue(type, defVal)} - + = 500 ? 300 : null} + > + {this.getDisplayedDefaultValue(type, defVal)} + + ) + }} + /> ) : ( - Default: {this.getDisplayedDefaultValue(type, defVal)} + {this.getDisplayedDefaultValue(type, defVal)}), + }} + /> )} @@ -526,11 +582,20 @@ export class Field extends PureComponent { return ( - Reset to default +     @@ -546,11 +611,20 @@ export class Field extends PureComponent { return ( - Change image + ); @@ -560,33 +634,52 @@ export class Field extends PureComponent { const { ariaName, name } = setting; const { loading, isInvalid, changeImage, savedValue, unsavedValue } = this.state; const isDisabled = loading || setting.isOverridden; + const { intl } = this.props; if (savedValue === unsavedValue && !changeImage) { return; } return ( - + - Save + changeImage ? this.cancelChangeImage() : this.cancelEdit()} disabled={isDisabled} data-test-subj={`advancedSetting-cancelEditField-${name}`} > - Cancel + @@ -599,10 +692,10 @@ export class Field extends PureComponent { const { error, isInvalid } = this.state; return ( - + { describe(`for ${type} setting`, () => { it('should render default value if there is no user value set', async () => { - const component = shallow( - { }); it('should render as read only with help text if overridden', async () => { - const component = shallow( - { }); it('should render user value if there is user value is set', async () => { - const component = shallow( - { }); it('should render custom setting icon if it is custom', async () => { - const component = shallow( - { if(type === 'image') { describe(`for changing ${type} setting`, () => { - const component = mount( - { it('should be able to change value from existing value and save', async () => { const newUserValue = `${userValue}=`; - findTestSubject(component, `advancedSetting-changeImage-${setting.name}`).simulate('click'); await component.instance().onImageChange([newUserValue]); component.update(); findTestSubject(component, `advancedSetting-saveEditField-${setting.name}`).simulate('click'); @@ -268,8 +267,8 @@ describe('Field', () => { }); } else if(type === 'markdown' || type === 'json') { describe(`for changing ${type} setting`, () => { - const component = mount( - { }); } else { describe(`for changing ${type} setting`, () => { - const component = mount( - - No settings found - - (Clear search) - + + + , + } + } + /> `; @@ -34,6 +45,7 @@ exports[`Form should render normally 1`] = ` - Search terms are hiding - 9 - settings - - - (clear search) - - + + + + + , + "settingsCount": 9, + } + } + /> diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/form/form.js b/src/core_plugins/kibana/public/management/sections/settings/components/form/form.js index 8c282e4ce7394..da0b46fdf6c9c 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/form/form.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/form/form.js @@ -32,8 +32,9 @@ import { import { getCategoryName } from '../../lib'; import { Field } from '../field'; +import { FormattedMessage, injectI18n } from '@kbn/i18n/react'; -export class Form extends PureComponent { +class FormUI extends PureComponent { static propTypes = { settings: PropTypes.object.isRequired, @@ -52,11 +53,23 @@ export class Form extends PureComponent { return ( - Search terms are hiding {totalSettings - currentSettings} settings {( - - (clear search) - - )} + + + + + + ), + }} + /> ); @@ -100,7 +113,20 @@ export class Form extends PureComponent { if (this.props.showNoResultsMessage) { return ( - No settings found (Clear search) + + + + ), + }} + /> ); } @@ -130,3 +156,5 @@ export class Form extends PureComponent { ); } } + +export const Form = injectI18n(FormUI); diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/form/form.test.js b/src/core_plugins/kibana/public/management/sections/settings/components/form/form.test.js index fddaae79ec44e..eb0b51a6d9ed6 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/form/form.test.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/form/form.test.js @@ -18,7 +18,7 @@ */ import React from 'react'; -import { shallow } from 'enzyme'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; import { Form } from './form'; @@ -75,8 +75,8 @@ const clearQuery = () => { }; describe('Form', () => { it('should render normally', async () => { - const component = shallow( - { }); it('should render no settings message when there are no settings', async () => { - const component = shallow( - { }); it('should not render no settings message when instructed not to', async () => { - const component = shallow( - { it('should render normally', () => { - expect(shallow()).toMatchSnapshot(); + expect(shallowWithIntl()).toMatchSnapshot(); }); }); \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/__snapshots__/page_subtitle.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/__snapshots__/page_subtitle.test.js.snap new file mode 100644 index 0000000000000..24ec895459038 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/__snapshots__/page_subtitle.test.js.snap @@ -0,0 +1,3 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`PageSubtitle should render normally 1`] = `""`; diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/index.js b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/index.js new file mode 100644 index 0000000000000..76b6293b4c267 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/index.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { PageSubtitle } from './page_subtitle'; diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.js b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.js new file mode 100644 index 0000000000000..35485fdc7b492 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export const PageSubtitle = () => null; \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.test.js b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.test.js new file mode 100644 index 0000000000000..cb1e785ac3043 --- /dev/null +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_subtitle/page_subtitle.test.js @@ -0,0 +1,28 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import React from 'react'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; + +import { PageSubtitle } from './page_subtitle'; + +describe('PageSubtitle', () => { + it('should render normally', () => { + expect(shallowWithIntl()).toMatchSnapshot(); + }); +}); \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.js.snap index f93bd34d9312e..11dd3b48d737c 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_title/__snapshots__/page_title.test.js.snap @@ -3,11 +3,16 @@ exports[`PageTitle should render normally 1`] = `

      - Settings +

      `; diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.js b/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.js index d76cb6bc52856..48407faea8cb3 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.js @@ -21,11 +21,17 @@ import React from 'react'; import { EuiText } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export const PageTitle = () => { return ( -

      Settings

      +

      + +

      ); }; \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.test.js b/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.test.js index 0b3edd71764bb..16fa30cd90c0e 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.test.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/page_title/page_title.test.js @@ -17,12 +17,12 @@ * under the License. */ import React from 'react'; -import { shallow } from 'enzyme'; +import { shallowWithIntl } from 'test_utils/enzyme_helpers'; import { PageTitle } from './page_title'; describe('PageTitle', () => { it('should render normally', () => { - expect(shallow()).toMatchSnapshot(); + expect(shallowWithIntl()).toMatchSnapshot(); }); }); \ No newline at end of file diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/search/__snapshots__/search.test.js.snap b/src/core_plugins/kibana/public/management/sections/settings/components/search/__snapshots__/search.test.js.snap index 230721cbaacf0..cdfc62c5134b8 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/search/__snapshots__/search.test.js.snap +++ b/src/core_plugins/kibana/public/management/sections/settings/components/search/__snapshots__/search.test.js.snap @@ -1,58 +1,61 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`Search should render normally 1`] = ` - + + /> + `; diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/search/search.js b/src/core_plugins/kibana/public/management/sections/settings/components/search/search.js index 71275d4db5893..2006839877d5b 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/search/search.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/search/search.js @@ -17,16 +17,18 @@ * under the License. */ -import React, { PureComponent } from 'react'; +import React, { Fragment, PureComponent } from 'react'; import PropTypes from 'prop-types'; +import { injectI18n } from '@kbn/i18n/react'; import { EuiSearchBar, + EuiFormErrorText, } from '@elastic/eui'; import { getCategoryName } from '../../lib'; -export class Search extends PureComponent { +class SearchUI extends PureComponent { static propTypes = { categories: PropTypes.array.isRequired, @@ -45,32 +47,78 @@ export class Search extends PureComponent { }); } + state = { + isSearchTextValid: true, + parseErrorMessage: null, + } + + onChange = ({ query, error }) => { + if (error) { + this.setState({ + isSearchTextValid: false, + parseErrorMessage: error.message, + }); + return; + } + + this.setState({ + isSearchTextValid: true, + parseErrorMessage: null, + }); + this.props.onQueryChange({ query }); + } + render() { - const { query, onQueryChange } = this.props; + const { query, intl } = this.props; const box = { incremental: true, - 'aria-label': 'Search advanced settings' // hack until EuiSearchBar is fixed + 'data-test-subj': 'settingsSearchBar', + 'aria-label': intl.formatMessage({ + id: 'kbn.management.settings.searchBarAriaLabel', + defaultMessage: 'Search advanced settings', + }), // hack until EuiSearchBar is fixed + }; const filters = [ { type: 'field_value_selection', field: 'category', - name: 'Category', + name: intl.formatMessage({ + id: 'kbn.management.settings.categorySearchLabel', + defaultMessage: 'Category', + }), multiSelect: 'or', options: this.categories, } ]; - return ( - + let queryParseError; + if (!this.state.isSearchTextValid) { + const parseErrorMsg = intl.formatMessage({ + id: 'kbn.management.settings.searchBar.unableToParseQueryErrorMessage', + defaultMessage: 'Unable to parse query', + }); + queryParseError = ( + + {`${parseErrorMsg}. ${this.state.parseErrorMessage}`} + + ); + } + return ( + + + {queryParseError} + ); } } + +export const Search = injectI18n(SearchUI); diff --git a/src/core_plugins/kibana/public/management/sections/settings/components/search/search.test.js b/src/core_plugins/kibana/public/management/sections/settings/components/search/search.test.js index a4eadaaa3ed9a..40532605d807a 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/components/search/search.test.js +++ b/src/core_plugins/kibana/public/management/sections/settings/components/search/search.test.js @@ -18,7 +18,9 @@ */ import React from 'react'; -import { shallow, mount } from 'enzyme'; +import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers'; +import { findTestSubject } from '@elastic/eui/lib/test'; + import { Query } from '@elastic/eui'; import { Search } from './search'; @@ -29,8 +31,8 @@ const categories = ['general', 'dashboard', 'hiddenCategory', 'x-pack']; describe('Search', () => { it('should render normally', async () => { const onQueryChange = () => {}; - const component = shallow( - { //This test is brittle as it knows about implementation details // (EuiFieldSearch uses onKeyup instead of onChange to handle input) const onQueryChange = jest.fn(); - const component = mount( - ); - component.find('input').simulate('keyup', { target: { value: 'new filter' } }); + findTestSubject(component, 'settingsSearchBar').simulate('keyup', { target: { value: 'new filter' } }); expect(onQueryChange).toHaveBeenCalledTimes(1); }); + + it('should handle query parse error', async () => { + const onQueryChangeMock = jest.fn(); + const component = mountWithIntl( + + ); + + const searchBar = findTestSubject(component, 'settingsSearchBar'); + + // Send invalid query + searchBar.simulate('keyup', { target: { value: '?' } }); + expect(onQueryChangeMock).toHaveBeenCalledTimes(0); + expect(component.state().isSearchTextValid).toBe(false); + + onQueryChangeMock.mockReset(); + + // Send valid query to ensure component can recover from invalid query + searchBar.simulate('keyup', { target: { value: 'dateFormat' } }); + expect(onQueryChangeMock).toHaveBeenCalledTimes(1); + expect(component.state().isSearchTextValid).toBe(true); + }); }); diff --git a/src/core_plugins/kibana/public/management/sections/settings/index.js b/src/core_plugins/kibana/public/management/sections/settings/index.js index b619c2238b495..384aca303dbde 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/index.js +++ b/src/core_plugins/kibana/public/management/sections/settings/index.js @@ -26,6 +26,7 @@ import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/r import React from 'react'; import { render, unmountComponentAtNode } from 'react-dom'; import { AdvancedSettings } from './advanced_settings'; +import { i18n } from '@kbn/i18n'; const REACT_ADVANCED_SETTINGS_DOM_ELEMENT_ID = 'reactAdvancedSettings'; @@ -75,7 +76,9 @@ uiModules.get('apps/management') }); management.getSection('kibana').register('settings', { - display: 'Advanced Settings', + display: i18n.translate('kbn.management.settings.sectionLabel', { + defaultMessage: 'Advanced Settings', + }), order: 20, url: '#/management/kibana/settings' }); diff --git a/src/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js b/src/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js index d41c4bce089ca..5dc9d8d4ee737 100644 --- a/src/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js +++ b/src/core_plugins/kibana/public/management/sections/settings/lib/get_category_name.js @@ -18,16 +18,33 @@ */ import { StringUtils } from 'ui/utils/string_utils'; +import { i18n } from '@kbn/i18n'; const names = { - general: 'General', - timelion: 'Timelion', - notifications: 'Notifications', - visualizations: 'Visualizations', - discover: 'Discover', - dashboard: 'Dashboard', - reporting: 'Reporting', - search: 'Search', + general: i18n.translate('kbn.management.settings.categoryNames.generalLabel', { + defaultMessage: 'General', + }), + timelion: i18n.translate('kbn.management.settings.categoryNames.timelionLabel', { + defaultMessage: 'Timelion', + }), + notifications: i18n.translate('kbn.management.settings.categoryNames.notificationsLabel', { + defaultMessage: 'Notifications', + }), + visualizations: i18n.translate('kbn.management.settings.categoryNames.visualizationsLabel', { + defaultMessage: 'Visualizations', + }), + discover: i18n.translate('kbn.management.settings.categoryNames.discoverLabel', { + defaultMessage: 'Discover', + }), + dashboard: i18n.translate('kbn.management.settings.categoryNames.dashboardLabel', { + defaultMessage: 'Dashboard', + }), + reporting: i18n.translate('kbn.management.settings.categoryNames.reportingLabel', { + defaultMessage: 'Reporting', + }), + search: i18n.translate('kbn.management.settings.categoryNames.searchLabel', { + defaultMessage: 'Search', + }), }; export function getCategoryName(category) { diff --git a/src/core_plugins/kibana/public/management/styles/main.less b/src/core_plugins/kibana/public/management/styles/main.less deleted file mode 100644 index 783cd1e9cb630..0000000000000 --- a/src/core_plugins/kibana/public/management/styles/main.less +++ /dev/null @@ -1,228 +0,0 @@ -@import (reference) "~ui/styles/theme"; -@import (reference) "~ui/styles/variables"; - -kbn-management-app, -kbn-management-landing, -kbn-management-indices, -kbn-management-indices-edit, -kbn-management-indices-create, -kbn-management-advanced, -kbn-management-objects, -kbn-management-objects-view { - display: block; -} - -.tab-account { - background-color: #FFFFFF; -} - -.tab-management { - background-color: #FFFFFF; -} - -.kbn-management-tab:first-letter { - text-transform: capitalize; -} - -kbn-management-objects { - background: @globalColorLightestGray; - min-height: 100vh; -} - -kbn-management-app { - li.current-page { - font-size: 1.5em; - margin: 0 10px; - } - - min-height: 100vh; -} - -kbn-management-landing { - .management-panel { - margin-bottom: 10px; - - } - - .management-panel__link { - font-size: 17px; - line-height: 32px; - - &.management-panel__link--disabled { - opacity: 0.5; - cursor: default; - - &:hover, &:visited { - color: @kibanaBlue2; - } - } - } - - /** - * 1. Set icon size. - * 2. Hack the panel title to move to the left a bit. - */ - .management-panel__heading-icon { - width: 20px; /* 1 */ - height: 20px; /* 1 */ - background-position: center; - background-repeat: no-repeat; - background-size: contain; /* 1 */ - margin-right: -3px; /* 2 */ - } - - .management-panel__heading-icon--security { - background-image: url("~ui/icons/security-gray.svg"); - } - - .management-panel__heading-icon--elasticsearch { - background-image: url("~ui/icons/elasticsearch-gray.svg"); - } - - .management-panel__heading-icon--kibana { - background-image: url("~ui/icons/kibana-gray.svg"); - } - - .management-panel__heading-icon--beats { - background-image: url("~ui/icons/beats-gray.svg"); - } - - .management-panel__heading-icon--logstash { - background-image: url("~ui/icons/logstash-gray.svg"); - } - -} - -kbn-management-objects { - form { - margin-bottom: @line-height-computed; - } - .list-unstyled { - li { - border-bottom: 1px solid; - border-bottom-color: @management-objects-list-border; - padding: 8px; - } - } - .empty { - color: @management-objects-empty-color; - } - - .item { - padding: 12px; - - .item-title { - margin-left: 30px; - } - - .actions { - margin-top: -6px; - } - } - - .header { - .title, .controls { - padding-right: 1em; - display: inline-block; - } - } -} - -.managementChangeIndexModal { - width: 800px; - overflow: auto; - max-height: 89vh; -} - -kbn-management-advanced { - // super specific rule to override bootstrap's equally specific rule - // https://github.com/twbs/bootstrap/blob/1f329f8f17aa989eabc6e94bdcab93e69ef0e463/less/tables.less#L35 - .table { - table-layout: fixed; - - tbody > tr > td { - vertical-align: middle; - } - } - - .advancedSettingsTableRowImage { - height: 3em; - width: auto; - } - - .advancedSettingsTableRowActionsCell { - max-width: 300px; - } -} - -kbn-management-objects-view { - .ace_editor { height: 300px; } -} - -.advanced-settings { - overflow-x: scroll; - - table { - width: 100%; - - tr.default td.value { - color: @management-advanced-table-default-color; - } - - td { - font-family: @font-family-monospace; - - &.actions { - width: 150px; - } - } - } -} - -.indices-settings { - i.active { - color: @management-indices-active-color; - } - - tr.field-settings { - .field-popularize { - margin-left: 5px; - display: none; - } - &:hover .field-popularize { - display: inline; - } - } -} - -kbn-management-indices { - .fields { - display: block; - table { - .table-striped() - } - - th:last-child, - td:last-child { - text-align: right; - } - } - - .indexed-fields { - th:first-child, - td:first-child { - width: 35%; - } - } - - .scripted-fields header { - margin: 5px 0; - text-align: right; - } - - p.text-center { - padding-top: 1em; - } -} - -@import "~ui/dragula/gu-dragula.less"; diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.html b/src/core_plugins/kibana/public/visualize/editor/editor.html index cc05d1c48ff3e..c73805e4eb678 100644 --- a/src/core_plugins/kibana/public/visualize/editor/editor.html +++ b/src/core_plugins/kibana/public/visualize/editor/editor.html @@ -40,11 +40,10 @@ - + >
      diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js index 489391c82705a..5e4ec07ff5e83 100644 --- a/src/core_plugins/kibana/public/visualize/editor/editor.js +++ b/src/core_plugins/kibana/public/visualize/editor/editor.js @@ -39,7 +39,7 @@ import { DashboardConstants } from '../../dashboard/dashboard_constants'; import { VisualizeConstants } from '../visualize_constants'; import { KibanaParsedUrl } from 'ui/url/kibana_parsed_url'; import { absoluteToParsedUrl } from 'ui/url/absolute_to_parsed_url'; -import { migrateLegacyQuery } from 'ui/utils/migrateLegacyQuery'; +import { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query'; import { recentlyAccessed } from 'ui/persisted_log'; import { timefilter } from 'ui/timefilter'; import { getVisualizeLoader } from '../../../../../ui/public/visualize/loader'; @@ -212,13 +212,13 @@ function VisEditor( description: 'Open Inspector for visualization', testId: 'openInspectorButton', disableButton() { - return !vis.hasInspector(); + return !vis.hasInspector || !vis.hasInspector(); }, run() { vis.openInspector().bindToAngularScope($scope); }, tooltip() { - if (!vis.hasInspector()) { + if (!vis.hasInspector || !vis.hasInspector()) { return 'This visualization doesn\'t support any inspectors.'; } } @@ -416,13 +416,15 @@ function VisEditor( } }); return { id }; - }, (err) => { + }, (error) => { + // eslint-disable-next-line + console.error(error); toastNotifications.addDanger({ title: `Error on saving '${savedVis.title}'`, - text: err.message, + text: error.message, 'data-test-subj': 'saveVisualizationError', }); - return { error: err }; + return { error }; }); } diff --git a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.js b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.js index fbe4beda7e644..04d731dbd77b0 100644 --- a/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.js +++ b/src/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable.js @@ -46,7 +46,10 @@ export class VisualizeEmbeddable extends Embeddable { }; getInspectorAdapters() { - return this.savedVisualization.vis.API.inspectorAdapters; + if (!this.handler) { + return undefined; + } + return this.handler.inspectorAdapters; } getEmbeddableState() { diff --git a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html index e593546a6b8b7..60d4622862e02 100644 --- a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html +++ b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.html @@ -5,11 +5,14 @@
      - Visualize +
      + Visualize +
      diff --git a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js index e31a2cbfb57b7..a6f839a8481c1 100644 --- a/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js +++ b/src/core_plugins/kibana/public/visualize/listing/visualize_listing.js @@ -22,6 +22,7 @@ import 'ui/pager_control'; import 'ui/pager'; import { uiModules } from 'ui/modules'; import { timefilter } from 'ui/timefilter'; +import { i18n } from '@kbn/i18n'; import { VisualizeListingTable } from './visualize_listing_table'; @@ -34,6 +35,7 @@ export function VisualizeListingController($injector) { const Notifier = $injector.get('Notifier'); const Private = $injector.get('Private'); const config = $injector.get('config'); + const breadcrumbState = $injector.get('breadcrumbState'); timefilter.disableAutoRefreshSelector(); timefilter.disableTimeRangeSelector(); @@ -58,4 +60,11 @@ export function VisualizeListingController($injector) { return visualizationService.delete(selectedIds) .catch(error => notify.error(error)); }; + + breadcrumbState.set([{ + text: i18n.translate('kbn.visualize.visualizeListingBreadcrumbsTitle', { + defaultMessage: 'Visualize', + }) + }]); + config.watch('k7design', (val) => this.showPluginBreadcrumbs = !val); } diff --git a/src/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js b/src/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js index 39af59f46e40e..e1765c58484f7 100644 --- a/src/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js +++ b/src/core_plugins/kibana/public/visualize/listing/visualize_listing_table.js @@ -148,6 +148,7 @@ export class VisualizeListingTable extends Component { ); diff --git a/src/core_plugins/kibana/public/visualize/wizard/step_1.html b/src/core_plugins/kibana/public/visualize/wizard/step_1.html index 0f7e542990d91..ff13e9a755559 100644 --- a/src/core_plugins/kibana/public/visualize/wizard/step_1.html +++ b/src/core_plugins/kibana/public/visualize/wizard/step_1.html @@ -50,6 +50,7 @@

      tooltip="{{ getVisTypeTooltip(type) }}" tooltip-placement="{{ getVisTypeTooltipPosition($parent.$index) }}" aria-describedby="visDescription_{{ ::getVisTypeId(type) }}" + data-test-subj="visType-{{::type.name}}" >
      ({ + getUiSettingDefaults: () => ({ 'search:queryLanguage': { value: 'lucene' } }), +})); + +import { fetch } from './fetch'; + +let callCluster; + +function setupMockCallCluster(optCount, language) { + callCluster = jest.fn((method, params) => { + if ('id' in params && params.id === 'kql-telemetry:kql-telemetry') { + if (optCount === null) { + return Promise.resolve({ + _index: '.kibana_1', + _type: 'doc', + _id: 'kql-telemetry:kql-telemetry', + found: false, + }); + } else { + return Promise.resolve({ + _source: { + 'kql-telemetry': { + ...optCount, + }, + type: 'kql-telemetry', + updated_at: '2018-10-05T20:20:56.258Z', + }, + }); + } + } else if ('body' in params && params.body.query.term.type === 'config') { + if (language === 'missingConfigDoc') { + Promise.resolve({ + hits: { + hits: [], + }, + }); + } else { + return Promise.resolve({ + hits: { + hits: [ + { + _source: { + config: { + 'search:queryLanguage': language, + }, + }, + }, + ], + }, + }); + } + } + }); +} + +describe('makeKQLUsageCollector', () => { + describe('fetch method', () => { + it('should return opt in data from the .kibana/kql-telemetry doc', async () => { + setupMockCallCluster({ optInCount: 1 }, 'kuery'); + const fetchResponse = await fetch(callCluster); + expect(fetchResponse.optInCount).toBe(1); + expect(fetchResponse.optOutCount).toBe(0); + }); + + it('should return the default query language set in advanced settings', async () => { + setupMockCallCluster({ optInCount: 1 }, 'kuery'); + const fetchResponse = await fetch(callCluster); + expect(fetchResponse.defaultQueryLanguage).toBe('kuery'); + }); + + // Indicates the user has modified the setting at some point but the value is currently the default + it('should return the kibana default query language if the config value is null', async () => { + setupMockCallCluster({ optInCount: 1 }, null); + const fetchResponse = await fetch(callCluster); + expect(fetchResponse.defaultQueryLanguage).toBe('lucene'); + }); + + it('should indicate when the default language has never been modified by the user', async () => { + setupMockCallCluster({ optInCount: 1 }, undefined); + const fetchResponse = await fetch(callCluster); + expect(fetchResponse.defaultQueryLanguage).toBe('default-lucene'); + }); + + it('should default to 0 opt in counts if the .kibana/kql-telemetry doc does not exist', async () => { + setupMockCallCluster(null, 'kuery'); + const fetchResponse = await fetch(callCluster); + expect(fetchResponse.optInCount).toBe(0); + expect(fetchResponse.optOutCount).toBe(0); + }); + + it('should default to the kibana default language if the config document does not exist', async () => { + setupMockCallCluster(null, 'missingConfigDoc'); + const fetchResponse = await fetch(callCluster); + expect(fetchResponse.defaultQueryLanguage).toBe('default-lucene'); + }); + }); +}); diff --git a/src/core_plugins/kibana/server/lib/kql_usage_collector/index.js b/src/core_plugins/kibana/server/lib/kql_usage_collector/index.js new file mode 100644 index 0000000000000..ea2979834be3a --- /dev/null +++ b/src/core_plugins/kibana/server/lib/kql_usage_collector/index.js @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { makeKQLUsageCollector } from './make_kql_usage_collector'; diff --git a/src/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js b/src/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js new file mode 100644 index 0000000000000..3ceff0fee504a --- /dev/null +++ b/src/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.js @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { fetch } from './fetch'; + +export function makeKQLUsageCollector(server) { + const kqlUsageCollector = server.usage.collectorSet.makeUsageCollector({ + type: 'kql', + fetch, + }); + + server.usage.collectorSet.register(kqlUsageCollector); +} diff --git a/src/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js b/src/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js new file mode 100644 index 0000000000000..7fd19fbcccc65 --- /dev/null +++ b/src/core_plugins/kibana/server/lib/kql_usage_collector/make_kql_usage_collector.test.js @@ -0,0 +1,48 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { makeKQLUsageCollector } from './make_kql_usage_collector'; + +describe('makeKQLUsageCollector', () => { + + let server; + let makeUsageCollectorStub; + let registerStub; + + beforeEach(() => { + makeUsageCollectorStub = jest.fn(); + registerStub = jest.fn(); + server = { + usage: { + collectorSet: { makeUsageCollector: makeUsageCollectorStub, register: registerStub }, + }, + }; + }); + + it('should call collectorSet.register', () => { + makeKQLUsageCollector(server); + expect(registerStub).toHaveBeenCalledTimes(1); + }); + + it('should call makeUsageCollector with type = kql', () => { + makeKQLUsageCollector(server); + expect(makeUsageCollectorStub).toHaveBeenCalledTimes(1); + expect(makeUsageCollectorStub.mock.calls[0][0].type).toBe('kql'); + }); +}); diff --git a/src/core_plugins/kibana/server/routes/api/export/index.js b/src/core_plugins/kibana/server/routes/api/export/index.js index 34f45e9a6b2da..a2469d8f5c5ae 100644 --- a/src/core_plugins/kibana/server/routes/api/export/index.js +++ b/src/core_plugins/kibana/server/routes/api/export/index.js @@ -36,18 +36,18 @@ export function exportApi(server) { tags: ['api'], }, method: ['GET'], - handler: (req, reply) => { + handler: async (req, h) => { const currentDate = moment.utc(); return exportDashboards(req) .then(resp => { const json = JSON.stringify(resp, null, ' '); const filename = `kibana-dashboards.${currentDate.format('YYYY-MM-DD-HH-mm-ss')}.json`; - reply(json) + return h.response(json) .header('Content-Disposition', `attachment; filename="${filename}"`) .header('Content-Type', 'application/json') .header('Content-Length', Buffer.byteLength(json, 'utf8')); }) - .catch(err => reply(Boom.boomify(err, { statusCode: 400 }))); + .catch(err => Boom.boomify(err, { statusCode: 400 })); } }); } diff --git a/src/core_plugins/kibana/server/routes/api/home/register_tutorials.js b/src/core_plugins/kibana/server/routes/api/home/register_tutorials.js index 89f1ff6213a14..861ed1c244d13 100644 --- a/src/core_plugins/kibana/server/routes/api/home/register_tutorials.js +++ b/src/core_plugins/kibana/server/routes/api/home/register_tutorials.js @@ -22,8 +22,8 @@ export function registerTutorials(server) { server.route({ path: '/api/kibana/home/tutorials', method: ['GET'], - handler: async function (req, reply) { - reply(server.getTutorials(req)); + handler: function (req) { + return server.getTutorials(req); } }); } diff --git a/src/core_plugins/kibana/server/routes/api/import/index.js b/src/core_plugins/kibana/server/routes/api/import/index.js index 945bd02059507..c7291798c6d65 100644 --- a/src/core_plugins/kibana/server/routes/api/import/index.js +++ b/src/core_plugins/kibana/server/routes/api/import/index.js @@ -39,10 +39,12 @@ export function importApi(server) { tags: ['api'], }, - handler: (req, reply) => { - return importDashboards(req) - .then((resp) => reply(resp)) - .catch(err => reply(Boom.boomify(err, { statusCode: 400 }))); + handler: async (req) => { + try { + return await importDashboards(req); + } catch (err) { + throw Boom.boomify(err, { statusCode: 400 }); + } } }); } diff --git a/src/core_plugins/kibana/server/routes/api/kql_telemetry/index.js b/src/core_plugins/kibana/server/routes/api/kql_telemetry/index.js new file mode 100644 index 0000000000000..04ce8e807ea20 --- /dev/null +++ b/src/core_plugins/kibana/server/routes/api/kql_telemetry/index.js @@ -0,0 +1,60 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import Joi from 'joi'; +import Boom from 'boom'; + +export function registerKqlTelemetryApi(server) { + server.route({ + path: '/api/kibana/kql_opt_in_telemetry', + method: 'POST', + config: { + validate: { + payload: Joi.object({ + opt_in: Joi.bool().required(), + }), + }, + tags: ['api'], + }, + handler: async function (request) { + const { savedObjects: { getSavedObjectsRepository } } = server; + const { callWithInternalUser } = server.plugins.elasticsearch.getCluster('admin'); + const internalRepository = getSavedObjectsRepository(callWithInternalUser); + + const { + payload: { opt_in: optIn }, + } = request; + + const counterName = optIn ? 'optInCount' : 'optOutCount'; + + try { + await internalRepository.incrementCounter( + 'kql-telemetry', + 'kql-telemetry', + counterName, + ); + } + catch (error) { + return new Boom('Something went wrong', { statusCode: error.status, data: { success: false } }); + } + + return { success: true }; + }, + }); +} diff --git a/src/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js b/src/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js index 34eca71cc2610..2525fbebd6968 100644 --- a/src/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js +++ b/src/core_plugins/kibana/server/routes/api/management/saved_objects/relationships.js @@ -38,20 +38,19 @@ export function registerRelationships(server) { }, }, - handler: async (req, reply) => { + handler: async (req) => { const type = req.params.type; const id = req.params.id; const size = req.query.size || 10; try { - const response = await findRelationships(type, id, size, req.getSavedObjectsClient()); - reply(response); + return await findRelationships(type, id, size, req.getSavedObjectsClient()); } catch (err) { if (isNotFoundError(err)) { - reply(Boom.boomify(new Error('Resource not found'), { statusCode: 404 })); - return; + throw Boom.boomify(new Error('Resource not found'), { statusCode: 404 }); } - reply(Boom.boomify(err, { statusCode: 500 })); + + throw Boom.boomify(err, { statusCode: 500 }); } }, }); diff --git a/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js b/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js index a085b9581c726..76cc66c05385c 100644 --- a/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js +++ b/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.js @@ -45,13 +45,14 @@ export function registerScrollForExportRoute(server) { }, }, - handler: async (req, reply) => { + handler: async (req) => { const savedObjectsClient = req.getSavedObjectsClient(); const objects = await findAll(savedObjectsClient, { perPage: 1000, type: req.payload.typesToInclude }); - const response = objects.map(hit => { + + return objects.map(hit => { const type = hit.type; return { _id: hit.id, @@ -63,8 +64,6 @@ export function registerScrollForExportRoute(server) { _migrationVersion: hit.migrationVersion, }; }); - - reply(response); } }); } @@ -82,7 +81,7 @@ export function registerScrollForCountRoute(server) { }, }, - handler: async (req, reply) => { + handler: async (req) => { const savedObjectsClient = req.getSavedObjectsClient(); const findOptions = { type: req.payload.typesToInclude, @@ -108,7 +107,7 @@ export function registerScrollForCountRoute(server) { } } - reply(counts); + return counts; } }); } diff --git a/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.test.js b/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.test.js index d64519f7ddd01..ad6f2f9ebc4b9 100644 --- a/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.test.js +++ b/src/core_plugins/kibana/server/routes/api/management/saved_objects/scroll.test.js @@ -20,8 +20,15 @@ import Hapi from 'hapi'; import { registerScrollForExportRoute } from './scroll'; const createMockServer = () => { - const mockServer = new Hapi.Server({ debug: false }); - mockServer.connection({ port: 8080 }); + const mockServer = new Hapi.Server({ + debug: false, + port: 8080, + routes: { + validate: { + failAction: (r, h, err) => { throw err; } + } + } + }); return mockServer; }; diff --git a/src/core_plugins/kibana/server/routes/api/remote_info/call_with_request_factory.js b/src/core_plugins/kibana/server/routes/api/remote_info/call_with_request_factory.js new file mode 100644 index 0000000000000..dc70072ffd285 --- /dev/null +++ b/src/core_plugins/kibana/server/routes/api/remote_info/call_with_request_factory.js @@ -0,0 +1,37 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { once } from 'lodash'; + +const callWithRequest = once(server => { + const cluster = server.plugins.elasticsearch.getCluster('data'); + return cluster.callWithRequest; +}); + +export const callWithRequestFactory = (server, request) => { + return (...args) => { + return callWithRequest(server)(request, ...args); + }; +}; diff --git a/src/core_plugins/kibana/server/routes/api/remote_info/index.js b/src/core_plugins/kibana/server/routes/api/remote_info/index.js new file mode 100644 index 0000000000000..2d1e57d432550 --- /dev/null +++ b/src/core_plugins/kibana/server/routes/api/remote_info/index.js @@ -0,0 +1,51 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { callWithRequestFactory } from './call_with_request_factory'; +import handleEsError from '../../../lib/handle_es_error'; + +async function fetchRemoteClusters(callWithRequest) { + const options = { + method: 'GET', + path: '_remote/info' + }; + const remoteInfo = await callWithRequest('transport.request', options); + return Object.keys(remoteInfo); +} + +export function registerClustersRoute(server) { + server.route({ + path: '/api/kibana/clusters', + method: 'GET', + handler: async request => { + const callWithRequest = callWithRequestFactory(server, request); + try { + return await fetchRemoteClusters(callWithRequest); + } catch (error) { + throw handleEsError(error); + } + } + }); +} diff --git a/src/core_plugins/kibana/server/routes/api/scripts/register_languages.js b/src/core_plugins/kibana/server/routes/api/scripts/register_languages.js index f8520ea97b77a..6b27d24dda785 100644 --- a/src/core_plugins/kibana/server/routes/api/scripts/register_languages.js +++ b/src/core_plugins/kibana/server/routes/api/scripts/register_languages.js @@ -21,8 +21,8 @@ export function registerLanguages(server) { server.route({ path: '/api/kibana/scripts/languages', method: 'GET', - handler: function (request, reply) { - reply(['painless', 'expression']); + handler: function () { + return ['painless', 'expression']; } }); } diff --git a/src/core_plugins/kibana/server/routes/api/scroll_search/index.js b/src/core_plugins/kibana/server/routes/api/scroll_search/index.js index 48301ded0523e..734fce97d8765 100644 --- a/src/core_plugins/kibana/server/routes/api/scroll_search/index.js +++ b/src/core_plugins/kibana/server/routes/api/scroll_search/index.js @@ -23,7 +23,7 @@ export function scrollSearchApi(server) { server.route({ path: '/api/kibana/legacy_scroll_start', method: ['POST'], - handler: (req, reply) => { + handler: async (req) => { const { callWithRequest } = server.plugins.elasticsearch.getCluster('admin'); const { index, size, body } = req.payload; const params = { @@ -33,21 +33,26 @@ export function scrollSearchApi(server) { scroll: '1m', sort: '_doc', }; - return callWithRequest(req, 'search', params) - .then(reply) - .catch(error => reply(handleESError(error))); + + try { + return await callWithRequest(req, 'search', params); + } catch (err) { + throw handleESError(err); + } } }); server.route({ path: '/api/kibana/legacy_scroll_continue', method: ['POST'], - handler: (req, reply) => { + handler: async (req) => { const { callWithRequest } = server.plugins.elasticsearch.getCluster('admin'); const { scrollId } = req.payload; - return callWithRequest(req, 'scroll', { scrollId, scroll: '1m' }) - .then(reply) - .catch(error => reply(handleESError(error))); + try { + return await callWithRequest(req, 'scroll', { scrollId, scroll: '1m' }); + } catch (err) { + throw handleESError(err); + } } }); } diff --git a/src/core_plugins/kibana/server/routes/api/search/count/register_count.js b/src/core_plugins/kibana/server/routes/api/search/count/register_count.js index 3a1fd9ee62e77..c3b24c3133994 100644 --- a/src/core_plugins/kibana/server/routes/api/search/count/register_count.js +++ b/src/core_plugins/kibana/server/routes/api/search/count/register_count.js @@ -24,22 +24,20 @@ export default function registerCount(server) { server.route({ path: '/api/kibana/{id}/_count', method: ['POST', 'GET'], - handler: function (req, reply) { + handler: async function (req) { const { callWithRequest } = server.plugins.elasticsearch.getCluster('data'); const boundCallWithRequest = _.partial(callWithRequest, req); - boundCallWithRequest('count', { - allowNoIndices: false, - index: req.params.id - }) - .then( - function (res) { - reply({ count: res.count }); - }, - function (error) { - reply(handleESError(error)); - } - ); + try { + const res = await boundCallWithRequest('count', { + allowNoIndices: false, + index: req.params.id + }); + + return { count: res.count }; + } catch (err) { + throw handleESError(err); + } } }); } diff --git a/src/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js b/src/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js index e8be66959d666..54adefc540545 100644 --- a/src/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js +++ b/src/core_plugins/kibana/server/routes/api/suggestions/register_value_suggestions.js @@ -24,7 +24,7 @@ export function registerValueSuggestions(server) { server.route({ path: '/api/kibana/suggestions/values/{index}', method: ['POST'], - handler: async function (req, reply) { + handler: async function (req) { const { index } = req.params; const { field, query, boolFilter } = req.payload; const { callWithRequest } = server.plugins.elasticsearch.getCluster('data'); @@ -33,9 +33,9 @@ export function registerValueSuggestions(server) { const response = await callWithRequest(req, 'search', { index, body }); const buckets = get(response, 'aggregations.suggestions.buckets') || []; const suggestions = map(buckets, 'key'); - reply(suggestions); + return suggestions; } catch (error) { - reply(handleESError(error)); + throw handleESError(error); } } }); diff --git a/src/core_plugins/kibana/server/tutorials/aerospike_metrics/index.js b/src/core_plugins/kibana/server/tutorials/aerospike_metrics/index.js index f9b656a888e1c..0e05abf5aea71 100644 --- a/src/core_plugins/kibana/server/tutorials/aerospike_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/aerospike_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function aerospikeMetricsSpecProvider() { +export function aerospikeMetricsSpecProvider(server, context) { const moduleName = 'aerospike'; return { id: 'aerospikeMetrics', @@ -40,6 +40,7 @@ export function aerospikeMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-aerospike.html', }, }), + euiIconType: 'logoAerospike', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.aerospikeMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function aerospikeMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/apache_logs/index.js b/src/core_plugins/kibana/server/tutorials/apache_logs/index.js index f9c90abc54bf1..cce2343500d02 100644 --- a/src/core_plugins/kibana/server/tutorials/apache_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/apache_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function apacheLogsSpecProvider() { +export function apacheLogsSpecProvider(server, context) { const moduleName = 'apache2'; const geoipRequired = true; const uaRequired = true; @@ -59,7 +59,7 @@ export function apacheLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/apache_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js b/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js index 9ea9c894d8977..d7d04589843bf 100644 --- a/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/apache_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function apacheMetricsSpecProvider() { +export function apacheMetricsSpecProvider(server, context) { const moduleName = 'apache'; return { id: 'apacheMetrics', @@ -56,7 +56,7 @@ export function apacheMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/apache_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js index 138bebdc57998..396d5d4145ddc 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js @@ -361,7 +361,7 @@ export const createGoClientInstructions = () => [ textPre: i18n.translate('kbn.server.tutorials.apm.goClient.install.textPre', { defaultMessage: 'Install the APM agent packages for Go.', }), - commands: ['go get github.com/elastic/apm-agent-go'], + commands: ['go get go.elastic.co/apm'], }, { title: i18n.translate('kbn.server.tutorials.apm.goClient.configure.title', { @@ -384,19 +384,20 @@ file name, or the `ELASTIC_APM_SERVICE_NAME` environment variable.', })} export ELASTIC_APM_SERVICE_NAME= -# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.setAmpServerUrlComment', { - defaultMessage: 'Set the APM Server URL. If unspecified, the agent will effectively be disabled.', +# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.setCustomApmServerUrlComment', { + defaultMessage: 'Set custom APM Server URL (default: {defaultApmServerUrl})', + values: { defaultApmServerUrl: 'http://localhost:8200' }, })} export ELASTIC_APM_SERVER_URL= -# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.setIfAmpServerRequiresTokenComment', { - defaultMessage: 'Set if APM Server requires a token.', +# ${i18n.translate('kbn.server.tutorials.apm.goClient.configure.commands.useIfApmRequiresTokenComment', { + defaultMessage: 'Use if APM Server requires a token', })} export ELASTIC_APM_SECRET_TOKEN= `.split('\n'), textPost: i18n.translate('kbn.server.tutorials.apm.goClient.configure.textPost', { - defaultMessage: 'See the [documentation]({documenationLink}) for advanced configuration.', - values: { documenationLink: '{config.docs.base_url}guide/en/apm/agent/go/current/configuration.html' }, + defaultMessage: 'See the [documentation]({documentationLink}) for advanced configuration.', + values: { documentationLink: '{config.docs.base_url}guide/en/apm/agent/go/current/configuration.html' }, }), }, { @@ -407,11 +408,11 @@ export ELASTIC_APM_SECRET_TOKEN= defaultMessage: 'Instrument your Go application by using one of the provided instrumentation modules or \ by using the tracer API directly.', }), - commands: ` + commands: `\ import ( "net/http" - "github.com/elastic/apm-agent-go/module/apmhttp" + "go.elastic.co/apm/module/apmhttp" ) func main() {curlyOpen} @@ -422,8 +423,7 @@ func main() {curlyOpen} `.split('\n'), textPost: i18n.translate('kbn.server.tutorials.apm.goClient.instrument.textPost', { defaultMessage: 'See the [documentation]({documentationLink}) for a detailed \ -guide to instrumenting Go source code.\n\n\ -**Warning: The Go agent is currently in Beta and not meant for production use.**', +guide to instrumenting Go source code.', values: { documentationLink: '{config.docs.base_url}guide/en/apm/agent/go/current/instrumenting-source.html' }, }), }, @@ -457,9 +457,9 @@ Do **not** add the agent as a dependency to your application.', -Delastic.apm.application_packages=org.example \\ -jar my-application.jar`.split('\n'), textPost: i18n.translate('kbn.server.tutorials.apm.javaClient.startApplication.textPost', { - defaultMessage: 'See the [documentation]({documenationLink}) for configuration options and advanced \ + defaultMessage: 'See the [documentation]({documentationLink}) for configuration options and advanced \ usage.\n\n**Warning: The Java agent is currently in Beta and not meant for production use.**', - values: { documenationLink: '{config.docs.base_url}guide/en/apm/agent/java/current/index.html' }, + values: { documentationLink: '{config.docs.base_url}guide/en/apm/agent/java/current/index.html' }, }), }, ]; diff --git a/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js b/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js index 2826aca5194db..5d037da91c4f0 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js +++ b/src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js @@ -44,6 +44,16 @@ const createStartServer = () => ({ }), }); +export function createStartServerUnixSysv() { + const START_SERVER = createStartServer(); + + return { + title: START_SERVER.title, + textPre: START_SERVER.textPre, + commands: ['service apm-server start'], + }; +} + export function createStartServerUnix() { const START_SERVER = createStartServer(); @@ -128,7 +138,7 @@ to allow the script to run. For example: {command}.', { title: START_SERVER.title, textPre: START_SERVER.textPre, - commands: ['apm-server.exe -e'], + commands: ['Start-Service apm-server'], }, ]; } diff --git a/src/core_plugins/kibana/server/tutorials/apm/on_prem.js b/src/core_plugins/kibana/server/tutorials/apm/on_prem.js index a75ce27384b21..8a3705edf0c76 100644 --- a/src/core_plugins/kibana/server/tutorials/apm/on_prem.js +++ b/src/core_plugins/kibana/server/tutorials/apm/on_prem.js @@ -22,6 +22,7 @@ import { INSTRUCTION_VARIANT } from '../../../common/tutorials/instruction_varia import { createWindowsServerInstructions, createEditConfig, + createStartServerUnixSysv, createStartServerUnix, createDownloadServerRpm, createDownloadServerDeb, @@ -41,6 +42,7 @@ import { export function onPremInstructions(apmIndexPattern) { const EDIT_CONFIG = createEditConfig(); const START_SERVER_UNIX = createStartServerUnix(); + const START_SERVER_UNIX_SYSV = createStartServerUnixSysv(); return { instructionSets: [ @@ -55,11 +57,11 @@ export function onPremInstructions(apmIndexPattern) { }, { id: INSTRUCTION_VARIANT.DEB, - instructions: [createDownloadServerDeb(), EDIT_CONFIG, START_SERVER_UNIX], + instructions: [createDownloadServerDeb(), EDIT_CONFIG, START_SERVER_UNIX_SYSV], }, { id: INSTRUCTION_VARIANT.RPM, - instructions: [createDownloadServerRpm(), EDIT_CONFIG, START_SERVER_UNIX], + instructions: [createDownloadServerRpm(), EDIT_CONFIG, START_SERVER_UNIX_SYSV], }, { id: INSTRUCTION_VARIANT.WINDOWS, @@ -77,10 +79,10 @@ export function onPremInstructions(apmIndexPattern) { defaultMessage: 'Check APM Server status', }), success: i18n.translate('kbn.server.tutorials.apm.apmServer.statusCheck.successMessage', { - defaultMessage: 'You have correctly setup APM-Server', + defaultMessage: 'You have correctly setup APM Server', }), error: i18n.translate('kbn.server.tutorials.apm.apmServer.statusCheck.errorMessage', { - defaultMessage: 'APM-Server has still not connected to Elasticsearch', + defaultMessage: 'APM Server has still not connected to Elasticsearch', }), esHitsCheck: { index: apmIndexPattern, @@ -101,6 +103,14 @@ export function onPremInstructions(apmIndexPattern) { defaultMessage: 'APM Agents', }), instructionVariants: [ + { + id: INSTRUCTION_VARIANT.JAVA, + instructions: createJavaClientInstructions(), + }, + { + id: INSTRUCTION_VARIANT.JS, + instructions: createJsClientInstructions(), + }, { id: INSTRUCTION_VARIANT.NODE, instructions: createNodeClientInstructions(), @@ -121,18 +131,10 @@ export function onPremInstructions(apmIndexPattern) { id: INSTRUCTION_VARIANT.RACK, instructions: createRackClientInstructions(), }, - { - id: INSTRUCTION_VARIANT.JS, - instructions: createJsClientInstructions(), - }, { id: INSTRUCTION_VARIANT.GO, instructions: createGoClientInstructions(), }, - { - id: INSTRUCTION_VARIANT.JAVA, - instructions: createJavaClientInstructions(), - }, ], statusCheck: { title: i18n.translate('kbn.server.tutorials.apm.apmAgents.statusCheck.title', { diff --git a/src/core_plugins/kibana/server/tutorials/ceph_metrics/index.js b/src/core_plugins/kibana/server/tutorials/ceph_metrics/index.js index aebcc62fc3211..22fe1ce2d7d8a 100644 --- a/src/core_plugins/kibana/server/tutorials/ceph_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/ceph_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function cephMetricsSpecProvider() { +export function cephMetricsSpecProvider(server, context) { const moduleName = 'ceph'; return { id: 'cephMetrics', @@ -40,6 +40,7 @@ export function cephMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-ceph.html', }, }), + euiIconType: 'logoCeph', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.cephMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function cephMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/cloudwatch_logs/index.js b/src/core_plugins/kibana/server/tutorials/cloudwatch_logs/index.js new file mode 100644 index 0000000000000..b5b053e329d1a --- /dev/null +++ b/src/core_plugins/kibana/server/tutorials/cloudwatch_logs/index.js @@ -0,0 +1,57 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; +import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; +import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/functionbeat_instructions'; + +export function cloudwatchLogsSpecProvider(server, context) { + return { + id: 'cloudwatchLogs', + name: i18n.translate('kbn.server.tutorials.cloudwatchLogs.nameTitle', { + defaultMessage: 'Cloudwatch Logs', + }), + category: TUTORIAL_CATEGORY.LOGGING, + shortDescription: i18n.translate('kbn.server.tutorials.cloudwatchLogs.shortDescription', { + defaultMessage: 'Collect Cloudwatch logs with Functionbeat', + }), + longDescription: i18n.translate('kbn.server.tutorials.cloudwatchLogs.longDescription', { + defaultMessage: 'Collect Cloudwatch logs by deploying Functionbeat to run as \ + an AWS Lambda function. \ + [Learn more]({learnMoreLink}).', + values: { + learnMoreLink: '{config.docs.beats.functionbeat}/functionbeat-getting-started.html', + }, + }), + //euiIconType: 'functionbeatApp', + artifacts: { + dashboards: [ + // TODO + ], + exportedFields: { + documentationUrl: '{config.docs.beats.functionbeat}/exported-fields.html' + } + }, + completionTimeMinutes: 10, + //previewImagePath: '/plugins/kibana/home/tutorial_resources/uptime_monitors/screenshot.png', + onPrem: onPremInstructions(null, null, null, context), + elasticCloud: cloudInstructions(), + onPremElasticCloud: onPremCloudInstructions() + }; +} diff --git a/src/core_plugins/kibana/server/tutorials/couchbase_metrics/index.js b/src/core_plugins/kibana/server/tutorials/couchbase_metrics/index.js index c9cc9610e0860..5ec32a5b99894 100644 --- a/src/core_plugins/kibana/server/tutorials/couchbase_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/couchbase_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function couchbaseMetricsSpecProvider() { +export function couchbaseMetricsSpecProvider(server, context) { const moduleName = 'couchbase'; return { id: 'couchbaseMetrics', @@ -40,6 +40,7 @@ export function couchbaseMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-couchbase.html', }, }), + euiIconType: 'logoCouchbase', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.couchbaseMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function couchbaseMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js b/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js index 6429390a48e55..289f8d2324155 100644 --- a/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/docker_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function dockerMetricsSpecProvider() { +export function dockerMetricsSpecProvider(server, context) { const moduleName = 'docker'; return { id: 'dockerMetrics', @@ -56,7 +56,7 @@ export function dockerMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/docker_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/dropwizard_metrics/index.js b/src/core_plugins/kibana/server/tutorials/dropwizard_metrics/index.js index 2222d9468808d..ba0b68e06913f 100644 --- a/src/core_plugins/kibana/server/tutorials/dropwizard_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/dropwizard_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function dropwizardMetricsSpecProvider() { +export function dropwizardMetricsSpecProvider(server, context) { const moduleName = 'dropwizard'; return { id: 'dropwizardMetrics', @@ -40,6 +40,7 @@ export function dropwizardMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-dropwizard.html', }, }), + euiIconType: 'logoDropwizard', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.dropwizardMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function dropwizardMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/elasticsearch_logs/index.js b/src/core_plugins/kibana/server/tutorials/elasticsearch_logs/index.js index 4dfcdbfbde5d9..55f2b3ea4ecb3 100644 --- a/src/core_plugins/kibana/server/tutorials/elasticsearch_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/elasticsearch_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function elasticsearchLogsSpecProvider() { +export function elasticsearchLogsSpecProvider(server, context) { const moduleName = 'elasticsearch'; const geoipRequired = false; const uaRequired = false; @@ -57,7 +57,7 @@ export function elasticsearchLogsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/elasticsearch_metrics/index.js b/src/core_plugins/kibana/server/tutorials/elasticsearch_metrics/index.js index abbbe3f1429c9..8982eedce7069 100644 --- a/src/core_plugins/kibana/server/tutorials/elasticsearch_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/elasticsearch_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function elasticsearchMetricsSpecProvider() { +export function elasticsearchMetricsSpecProvider(server, context) { const moduleName = 'elasticsearch'; return { id: 'elasticsearchMetrics', @@ -54,7 +54,7 @@ export function elasticsearchMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/etcd_metrics/index.js b/src/core_plugins/kibana/server/tutorials/etcd_metrics/index.js index 2b704f57ab208..d781f9aadf6c9 100644 --- a/src/core_plugins/kibana/server/tutorials/etcd_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/etcd_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function etcdMetricsSpecProvider() { +export function etcdMetricsSpecProvider(server, context) { const moduleName = 'etcd'; return { id: 'etcdMetrics', @@ -40,6 +40,7 @@ export function etcdMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-etcd.html', }, }), + euiIconType: 'logoEtcd', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.etcdMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function etcdMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/golang_metrics/index.js b/src/core_plugins/kibana/server/tutorials/golang_metrics/index.js index 2714de14f494d..f1da6a6f4350b 100644 --- a/src/core_plugins/kibana/server/tutorials/golang_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/golang_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function golangMetricsSpecProvider() { +export function golangMetricsSpecProvider(server, context) { const moduleName = 'golang'; return { id: moduleName + 'Metrics', @@ -41,6 +41,7 @@ export function golangMetricsSpecProvider() { learnMoreLink: `{config.docs.beats.metricbeat}/metricbeat-module-${moduleName}.html`, }, }), + euiIconType: 'logoGolang', artifacts: { dashboards: [ { @@ -56,7 +57,7 @@ export function golangMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/haproxy_metrics/index.js b/src/core_plugins/kibana/server/tutorials/haproxy_metrics/index.js index f2d119b75e916..68da29c323f84 100644 --- a/src/core_plugins/kibana/server/tutorials/haproxy_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/haproxy_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function haproxyMetricsSpecProvider() { +export function haproxyMetricsSpecProvider(server, context) { const moduleName = 'haproxy'; return { id: 'haproxyMetrics', @@ -40,6 +40,7 @@ export function haproxyMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-haproxy.html', }, }), + euiIconType: 'logoHAproxy', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.haproxyMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function haproxyMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/iis_logs/index.js b/src/core_plugins/kibana/server/tutorials/iis_logs/index.js index 54ee34caa1765..549789aaa9076 100644 --- a/src/core_plugins/kibana/server/tutorials/iis_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/iis_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function iisLogsSpecProvider() { +export function iisLogsSpecProvider(server, context) { const moduleName = 'iis'; const geoipRequired = false; const uaRequired = false; @@ -42,7 +42,7 @@ export function iisLogsSpecProvider() { learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-iis.html', }, }), - //euiIconType: 'logoIIS', + // euiIconType: 'logoIIS', artifacts: { dashboards: [ { @@ -59,7 +59,7 @@ export function iisLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/iis_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/kafka_logs/index.js b/src/core_plugins/kibana/server/tutorials/kafka_logs/index.js index 4ac90a5e85e4a..a4dfebd204280 100644 --- a/src/core_plugins/kibana/server/tutorials/kafka_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/kafka_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function kafkaLogsSpecProvider() { +export function kafkaLogsSpecProvider(server, context) { const moduleName = 'kafka'; const geoipRequired = false; const uaRequired = false; @@ -42,7 +42,7 @@ export function kafkaLogsSpecProvider() { learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-kafka.html', }, }), - //euiIconType: 'logoKafka', + euiIconType: 'logoKafka', artifacts: { dashboards: [ { @@ -59,7 +59,7 @@ export function kafkaLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/kafka_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/kafka_metrics/index.js b/src/core_plugins/kibana/server/tutorials/kafka_metrics/index.js index c5f0403a93773..388155d4943d3 100644 --- a/src/core_plugins/kibana/server/tutorials/kafka_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/kafka_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function kafkaMetricsSpecProvider() { +export function kafkaMetricsSpecProvider(server, context) { const moduleName = 'kafka'; return { id: 'kafkaMetrics', @@ -40,6 +40,7 @@ export function kafkaMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-kafka.html', }, }), + euiIconType: 'logoKafka', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.kafkaMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function kafkaMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/kibana_metrics/index.js b/src/core_plugins/kibana/server/tutorials/kibana_metrics/index.js index 5e2a734372f1c..83953af8589ed 100644 --- a/src/core_plugins/kibana/server/tutorials/kibana_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/kibana_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function kibanaMetricsSpecProvider() { +export function kibanaMetricsSpecProvider(server, context) { const moduleName = 'kibana'; return { id: 'kibanaMetrics', @@ -54,7 +54,7 @@ export function kibanaMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js b/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js index c4b483be10ec7..255f5821f0e66 100644 --- a/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/kubernetes_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function kubernetesMetricsSpecProvider() { +export function kubernetesMetricsSpecProvider(server, context) { const moduleName = 'kubernetes'; return { id: 'kubernetesMetrics', @@ -56,7 +56,7 @@ export function kubernetesMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/kubernetes_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/logstash_logs/index.js b/src/core_plugins/kibana/server/tutorials/logstash_logs/index.js index ca11ee9470084..8bec45d94adfd 100644 --- a/src/core_plugins/kibana/server/tutorials/logstash_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/logstash_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function logstashLogsSpecProvider() { +export function logstashLogsSpecProvider(server, context) { const moduleName = 'logstash'; const geoipRequired = false; const uaRequired = false; @@ -59,7 +59,7 @@ export function logstashLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/logstash_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/logstash_metrics/index.js b/src/core_plugins/kibana/server/tutorials/logstash_metrics/index.js index 8689cad2fc966..1978ff0e063e8 100644 --- a/src/core_plugins/kibana/server/tutorials/logstash_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/logstash_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function logstashMetricsSpecProvider() { +export function logstashMetricsSpecProvider(server, context) { const moduleName = 'logstash'; return { id: moduleName + 'Metrics', @@ -31,7 +31,7 @@ export function logstashMetricsSpecProvider() { isBeta: true, category: TUTORIAL_CATEGORY.METRICS, shortDescription: i18n.translate('kbn.server.tutorials.logstashMetrics.shortDescription', { - defaultMessage: 'Fetch interal metrics from a Logstash server.', + defaultMessage: 'Fetch internal metrics from a Logstash server.', }), longDescription: i18n.translate('kbn.server.tutorials.logstashMetrics.longDescription', { defaultMessage: 'The `{moduleName}` Metricbeat module fetches internal metrics from a Logstash server. \ @@ -55,7 +55,7 @@ export function logstashMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/memcached_metrics/index.js b/src/core_plugins/kibana/server/tutorials/memcached_metrics/index.js index 28021ffebdbf7..4f6c13d356555 100644 --- a/src/core_plugins/kibana/server/tutorials/memcached_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/memcached_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function memcachedMetricsSpecProvider() { +export function memcachedMetricsSpecProvider(server, context) { const moduleName = 'memcached'; return { id: 'memcachedMetrics', @@ -40,6 +40,7 @@ export function memcachedMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-memcached.html', }, }), + euiIconType: 'logoMemcached', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.memcachedMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function memcachedMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/mongodb_metrics/index.js b/src/core_plugins/kibana/server/tutorials/mongodb_metrics/index.js index e3db5dd55a4f2..8058fbe37b711 100644 --- a/src/core_plugins/kibana/server/tutorials/mongodb_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/mongodb_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function mongodbMetricsSpecProvider() { +export function mongodbMetricsSpecProvider(server, context) { const moduleName = 'mongodb'; return { id: 'mongodbMetrics', @@ -39,7 +39,7 @@ export function mongodbMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-mongodb.html', }, }), - //euiIconType: 'logoMongoDB', + euiIconType: 'logoMongodb', artifacts: { dashboards: [ { @@ -56,7 +56,7 @@ export function mongodbMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/mongodb_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/munin_metrics/index.js b/src/core_plugins/kibana/server/tutorials/munin_metrics/index.js index ab21dc2b03bd4..e6e6489dc6fca 100644 --- a/src/core_plugins/kibana/server/tutorials/munin_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/munin_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function muninMetricsSpecProvider() { +export function muninMetricsSpecProvider(server, context) { const moduleName = 'munin'; return { id: 'muninMetrics', @@ -53,7 +53,7 @@ export function muninMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js b/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js index bddc0d9659f49..9b06e4a1fafc4 100644 --- a/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/mysql_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function mysqlLogsSpecProvider() { +export function mysqlLogsSpecProvider(server, context) { const moduleName = 'mysql'; const geoipRequired = false; const uaRequired = false; @@ -59,7 +59,7 @@ export function mysqlLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/mysql_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js b/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js index 37bd452a7fad8..24614ab353e83 100644 --- a/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/mysql_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function mysqlMetricsSpecProvider() { +export function mysqlMetricsSpecProvider(server, context) { const moduleName = 'mysql'; return { id: 'mysqlMetrics', @@ -56,7 +56,7 @@ export function mysqlMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/mysql_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js b/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js index d540a3f9f2daa..03e7454b60b8c 100644 --- a/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/nginx_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function nginxLogsSpecProvider() { +export function nginxLogsSpecProvider(server, context) { const moduleName = 'nginx'; const geoipRequired = true; const uaRequired = true; @@ -59,7 +59,7 @@ export function nginxLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/nginx_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js b/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js index 38c54bf8ae2d6..1eb34a5413cc3 100644 --- a/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/nginx_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function nginxMetricsSpecProvider() { +export function nginxMetricsSpecProvider(server, context) { const moduleName = 'nginx'; return { id: 'nginxMetrics', @@ -60,7 +60,7 @@ which must be enabled in your Nginx installation. \ }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/nginx_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/osquery_logs/index.js b/src/core_plugins/kibana/server/tutorials/osquery_logs/index.js index fab1fb78285ac..6ffb28784e127 100644 --- a/src/core_plugins/kibana/server/tutorials/osquery_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/osquery_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function osqueryLogsSpecProvider() { +export function osqueryLogsSpecProvider(server, context) { const moduleName = 'osquery'; const geoipRequired = false; const uaRequired = false; @@ -42,7 +42,7 @@ export function osqueryLogsSpecProvider() { learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-osquery.html', }, }), - //euiIconType: 'logoOsquery', + euiIconType: 'logoOsquery', artifacts: { dashboards: [ { @@ -59,7 +59,7 @@ export function osqueryLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/osquery_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/php_fpm_metrics/index.js b/src/core_plugins/kibana/server/tutorials/php_fpm_metrics/index.js index f024bcb62f852..ed35593467d37 100644 --- a/src/core_plugins/kibana/server/tutorials/php_fpm_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/php_fpm_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function phpfpmMetricsSpecProvider() { +export function phpfpmMetricsSpecProvider(server, context) { const moduleName = 'php_fpm'; return { id: 'phpfpmMetrics', @@ -40,7 +40,7 @@ export function phpfpmMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-php_fpm.html', }, }), - //euiIconType: 'logoPHPFPM', + euiIconType: 'logoPhp', artifacts: { dashboards: [ /*{ @@ -55,7 +55,7 @@ export function phpfpmMetricsSpecProvider() { }, completionTimeMinutes: 10, //previewImagePath: '/plugins/kibana/home/tutorial_resources/php_fpm_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/postgresql_logs/index.js b/src/core_plugins/kibana/server/tutorials/postgresql_logs/index.js index ff4c09d8ba2f0..df4239470cc27 100644 --- a/src/core_plugins/kibana/server/tutorials/postgresql_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/postgresql_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function postgresqlLogsSpecProvider() { +export function postgresqlLogsSpecProvider(server, context) { const moduleName = 'postgresql'; const geoipRequired = false; const uaRequired = false; @@ -42,7 +42,7 @@ export function postgresqlLogsSpecProvider() { learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-postgresql.html', }, }), - //euiIconType: 'logoPostgreSQL', + euiIconType: 'logoPostgres', artifacts: { dashboards: [ { @@ -59,7 +59,7 @@ export function postgresqlLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/postgresql_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/postgresql_metrics/index.js b/src/core_plugins/kibana/server/tutorials/postgresql_metrics/index.js index c646700c3d011..5c1edf4835ba8 100644 --- a/src/core_plugins/kibana/server/tutorials/postgresql_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/postgresql_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function postgresqlMetricsSpecProvider() { +export function postgresqlMetricsSpecProvider(server, context) { const moduleName = 'postgresql'; return { id: 'postgresqlMetrics', @@ -40,7 +40,7 @@ export function postgresqlMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-postgresql.html', }, }), - //euiIconType: 'logoPostgreSQL', + euiIconType: 'logoPostgres', artifacts: { dashboards: [ /* @@ -57,7 +57,7 @@ export function postgresqlMetricsSpecProvider() { }, completionTimeMinutes: 10, //previewImagePath: '/plugins/kibana/home/tutorial_resources/postgresql_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/prometheus_metrics/index.js b/src/core_plugins/kibana/server/tutorials/prometheus_metrics/index.js index 5bfad2d708706..02be5c4a7bee1 100644 --- a/src/core_plugins/kibana/server/tutorials/prometheus_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/prometheus_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function prometheusMetricsSpecProvider() { +export function prometheusMetricsSpecProvider(server, context) { const moduleName = 'prometheus'; return { id: moduleName + 'Metrics', @@ -41,6 +41,7 @@ export function prometheusMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-' + moduleName + '.html', }, }), + euiIconType: 'logoPrometheus', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.prometheusMetrics.artifacts.application.label', { @@ -54,7 +55,7 @@ export function prometheusMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/rabbitmq_metrics/index.js b/src/core_plugins/kibana/server/tutorials/rabbitmq_metrics/index.js index 0b343d3dd4abc..b76787260b4e9 100644 --- a/src/core_plugins/kibana/server/tutorials/rabbitmq_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/rabbitmq_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function rabbitmqMetricsSpecProvider() { +export function rabbitmqMetricsSpecProvider(server, context) { const moduleName = 'rabbitmq'; return { id: 'rabbitmqMetrics', @@ -39,7 +39,7 @@ export function rabbitmqMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-rabbitmq.html', }, }), - //euiIconType: 'logoRabbitMQ', + euiIconType: 'logoRabbitmq', isBeta: true, artifacts: { dashboards: [ @@ -57,7 +57,7 @@ export function rabbitmqMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/rabbitmq_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/redis_logs/index.js b/src/core_plugins/kibana/server/tutorials/redis_logs/index.js index 397181820d060..c142f62a8ea5c 100644 --- a/src/core_plugins/kibana/server/tutorials/redis_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/redis_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function redisLogsSpecProvider() { +export function redisLogsSpecProvider(server, context) { const moduleName = 'redis'; const geoipRequired = false; const uaRequired = false; @@ -65,7 +65,7 @@ Note that the `slowlog` fileset is experimental. \ }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/redis_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js b/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js index e1d451a17fb32..928ced07ade26 100644 --- a/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/redis_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function redisMetricsSpecProvider() { +export function redisMetricsSpecProvider(server, context) { const moduleName = 'redis'; return { id: 'redisMetrics', @@ -56,7 +56,7 @@ export function redisMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/redis_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/register.js b/src/core_plugins/kibana/server/tutorials/register.js index cf23318f4f2e4..fd05018004657 100644 --- a/src/core_plugins/kibana/server/tutorials/register.js +++ b/src/core_plugins/kibana/server/tutorials/register.js @@ -37,6 +37,7 @@ import { postgresqlLogsSpecProvider } from './postgresql_logs'; import { rabbitmqMetricsSpecProvider } from './rabbitmq_metrics'; import { redisLogsSpecProvider } from './redis_logs'; import { redisMetricsSpecProvider } from './redis_metrics'; +import { suricataLogsSpecProvider } from './suricata_logs'; import { dockerMetricsSpecProvider } from './docker_metrics'; import { kubernetesMetricsSpecProvider } from './kubernetes_metrics'; import { uwsgiMetricsSpecProvider } from './uwsgi_metrics'; @@ -60,6 +61,8 @@ import { golangMetricsSpecProvider } from './golang_metrics'; import { logstashMetricsSpecProvider } from './logstash_metrics'; import { prometheusMetricsSpecProvider } from './prometheus_metrics'; import { zookeeperMetricsSpecProvider } from './zookeeper_metrics'; +import { uptimeMonitorsSpecProvider } from './uptime_monitors'; +import { cloudwatchLogsSpecProvider } from './cloudwatch_logs'; export function registerTutorials(server) { server.registerTutorial(systemLogsSpecProvider); @@ -82,6 +85,7 @@ export function registerTutorials(server) { server.registerTutorial(rabbitmqMetricsSpecProvider); server.registerTutorial(redisLogsSpecProvider); server.registerTutorial(redisMetricsSpecProvider); + server.registerTutorial(suricataLogsSpecProvider); server.registerTutorial(dockerMetricsSpecProvider); server.registerTutorial(kubernetesMetricsSpecProvider); server.registerTutorial(uwsgiMetricsSpecProvider); @@ -105,4 +109,6 @@ export function registerTutorials(server) { server.registerTutorial(logstashMetricsSpecProvider); server.registerTutorial(prometheusMetricsSpecProvider); server.registerTutorial(zookeeperMetricsSpecProvider); + server.registerTutorial(uptimeMonitorsSpecProvider); + server.registerTutorial(cloudwatchLogsSpecProvider); } diff --git a/src/core_plugins/kibana/server/tutorials/suricata_logs/index.js b/src/core_plugins/kibana/server/tutorials/suricata_logs/index.js new file mode 100644 index 0000000000000..57d030a2fc535 --- /dev/null +++ b/src/core_plugins/kibana/server/tutorials/suricata_logs/index.js @@ -0,0 +1,67 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; +import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; +import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; + +export function suricataLogsSpecProvider(server, context) { + const moduleName = 'suricata'; + const geoipRequired = false; + const uaRequired = false; + const platforms = ['OSX', 'DEB', 'RPM', 'WINDOWS']; + return { + id: 'suricataLogs', + name: i18n.translate('kbn.server.tutorials.suricataLogs.nameTitle', { + defaultMessage: 'Suricata logs', + }), + category: TUTORIAL_CATEGORY.SECURITY, + shortDescription: i18n.translate('kbn.server.tutorials.suricataLogs.shortDescription', { + defaultMessage: 'Collect the result logs created by Suricata IDS/IPS/NSM.', + }), + longDescription: i18n.translate('kbn.server.tutorials.suricataLogs.longDescription', { + defaultMessage: 'The `suricata` Filebeat module collects the logs from the \ +[Suricata Eve JSON output](https://suricata.readthedocs.io/en/latest/output/eve/eve-json-format.html). \ +[Learn more]({learnMoreLink}).', + values: { + learnMoreLink: '{config.docs.beats.filebeat}/filebeat-module-suricata.html', + }, + }), + //euiIconType: 'logoSuricata', + artifacts: { + dashboards: [ + { + id: '69f5ae20-eb02-11e7-8f04-51231daa5b05', + linkLabel: i18n.translate('kbn.server.tutorials.suricataLogs.artifacts.dashboards.linkLabel', { + defaultMessage: 'Suricata logs dashboard', + }), + isOverview: true + } + ], + exportedFields: { + documentationUrl: '{config.docs.beats.filebeat}/exported-fields-suricata.html' + } + }, + completionTimeMinutes: 10, + previewImagePath: '/plugins/kibana/home/tutorial_resources/suricata_logs/screenshot.png', + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), + elasticCloud: cloudInstructions(moduleName, platforms), + onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) + }; +} diff --git a/src/core_plugins/kibana/server/tutorials/system_logs/index.js b/src/core_plugins/kibana/server/tutorials/system_logs/index.js index 74117526ac77c..54f295ecb44f8 100644 --- a/src/core_plugins/kibana/server/tutorials/system_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/system_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function systemLogsSpecProvider() { +export function systemLogsSpecProvider(server, context) { const moduleName = 'system'; const geoipRequired = true; const uaRequired = false; @@ -59,7 +59,7 @@ Unix/Linux based distributions. This module is not available on Windows. \ }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/system_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/system_metrics/index.js b/src/core_plugins/kibana/server/tutorials/system_metrics/index.js index 61669025d2f1f..a5fc1d7fd6333 100644 --- a/src/core_plugins/kibana/server/tutorials/system_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/system_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function systemMetricsSpecProvider() { +export function systemMetricsSpecProvider(server, context) { const moduleName = 'system'; return { id: 'systemMetrics', @@ -56,7 +56,7 @@ It collects system wide statistics and statistics per process and filesystem. \ }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/system_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/traefik_logs/index.js b/src/core_plugins/kibana/server/tutorials/traefik_logs/index.js index 7c7cdafd4fa25..5b90a2707b7a3 100644 --- a/src/core_plugins/kibana/server/tutorials/traefik_logs/index.js +++ b/src/core_plugins/kibana/server/tutorials/traefik_logs/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/filebeat_instructions'; -export function traefikLogsSpecProvider() { +export function traefikLogsSpecProvider(server, context) { const moduleName = 'traefik'; const geoipRequired = false; const uaRequired = false; @@ -59,7 +59,7 @@ export function traefikLogsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/traefik_logs/screenshot.png', - onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired), + onPrem: onPremInstructions(moduleName, platforms, geoipRequired, uaRequired, context), elasticCloud: cloudInstructions(moduleName, platforms), onPremElasticCloud: onPremCloudInstructions(moduleName, platforms) }; diff --git a/src/core_plugins/kibana/server/tutorials/uptime_monitors/index.js b/src/core_plugins/kibana/server/tutorials/uptime_monitors/index.js new file mode 100644 index 0000000000000..504948a887703 --- /dev/null +++ b/src/core_plugins/kibana/server/tutorials/uptime_monitors/index.js @@ -0,0 +1,63 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; +import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; +import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/heartbeat_instructions'; + +export function uptimeMonitorsSpecProvider(server, context) { + return { + id: 'uptimeMonitors', + name: i18n.translate('kbn.server.tutorials.uptimeMonitors.nameTitle', { + defaultMessage: 'Uptime Monitors', + }), + category: TUTORIAL_CATEGORY.METRICS, + shortDescription: i18n.translate('kbn.server.tutorials.uptimeMonitors.shortDescription', { + defaultMessage: 'Monitor services for their availability', + }), + longDescription: i18n.translate('kbn.server.tutorials.uptimeMonitors.longDescription', { + defaultMessage: 'Monitor services for their availability with active probing. \ + Given a list of URLs, Heartbeat asks the simple question: Are you alive? \ + [Learn more]({learnMoreLink}).', + values: { + learnMoreLink: '{config.docs.beats.heartbeat}/heartbeat-getting-started.html', + }, + }), + euiIconType: 'heartbeatApp', + artifacts: { + dashboards: [ + { + id: 'f3e771c0-eb19-11e6-be20-559646f8b9ba', + linkLabel: i18n.translate('kbn.server.tutorials.uptimeMonitors.artifacts.dashboards.linkLabel', { + defaultMessage: 'Heartbeat dashboard', + }), + isOverview: true + } + ], + exportedFields: { + documentationUrl: '{config.docs.beats.heartbeat}/exported-fields.html' + } + }, + completionTimeMinutes: 10, + previewImagePath: '/plugins/kibana/home/tutorial_resources/uptime_monitors/screenshot.png', + onPrem: onPremInstructions(null, null, null, context), + elasticCloud: cloudInstructions(), + onPremElasticCloud: onPremCloudInstructions() + }; +} diff --git a/src/core_plugins/kibana/server/tutorials/uwsgi_metrics/index.js b/src/core_plugins/kibana/server/tutorials/uwsgi_metrics/index.js index 3769c3fa6f014..a55d7c237d987 100644 --- a/src/core_plugins/kibana/server/tutorials/uwsgi_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/uwsgi_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function uwsgiMetricsSpecProvider() { +export function uwsgiMetricsSpecProvider(server, context) { const moduleName = 'uwsgi'; return { id: 'uwsgiMetrics', @@ -57,7 +57,7 @@ export function uwsgiMetricsSpecProvider() { }, completionTimeMinutes: 10, previewImagePath: '/plugins/kibana/home/tutorial_resources/uwsgi_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/vsphere_metrics/index.js b/src/core_plugins/kibana/server/tutorials/vsphere_metrics/index.js index 7ef4e68768b22..035e4ef5983ff 100644 --- a/src/core_plugins/kibana/server/tutorials/vsphere_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/vsphere_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function vSphereMetricsSpecProvider() { +export function vSphereMetricsSpecProvider(server, context) { const moduleName = 'vsphere'; return { id: 'vsphereMetrics', @@ -54,7 +54,7 @@ export function vSphereMetricsSpecProvider() { }, completionTimeMinutes: 10, //previewImagePath: '/plugins/kibana/home/tutorial_resources/vsphere_metrics/screenshot.png', - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/windows_metrics/index.js b/src/core_plugins/kibana/server/tutorials/windows_metrics/index.js index 16543ef745b92..66d383af8a79c 100644 --- a/src/core_plugins/kibana/server/tutorials/windows_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/windows_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function windowsMetricsSpecProvider() { +export function windowsMetricsSpecProvider(server, context) { const moduleName = 'windows'; return { id: 'windowsMetrics', @@ -40,6 +40,7 @@ export function windowsMetricsSpecProvider() { learnMoreLink: '{config.docs.beats.metricbeat}/metricbeat-module-windows.html', }, }), + euiIconType: 'logoWindows', artifacts: { application: { label: i18n.translate('kbn.server.tutorials.windowsMetrics.artifacts.application.label', { @@ -53,7 +54,7 @@ export function windowsMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/server/tutorials/zookeeper_metrics/index.js b/src/core_plugins/kibana/server/tutorials/zookeeper_metrics/index.js index 1a5b78df196bf..f97bd485bbd2c 100644 --- a/src/core_plugins/kibana/server/tutorials/zookeeper_metrics/index.js +++ b/src/core_plugins/kibana/server/tutorials/zookeeper_metrics/index.js @@ -21,7 +21,7 @@ import { i18n } from '@kbn/i18n'; import { TUTORIAL_CATEGORY } from '../../../common/tutorials/tutorial_category'; import { onPremInstructions, cloudInstructions, onPremCloudInstructions } from '../../../common/tutorials/metricbeat_instructions'; -export function zookeeperMetricsSpecProvider() { +export function zookeeperMetricsSpecProvider(server, context) { const moduleName = 'zookeeper'; return { id: moduleName + 'Metrics', @@ -31,7 +31,7 @@ export function zookeeperMetricsSpecProvider() { isBeta: true, category: TUTORIAL_CATEGORY.METRICS, shortDescription: i18n.translate('kbn.server.tutorials.zookeeperMetrics.shortDescription', { - defaultMessage: 'Fetch interal metrics from a Zookeeper server.', + defaultMessage: 'Fetch internal metrics from a Zookeeper server.', }), longDescription: i18n.translate('kbn.server.tutorials.zookeeperMetrics.longDescription', { defaultMessage: 'The `{moduleName}` Metricbeat module fetches internal metrics from a Zookeeper server. \ @@ -54,7 +54,7 @@ export function zookeeperMetricsSpecProvider() { } }, completionTimeMinutes: 10, - onPrem: onPremInstructions(moduleName), + onPrem: onPremInstructions(moduleName, null, null, null, context), elasticCloud: cloudInstructions(moduleName), onPremElasticCloud: onPremCloudInstructions(moduleName) }; diff --git a/src/core_plugins/kibana/ui_setting_defaults.js b/src/core_plugins/kibana/ui_setting_defaults.js index 8b2dcc2d2b4a6..f86477a89e46d 100644 --- a/src/core_plugins/kibana/ui_setting_defaults.js +++ b/src/core_plugins/kibana/ui_setting_defaults.js @@ -19,6 +19,7 @@ import moment from 'moment-timezone'; import numeralLanguages from '@elastic/numeral/languages'; +import { IS_KIBANA_RELEASE } from '../../utils'; export function getUiSettingDefaults() { const weekdays = moment.weekdays().slice(); @@ -44,6 +45,12 @@ export function getUiSettingDefaults() { description: `When set, * is allowed as the first character in a query clause. Currently only applies when experimental query features are enabled in the query bar. To disallow leading wildcards in basic lucene queries, use query:queryString:options`, }, + 'k7design': { + name: 'Use the new K7 UI design', + value: IS_KIBANA_RELEASE, + description: `When set, Kibana will use the new K7 design targeted for release in 7.0. At this time, not all features are + implemented.`, + }, 'search:queryLanguage': { name: 'Query language', value: 'lucene', @@ -527,5 +534,14 @@ export function getUiSettingDefaults() { `, category: ['accessibility'], }, + 'rollups:enableIndexPatterns': { + name: 'Enable rollup index patterns', + value: true, + description: ` + Enable the creation of index patterns which capture rollup indices, which in turn enable + visualizations based on rollup data. Refresh the page to apply the changes. + `, + category: ['rollups'], + }, }; } diff --git a/src/core_plugins/markdown_vis/index.js b/src/core_plugins/markdown_vis/index.js index 5a1b426ec1dee..0f5fb086d1157 100644 --- a/src/core_plugins/markdown_vis/index.js +++ b/src/core_plugins/markdown_vis/index.js @@ -24,7 +24,8 @@ export default function (kibana) { uiExports: { visTypes: [ 'plugins/markdown_vis/markdown_vis' - ] + ], + styleSheetPaths: `${__dirname}/public/index.scss`, } }); diff --git a/src/core_plugins/markdown_vis/public/_markdown_vis.scss b/src/core_plugins/markdown_vis/public/_markdown_vis.scss new file mode 100644 index 0000000000000..f9f4347096db1 --- /dev/null +++ b/src/core_plugins/markdown_vis/public/_markdown_vis.scss @@ -0,0 +1,8 @@ +.mkdVis { + padding: $euiSizeM; + width: 100%; +} + +#markdownVisInput { + resize: none; +} diff --git a/src/core_plugins/markdown_vis/public/images/icon-markdown.svg b/src/core_plugins/markdown_vis/public/images/icon-markdown.svg deleted file mode 100644 index 87cb0a58c1b12..0000000000000 --- a/src/core_plugins/markdown_vis/public/images/icon-markdown.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - icon-markdown update - Created with Sketch. - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/markdown_vis/public/index.scss b/src/core_plugins/markdown_vis/public/index.scss new file mode 100644 index 0000000000000..d52d2a6caec23 --- /dev/null +++ b/src/core_plugins/markdown_vis/public/index.scss @@ -0,0 +1,10 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "mkd" to avoid conflicts. +// Examples +// mkdChart +// mkdChart__legend +// mkdChart__legend--small +// mkdChart__legend-isLoading + +@import './markdown_vis'; diff --git a/src/core_plugins/markdown_vis/public/markdown_vis.js b/src/core_plugins/markdown_vis/public/markdown_vis.js index 239832cd778af..6c762aa148636 100644 --- a/src/core_plugins/markdown_vis/public/markdown_vis.js +++ b/src/core_plugins/markdown_vis/public/markdown_vis.js @@ -17,7 +17,6 @@ * under the License. */ -import './markdown_vis.less'; import { MarkdownVisWrapper } from './markdown_vis_controller'; import { VisFactoryProvider } from 'ui/vis/vis_factory'; import { CATEGORY } from 'ui/vis/vis_category'; diff --git a/src/core_plugins/markdown_vis/public/markdown_vis.less b/src/core_plugins/markdown_vis/public/markdown_vis.less deleted file mode 100644 index e2bd489daa750..0000000000000 --- a/src/core_plugins/markdown_vis/public/markdown_vis.less +++ /dev/null @@ -1,8 +0,0 @@ -.markdown-vis { - padding: 1em; - width: 100%; -} - -#markdownVisInput { - resize: none; -} diff --git a/src/core_plugins/markdown_vis/public/markdown_vis_controller.js b/src/core_plugins/markdown_vis/public/markdown_vis_controller.js index a5fa633f6f2d6..2d22294fa5d25 100644 --- a/src/core_plugins/markdown_vis/public/markdown_vis_controller.js +++ b/src/core_plugins/markdown_vis/public/markdown_vis_controller.js @@ -54,7 +54,7 @@ class MarkdownVisComponent extends Component { render() { return (
      - - - 42 - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/metric_vis/public/index.scss b/src/core_plugins/metric_vis/public/index.scss new file mode 100644 index 0000000000000..0a497fa75bbf0 --- /dev/null +++ b/src/core_plugins/metric_vis/public/index.scss @@ -0,0 +1,10 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "mtr" to avoid conflicts. +// Examples +// mtrChart +// mtrChart__legend +// mtrChart__legend--small +// mtrChart__legend-isLoading + +@import './metric_vis'; diff --git a/src/core_plugins/metric_vis/public/metric_vis.js b/src/core_plugins/metric_vis/public/metric_vis.js index 167a9b55f9e06..119f28296f904 100644 --- a/src/core_plugins/metric_vis/public/metric_vis.js +++ b/src/core_plugins/metric_vis/public/metric_vis.js @@ -17,7 +17,6 @@ * under the License. */ -import './metric_vis.less'; import './metric_vis_params'; import { VisFactoryProvider } from 'ui/vis/vis_factory'; import { CATEGORY } from 'ui/vis/vis_category'; @@ -32,16 +31,16 @@ import { MetricVisComponent } from './metric_vis_controller'; // register the provider with the visTypes registry VisTypesRegistryProvider.register(MetricVisProvider); -function MetricVisProvider(Private) { +function MetricVisProvider(Private, i18n) { const VisFactory = Private(VisFactoryProvider); // return the visType object, which kibana will use to display and configure new // Vis object of this type. return VisFactory.createReactVisualization({ name: 'metric', - title: 'Metric', + title: i18n('metricVis.metricTitle', { defaultMessage: 'Metric' }), icon: 'visMetric', - description: 'Display a calculation as a single number', + description: i18n('metricVis.metricDescription', { defaultMessage: 'Display a calculation as a single number' }), category: CATEGORY.DATA, visConfig: { component: MetricVisComponent, @@ -73,15 +72,28 @@ function MetricVisProvider(Private) { }, editorConfig: { collections: { - metricColorMode: ['None', 'Labels', 'Background'], - colorSchemas: Object.keys(vislibColorMaps), + metricColorMode: [ + { + id: 'None', + label: i18n('metricVis.colorModes.noneOptionLabel', { defaultMessage: 'None' }) + }, + { + id: 'Labels', + label: i18n('metricVis.colorModes.labelsOptionLabel', { defaultMessage: 'Labels' }) + }, + { + id: 'Background', + label: i18n('metricVis.colorModes.backgroundOptionLabel', { defaultMessage: 'Background' }) + } + ], + colorSchemas: Object.values(vislibColorMaps).map(value => ({ id: value.id, label: value.label })), }, optionsTemplate: '', schemas: new Schemas([ { group: 'metrics', name: 'metric', - title: 'Metric', + title: i18n('metricVis.schemas.metricTitle', { defaultMessage: 'Metric' }), min: 1, aggFilter: [ '!std_dev', '!geo_centroid', @@ -92,7 +104,7 @@ function MetricVisProvider(Private) { }, { group: 'buckets', name: 'group', - title: 'Split Group', + title: i18n('metricVis.schemas.splitGroupTitle', { defaultMessage: 'Split Group' }), min: 0, max: 1, aggFilter: ['!geohash_grid', '!filter'] diff --git a/src/core_plugins/metric_vis/public/metric_vis.less b/src/core_plugins/metric_vis/public/metric_vis.less deleted file mode 100644 index 3469729d4098c..0000000000000 --- a/src/core_plugins/metric_vis/public/metric_vis.less +++ /dev/null @@ -1,34 +0,0 @@ -@import (reference) "~ui/styles/mixins.less"; - -.metric-vis { - width: 100%; - display: flex; - flex-direction: row; - flex-wrap: wrap; - - .metric-value { - font-weight: bold; - .ellipsis(); - } - - .metric-container { - text-align: center; - margin: auto; - padding: 16px; - } - - .metric-container--light { - color: white; - } - - .metric-container--filterable { - cursor: pointer; - transition: transform 0.2s ease; - transform: translate(0, 0); - - &:hover, &:focus { - box-shadow: none; - transform: translate(0, -2px); - } - } -} diff --git a/src/core_plugins/metric_vis/public/metric_vis_controller.js b/src/core_plugins/metric_vis/public/metric_vis_controller.js index abd6d63cc8ec4..932b4f42a0cf1 100644 --- a/src/core_plugins/metric_vis/public/metric_vis_controller.js +++ b/src/core_plugins/metric_vis/public/metric_vis_controller.js @@ -180,7 +180,7 @@ export class MetricVisComponent extends Component { const metrics = this._processTableGroups(this.props.visData); metricsHtml = metrics.map(this._renderMetric); } - return (
      {metricsHtml}
      ); + return (
      {metricsHtml}
      ); } componentDidMount() { diff --git a/src/core_plugins/metric_vis/public/metric_vis_params.html b/src/core_plugins/metric_vis/public/metric_vis_params.html index 84db2d91e23f9..ae421468e40c6 100644 --- a/src/core_plugins/metric_vis/public/metric_vis_params.html +++ b/src/core_plugins/metric_vis/public/metric_vis_params.html @@ -1,8 +1,12 @@
      -

      @@ -89,14 +110,21 @@

      - Required: You must specify at least one range. + +

      - Add Range + class="kuiButton kuiButton--primary kuiButton--fullWidth" + i18n-id="metricVis.params.ranges.addRangeButtonLabel" + i18n-default-message="Add Range" + >
      @@ -107,7 +135,7 @@ kbn-accessible-click aria-expanded="{{!!showColorOptions}}" aria-controls="metricOptionsColors" - aria-label="Toggle color options" + aria-label="{{::'metricVis.params.color.toggleOptionsAriaLabel' | i18n: { defaultMessage: 'Toggle color options' } }}" class="kuiSideBarCollapsibleTitle__label" ng-click="showColorOptions = !showColorOptions" > @@ -119,44 +147,63 @@ }" class="fa fa-caret-right kuiSideBarCollapsibleTitle__caret" > - - Color Options +
      -
      -
      -
      @@ -195,7 +245,12 @@
      diff --git a/src/core_plugins/metric_vis/public/metric_vis_params.js b/src/core_plugins/metric_vis/public/metric_vis_params.js index 43adf503d72bd..76a709f5df24f 100644 --- a/src/core_plugins/metric_vis/public/metric_vis_params.js +++ b/src/core_plugins/metric_vis/public/metric_vis_params.js @@ -22,7 +22,7 @@ import metricVisParamsTemplate from './metric_vis_params.html'; import _ from 'lodash'; const module = uiModules.get('kibana'); -module.directive('metricVisParams', function () { +module.directive('metricVisParams', function (i18n) { return { restrict: 'E', template: metricVisParamsTemplate, @@ -80,6 +80,7 @@ module.directive('metricVisParams', function () { $scope.customColors = true; }); + $scope.editorState.requiredDescription = i18n('metricVis.params.ranges.warning.requiredDescription', { defaultMessage: 'Required:' }); } }; }); diff --git a/src/core_plugins/metrics/index.js b/src/core_plugins/metrics/index.js index 886d57e3dcbd8..2b989a5b6c6e7 100644 --- a/src/core_plugins/metrics/index.js +++ b/src/core_plugins/metrics/index.js @@ -27,7 +27,8 @@ export default function (kibana) { uiExports: { visTypes: [ 'plugins/metrics/kbn_vis_types' - ] + ], + styleSheetPaths: `${__dirname}/public/index.scss`, }, config(Joi) { diff --git a/src/core_plugins/metrics/public/_hacks.scss b/src/core_plugins/metrics/public/_hacks.scss new file mode 100644 index 0000000000000..06ae8d7abfbd5 --- /dev/null +++ b/src/core_plugins/metrics/public/_hacks.scss @@ -0,0 +1,128 @@ +// EUITODO: Create our own Markdown styles +.tvbMarkdown__content { + color: rgba(0,0,0,1); + + pre, code, tt { + border-radius: 0; + font: 1em/1.5em 'Andale Mono', 'Lucida Console', monospace; + } + + h1 { font-size: 30px; } + h2 { font-size: 26px; } + h3 { font-size: 22px; } + h4 { font-size: 18px; } + h5 { font-size: 16px; } + h6 { font-size: 16px; } + + h1, h2, h3, h4, h5, h6, b, strong { + margin:0 0 15px 0; + font-weight: bold; + } + em, i, dfn { + font-style: italic; + } + dfn { + font-weight:bold; + } + p, code, pre, kbd { + margin:0 0 15px 0; + } + blockquote { + margin:0 15px 15px 15px; + } + cite { + font-style: italic; + } + li ul, li ol { + margin:0 15px; + } + ul, ol { + margin:0 15px 15px 15px; + } + ul { + list-style-type:disc; + } + ol { + list-style-type:decimal; + } + ol ol { + list-style: upper-alpha; + } + ol ol ol { + list-style: lower-roman; + } + ol ol ol ol { + list-style: lower-alpha; + } + dl { + margin:0 0 15px 0; + } + dl dt { + font-weight:bold; + } + dd { + margin-left:1.5em; + } + table { + margin-bottom:1.4em; + width:100%; + } + th { + font-weight:bold; + } + th, td, caption { + padding:4px 15px 4px 5px; + } + tfoot { + font-style:italic; + } + sup, sub { + line-height:0; + } + abbr, acronym { + border-bottom: 1px dotted; + } + address { + margin:0 0 15px; + font-style:italic; + } + del { + text-decoration: line-through; + } + pre { + margin: 15px 0; + white-space: pre; + } + img { + max-width: 100%; + } + pre, code, tt { + background-color: rgba(0,0,0,0.1); + color: red; + code { + color: rgba(0,0,0,1); + background-color: transparent; + } + border: none; + } + + .tvbMarkdown.reversed & { + .table > thead > tr > th { + color: rgba(255,255,255,0.5); + border-bottom: 2px solid rgba(255,255,255,0.2); + } + .table > tbody > tr > td { + border-top: 1px solid rgba(255,255,255,0.2); + } + color: rgba(255,255,255,1); + pre, code, tt { + background-color: rgba(255,255,255,0.2); + color: #ffa5a8; + code { + color: rgba(255,255,255,1); + background-color: transparent; + } + border: none; + } + } +} diff --git a/src/core_plugins/metrics/public/_mixins.scss b/src/core_plugins/metrics/public/_mixins.scss new file mode 100644 index 0000000000000..0cc119601148b --- /dev/null +++ b/src/core_plugins/metrics/public/_mixins.scss @@ -0,0 +1,14 @@ +@import 'node_modules/@elastic/eui/src/components/form/variables'; +@import 'node_modules/@elastic/eui/src/components/form/mixins'; + +@mixin tvbEditor__repeatingRow { + background-color: $euiColorLightestShade; + padding: $euiSizeS; + margin-bottom: $euiSizeS; +} + +// SASSTODO: These need to be converted to EUI, +// but they have type errors +@mixin tvbEditor__input { + @include euiFormControlStyle($borderOnly: false, $includeStates: true, $includeSizes: false); +} diff --git a/src/core_plugins/metrics/public/_ui_sortable.scss b/src/core_plugins/metrics/public/_ui_sortable.scss new file mode 100644 index 0000000000000..5d66b42a0a9d1 --- /dev/null +++ b/src/core_plugins/metrics/public/_ui_sortable.scss @@ -0,0 +1,41 @@ +// react-anything-sortable overrides +// Scoped to just the TSVB editor + +.tvbEditor { + + .ui-sortable { + display: block; + position: relative; + overflow: visible; + user-select: none; + + &:before, + &:after { + content: " "; + display: table; + } + + &:after { + clear: both; + } + + .ui-sortable-item.ui-sortable-dragging { + position: absolute; + z-index: $euiZLevel2; + } + + .ui-sortable-placeholder { + display: none; + + &.visible { + display: block; + opacity: 0.5; + z-index: -1; + } + } + } + +} + + + diff --git a/src/core_plugins/metrics/public/_variables.scss b/src/core_plugins/metrics/public/_variables.scss new file mode 100644 index 0000000000000..7182e9b2b2f10 --- /dev/null +++ b/src/core_plugins/metrics/public/_variables.scss @@ -0,0 +1,11 @@ +$tvbLineColor: transparentize($euiColorFullShade,0.8); +$tvbLineColorReversed: transparentize($euiColorEmptyShade,0.6); + +$tvbTextColor: transparentize($euiColorFullShade,0.6); +$tvbTextColorReversed: transparentize($euiColorEmptyShade,0.4); + +$tvbValueColor: transparentize($euiColorFullShade,0.3); +$tvbValueColorReversed: transparentize($euiColorEmptyShade,0.2); + +$tvbHoverBackgroundColor: transparentize($euiColorFullShade,0.9); +$tvbHoverBackgroundColorReversed: transparentize($euiColorEmptyShade,0.9); diff --git a/src/core_plugins/metrics/public/components/_annotations_editor.scss b/src/core_plugins/metrics/public/components/_annotations_editor.scss new file mode 100644 index 0000000000000..3372367be273d --- /dev/null +++ b/src/core_plugins/metrics/public/components/_annotations_editor.scss @@ -0,0 +1,13 @@ +@import 'node_modules/@elastic/eui/src/components/panel/mixins'; + +.tvbAnnotationsEditor__container { + padding: $euiSize; + background-color: $euiColorLightestShade; +} + +@include euiPanel('tvbAnnotationsEditor'); + +.tvbAnnotationsEditor { + margin-bottom: $euiSize; + padding: $euiSizeS; +} diff --git a/src/core_plugins/metrics/public/components/_color_picker.scss b/src/core_plugins/metrics/public/components/_color_picker.scss new file mode 100644 index 0000000000000..cafe3a1cb59c6 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_color_picker.scss @@ -0,0 +1,44 @@ +// EUITODO: Convert to EuiColorPicker + +@import 'node_modules/@elastic/eui/src/components/color_picker/index'; + +.tvbColorPicker { + display: flex; + align-items: center; + position: relative; +} + +.tvbColorPicker__swatch-empty, +.tvbColorPicker__swatch { + @extend .euiColorPicker__swatch; +} + +.tvbColorPicker__swatch-empty { + background-color: transparent; + background-size: 22px 22px; + background-image: repeating-linear-gradient( + -45deg, + $euiColorDanger, + $euiColorDanger 2px, + transparent 2px, + transparent $euiSize + ); +} + +.tvbColorPicker__clear { + margin-left: $euiSizeXS; +} + +.tvbColorPicker__popover { + position: absolute; + top: $euiSizeL; + z-index: 2; +} + +.tvbColorPicker__cover { + position: fixed; + top: 0px; + right: 0px; + left: 0px; + bottom: 0px; +} diff --git a/src/core_plugins/metrics/public/components/_color_rules.scss b/src/core_plugins/metrics/public/components/_color_rules.scss new file mode 100644 index 0000000000000..16ad929ec8bed --- /dev/null +++ b/src/core_plugins/metrics/public/components/_color_rules.scss @@ -0,0 +1,3 @@ +.tvbColorRules__rule { + @include tvbEditor__repeatingRow; +} diff --git a/src/core_plugins/metrics/public/components/_custom_color_picker.scss b/src/core_plugins/metrics/public/components/_custom_color_picker.scss new file mode 100644 index 0000000000000..a4147a4ee2d91 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_custom_color_picker.scss @@ -0,0 +1,97 @@ +// EUITODO: Convert to EuiColorPicker +// with additional support for alpha, saturation, swatches + +// SASSTODO: This custom picker moved all styles from react-color inline styles +// to SASS, but it should be in EUI. +// Also, some pixel values were kept as is to match inline styles from react-color +.tvbColorPickerPopUp { + @include euiBottomShadowMedium(); + background-color: $euiColorEmptyShade; + border-radius: $euiBorderRadius; + box-sizing: initial; + width: 275px; + font-family: 'Menlo'; +} + +.tvbColorPickerPopUp__saturation { + width: 100%; + padding-bottom: 55%; + position: relative; + border-radius: $euiBorderRadius $euiBorderRadius 0 0; + overflow: hidden; +} + +.tvbColorPickerPopUp__body { + padding: $euiSize; +} + +.tvbColorPickerPopUp__controls { + display: flex; +} + +.tvbColorPickerPopUp__color { + width: $euiSizeXL; + + // The color indicator doesn't work, hiding it until it does + display: none; +} + +.tvbColorPickerPopUp__color-disableAlpha { + width: $euiSizeL; +} + +.tvbColorPickerPopUp__swatch { + margin-top: 6px; + width: $euiSize; + height: $euiSize; + border-radius: $euiSizeS; + position: relative; + overflow: hidden; +} + +.tvbColorPickerPopUp__swatch-disableAlpha { + width: 10px; + height: 10px; + margin: 0px; +} + +.tvbColorPickerPopUp__active { + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + border-radius: $euiSizeS; + box-shadow: inset 0 0 0 1px rgba(0,0,0,0.1); + z-index: 2; +} + +.tvbColorPickerPopUp__toggles { + flex: 1 +} + +.tvbColorPickerPopUp__hue { + height: 10px; + position: relative; + margin-bottom: $euiSizeS; +} + +.tvbColorPickerPopUp__hue-disableAlpha { + margin-bottom: 0px; +} + +.tvbColorPickerPopUp__alpha { + height: 10px; + position: relative; +} + +.tvbColorPickerPopUp__alpha-disableAlpha { + display: none; +} + +.tvbColorPickerPopUp__swatches { + display: flex; + flex-wrap: wrap; + justify-content: center; + margin-top: $euiSize; +} diff --git a/src/core_plugins/metrics/public/components/_error.scss b/src/core_plugins/metrics/public/components/_error.scss new file mode 100644 index 0000000000000..607863ccbf048 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_error.scss @@ -0,0 +1,33 @@ +// EUITODO: Convert to EuiCallout +.tvbError { + padding: $euiSize; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + + // Calculate colors similar to EuiCallout + $tempBackgroundColor: tintOrShade($euiColorDanger, 90%, 70%); + background-color: $tempBackgroundColor; + + .tvbError__title { + @include euiTitle("xs"); + color: makeHighContrastColor($euiColorDanger, $tempBackgroundColor); + } +} + +.tvbError__additional, +.tvbError__stack { + margin-top: $euiSizeS; +} + +// EUITODO: Convert to EuiCodeBlock +.tvbError__stack { + padding: $euiSizeS; + background: $euiCodeBlockBackgroundColor; + color: $euiCodeBlockColor; + line-height: $euiLineHeight; + font-family: $euiCodeFontFamily; + font-weight: $euiFontWeightRegular; + white-space: pre-wrap; +} diff --git a/src/core_plugins/metrics/public/components/_index.scss b/src/core_plugins/metrics/public/components/_index.scss new file mode 100644 index 0000000000000..3a10b07c23e2b --- /dev/null +++ b/src/core_plugins/metrics/public/components/_index.scss @@ -0,0 +1,16 @@ +@import './annotations_editor'; +@import './color_rules'; +@import './color_picker'; +@import './custom_color_picker'; +@import './error'; +@import './no_data'; +@import './markdown_editor'; +@import './series_editor'; +@import './vis_editor'; +@import './vis_editor_visualization'; +@import './vis_picker'; +@import './vis_with_splits'; + +@import './aggs/index'; +@import './panel_config/index'; +@import './vis_types/index'; diff --git a/src/core_plugins/metrics/public/components/_markdown_editor.scss b/src/core_plugins/metrics/public/components/_markdown_editor.scss new file mode 100644 index 0000000000000..57ffb26cf55ca --- /dev/null +++ b/src/core_plugins/metrics/public/components/_markdown_editor.scss @@ -0,0 +1,28 @@ +.tvbMarkdownEditor { + display: flex; + background-color: $euiColorEmptyShade; + height: 500px; +} + +.tvbMarkdownEditor__editor, +.tvbMarkdownEditor__variables { + width: 50%; + flex: 1 0 auto; +} + +.tvbMarkdownEditor__editor { + border-right: 2px solid $euiColorLightestShade; +} + +.tvbMarkdownEditor__variables { + padding: $euiSizeS; + overflow: auto; +} + +.tvbMarkdownEditor__noVariables { + display: block; + padding-bottom: $euiSizeXXL; + padding-top: $euiSizeXXL - $euiSizeL; + text-align: center; + border-bottom: $euiBorderThin; +} diff --git a/src/core_plugins/metrics/public/components/_no_data.scss b/src/core_plugins/metrics/public/components/_no_data.scss new file mode 100644 index 0000000000000..5993600445028 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_no_data.scss @@ -0,0 +1,17 @@ +// EUITODO: Convert to EuiCallout +.tvbNoData { + padding: $euiSize; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + + // Calculate colors similar to EuiCallout + $tempBackgroundColor: tintOrShade($euiColorPrimary, 90%, 70%); + background-color: $tempBackgroundColor; + + .tvbNoData__title { + @include euiTitle("xs"); + color: makeHighContrastColor($euiColorPrimary, $tempBackgroundColor); + } +} diff --git a/src/core_plugins/metrics/public/components/_series_editor.scss b/src/core_plugins/metrics/public/components/_series_editor.scss new file mode 100644 index 0000000000000..38d879414d326 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_series_editor.scss @@ -0,0 +1,23 @@ +@import 'node_modules/@elastic/eui/src/components/panel/mixins'; + +.tvbSeriesEditor__container { + padding: $euiSize; + background-color: $euiColorLightestShade; +} + +@include euiPanel('tvbSeriesEditor'); + +.tvbSeriesEditor { + margin-bottom: $euiSize; + padding: $euiSizeS; + + // When dragging a collapsed item, make sure the contents doesn't show + &.ui-sortable-dragging { + overflow: hidden; + } +} + +.tvbSeries__body { + margin-left: $euiSizeXL; + margin-top: $euiSizeS; +} diff --git a/src/core_plugins/metrics/public/components/_vis_editor.scss b/src/core_plugins/metrics/public/components/_vis_editor.scss new file mode 100644 index 0000000000000..d171e6874b2a6 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_vis_editor.scss @@ -0,0 +1,4 @@ +.tvbEditor { + flex: 1; + background: $euiColorLightestShade; +} diff --git a/src/core_plugins/metrics/public/components/_vis_editor_visualization.scss b/src/core_plugins/metrics/public/components/_vis_editor_visualization.scss new file mode 100644 index 0000000000000..0d8e15eb9be7f --- /dev/null +++ b/src/core_plugins/metrics/public/components/_vis_editor_visualization.scss @@ -0,0 +1,19 @@ +.tvbEditorVisualization { + position: relative; + display: flex; + flex-direction: column; + flex: 1 0 auto; + width: 100%; + height: $euiSizeL * 10; + line-height: normal; + background-color: $euiColorEmptyShade; + overflow: auto; +} + +.tvbEditorVisualization__apply { + padding: $euiSizeS; +} + +.tvbEditorVisualization__draghandle { + @include kibana-resizer($size: ($euiSizeM + 2px), $direction: vertical); +} diff --git a/src/core_plugins/metrics/public/components/_vis_picker.scss b/src/core_plugins/metrics/public/components/_vis_picker.scss new file mode 100644 index 0000000000000..94f8d6fac97d4 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_vis_picker.scss @@ -0,0 +1,4 @@ +.tvbVisPickerItem { + font-size: $euiFontSizeM; + font-weight: $euiFontWeightMedium; +} diff --git a/src/core_plugins/metrics/public/components/_vis_with_splits.scss b/src/core_plugins/metrics/public/components/_vis_with_splits.scss new file mode 100644 index 0000000000000..9244d9ed7c689 --- /dev/null +++ b/src/core_plugins/metrics/public/components/_vis_with_splits.scss @@ -0,0 +1,11 @@ +.tvbSplitVis { + display: flex; + flex: 1 0 auto; +} + +.tvbSplitVis__split { + display: flex; + flex: 1 0 0; + flex-direction: column; + overflow: hidden; +} diff --git a/src/core_plugins/metrics/public/components/add_delete_buttons.js b/src/core_plugins/metrics/public/components/add_delete_buttons.js index 004445d9c45ad..222ffa1af0f5e 100644 --- a/src/core_plugins/metrics/public/components/add_delete_buttons.js +++ b/src/core_plugins/metrics/public/components/add_delete_buttons.js @@ -19,7 +19,7 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; function AddDeleteButtons(props) { const { testSubj } = props; @@ -28,16 +28,17 @@ function AddDeleteButtons(props) { return null; } return ( - - - + + + + + ); }; const createAdd = () => { @@ -45,16 +46,16 @@ function AddDeleteButtons(props) { return null; } return ( - - - + + + + + ); }; const deleteBtn = createDelete(); @@ -62,24 +63,24 @@ function AddDeleteButtons(props) { let clone; if (props.onClone && !props.disableAdd) { clone = ( - - - + + + + + ); } return ( -
      + { clone } { addBtn } { deleteBtn } -
      + ); } @@ -98,7 +99,8 @@ AddDeleteButtons.propTypes = { disableDelete: PropTypes.bool, onClone: PropTypes.func, onAdd: PropTypes.func, - onDelete: PropTypes.func + onDelete: PropTypes.func, + responsive: PropTypes.bool, }; export default AddDeleteButtons; diff --git a/src/core_plugins/metrics/public/components/add_delete_buttons.test.js b/src/core_plugins/metrics/public/components/add_delete_buttons.test.js index d414149b6634c..de24bbff55846 100644 --- a/src/core_plugins/metrics/public/components/add_delete_buttons.test.js +++ b/src/core_plugins/metrics/public/components/add_delete_buttons.test.js @@ -29,7 +29,7 @@ describe('AddDeleteButtons', () => { const wrapper = shallow( ); - wrapper.find('button').at(0).simulate('click'); + wrapper.find('EuiButtonIcon').at(0).simulate('click'); expect(handleAdd.calledOnce).to.equal(true); }); @@ -38,7 +38,7 @@ describe('AddDeleteButtons', () => { const wrapper = shallow( ); - wrapper.find('button').at(1).simulate('click'); + wrapper.find('EuiButtonIcon').at(1).simulate('click'); expect(handleDelete.calledOnce).to.equal(true); }); @@ -47,7 +47,7 @@ describe('AddDeleteButtons', () => { const wrapper = shallow( ); - wrapper.find('button').at(0).simulate('click'); + wrapper.find('EuiButtonIcon').at(0).simulate('click'); expect(handleClone.calledOnce).to.equal(true); }); diff --git a/src/core_plugins/metrics/public/components/aggs/_agg_row.scss b/src/core_plugins/metrics/public/components/aggs/_agg_row.scss new file mode 100644 index 0000000000000..bb65a43dd8bed --- /dev/null +++ b/src/core_plugins/metrics/public/components/aggs/_agg_row.scss @@ -0,0 +1,23 @@ +.tvbAggRow { + @include tvbEditor__repeatingRow; +} + +.tvbAggRow--split { + padding-left: $euiSizeXL; +} + +.tvbAggRow__visibilityIcon { + margin-top: $euiSizeXS; +} + +.tvbAggRow__children { + padding-top: $euiSizeS - 2px; +} + +.tvbAggRow__unavailable { + margin-top: -$euiSizeXS; +} + +.tvbAgg__input { + @include euiFormControlStyle($borderOnly: false, $includeStates: true, $includeSizes: false); +} diff --git a/src/core_plugins/metrics/public/components/aggs/_index.scss b/src/core_plugins/metrics/public/components/aggs/_index.scss new file mode 100644 index 0000000000000..cf423d36ef486 --- /dev/null +++ b/src/core_plugins/metrics/public/components/aggs/_index.scss @@ -0,0 +1 @@ +@import './agg_row'; diff --git a/src/core_plugins/metrics/public/components/aggs/agg_row.js b/src/core_plugins/metrics/public/components/aggs/agg_row.js index 1e5fea49c9a60..756e7b7eb3fd0 100644 --- a/src/core_plugins/metrics/public/components/aggs/agg_row.js +++ b/src/core_plugins/metrics/public/components/aggs/agg_row.js @@ -21,47 +21,49 @@ import PropTypes from 'prop-types'; import React from 'react'; import _ from 'lodash'; import AddDeleteButtons from '../add_delete_buttons'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiButtonIcon, EuiIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; function AggRow(props) { - let iconClassName = 'fa fa-eye-slash'; - let iconRowClassName = 'vis_editor__agg_row-icon'; + let iconType = 'eyeClosed'; + let iconColor = 'subdued'; const last = _.last(props.siblings); if (last.id === props.model.id) { - iconClassName = 'fa fa-eye'; - iconRowClassName += ' last'; + iconType = 'eye'; + iconColor = 'text'; } let dragHandle; if (!props.disableDelete) { dragHandle = ( -
      - -
      - -
      + + + -
      + ); } return ( -
      -
      -
      - -
      - {props.children} - { dragHandle } - -
      +
      + + + + + + {props.children} + + {dragHandle} + + + +
      ); } diff --git a/src/core_plugins/metrics/public/components/aggs/agg_select.js b/src/core_plugins/metrics/public/components/aggs/agg_select.js index 91e3c9478b154..f447104cf591f 100644 --- a/src/core_plugins/metrics/public/components/aggs/agg_select.js +++ b/src/core_plugins/metrics/public/components/aggs/agg_select.js @@ -80,7 +80,7 @@ function filterByPanelType(panelType) { } function AggSelect(props) { - const { siblings, panelType, value } = props; + const { siblings, panelType, value, onChange, ...rest } = props; const selectedOption = allAggOptions.find(option => { return value === option.value; @@ -120,18 +120,19 @@ function AggSelect(props) { const handleChange = selectedOptions => { if (!selectedOptions || selectedOptions.length <= 0) return; - props.onChange(selectedOptions); + onChange(selectedOptions); }; return ( -
      +
      ); diff --git a/src/core_plugins/metrics/public/components/aggs/calculation.js b/src/core_plugins/metrics/public/components/aggs/calculation.js index 77bdb2aa25125..9a22596915b66 100644 --- a/src/core_plugins/metrics/public/components/aggs/calculation.js +++ b/src/core_plugins/metrics/public/components/aggs/calculation.js @@ -29,7 +29,15 @@ import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; import Vars from './vars'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, + EuiTextArea, + EuiFormRow, + EuiCode, +} from '@elastic/eui'; class CalculationAgg extends Component { @@ -61,40 +69,49 @@ class CalculationAgg extends Component { onDelete={this.props.onDelete} siblings={this.props.siblings} > -
      -
      -
      Aggregation
      + + + Aggregation -
      -
      Variables
      - -
      -
      - - + + + Variables + + + + + + Variables are keys on the params object, i.e. params.<name>. + To access the bucket interval (in milliseconds) use params._interval. +
      + } + > + -
      -
      -
      + + + ); } diff --git a/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js b/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js index 3ab487c3b6d96..5bb10f6982c56 100644 --- a/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js +++ b/src/core_plugins/metrics/public/components/aggs/cumulative_sum.js @@ -24,9 +24,11 @@ import AggSelect from './agg_select'; import MetricSelect from './metric_select'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormLabel, EuiFormRow } from '@elastic/eui'; function CumulativeSumAgg(props) { const { model, siblings } = props; + const htmlId = htmlIdGenerator(); const handleChange = createChangeHandler(props.onChange, model); const handleSelectChange = createSelectHandler(handleChange); return ( @@ -37,24 +39,31 @@ function CumulativeSumAgg(props) { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      -
      Metric
      - -
      + + + Aggregation + + + + + + + + ); diff --git a/src/core_plugins/metrics/public/components/aggs/derivative.js b/src/core_plugins/metrics/public/components/aggs/derivative.js index 73ce9a244aa22..65213afe36ac0 100644 --- a/src/core_plugins/metrics/public/components/aggs/derivative.js +++ b/src/core_plugins/metrics/public/components/aggs/derivative.js @@ -25,7 +25,14 @@ import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, + EuiFieldText, + EuiFormRow, +} from '@elastic/eui'; export const DerivativeAgg = props => { const { siblings } = props; @@ -47,36 +54,47 @@ export const DerivativeAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      -
      Metric
      - -
      -
      - - -
      + + + Aggregation + + + + + + + + + + + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/field_select.js b/src/core_plugins/metrics/public/components/aggs/field_select.js index 175ae7126bc6a..9eef8f3f4e74f 100644 --- a/src/core_plugins/metrics/public/components/aggs/field_select.js +++ b/src/core_plugins/metrics/public/components/aggs/field_select.js @@ -25,12 +25,12 @@ import { import generateByTypeFilter from '../lib/generate_by_type_filter'; function FieldSelect(props) { - const { type, fields, indexPattern, value, onChange, disabled } = props; + const { type, fields, indexPattern, value, onChange, disabled, restrict, ...rest } = props; if (type === 'count') { return null; } const options = (fields[indexPattern] || []) - .filter(generateByTypeFilter(props.restrict)) + .filter(generateByTypeFilter(restrict)) .map(field => { return { label: field.name, value: field.name }; }); @@ -47,7 +47,8 @@ function FieldSelect(props) { options={options} selectedOptions={selectedOptions} onChange={onChange} - singleSelection={true} + singleSelection={{ asPlainText: true }} + {...rest} /> ); } diff --git a/src/core_plugins/metrics/public/components/aggs/filter_ratio.js b/src/core_plugins/metrics/public/components/aggs/filter_ratio.js index 6db2d61af9134..d0291ca958442 100644 --- a/src/core_plugins/metrics/public/components/aggs/filter_ratio.js +++ b/src/core_plugins/metrics/public/components/aggs/filter_ratio.js @@ -25,7 +25,15 @@ import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, + EuiFieldText, + EuiSpacer, + EuiFormRow, +} from '@elastic/eui'; export const FilterRatioAgg = props => { const { @@ -58,59 +66,58 @@ export const FilterRatioAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      -
      -
      Aggregation
      - -
      -
      - - + + + Aggregation + + + + + + -
      -
      - - + + + + + -
      -
      -
      -
      -
      Metric Aggregation
      - -
      - { model.metric_agg !== 'count' ? ( -
      - + + + + + + + + + + + Metric Aggregation + + + + { model.metric_agg !== 'count' ? ( + + { value={model.field} onChange={handleSelectChange('field')} /> -
      ) : null } -
      -
      + + ) : null } + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/math.js b/src/core_plugins/metrics/public/components/aggs/math.js index d70617d1148d5..77b33b9a14069 100644 --- a/src/core_plugins/metrics/public/components/aggs/math.js +++ b/src/core_plugins/metrics/public/components/aggs/math.js @@ -28,6 +28,16 @@ import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; import Vars from './vars'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, + EuiTextArea, + EuiLink, + EuiFormRow, + EuiCode, +} from '@elastic/eui'; class MathAgg extends Component { componentWillMount() { @@ -42,6 +52,7 @@ class MathAgg extends Component { render() { const { siblings } = this.props; + const htmlId = htmlIdGenerator(); const defaults = { script: '' }; const model = { ...defaults, ...this.props.model }; @@ -58,60 +69,63 @@ class MathAgg extends Component { onDelete={this.props.onDelete} siblings={this.props.siblings} > -
      -
      -
      Aggregation
      + + + Aggregation -
      -
      Variables
      - -
      -
      - - -
      - This field uses basic math expressions (see{' '} - - TinyMath - ) - Variables are keys on the params object, - i.e. params.<name> To access all the data use - params._all.<name>.values for an array of the - values and params._all.<name>.timestamps - for an array of the timestamps. params._timestamp - is available for the current bucket's timestamp, - params._index is available for the current - bucket's index, and params._intervals - available for the interval in milliseconds. -
      -
      -
      -
      + fullWidth + value={model.script} + /> + + + ); } diff --git a/src/core_plugins/metrics/public/components/aggs/metric_select.js b/src/core_plugins/metrics/public/components/aggs/metric_select.js index fb12f085a6254..7bd7f42d3d4c8 100644 --- a/src/core_plugins/metrics/public/components/aggs/metric_select.js +++ b/src/core_plugins/metrics/public/components/aggs/metric_select.js @@ -59,11 +59,11 @@ export function filterRows(includeSiblings) { } function MetricSelect(props) { - const { restrict, metric, onChange, value, exclude, includeSiblings } = props; + const { additionalOptions, restrict, metric, metrics, onChange, value, exclude, includeSiblings, clearable, ...rest } = props; - const metrics = props.metrics.filter(createTypeFilter(restrict, exclude)); + const calculatedMetrics = metrics.filter(createTypeFilter(restrict, exclude)); - const siblings = calculateSiblings(metrics, metric); + const siblings = calculateSiblings(calculatedMetrics, metric); // Percentiles need to be handled differently because one percentile aggregation // could have multiple percentiles associated with it. So the user needs a way @@ -71,7 +71,7 @@ function MetricSelect(props) { const percentileOptions = siblings .filter(row => /^percentile/.test(row.type)) .reduce((acc, row) => { - const label = calculateLabel(row, metrics); + const label = calculateLabel(row, calculatedMetrics); row.percentiles.forEach(p => { if (p.value) { const value = /\./.test(p.value) ? p.value : `${p.value}.0`; @@ -85,10 +85,10 @@ function MetricSelect(props) { }, []); const options = siblings.filter(filterRows(includeSiblings)).map(row => { - const label = calculateLabel(row, metrics); + const label = calculateLabel(row, calculatedMetrics); return { value: row.id, label }; }); - const allOptions = [...options, ...props.additionalOptions, ...percentileOptions]; + const allOptions = [...options, ...additionalOptions, ...percentileOptions]; const selectedOption = allOptions.find(option => { return value === option.value; @@ -101,7 +101,9 @@ function MetricSelect(props) { options={allOptions} selectedOptions={selectedOptions} onChange={onChange} - singleSelection={true} + singleSelection={{ asPlainText: true }} + isClearable={clearable} + {...rest} /> ); } diff --git a/src/core_plugins/metrics/public/components/aggs/moving_average.js b/src/core_plugins/metrics/public/components/aggs/moving_average.js index 245037c8959f9..391f48a658a75 100644 --- a/src/core_plugins/metrics/public/components/aggs/moving_average.js +++ b/src/core_plugins/metrics/public/components/aggs/moving_average.js @@ -28,7 +28,14 @@ import createTextHandler from '../lib/create_text_handler'; import createNumberHandler from '../lib/create_number_handler'; import { htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, EuiComboBox, + EuiSpacer, + EuiFormRow, + EuiCode, + EuiTextArea, } from '@elastic/eui'; export const MovingAverageAgg = props => { @@ -71,91 +78,109 @@ export const MovingAverageAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      -
      -
      Aggregation
      - -
      -
      -
      Metric
      + + + Aggregation + + + + -
      -
      -
      -
      - + + + + + + + + + -
      -
      - + + + + + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + Should it be text or number? + */} -
      -
      - + + + + -
      -
      - + + + + + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + Should it be text or number? + */} -
      -
      -
      -
      - - -
      -
      -
      + + + + + + + + Key=Value space-delimited + } + > + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/percentile.js b/src/core_plugins/metrics/public/components/aggs/percentile.js index c9744a8c69340..7a1e89db80830 100644 --- a/src/core_plugins/metrics/public/components/aggs/percentile.js +++ b/src/core_plugins/metrics/public/components/aggs/percentile.js @@ -30,8 +30,15 @@ import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import { htmlIdGenerator, + EuiSpacer, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, EuiComboBox, + EuiFieldNumber, + EuiFormRow, } from '@elastic/eui'; + const newPercentile = (opts) => { return _.assign({ id: uuid.v1(), mode: 'line', shade: 0.2 }, opts); }; @@ -65,64 +72,74 @@ class Percentiles extends Component { if (model.mode === 'line') { optionsStyle.display = 'none'; } + const labelStyle = { marginBottom: 0 }; const htmlId = htmlIdGenerator(model.id); const selectedModeOption = modeOptions.find(option => { return model.mode === option.value; }); return ( -
      -
      - - -
      + + + + + + + + Mode: + + -
      - - - - -
      - -
      + + + + Fill to: + + + + + + + Shade (0 to 1): + + + + + + + + + + + ); } @@ -132,9 +149,9 @@ class Percentiles extends Component { const rows = model[name].map(this.renderRow); return ( -
      + { rows } -
      + ); } } @@ -166,6 +183,7 @@ class PercentileAgg extends Component { // eslint-disable-line react/no-multi-co const handleChange = createChangeHandler(this.props.onChange, model); const handleSelectChange = createSelectHandler(handleChange); const indexPattern = series.override_index_pattern && series.series_index_pattern || panel.index_pattern; + const htmlId = htmlIdGenerator(); return ( -
      -
      -
      -
      Aggregation
      - -
      -
      -
      Field
      + + + Aggregation + + + + -
      -
      - -
      + + + + + + + +
      ); } diff --git a/src/core_plugins/metrics/public/components/aggs/percentile_rank.js b/src/core_plugins/metrics/public/components/aggs/percentile_rank.js index 626f6105d5497..5dfefa6c37426 100644 --- a/src/core_plugins/metrics/public/components/aggs/percentile_rank.js +++ b/src/core_plugins/metrics/public/components/aggs/percentile_rank.js @@ -25,7 +25,14 @@ import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, + EuiFieldText, + EuiFormRow, +} from '@elastic/eui'; export const PercentileRankAgg = props => { const { series, panel, fields } = props; @@ -47,36 +54,38 @@ export const PercentileRankAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      - - -
      -
      - - -
      + + + Aggregation + + + + + + + + + + + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/positive_only.js b/src/core_plugins/metrics/public/components/aggs/positive_only.js index cf04e6549cb0b..dedef18b71251 100644 --- a/src/core_plugins/metrics/public/components/aggs/positive_only.js +++ b/src/core_plugins/metrics/public/components/aggs/positive_only.js @@ -24,6 +24,7 @@ import MetricSelect from './metric_select'; import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormLabel, EuiFormRow } from '@elastic/eui'; export const PositiveOnlyAgg = props => { const { siblings } = props; @@ -31,6 +32,7 @@ export const PositiveOnlyAgg = props => { const defaults = { unit: '' }; const model = { ...defaults, ...props.model }; + const htmlId = htmlIdGenerator(); const handleChange = createChangeHandler(props.onChange, model); const handleSelectChange = createSelectHandler(handleChange); @@ -42,24 +44,31 @@ export const PositiveOnlyAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      -
      Metric
      - -
      + + + Aggregation + + + + + + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/serial_diff.js b/src/core_plugins/metrics/public/components/aggs/serial_diff.js index b4d2871b731a3..c1d86ce9e30de 100644 --- a/src/core_plugins/metrics/public/components/aggs/serial_diff.js +++ b/src/core_plugins/metrics/public/components/aggs/serial_diff.js @@ -25,7 +25,7 @@ import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import createNumberHandler from '../lib/create_number_handler'; -import { htmlIdGenerator } from '@elastic/eui'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormLabel, EuiFormRow } from '@elastic/eui'; export const SerialDiffAgg = props => { const { siblings } = props; @@ -46,34 +46,45 @@ export const SerialDiffAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      -
      Metric
      - -
      -
      - - -
      + + + Aggregation + + + + + + + + + + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + Should it be text or number? + */} + + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/series_agg.js b/src/core_plugins/metrics/public/components/aggs/series_agg.js index ebcde12d33c57..6fd85372bf921 100644 --- a/src/core_plugins/metrics/public/components/aggs/series_agg.js +++ b/src/core_plugins/metrics/public/components/aggs/series_agg.js @@ -25,7 +25,12 @@ import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import { htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, EuiComboBox, + EuiTitle, + EuiFormRow, } from '@elastic/eui'; function SeriesAgg(props) { @@ -60,11 +65,9 @@ function SeriesAgg(props) { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      - Series Agg is not compatible with the table visualization. -
      -
      + + Series Agg is not compatible with the table visualization. + ); } @@ -77,25 +80,28 @@ function SeriesAgg(props) { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      - - -
      + + + Aggregation + + + + + + + + ); diff --git a/src/core_plugins/metrics/public/components/aggs/static.js b/src/core_plugins/metrics/public/components/aggs/static.js index bedcbd75a0b29..aa431685c229e 100644 --- a/src/core_plugins/metrics/public/components/aggs/static.js +++ b/src/core_plugins/metrics/public/components/aggs/static.js @@ -24,7 +24,14 @@ import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, + EuiFieldNumber, + EuiFormRow, +} from '@elastic/eui'; export const Static = props => { const handleChange = createChangeHandler(props.onChange, props.model); @@ -48,32 +55,27 @@ export const Static = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      -
      -
      Aggregation
      - -
      -
      - - + + Aggregation + + + + + -
      -
      -
      + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/std_agg.js b/src/core_plugins/metrics/public/components/aggs/std_agg.js index 1e97dca5e8d4d..f61cea24b04f2 100644 --- a/src/core_plugins/metrics/public/components/aggs/std_agg.js +++ b/src/core_plugins/metrics/public/components/aggs/std_agg.js @@ -24,7 +24,7 @@ import FieldSelect from './field_select'; import AggRow from './agg_row'; import createChangeHandler from '../lib/create_change_handler'; import createSelectHandler from '../lib/create_select_handler'; -import { htmlIdGenerator } from '@elastic/eui'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiFormLabel } from '@elastic/eui'; function StandardAgg(props) { const { model, panel, series, fields } = props; @@ -47,32 +47,39 @@ function StandardAgg(props) { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      - { - model.type !== 'count' - ? ( -
      - - -
      - ) : null - } + + + Aggregation + + + + { + model.type !== 'count' + ? ( + + + + + + ) : null + } + + ); diff --git a/src/core_plugins/metrics/public/components/aggs/std_deviation.js b/src/core_plugins/metrics/public/components/aggs/std_deviation.js index d8e4e96720c24..f7608c875d12e 100644 --- a/src/core_plugins/metrics/public/components/aggs/std_deviation.js +++ b/src/core_plugins/metrics/public/components/aggs/std_deviation.js @@ -27,7 +27,12 @@ import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; import { htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, EuiComboBox, + EuiFieldText, + EuiFormRow, } from '@elastic/eui'; export const StandardDeviationAgg = props => { @@ -63,46 +68,48 @@ export const StandardDeviationAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      - - -
      -
      - - -
      -
      - - -
      + + + Aggregation + + + + + + + + + + + + + + + + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/std_sibling.js b/src/core_plugins/metrics/public/components/aggs/std_sibling.js index 4e4fe2e9e9406..30232933ffc71 100644 --- a/src/core_plugins/metrics/public/components/aggs/std_sibling.js +++ b/src/core_plugins/metrics/public/components/aggs/std_sibling.js @@ -27,7 +27,12 @@ import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; import { htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFieldText, EuiComboBox, + EuiFormLabel, + EuiFormRow, } from '@elastic/eui'; export const StandardSiblingAgg = props => { @@ -43,15 +48,14 @@ export const StandardSiblingAgg = props => { const stdDev = {}; if (model.type === 'std_deviation_bucket') { stdDev.sigma = ( -
      - - -
      + + + + + ); const modeOptions = [ @@ -65,16 +69,16 @@ export const StandardSiblingAgg = props => { }); stdDev.mode = ( -
      - - -
      + + + + + ); } @@ -86,27 +90,34 @@ export const StandardSiblingAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      Aggregation
      - -
      -
      -
      Metric
      - -
      - { stdDev.sigma } - { stdDev.mode } + + + Aggregation + + + + + + + + { stdDev.sigma } + { stdDev.mode } + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/top_hit.js b/src/core_plugins/metrics/public/components/aggs/top_hit.js index bfda4f9780c72..06abcfad6039f 100644 --- a/src/core_plugins/metrics/public/components/aggs/top_hit.js +++ b/src/core_plugins/metrics/public/components/aggs/top_hit.js @@ -26,7 +26,12 @@ import createSelectHandler from '../lib/create_select_handler'; import createTextHandler from '../lib/create_text_handler'; import { htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormLabel, EuiComboBox, + EuiSpacer, + EuiFormRow, } from '@elastic/eui'; export const TopHitAgg = props => { @@ -72,23 +77,20 @@ export const TopHitAgg = props => { onDelete={props.onDelete} siblings={props.siblings} > -
      -
      -
      -
      Aggregation
      - -
      -
      - + + + Aggregation + + + + { value={model.field} onChange={handleSelectChange('field')} /> -
      -
      -
      -
      - + + + + + + + + + + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + Should it be text or number? + */} -
      -
      - + + + + -
      -
      - + + + + -
      -
      - + + + + -
      -
      -
      + + + ); }; diff --git a/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js b/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js index 15276f0d64ad9..3c24bc1b5266f 100644 --- a/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js +++ b/src/core_plugins/metrics/public/components/aggs/unsupported_agg.js @@ -19,6 +19,8 @@ import AggRow from './agg_row'; import React from 'react'; +import { EuiCode, EuiTitle } from '@elastic/eui'; + export function UnsupportedAgg(props) { return ( -
      -

      - The {props.model.type} aggregation is no longer - supported. -

      -
      + + The {props.model.type} aggregation is no longer supported. +
      ); } diff --git a/src/core_plugins/metrics/public/components/aggs/vars.js b/src/core_plugins/metrics/public/components/aggs/vars.js index f80537ebd2048..1ace6b717aee8 100644 --- a/src/core_plugins/metrics/public/components/aggs/vars.js +++ b/src/core_plugins/metrics/public/components/aggs/vars.js @@ -23,6 +23,7 @@ import _ from 'lodash'; import AddDeleteButtons from '../add_delete_buttons'; import * as collectionActions from '../lib/collection_actions'; import MetricSelect from './metric_select'; +import { EuiFlexGroup, EuiFlexItem, EuiFieldText } from '@elastic/eui'; class CalculationVars extends Component { @@ -44,34 +45,36 @@ class CalculationVars extends Component { const handleAdd = collectionActions.handleAdd.bind(null, this.props); const handleDelete = collectionActions.handleDelete.bind(null, this.props, row); return ( -
      -
      - -
      -
      - -
      -
      - -
      -
      + + + + + + + + + + + + + ); } @@ -80,9 +83,9 @@ class CalculationVars extends Component { if (!model[name]) return (
      ); const rows = model[name].map(this.renderRow); return ( -
      + { rows } -
      + ); } diff --git a/src/core_plugins/metrics/public/components/annotations_editor.js b/src/core_plugins/metrics/public/components/annotations_editor.js index b7c97455c7b76..88c8f2062121b 100644 --- a/src/core_plugins/metrics/public/components/annotations_editor.js +++ b/src/core_plugins/metrics/public/components/annotations_editor.js @@ -30,6 +30,15 @@ import YesNo from './yes_no'; import { htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiTitle, + EuiButton, + EuiCode, EuiText, } from '@elastic/eui'; @@ -74,118 +83,133 @@ class AnnotationsEditor extends Component { const handleDelete = collectionActions.handleDelete .bind(null, this.props, model); return ( -
      -
      - -
      -
      -
      -
      - - -
      -
      - - -
      -
      -
      -
      - - -
      -
      - Ignore Global Filters - - -
      -
      - Ignore Panel Filters - - -
      -
      -
      -
      - -
      - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Ignore global filters? + + -
      -
      -
      - - -
      -
      - - -
      -
      -
      -
      - -
      + + + Ignore panel filters? + + + + + + + + + + + + + + + + + + + + eg. {'{{field}}'} + } + fullWidth + > + + + + + + + + + + +
      ); } @@ -197,36 +221,26 @@ class AnnotationsEditor extends Component { const handleAdd = collectionActions.handleAdd .bind(null, this.props, newAnnotation); content = ( -
      - -

      Click the button below to create an annotation data source.

      - -
      -
      + +

      Click the button below to create an annotation data source.

      + Add data source +
      ); } else { const annotations = model.annotations.map(this.renderRow); content = ( -
      -
      - -
      +
      + + Data sources + + + { annotations }
      ); } return( -
      +
      { content }
      ); diff --git a/src/core_plugins/metrics/public/components/color_picker.js b/src/core_plugins/metrics/public/components/color_picker.js index 841b716e5cec2..3458556300079 100644 --- a/src/core_plugins/metrics/public/components/color_picker.js +++ b/src/core_plugins/metrics/public/components/color_picker.js @@ -22,7 +22,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { EuiToolTip, } from '@elastic/eui'; +import { EuiIconTip, } from '@elastic/eui'; import Picker from './custom_color_picker'; class ColorPicker extends Component { @@ -66,7 +66,7 @@ class ColorPicker extends Component { return (
      - + - +
      @@ -145,25 +166,30 @@ class MarkdownEditor extends Component { {rows}
      + {rows.length === 0 && ( -
      No variables available for the selected data metrics.
      + + No variables available for the selected data metrics. + )} -
      - -

      - There is also a special variable named _all which you can use to access the entire tree. This is useful for - creating lists with data from a group by... -

      -
      -
      + + + +

      + There is also a special variable named _all which you can use to access the entire tree. This is useful for + creating lists with data from a group by... +

      +
      + + {`# All servers: - {{#each _all}} - - {{ label }} {{ last.formatted }} - {{/each}}`} + {{#each _all}} + - {{ label }} {{ last.formatted }} + {{/each}}`}

      @@ -174,8 +200,8 @@ class MarkdownEditor extends Component { MarkdownEditor.propTypes = { onChange: PropTypes.func, model: PropTypes.object, - visData: PropTypes.object, - dateFormat: PropTypes.string + dateFormat: PropTypes.string, + visData$: PropTypes.object, }; export default MarkdownEditor; diff --git a/src/core_plugins/metrics/public/components/no_data.js b/src/core_plugins/metrics/public/components/no_data.js index 331d3f3a5c36d..579d87076fe05 100644 --- a/src/core_plugins/metrics/public/components/no_data.js +++ b/src/core_plugins/metrics/public/components/no_data.js @@ -21,8 +21,8 @@ import React from 'react'; function NoDataComponent() { return ( -
      -
      No data to display for the selected metrics .
      +
      +
      No data to display for the selected metrics
      ); } diff --git a/src/core_plugins/metrics/public/components/panel_config.js b/src/core_plugins/metrics/public/components/panel_config.js index 59e3fb381b2df..91c9449276083 100644 --- a/src/core_plugins/metrics/public/components/panel_config.js +++ b/src/core_plugins/metrics/public/components/panel_config.js @@ -48,8 +48,8 @@ PanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, - dateFormat: PropTypes.string + dateFormat: PropTypes.string, + visData$: PropTypes.object, }; export default PanelConfig; diff --git a/src/core_plugins/metrics/public/components/panel_config/_index.scss b/src/core_plugins/metrics/public/components/panel_config/_index.scss new file mode 100644 index 0000000000000..b2c1b560dcdb1 --- /dev/null +++ b/src/core_plugins/metrics/public/components/panel_config/_index.scss @@ -0,0 +1 @@ +@import './panel_config'; diff --git a/src/core_plugins/metrics/public/components/panel_config/_panel_config.scss b/src/core_plugins/metrics/public/components/panel_config/_panel_config.scss new file mode 100644 index 0000000000000..886b64f6fe647 --- /dev/null +++ b/src/core_plugins/metrics/public/components/panel_config/_panel_config.scss @@ -0,0 +1,4 @@ +.tvbPanelConfig__container { + padding: $euiSize; + background-color: $euiColorLightestShade; +} diff --git a/src/core_plugins/metrics/public/components/panel_config/gauge.js b/src/core_plugins/metrics/public/components/panel_config/gauge.js index 043133992663d..f275f7d1fc9dc 100644 --- a/src/core_plugins/metrics/public/components/panel_config/gauge.js +++ b/src/core_plugins/metrics/public/components/panel_config/gauge.js @@ -30,6 +30,18 @@ import YesNo from '../yes_no'; import { htmlIdGenerator, EuiComboBox, + EuiTabs, + EuiTab, + EuiPanel, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiFieldNumber, + EuiTitle, + EuiHorizontalRule, } from '@elastic/eui'; class GaugePanelConfig extends Component { @@ -90,92 +102,137 @@ class GaugePanelConfig extends Component { ); } else { view = ( -
      - -
      - - -
      Ignore Global Filter
      - -
      -
      -
      Background Color
      - - - - - +
      + + Data + -
      -
      -
      Inner Color
      - - - - - -
      -
      -
      Color Rules
      -
      -
      + + + + + + + + + + + Ignore global filter? + + + + + + + + + + Style + + + + + + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + It accepts a null value, but is passed a empty string. + */} + + + + + + + + + + + + + + + + + + + + + + + + + Background color: + + + + + + Inner color: + + + + + + + + + Color rules + -
      +
      ); } return (
      -
      - - -
      + > + Panel options + + {view}
      ); @@ -218,7 +273,6 @@ GaugePanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, }; export default GaugePanelConfig; diff --git a/src/core_plugins/metrics/public/components/panel_config/markdown.js b/src/core_plugins/metrics/public/components/panel_config/markdown.js index 29d419b596696..e48e62fab76ea 100644 --- a/src/core_plugins/metrics/public/components/panel_config/markdown.js +++ b/src/core_plugins/metrics/public/components/panel_config/markdown.js @@ -32,6 +32,17 @@ import { KuiCodeEditor } from '@kbn/ui-framework/components'; import { htmlIdGenerator, EuiComboBox, + EuiTabs, + EuiTab, + EuiPanel, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiTitle, + EuiHorizontalRule, } from '@elastic/eui'; const lessC = less(window, { env: 'production' }); @@ -93,61 +104,91 @@ class MarkdownPanelConfig extends Component { ); } else { view = ( -
      - -
      -
      Background Color
      - - - -
      Ignore Global Filter
      - -
      -
      -
      Show Scrollbars
      - + + Data + + + - -
      - -
      -
      -
      -
      Custom CSS (supports Less)
      -
      -
      + + + + + + + + + + + Ignore global filter? + + + + + + + + + + Style + + + + + Background color: + + + + + + Show scrollbars? + + + + + + Vertical alignment: + + + + + + + + + Custom CSS (supports Less) + -
      +
      ); } return (
      -
      - - - -
      + > + Panel options + + {view}
      ); @@ -197,7 +235,6 @@ MarkdownPanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, dateFormat: PropTypes.string }; diff --git a/src/core_plugins/metrics/public/components/panel_config/metric.js b/src/core_plugins/metrics/public/components/panel_config/metric.js index b8b9709a1101e..eea7608670bff 100644 --- a/src/core_plugins/metrics/public/components/panel_config/metric.js +++ b/src/core_plugins/metrics/public/components/panel_config/metric.js @@ -25,7 +25,20 @@ import createTextHandler from '../lib/create_text_handler'; import ColorRules from '../color_rules'; import YesNo from '../yes_no'; import uuid from 'uuid'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiTabs, + EuiTab, + EuiPanel, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiTitle, + EuiHorizontalRule, +} from '@elastic/eui'; class MetricPanelConfig extends Component { @@ -67,61 +80,77 @@ class MetricPanelConfig extends Component { ); } else { view = ( -
      - -
      - - -
      Ignore Global Filter
      - + + Data + + + -
      -
      -
      Color Rules
      -
      -
      + + + + + + + + + + + Ignore global filter? + + + + + + + + + + Color rules + + -
      +
      ); } return (
      -
      - - -
      + data-test-subj="metricEditorPanelOptionsBtn" + > + Panel options + + {view}
      ); @@ -133,7 +162,6 @@ MetricPanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, }; export default MetricPanelConfig; diff --git a/src/core_plugins/metrics/public/components/panel_config/table.js b/src/core_plugins/metrics/public/components/panel_config/table.js index 58fcf43c7aaad..fbed539877417 100644 --- a/src/core_plugins/metrics/public/components/panel_config/table.js +++ b/src/core_plugins/metrics/public/components/panel_config/table.js @@ -26,7 +26,22 @@ import createTextHandler from '../lib/create_text_handler'; import createSelectHandler from '../lib/create_select_handler'; import uuid from 'uuid'; import YesNo from '../yes_no'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiTabs, + EuiTab, + EuiPanel, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiTitle, + EuiHorizontalRule, + EuiCode, + EuiText, +} from '@elastic/eui'; class TablePanelConfig extends Component { @@ -59,45 +74,63 @@ class TablePanelConfig extends Component { if (selectedTab === 'data') { view = (
      -
      -
      -
      +
      + +

      For the table visualization you need to define a field to group by using a terms aggregation.

      -
      -
      - -
      - -
      - - - - -
      -
      + + + + + + + + + + + + + + + + + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + Should it be number or string? + */} + + + + +
      + -
      - - + + Data + + -
      - -
      - - - - + This supports mustache templating. + {'{{key}}'} is set to the term. + + } + > + + + + + + -
      + + + + + + + + + + + Ignore global filter? + + + + +
      ); } return (
      -
      -
      + this.switchTab('data')} > Columns -
      -
      + this.switchTab('options')} > - Panel Options -
      -
      + Panel options + + {view}
      ); @@ -172,7 +227,6 @@ TablePanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, }; export default TablePanelConfig; diff --git a/src/core_plugins/metrics/public/components/panel_config/timeseries.js b/src/core_plugins/metrics/public/components/panel_config/timeseries.js index 85b09047b7d9f..25281b08ef943 100644 --- a/src/core_plugins/metrics/public/components/panel_config/timeseries.js +++ b/src/core_plugins/metrics/public/components/panel_config/timeseries.js @@ -29,6 +29,17 @@ import YesNo from '../yes_no'; import { htmlIdGenerator, EuiComboBox, + EuiTabs, + EuiTab, + EuiPanel, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiTitle, + EuiHorizontalRule, } from '@elastic/eui'; class TimeseriesPanelConfig extends Component { @@ -99,127 +110,165 @@ class TimeseriesPanelConfig extends Component { ); } else { view = ( -
      - -
      - - - - - -
      - -
      - -
      - -
      -
      -
      -
      Background Color
      - -
      Show Legend
      - - -
      - -
      -
      Display Grid
      - -
      -
      - - -
      Ignore Global Filter
      - + + Data + + + -
      + + + + + + + + + + + Ignore global filter? + + + + + + + + + + Style + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Background color: + + + + + + Show legend? + + + + + + Legend position + + + + + + Display grid + + + + + +
      ); } return (
      -
      - - - -
      + > + Annotations + + {view}
      ); @@ -232,7 +281,6 @@ TimeseriesPanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, }; export default TimeseriesPanelConfig; diff --git a/src/core_plugins/metrics/public/components/panel_config/top_n.js b/src/core_plugins/metrics/public/components/panel_config/top_n.js index 98b5155e2c0b5..4721f4f42d251 100644 --- a/src/core_plugins/metrics/public/components/panel_config/top_n.js +++ b/src/core_plugins/metrics/public/components/panel_config/top_n.js @@ -26,7 +26,21 @@ import ColorRules from '../color_rules'; import ColorPicker from '../color_picker'; import uuid from 'uuid'; import YesNo from '../yes_no'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiTabs, + EuiTab, + EuiPanel, + EuiFlexGroup, + EuiFlexItem, + EuiFormRow, + EuiFormLabel, + EuiSpacer, + EuiFieldText, + EuiTitle, + EuiHorizontalRule, + EuiCode, +} from '@elastic/eui'; class TopNPanelConfig extends Component { @@ -67,52 +81,85 @@ class TopNPanelConfig extends Component { ); } else { view = ( -
      -
      - - + + Data + + -
      - -
      -
      Background Color
      - - - -
      Ignore Global Filter
      - + This supports mustache templating. + {'{{key}}'} is set to the term. + + } + > + + + + + + -
      -
      -
      Color Rules
      -
      -
      + + + + + + + + + + + Ignore global filter? + + + + + + + + + + Style + + + + + Background color: + + + + + + + + + Color rules + -
      +
      ); } return (
      -
      - - -
      + > + Panel options + + {view}
      ); @@ -154,7 +199,6 @@ TopNPanelConfig.propTypes = { fields: PropTypes.object, model: PropTypes.object, onChange: PropTypes.func, - visData: PropTypes.object, }; export default TopNPanelConfig; diff --git a/src/core_plugins/metrics/public/components/series_config.js b/src/core_plugins/metrics/public/components/series_config.js index 3f734aae65ace..ba46b589f1a04 100644 --- a/src/core_plugins/metrics/public/components/series_config.js +++ b/src/core_plugins/metrics/public/components/series_config.js @@ -24,7 +24,17 @@ import createSelectHandler from './lib/create_select_handler'; import createTextHandler from './lib/create_text_handler'; import YesNo from './yes_no'; import { IndexPattern } from './index_pattern'; -import { htmlIdGenerator } from '@elastic/eui'; +import { + htmlIdGenerator, + EuiFlexGroup, + EuiFlexItem, + EuiFieldText, + EuiFormRow, + EuiCode, + EuiHorizontalRule, + EuiFormLabel, + EuiSpacer, +} from '@elastic/eui'; export const SeriesConfig = props => { const defaults = { offset_time: '', value_template: '' }; @@ -34,65 +44,81 @@ export const SeriesConfig = props => { const htmlId = htmlIdGenerator(); return ( -
      -
      -
      - - - + + + + + + + + + + + + + + - - eg.{'{{value}}/s'}} + fullWidth + > + + + + + -
      -
      -
      Override Index Pattern
      + label="Offset series time by (1m, 1h, 1w, 1d)" + > + + + + + + + + + + Override Index Pattern? + + + -
      -
      - - -
      -
      + + +
      ); }; diff --git a/src/core_plugins/metrics/public/components/series_editor.js b/src/core_plugins/metrics/public/components/series_editor.js index 69aaadc3b343e..c48efffb4f7ec 100644 --- a/src/core_plugins/metrics/public/components/series_editor.js +++ b/src/core_plugins/metrics/public/components/series_editor.js @@ -61,6 +61,7 @@ class SeriesEditor extends Component { const { fields, model, name, limit, colorPicker } = props; return ( = limit} disableDelete={model[name].length < 2} @@ -88,12 +89,12 @@ class SeriesEditor extends Component { this.props.onChange({ series }); }; return ( -
      +
      { series } diff --git a/src/core_plugins/metrics/public/components/splits/everything.js b/src/core_plugins/metrics/public/components/splits/everything.js index 73fc8cc185ae2..4eb7c5e031323 100644 --- a/src/core_plugins/metrics/public/components/splits/everything.js +++ b/src/core_plugins/metrics/public/components/splits/everything.js @@ -21,20 +21,23 @@ import createSelectHandler from '../lib/create_select_handler'; import GroupBySelect from './group_by_select'; import PropTypes from 'prop-types'; import React from 'react'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui'; function SplitByEverything(props) { const { onChange, model } = props; + const htmlId = htmlIdGenerator(); const handleSelectChange = createSelectHandler(onChange); return ( -
      -
      Group By
      -
      - -
      -
      + + + + + + + ); } diff --git a/src/core_plugins/metrics/public/components/splits/filter.js b/src/core_plugins/metrics/public/components/splits/filter.js index ab50c8f1ff1ac..05248577c758f 100644 --- a/src/core_plugins/metrics/public/components/splits/filter.js +++ b/src/core_plugins/metrics/public/components/splits/filter.js @@ -22,29 +22,34 @@ import createSelectHandler from '../lib/create_select_handler'; import GroupBySelect from './group_by_select'; import PropTypes from 'prop-types'; import React from 'react'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiFieldText } from '@elastic/eui'; export const SplitByFilter = props => { const { onChange } = props; const defaults = { filter: '' }; const model = { ...defaults, ...props.model }; + const htmlId = htmlIdGenerator(); const handleTextChange = createTextHandler(onChange); const handleSelectChange = createSelectHandler(onChange); return ( -
      -
      Group By
      -
      - -
      -
      Query String
      - -
      + + + + + + + + + + + + ); }; diff --git a/src/core_plugins/metrics/public/components/splits/filter_items.js b/src/core_plugins/metrics/public/components/splits/filter_items.js index 9e439411cc705..c00b29897f8ab 100644 --- a/src/core_plugins/metrics/public/components/splits/filter_items.js +++ b/src/core_plugins/metrics/public/components/splits/filter_items.js @@ -24,6 +24,7 @@ import * as collectionActions from '../lib/collection_actions'; import AddDeleteButtons from '../add_delete_buttons'; import ColorPicker from '../color_picker'; import uuid from 'uuid'; +import { EuiFieldText, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; class FilterItems extends Component { constructor(props) { @@ -53,41 +54,42 @@ class FilterItems extends Component { const handleDelete = collectionActions.handleDelete .bind(null, this.props, model); return ( -
      -
      + + -
      -
      - + + -
      -
      - + + -
      -
      + + -
      -
      + + ); } @@ -96,7 +98,7 @@ class FilterItems extends Component { if (!model[name]) return (
      ); const rows = model[name].map(this.renderRow); return ( -
      +
      { rows }
      ); diff --git a/src/core_plugins/metrics/public/components/splits/filters.js b/src/core_plugins/metrics/public/components/splits/filters.js index 9f3d72b1c51df..9e86b232402d2 100644 --- a/src/core_plugins/metrics/public/components/splits/filters.js +++ b/src/core_plugins/metrics/public/components/splits/filters.js @@ -22,29 +22,30 @@ import GroupBySelect from './group_by_select'; import FilterItems from './filter_items'; import PropTypes from 'prop-types'; import React from 'react'; +import { htmlIdGenerator, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui'; + function SplitByFilters(props) { const { onChange, model } = props; + const htmlId = htmlIdGenerator(); const handleSelectChange = createSelectHandler(onChange); return( -
      -
      -
      Group By
      -
      - -
      -
      -
      -
      - -
      -
      +
      + + + + + + + + +
      ); } diff --git a/src/core_plugins/metrics/public/components/splits/group_by_select.js b/src/core_plugins/metrics/public/components/splits/group_by_select.js index 8f377f03fe82b..e0436a7047f2d 100644 --- a/src/core_plugins/metrics/public/components/splits/group_by_select.js +++ b/src/core_plugins/metrics/public/components/splits/group_by_select.js @@ -35,6 +35,7 @@ function GroupBySelect(props) { }); return ( { + const htmlId = htmlIdGenerator(); const handleTextChange = createTextHandler(props.onChange); const handleSelectChange = createSelectHandler(props.onChange); const { indexPattern } = props; @@ -47,52 +46,64 @@ export const SplitByTerms = props => { }); return ( -
      -
      Group By
      -
      - -
      -
      By
      -
      - -
      -
      Top
      - -
      Order By
      -
      - -
      -
      Direction
      -
      - -
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      ); }; diff --git a/src/core_plugins/metrics/public/components/vis_editor.js b/src/core_plugins/metrics/public/components/vis_editor.js index 0c5f2e78a298d..b217446f81056 100644 --- a/src/core_plugins/metrics/public/components/vis_editor.js +++ b/src/core_plugins/metrics/public/components/vis_editor.js @@ -19,12 +19,17 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; +import * as Rx from 'rxjs'; +import { share } from 'rxjs/operators'; import VisEditorVisualization from './vis_editor_visualization'; import Visualization from './visualization'; import VisPicker from './vis_picker'; import PanelConfig from './panel_config'; import brushHandler from '../lib/create_brush_handler'; import { get } from 'lodash'; +import { extractIndexPatterns } from '../lib/extract_index_patterns'; +import { fetchFields } from '../lib/fetch_fields'; +import chrome from 'ui/chrome'; class VisEditor extends Component { constructor(props) { @@ -32,11 +37,19 @@ class VisEditor extends Component { const { vis } = props; this.appState = vis.API.getAppState(); const reversed = get(this.appState, 'options.darkTheme', false); - this.state = { model: props.vis.params, dirty: false, autoApply: true, reversed }; + this.state = { + model: props.vis.params, + dirty: false, + autoApply: true, + reversed, + visFields: {}, + }; this.onBrush = brushHandler(props.vis.API.timeFilter); this.handleUiState = this.handleUiState.bind(this, props.vis); this.handleAppStateChange = this.handleAppStateChange.bind(this); this.getConfig = (...args) => props.config.get(...args); + this.visDataSubject = new Rx.Subject(); + this.visData$ = this.visDataSubject.asObservable().pipe(share()); } handleUiState(vis, ...args) { @@ -60,29 +73,62 @@ class VisEditor extends Component { } } - render() { - const handleChange = (part) => { - const nextModel = { ...this.state.model, ...part }; + fetchIndexPatternFields = async () => { + const { params } = this.props.vis; + const { visFields } = this.state; + const indexPatterns = extractIndexPatterns(params, visFields); + const fields = await fetchFields(indexPatterns); + this.setState((previousState) => { + return { + visFields: { + ...previousState.visFields, + ...fields, + } + }; + }); + } - this.props.vis.params = nextModel; - if (this.state.autoApply) { - this.props.vis.updateState(); - } + setDefaultIndexPattern = async () => { + if (this.props.vis.params.index_pattern === '') { + // set the default index pattern if none is defined. + const savedObjectsClient = chrome.getSavedObjectsClient(); + const indexPattern = await savedObjectsClient.get('index-pattern', this.getConfig('defaultIndex')); + const defaultIndexPattern = indexPattern.attributes.title; + this.props.vis.params.index_pattern = defaultIndexPattern; + } + } - this.setState({ model: nextModel, dirty: !this.state.autoApply }); - }; + handleChange = async (partialModel) => { + const nextModel = { ...this.state.model, ...partialModel }; + this.props.vis.params = nextModel; + if (this.state.autoApply) { + this.props.vis.updateState(); + } + this.setState({ + model: nextModel, + dirty: !this.state.autoApply, + }); + this.fetchIndexPatternFields(); + } - const handleAutoApplyToggle = (part) => { - this.setState({ autoApply: part.target.checked }); - }; + handleCommit = () => { + this.props.vis.updateState(); + this.setState({ dirty: false }); + } - const handleCommit = () => { - this.props.vis.updateState(); - this.setState({ dirty: false }); - }; + handleAutoApplyToggle = (event) => { + this.setState({ autoApply: event.target.checked }); + } + onDataChange = (data) => { + this.visDataSubject.next(data); + } + + render() { if (!this.props.isEditorMode) { - if (!this.props.vis.params || !this.props.visData) return null; + if (!this.props.vis.params || !this.props.visData) { + return null; + } const reversed = this.state.reversed; return ( -
      - +
      +
      +
      -
      +
      @@ -141,7 +188,9 @@ class VisEditor extends Component { return null; } - componentDidMount() { + async componentDidMount() { + await this.setDefaultIndexPattern(); + await this.fetchIndexPatternFields(); this.props.renderComplete(); } diff --git a/src/core_plugins/metrics/public/components/vis_editor_visualization.js b/src/core_plugins/metrics/public/components/vis_editor_visualization.js index 6c87adec8eef6..278265769b772 100644 --- a/src/core_plugins/metrics/public/components/vis_editor_visualization.js +++ b/src/core_plugins/metrics/public/components/vis_editor_visualization.js @@ -19,9 +19,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; -import { keyCodes } from '@elastic/eui'; -import Toggle from 'react-toggle'; -import 'react-toggle/style.css'; +import { keyCodes, EuiFlexGroup, EuiFlexItem, EuiButton, EuiText, EuiSwitch } from '@elastic/eui'; import { getVisualizeLoader } from 'ui/visualize/loader/visualize_loader'; const MIN_CHART_HEIGHT = 250; @@ -39,6 +37,7 @@ class VisEditorVisualization extends Component { this.onSizeHandleKeyDown = this.onSizeHandleKeyDown.bind(this); this._visEl = React.createRef(); + this._subscription = null; } handleMouseDown() { @@ -67,6 +66,9 @@ class VisEditorVisualization extends Component { if (this._handler) { this._handler.destroy(); } + if(this._subscription) { + this._subscription.unsubscribe(); + } } onUpdate = () => { @@ -90,6 +92,10 @@ class VisEditorVisualization extends Component { appState: this.props.appState, }); + this._subscription = this._handler.data$.subscribe((data) => { + this.props.onDataChange(data); + }); + if (this._handlerUpdateHasAlreadyBeenTriggered) { this.onUpdate(); } @@ -134,47 +140,41 @@ class VisEditorVisualization extends Component { style.userSelect = 'none'; } - const applyButtonClassName = dirty ? 'thor__button-solid-default' : 'thor__button-outlined-grayLight'; let applyMessage = 'The latest changes have been applied.'; if (dirty) applyMessage = 'The changes to this visualization have not been applied.'; if (autoApply) applyMessage = 'The changes will be automatically applied.'; const applyButton = ( -
      - -
      - + + -
      -
      - -
      -
      - {applyMessage} -
      -
      + + + + +

      + {applyMessage} +

      +
      +
      + + {!autoApply && + + Apply changes + + } + ); return (
      -
      +
      {applyButton} + { label } + ); } VisPickerItem.propTypes = { - icon: PropTypes.string, label: PropTypes.string, onClick: PropTypes.func, type: PropTypes.string, @@ -61,13 +50,13 @@ function VisPicker(props) { }; const { model } = props; - const icons = [ - { type: 'timeseries', icon: 'fa-line-chart', label: 'Time Series' }, - { type: 'metric', icon: 'fa-superscript', label: 'Metric' }, - { type: 'top_n', icon: 'fa-bar-chart fa-rotate-90', label: 'Top N' }, - { type: 'gauge', icon: 'fa-circle-o-notch', label: 'Gauge' }, - { type: 'markdown', icon: 'fa-paragraph', label: 'Markdown' }, - { type: 'table', icon: 'fa-paragraph', label: 'Table' } + const tabs = [ + { type: 'timeseries', label: 'Time Series' }, + { type: 'metric', label: 'Metric' }, + { type: 'top_n', label: 'Top N' }, + { type: 'gauge', label: 'Gauge' }, + { type: 'markdown', label: 'Markdown' }, + { type: 'table', label: 'Table' } ].map(item => { return ( - { icons } -
      + + { tabs } + ); } diff --git a/src/core_plugins/metrics/public/components/vis_types/_index.scss b/src/core_plugins/metrics/public/components/vis_types/_index.scss new file mode 100644 index 0000000000000..a2918916c4c4a --- /dev/null +++ b/src/core_plugins/metrics/public/components/vis_types/_index.scss @@ -0,0 +1,3 @@ +@import './vis_types'; + +@import './markdown/markdown'; diff --git a/src/core_plugins/metrics/public/components/vis_types/_vis_types.scss b/src/core_plugins/metrics/public/components/vis_types/_vis_types.scss new file mode 100644 index 0000000000000..f4f9230b32dc2 --- /dev/null +++ b/src/core_plugins/metrics/public/components/vis_types/_vis_types.scss @@ -0,0 +1,6 @@ +.tvbVis { + display: flex; + flex-direction: column; + flex: 1 1 100%; + padding: $euiSizeS; +} diff --git a/src/core_plugins/metrics/public/components/vis_types/gauge/series.js b/src/core_plugins/metrics/public/components/vis_types/gauge/series.js index b2b702304699c..6c95520995fd3 100644 --- a/src/core_plugins/metrics/public/components/vis_types/gauge/series.js +++ b/src/core_plugins/metrics/public/components/vis_types/gauge/series.js @@ -24,7 +24,7 @@ import AddDeleteButtons from '../../add_delete_buttons'; import { SeriesConfig } from '../../series_config'; import Sortable from 'react-anything-sortable'; import Split from '../../split'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiFieldText, EuiButtonIcon } from '@elastic/eui'; import createAggRowRender from '../../lib/create_agg_row_render'; import createTextHandler from '../../lib/create_text_handler'; import { createUpDownHandler } from '../../lib/sort_keyhandler'; @@ -48,15 +48,11 @@ function GaugeSeries(props) { const handleChange = createTextHandler(onChange); const aggs = model.metrics.map(createAggRowRender(props)); - let caretClassName = 'fa fa-caret-down'; - if (!visible) caretClassName = 'fa fa-caret-right'; + let caretIcon = 'arrowDown'; + if (!visible) caretIcon = 'arrowRight'; let body = null; if (visible) { - let metricsClassName = 'kbnTabs__tab'; - let optionsClassname = 'kbnTabs__tab'; - if (selectedTab === 'metrics') metricsClassName += '-active'; - if (selectedTab === 'options') optionsClassname += '-active'; let seriesBody; if (selectedTab === 'metrics') { const handleSort = (data) => { @@ -70,19 +66,17 @@ function GaugeSeries(props) { dynamic={true} direction="vertical" onSort={handleSort} - sortHandle="vis_editor__agg_sort" + sortHandle="tvbAggRow__sortHandle" > { aggs } -
      -
      - -
      +
      +
      ); @@ -96,24 +90,22 @@ function GaugeSeries(props) { ); } body = ( -
      -
      - - -
      + > + Options + + {seriesBody}
      ); @@ -131,45 +123,54 @@ function GaugeSeries(props) { let dragHandle; if (!props.disableDelete) { dragHandle = ( - - - + + + + + ); } return (
      -
      -
      - + /> + + + { colorPicker } -
      - -
      - { dragHandle } +
      + + + + + + { dragHandle } + + -
      -
      + + + { body }
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js b/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js index 1330737a6111f..55c861e1fcee4 100644 --- a/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js +++ b/src/core_plugins/metrics/public/components/vis_types/gauge/vis.js @@ -83,7 +83,7 @@ function GaugeVisualization(props) { const style = { backgroundColor: panelBackgroundColor }; return ( -
      +
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/markdown/_markdown.scss b/src/core_plugins/metrics/public/components/vis_types/markdown/_markdown.scss new file mode 100644 index 0000000000000..d6dc376911ef9 --- /dev/null +++ b/src/core_plugins/metrics/public/components/vis_types/markdown/_markdown.scss @@ -0,0 +1,30 @@ +.tvbMarkdown { + display: flex; + flex-direction: column; + flex: 1 0 auto; + position: relative; +} + +.tvbMarkdown__content { + display: flex; + flex-direction: column; + flex: 1 0 auto; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + overflow: hidden; + + &.middle { + justify-content: center; + } + &.bottom { + justify-content: flex-end; + } + &.scrolling { + overflow: auto; + } +} + + diff --git a/src/core_plugins/metrics/public/components/vis_types/markdown/series.js b/src/core_plugins/metrics/public/components/vis_types/markdown/series.js index 738dddc84f768..7889f433a8d4a 100644 --- a/src/core_plugins/metrics/public/components/vis_types/markdown/series.js +++ b/src/core_plugins/metrics/public/components/vis_types/markdown/series.js @@ -25,6 +25,7 @@ import Sortable from 'react-anything-sortable'; import Split from '../../split'; import createAggRowRender from '../../lib/create_agg_row_render'; import createTextHandler from '../../lib/create_text_handler'; +import { EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiFieldText, EuiButtonIcon } from '@elastic/eui'; function MarkdownSeries(props) { const { @@ -45,15 +46,11 @@ function MarkdownSeries(props) { const handleChange = createTextHandler(onChange); const aggs = model.metrics.map(createAggRowRender(props)); - let caretClassName = 'fa fa-caret-down'; - if (!visible) caretClassName = 'fa fa-caret-right'; + let caretIcon = 'arrowDown'; + if (!visible) caretIcon = 'arrowRight'; let body = null; if (visible) { - let metricsClassName = 'kbnTabs__tab'; - let optionsClassname = 'kbnTabs__tab'; - if (selectedTab === 'metrics') metricsClassName += '-active'; - if (selectedTab === 'options') optionsClassname += '-active'; let seriesBody; if (selectedTab === 'metrics') { const handleSort = (data) => { @@ -67,19 +64,17 @@ function MarkdownSeries(props) { dynamic={true} direction="vertical" onSort={handleSort} - sortHandle="vis_editor__agg_sort" + sortHandle="tvbAggRow__sortHandle" > { aggs } -
      -
      - -
      +
      +
      ); @@ -93,24 +88,22 @@ function MarkdownSeries(props) { ); } body = ( -
      -
      - - -
      + > + Options + + {seriesBody}
      ); @@ -118,47 +111,55 @@ function MarkdownSeries(props) { return (
      -
      -
      - -
      - - -
      + /> + + + + + + + + + + + -
      -
      + + + { body }
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js b/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js index b4ceb0313e5a8..1ebf9e0b9649a 100644 --- a/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js +++ b/src/core_plugins/metrics/public/components/vis_types/markdown/vis.js @@ -47,8 +47,8 @@ function MarkdownVisualization(props) { ...variables } ); - let className = 'thorMarkdown'; - let contentClassName = `thorMarkdown__content ${model.markdown_vertical_align}`; + let className = 'tvbMarkdown'; + let contentClassName = `tvbMarkdown__content ${model.markdown_vertical_align}`; if (model.markdown_scrollbars) contentClassName += ' scrolling'; if (reversed) className += ' reversed'; const markdownError = markdownSource instanceof Error ? markdownSource : null; @@ -63,7 +63,7 @@ function MarkdownVisualization(props) { ); } return ( -
      +
      {markdown}
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/metric/series.js b/src/core_plugins/metrics/public/components/vis_types/metric/series.js index ae72cfc2d1ba5..77b39ca3c9390 100644 --- a/src/core_plugins/metrics/public/components/vis_types/metric/series.js +++ b/src/core_plugins/metrics/public/components/vis_types/metric/series.js @@ -24,7 +24,7 @@ import AddDeleteButtons from '../../add_delete_buttons'; import { SeriesConfig } from '../../series_config'; import Sortable from 'react-anything-sortable'; import Split from '../../split'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiFieldText, EuiButtonIcon } from '@elastic/eui'; import createAggRowRender from '../../lib/create_agg_row_render'; import createTextHandler from '../../lib/create_text_handler'; import { createUpDownHandler } from '../../lib/sort_keyhandler'; @@ -48,15 +48,11 @@ function MetricSeries(props) { const handleChange = createTextHandler(onChange); const aggs = model.metrics.map(createAggRowRender(props)); - let caretClassName = 'fa fa-caret-down'; - if (!visible) caretClassName = 'fa fa-caret-right'; + let caretIcon = 'arrowDown'; + if (!visible) caretIcon = 'arrowRight'; let body = null; if (visible) { - let metricsClassName = 'kbnTabs__tab'; - let optionsClassname = 'kbnTabs__tab'; - if (selectedTab === 'metrics') metricsClassName += '-active'; - if (selectedTab === 'options') optionsClassname += '-active'; let seriesBody; if (selectedTab === 'metrics') { const handleSort = (data) => { @@ -70,19 +66,17 @@ function MetricSeries(props) { dynamic={true} direction="vertical" onSort={handleSort} - sortHandle="vis_editor__agg_sort" + sortHandle="tvbAggRow__sortHandle" > { aggs } -
      -
      - -
      +
      +
      ); @@ -96,24 +90,22 @@ function MetricSeries(props) { ); } body = ( -
      -
      - - -
      + > + Options + + {seriesBody}
      ); @@ -122,57 +114,65 @@ function MetricSeries(props) { let colorPicker; if (props.colorPicker) { colorPicker = ( - + + + ); } let dragHandle; if (!props.disableDelete) { dragHandle = ( - - - + + + + + ); } return (
      -
      -
      - - { colorPicker } -
      - -
      - { dragHandle } + /> + + + { colorPicker } + + + + + + { dragHandle } + + -
      -
      + + + { body }
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/metric/vis.js b/src/core_plugins/metrics/public/components/vis_types/metric/vis.js index a81f7c4ecb107..f7d2607e6ce15 100644 --- a/src/core_plugins/metrics/public/components/vis_types/metric/vis.js +++ b/src/core_plugins/metrics/public/components/vis_types/metric/vis.js @@ -74,8 +74,10 @@ function MetricVisualization(props) { params.reversed = color(panelBackgroundColor).luminosity() < 0.45; } const style = { backgroundColor: panelBackgroundColor }; + params.backgroundColor = panelBackgroundColor; + return ( -
      +
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/table/config.js b/src/core_plugins/metrics/public/components/vis_types/table/config.js index 67ed6e00205bf..324bc89d4dc86 100644 --- a/src/core_plugins/metrics/public/components/vis_types/table/config.js +++ b/src/core_plugins/metrics/public/components/vis_types/table/config.js @@ -29,6 +29,15 @@ import ColorRules from '../../color_rules'; import { htmlIdGenerator, EuiComboBox, + EuiFlexGroup, + EuiFlexItem, + EuiFieldText, + EuiFormRow, + EuiCode, + EuiHorizontalRule, + EuiFormLabel, + EuiSpacer, + EuiTitle, } from '@elastic/eui'; class TableSeriesConfig extends Component { @@ -65,67 +74,102 @@ class TableSeriesConfig extends Component { }); return ( -
      -
      -
      +
      + + + - - -
      -
      - - + + eg.{'{{value}}/s'}} + fullWidth + > + + + + + + + + + + - + label="Filter" + fullWidth + > + + + + + Show trend arrows? + -
      -
      -
      + + + + + + + + -
      - -
      + + + + -
      -
      -
      - -
      -
      + + + + + + + Color rules + + +
      ); } diff --git a/src/core_plugins/metrics/public/components/vis_types/table/series.js b/src/core_plugins/metrics/public/components/vis_types/table/series.js index f44df0306f9f5..8802f1436d960 100644 --- a/src/core_plugins/metrics/public/components/vis_types/table/series.js +++ b/src/core_plugins/metrics/public/components/vis_types/table/series.js @@ -22,7 +22,7 @@ import PropTypes from 'prop-types'; import AddDeleteButtons from '../../add_delete_buttons'; import SeriesConfig from './config'; import Sortable from 'react-anything-sortable'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiFieldText, EuiButtonIcon } from '@elastic/eui'; import createTextHandler from '../../lib/create_text_handler'; import createAggRowRender from '../../lib/create_agg_row_render'; import { createUpDownHandler } from '../../lib/sort_keyhandler'; @@ -42,15 +42,11 @@ function TopNSeries(props) { const handleChange = createTextHandler(onChange); const aggs = model.metrics.map(createAggRowRender(props)); - let caretClassName = 'fa fa-caret-down'; - if (!visible) caretClassName = 'fa fa-caret-right'; + let caretIcon = 'arrowDown'; + if (!visible) caretIcon = 'arrowRight'; let body = null; if (visible) { - let metricsClassName = 'kbnTabs__tab'; - let optionsClassname = 'kbnTabs__tab'; - if (selectedTab === 'metrics') metricsClassName += '-active'; - if (selectedTab === 'options') optionsClassname += '-active'; let seriesBody; if (selectedTab === 'metrics') { const handleSort = (data) => { @@ -64,7 +60,7 @@ function TopNSeries(props) { dynamic={true} direction="vertical" onSort={handleSort} - sortHandle="vis_editor__agg_sort" + sortHandle="tvbAggRow__sortHandle" > { aggs } @@ -81,22 +77,22 @@ function TopNSeries(props) { ); } body = ( -
      -
      -
      + + props.switchTab('metrics')} > Metrics -
      -
      + props.switchTab('options')} > Options -
      -
      + + {seriesBody}
      ); @@ -105,40 +101,50 @@ function TopNSeries(props) { let dragHandle; if (!props.disableDelete) { dragHandle = ( - - - + + + + + ); } return (
      -
      -
      - -
      - -
      - { dragHandle } + + + + + + + + + + { dragHandle } + + -
      -
      + + + { body }
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/table/vis.js b/src/core_plugins/metrics/public/components/vis_types/table/vis.js index f65d738db43de..223bb7193bc17 100644 --- a/src/core_plugins/metrics/public/components/vis_types/table/vis.js +++ b/src/core_plugins/metrics/public/components/vis_types/table/vis.js @@ -23,7 +23,7 @@ import PropTypes from 'prop-types'; import tickFormatter from '../../lib/tick_formatter'; import calculateLabel from '../../../../common/calculate_label'; import { isSortable } from './is_sortable'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiIcon } from '@elastic/eui'; import replaceVars from '../../lib/replace_vars'; function getColor(rules, colorKey, value) { @@ -62,24 +62,24 @@ class TableVis extends Component { const value = formatter(item.last); let trend; if (column.trend_arrows) { - const trendClass = item.slope > 0 ? 'fa-long-arrow-up' : 'fa-long-arrow-down'; + const trendIcon = item.slope > 0 ? 'sortUp' : 'sortDown'; trend = ( - - + +   ); } const style = { color: getColor(column.color_rules, 'text', item.last) }; return ( - - { value } + + { value } {trend} ); }); return ( - {rowDisplay} + {rowDisplay} {columns} ); @@ -109,12 +109,12 @@ class TableVis extends Component { if (isSortable(metric)) { let sortIcon; if (sort.column === item.id) { - sortIcon = sort.order === 'asc' ? 'sort-asc' : 'sort-desc'; + sortIcon = sort.order === 'asc' ? 'sortUp' : 'sortDown'; } else { - sortIcon = 'sort'; + sortIcon = 'empty'; } sortComponent = ( - + ); } let headerContent = ( @@ -122,13 +122,12 @@ class TableVis extends Component { ); if (!isSortable(metric)) { headerContent = ( - {headerContent} + {headerContent} ); } return ( + ); const handleSortClick = () => { let order; @@ -158,7 +157,7 @@ class TableVis extends Component { }; return ( - {label} {sortComponent} + {label} {sortComponent} { columns } ); @@ -184,7 +183,6 @@ class TableVis extends Component { rows = ( {message} @@ -193,7 +191,7 @@ class TableVis extends Component { ); } return( -
      +
      {header} diff --git a/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js b/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js index da8b2e5b55a17..b615bfae2e3cc 100644 --- a/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js +++ b/src/core_plugins/metrics/public/components/vis_types/timeseries/config.js @@ -27,6 +27,15 @@ import { IndexPattern } from '../../index_pattern'; import { htmlIdGenerator, EuiComboBox, + EuiFlexGroup, + EuiFlexItem, + EuiFieldText, + EuiFormRow, + EuiCode, + EuiHorizontalRule, + EuiFieldNumber, + EuiFormLabel, + EuiSpacer, } from '@elastic/eui'; function TimeseriesConfig(props) { @@ -84,252 +93,311 @@ function TimeseriesConfig(props) { let type; if (model.chart_type === 'line') { type = ( -
      - -
      - + + -
      - -
      - + + + + + + + + + + + + + + + + + + + + + + + + + Steps + + -
      - - - - - - -
      Steps
      - -
      + + ); } if (model.chart_type === 'bar') { type = ( -
      - -
      - + + -
      - -
      - + + + + + -
      - - - - -
      + label="Stacked" + > + + + + + + + + + + + + + + ); } const disableSeparateYaxis = model.separate_axis ? false : true; return ( -
      -
      -
      +
      + + + - - + + -
      - { type } -
      - - eg.{'{{value}}/s'}} + fullWidth + > + + + + + + + + + + + + + + { type } + + + + + + -
      Hide in Legend
      + label="Offset series time by (1m, 1h, 1w, 1d)" + > + +
      +
      + + Hide in legend + - -
      + + + -
      -
      -
      -
      Separate Axis
      + + + + + + + + + Separate axis? + - - + + - - + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + It accepts a null value, but is passed a empty string. + */} + + + + + - -
      + label="Axis max" + > + {/* + EUITODO: The following input couldn't be converted to EUI because of type mis-match. + It accepts a null value, but is passed a empty string. + */} + + + + + -
      -
      -
      -
      Override Index Pattern
      + + + + + + + + + Override Index Pattern? + + + -
      -
      - - -
      -
      + + +
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js b/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js index b82f8dace2b70..23a349aaac39e 100644 --- a/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js +++ b/src/core_plugins/metrics/public/components/vis_types/timeseries/series.js @@ -23,7 +23,7 @@ import ColorPicker from '../../color_picker'; import AddDeleteButtons from '../../add_delete_buttons'; import SeriesConfig from './config'; import Sortable from 'react-anything-sortable'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiFieldText, EuiButtonIcon } from '@elastic/eui'; import Split from '../../split'; import createAggRowRender from '../../lib/create_agg_row_render'; import createTextHandler from '../../lib/create_text_handler'; @@ -48,15 +48,11 @@ function TimeseriesSeries(props) { const handleChange = createTextHandler(onChange); const aggs = model.metrics.map(createAggRowRender(props)); - let caretClassName = 'fa fa-caret-down'; - if (!visible) caretClassName = 'fa fa-caret-right'; + let caretIcon = 'arrowDown'; + if (!visible) caretIcon = 'arrowRight'; let body = null; if (visible) { - let metricsClassName = 'kbnTabs__tab'; - let optionsClassname = 'kbnTabs__tab'; - if (selectedTab === 'metrics') metricsClassName += '-active'; - if (selectedTab === 'options') optionsClassname += '-active'; let seriesBody; if (selectedTab === 'metrics') { const handleSort = (data) => { @@ -70,19 +66,17 @@ function TimeseriesSeries(props) { dynamic={true} direction="vertical" onSort={handleSort} - sortHandle="vis_editor__agg_sort" + sortHandle="tvbAggRow__sortHandle" > { aggs } -
      -
      - -
      +
      +
      ); @@ -96,24 +90,22 @@ function TimeseriesSeries(props) { ); } body = ( -
      -
      - - -
      + > + Options + + {seriesBody}
      ); @@ -131,45 +123,53 @@ function TimeseriesSeries(props) { let dragHandle; if (!props.disableDelete) { dragHandle = ( - - - + + + + + ); } return (
      -
      -
      - + /> + + + { colorPicker } -
      - -
      - { dragHandle } +
      + + + + + + { dragHandle } + + -
      -
      + + + { body }
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js b/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js index 7e40d1fe5b2c5..1550522f4bf60 100644 --- a/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js +++ b/src/core_plugins/metrics/public/components/vis_types/timeseries/vis.js @@ -201,7 +201,7 @@ class TimeseriesVisualization extends Component { params.reversed = color(panelBackgroundColor || backgroundColor).luminosity() < 0.45; } return ( -
      +
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/top_n/series.js b/src/core_plugins/metrics/public/components/vis_types/top_n/series.js index 5daa0d442eb53..fa112a41e39c8 100644 --- a/src/core_plugins/metrics/public/components/vis_types/top_n/series.js +++ b/src/core_plugins/metrics/public/components/vis_types/top_n/series.js @@ -24,7 +24,7 @@ import AddDeleteButtons from '../../add_delete_buttons'; import { SeriesConfig } from '../../series_config'; import Sortable from 'react-anything-sortable'; import Split from '../../split'; -import { EuiToolTip } from '@elastic/eui'; +import { EuiToolTip, EuiTabs, EuiTab, EuiFlexGroup, EuiFlexItem, EuiFieldText, EuiButtonIcon } from '@elastic/eui'; import createTextHandler from '../../lib/create_text_handler'; import createAggRowRender from '../../lib/create_agg_row_render'; import { createUpDownHandler } from '../../lib/sort_keyhandler'; @@ -46,15 +46,11 @@ function TopNSeries(props) { const handleChange = createTextHandler(onChange); const aggs = model.metrics.map(createAggRowRender(props)); - let caretClassName = 'fa fa-caret-down'; - if (!visible) caretClassName = 'fa fa-caret-right'; + let caretIcon = 'arrowDown'; + if (!visible) caretIcon = 'arrowRight'; let body = null; if (visible) { - let metricsClassName = 'kbnTabs__tab'; - let optionsClassname = 'kbnTabs__tab'; - if (selectedTab === 'metrics') metricsClassName += '-active'; - if (selectedTab === 'options') optionsClassname += '-active'; let seriesBody; if (selectedTab === 'metrics') { const handleSort = (data) => { @@ -68,19 +64,17 @@ function TopNSeries(props) { dynamic={true} direction="vertical" onSort={handleSort} - sortHandle="vis_editor__agg_sort" + sortHandle="tvbAggRow__sortHandle" > { aggs } -
      -
      - -
      +
      +
      ); @@ -94,24 +88,22 @@ function TopNSeries(props) { ); } body = ( -
      -
      - - -
      + > + Options + + {seriesBody}
      ); @@ -129,45 +121,53 @@ function TopNSeries(props) { let dragHandle; if (!props.disableDelete) { dragHandle = ( - - - + + + + + ); } return (
      -
      -
      - + /> + + + { colorPicker } -
      - -
      - { dragHandle } +
      + + + + + + { dragHandle } + + -
      -
      + + + { body }
      ); diff --git a/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js b/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js index 2023b884e3bb1..b2a4db7307200 100644 --- a/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js +++ b/src/core_plugins/metrics/public/components/vis_types/top_n/vis.js @@ -93,7 +93,7 @@ function TopNVisualization(props) { } const style = { backgroundColor: panelBackgroundColor }; return ( -
      +
      ); diff --git a/src/core_plugins/metrics/public/components/vis_with_splits.js b/src/core_plugins/metrics/public/components/vis_with_splits.js index 18b0bca7c8869..8dcf56dba4207 100644 --- a/src/core_plugins/metrics/public/components/vis_with_splits.js +++ b/src/core_plugins/metrics/public/components/vis_with_splits.js @@ -65,22 +65,20 @@ export function visWithSplits(WrappedComponent) { } }; return ( -
      -
      - -
      +
      +
      ); }); return ( -
      {rows}
      +
      {rows}
      ); } SplitVisComponent.displayName = `SplitVisComponent(${getDisplayName(WrappedComponent)})`; diff --git a/src/core_plugins/metrics/public/components/visualization.js b/src/core_plugins/metrics/public/components/visualization.js index fc2536f9432bb..b72e1b047558c 100644 --- a/src/core_plugins/metrics/public/components/visualization.js +++ b/src/core_plugins/metrics/public/components/visualization.js @@ -79,10 +79,6 @@ function Visualization(props) { return
      ; } -Visualization.defaultProps = { - className: 'thor__visualization' -}; - Visualization.propTypes = { backgroundColor: PropTypes.string, className: PropTypes.string, @@ -97,4 +93,8 @@ Visualization.propTypes = { getConfig: PropTypes.func }; +Visualization.defaultProps = { + className: 'tvbVis' +}; + export default Visualization; diff --git a/src/core_plugins/metrics/public/components/yes_no.js b/src/core_plugins/metrics/public/components/yes_no.js index f76d7b96b4223..7a79ac6ca988c 100644 --- a/src/core_plugins/metrics/public/components/yes_no.js +++ b/src/core_plugins/metrics/public/components/yes_no.js @@ -20,6 +20,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import _ from 'lodash'; +import { EuiRadio, htmlIdGenerator } from '@elastic/eui'; function YesNo(props) { const { name, value } = props; @@ -30,29 +31,31 @@ function YesNo(props) { props.onChange(parts); }; }; + const htmlId = htmlIdGenerator(); const inputName = name + _.uniqueId(); return ( -
      - - +
      + + +   + +
      ); } diff --git a/src/core_plugins/metrics/public/components/yes_no.test.js b/src/core_plugins/metrics/public/components/yes_no.test.js index 38ab90b61de07..e931ba5ce0775 100644 --- a/src/core_plugins/metrics/public/components/yes_no.test.js +++ b/src/core_plugins/metrics/public/components/yes_no.test.js @@ -29,7 +29,7 @@ describe('YesNo', () => { const wrapper = shallow( ); - wrapper.find('input').first().simulate('change'); + wrapper.find('EuiRadio').first().simulate('change'); expect(handleChange.calledOnce).to.equal(true); expect(handleChange.firstCall.args[0]).to.eql({ test: 1 @@ -41,7 +41,7 @@ describe('YesNo', () => { const wrapper = shallow( ); - wrapper.find('input').last().simulate('change'); + wrapper.find('EuiRadio').last().simulate('change'); expect(handleChange.calledOnce).to.equal(true); expect(handleChange.firstCall.args[0]).to.eql({ test: 0 diff --git a/src/core_plugins/metrics/public/images/icon-visualbuilder.svg b/src/core_plugins/metrics/public/images/icon-visualbuilder.svg deleted file mode 100644 index 669d368748fc2..0000000000000 --- a/src/core_plugins/metrics/public/images/icon-visualbuilder.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon-hammer - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/metrics/public/index.scss b/src/core_plugins/metrics/public/index.scss new file mode 100644 index 0000000000000..e989e05913813 --- /dev/null +++ b/src/core_plugins/metrics/public/index.scss @@ -0,0 +1,23 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "tvb" to avoid conflicts. +// Examples +// tvbChart +// tvbChart__legend +// tvbChart__legend--small +// tvbChart__legend-isLoading + +@import './variables'; +@import './mixins'; + +// Hacks (mostly todo's) +@import './hacks'; + +// Library overrides +@import './ui_sortable'; + +// Components +@import './components/index'; + +// Visualizations +@import './visualizations/components/index'; diff --git a/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js b/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js index 442ae4399dcbd..83e2c4916b049 100644 --- a/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js +++ b/src/core_plugins/metrics/public/kbn_vis_types/editor_controller.js @@ -18,48 +18,27 @@ */ import React from 'react'; -import chrome from 'ui/chrome'; import { render, unmountComponentAtNode } from 'react-dom'; -import { FetchFieldsProvider } from '../lib/fetch_fields'; -import { extractIndexPatterns } from '../lib/extract_index_patterns'; function ReactEditorControllerProvider(Private, config) { - const fetchFields = Private(FetchFieldsProvider); - const savedObjectsClient = chrome.getSavedObjectsClient(); - class ReactEditorController { constructor(el, savedObj) { this.el = el; this.savedObj = savedObj; this.vis = savedObj.vis; - this.vis.fields = {}; } - render(params) { - return new Promise((resolve) => { - Promise.resolve().then(() => { - if (this.vis.params.index_pattern === '') { - return savedObjectsClient.get('index-pattern', config.get('defaultIndex')).then((indexPattern) => { - this.vis.params.index_pattern = indexPattern.attributes.title; - }); - } - }).then(() => { - const indexPatterns = extractIndexPatterns(this.vis); - fetchFields(indexPatterns).then(fields => { - this.vis.fields = { ...fields, ...this.vis.fields }; - const Component = this.vis.type.editorConfig.component; - render(, this.el); - }); - }); - }); + async render(params) { + const Component = this.vis.type.editorConfig.component; + render( {}} + isEditorMode={true} + appState={params.appState} + />, this.el); } resize() { diff --git a/src/core_plugins/metrics/public/kbn_vis_types/index.js b/src/core_plugins/metrics/public/kbn_vis_types/index.js index 5f2e340fefad3..ea82789cf61b7 100644 --- a/src/core_plugins/metrics/public/kbn_vis_types/index.js +++ b/src/core_plugins/metrics/public/kbn_vis_types/index.js @@ -17,8 +17,6 @@ * under the License. */ -import '../visualizations/less/main.less'; -import '../less/main.less'; import { MetricsRequestHandlerProvider } from './request_handler'; import { ReactEditorControllerProvider } from './editor_controller'; import { VisFactoryProvider } from 'ui/vis/vis_factory'; @@ -40,7 +38,6 @@ export default function MetricsVisProvider(Private) { description: 'Build time-series using a visual pipeline interface', category: CATEGORY.TIME, icon: 'visVisualBuilder', - stage: 'experimental', feedbackMessage: defaultFeedbackMessage, visConfig: { defaults: { diff --git a/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js b/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js index 5889c5a7d7af9..51bce4c094fbe 100644 --- a/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js +++ b/src/core_plugins/metrics/public/kbn_vis_types/request_handler.js @@ -18,20 +18,20 @@ */ import { validateInterval } from '../lib/validate_interval'; -import { dashboardContextProvider } from 'plugins/kibana/dashboard/dashboard_context'; import { timezoneProvider } from 'ui/vis/lib/timezone'; import { timefilter } from 'ui/timefilter'; +import { BuildESQueryProvider } from 'ui/courier'; const MetricsRequestHandlerProvider = function (Private, Notifier, config, $http) { - const dashboardContext = Private(dashboardContextProvider); const notify = new Notifier({ location: 'Metrics' }); + const buildEsQuery = Private(BuildESQueryProvider); return { name: 'metrics', - handler: function (vis, { uiState, timeRange }) { + handler: function ({ aggs, uiState, timeRange, filters, query, visParams }) { const timezone = Private(timezoneProvider)(); return new Promise((resolve) => { - const panel = vis.params; + const panel = visParams; const uiStateObj = uiState.get(panel.type, {}); const parsedTimeRange = timefilter.calculateBounds(timeRange); const scaledDataFormat = config.get('dateFormat:scaled'); @@ -39,7 +39,7 @@ const MetricsRequestHandlerProvider = function (Private, Notifier, config, $http if (panel && panel.id) { const params = { timerange: { timezone, ...parsedTimeRange }, - filters: [dashboardContext()], + filters: [buildEsQuery(aggs.indexPattern, [query], filters)], panels: [panel], state: uiStateObj }; diff --git a/src/core_plugins/metrics/public/less/color_picker.less b/src/core_plugins/metrics/public/less/color_picker.less deleted file mode 100644 index ee715d9597a46..0000000000000 --- a/src/core_plugins/metrics/public/less/color_picker.less +++ /dev/null @@ -1,89 +0,0 @@ -.color_picker { - background-color: #fff; - border-radius: 2px; - box-shadow: 0 0 2px rgba(0,0,0,0.3), 0 4px 8px rgba(0,0,0,0.3); - box-sizing: initial; - width: 275px; - font-family: 'Menlo'; -} - -.color_picker__saturation { - width: 100%; - padding-bottom: 55%; - position: relative; - border-radius: 2px 2px 0 0; - overflow: hidden; -} - -.color_picker__body { - padding: 16px 16px 12px; -} - -.color_picker__controls { - display: flex; -} - -.color_picker__color { - width: 32px; -} - -.color_picker__color-disable_alpha { - width: 22px; -} - -.color_picker__swatch { - margin-top: 6px; - width: 16px; - height: 16px; - border-radius: 8px; - position: relative; - overflow: hidden; -} - -.color_picker__swatch-disable_alpha { - width: 10px; - height: 10px; - margin: 0px; -} - -.color_picker__active { - position: absolute; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; - border-radius: 8px; - box-shadow: inset 0 0 0 1px rgba(0,0,0,0.1); - z-index: 2; -} - -.color_picker__toggles { - flex: 1 -} - -.color_picker__hue { - height: 10px; - position: relative; - margin-bottom: 8px; -} - -.color_picker__hue-disable_alpha { - margin-bottom: 0px; -} - -.color_picker__alpha { - height: 10px; - position: relative; -} - -.color_picker__alpha-disable_alpha { - display: none; -} - -.color_picker__swatches { - display: flex; - flex-wrap: wrap; - justify-content: center; - margin-top: 10px; -} - diff --git a/src/core_plugins/metrics/public/less/color_rules.less b/src/core_plugins/metrics/public/less/color_rules.less deleted file mode 100644 index efe34ca3c1424..0000000000000 --- a/src/core_plugins/metrics/public/less/color_rules.less +++ /dev/null @@ -1,35 +0,0 @@ -.color_rules { - flex: 1 0 auto; -} - -.color_rules__rule { - background-color: @grayLightest; - padding: 10px; - margin-bottom: 5px; - display: flex; - align-items: center; - flex: 1 0 auto; -} - -.color_rules__item { - flex: 1 0 auto; - margin-right: 10px; -} - -.color_rules__label { - font-weight: normal; - margin: 0 10px; -} - -.color_rules__input { - padding: 6px 10px; - border-radius: 4px; - border: 1px solid @grayLight; - flex: 1 0 auto; - margin-right: 10px; -} - -.color_rules__secondary { - display: flex; - align-items: center; -} diff --git a/src/core_plugins/metrics/public/less/editor.less b/src/core_plugins/metrics/public/less/editor.less deleted file mode 100644 index 91ed752b23bd9..0000000000000 --- a/src/core_plugins/metrics/public/less/editor.less +++ /dev/null @@ -1,607 +0,0 @@ -@borderRadius: 4px; - -.vis_editor { - flex: 1; -} -.vis_editor_container { - background: @pageColor; -} - -// general styles -.vis_editor__title { - display: flex; - flex-grow: 1; - align-items: center; - font-size: 20px; - margin-bottom: 20px; - - i.fa { - color: @grayLighter; - margin: 0 10px; - } - - i.fa-pencil { - &:hover { - color: @gray; - } - } - - i.fa-check-square { - color: @esGreen; - &:hover { - color: darken(@esGreen, 10%); - } - } - - input { - padding: 0 10px; - border-radius: 4px; - border: 1px solid @grayLighter; - flex-grow: 1; - } -} -.vis_editor__container { - padding: 10px; - background-color: @white; - display: flex; - flex-direction: column; - flex: 1 1 auto; -} -.vis_editor__label { - display: block; - font-size: 1em; - font-weight: normal; - color: @gray; - margin: 0 10px; - flex-shrink: 0; - &:first-child { - margin: 0 10px 0 0; - } -} - -.vis_editor__note { - .vis_editor__label; - font-style: italic; -} -.vis_editor__input { - padding: 8px 10px; - border-radius: @borderRadius; - border: 1px solid @grayLight; - font-size: 1.1em; -} -.vis_editor__input-grows { - .vis_editor__input; - flex-grow: 1; -} -.vis_editor__input-grows-100 { - .vis_editor__input-grows; - width: 100%; -} -.vis_editor__input-number { - .vis_editor__input; - width: 60px; -} -.vis_editor__row { - display: flex; - align-items: center; -} -.vis_editor__item { - flex-grow: 1; -} -.vis_editor__row_item { - flex-grow: 1; - margin-right: 10px; -} -.vis_editor__subhead { - font-size: 12px; - color: @gray; - margin: 5px 0; -} -.vis_editor__subhead-main { - font-size: 18px; - color: @gray; - margin: 10px 10px 5px; -} -.vis_editor__note { - font-size: 14px; - color: @gray; - margin: 5px 0 10px 0; -} - -// color_picker.js -.vis_editor__color_picker { - display: flex; - align-items: center; - position: relative; -} -.vis_editor__color_picker-swatch { - border: 1px solid @grayDark; - width: 20px; - height: 20px; - border-radius: 4px; -} -.vis_editor__color_picker-swatch-empty { - .vis_editor__color_picker-swatch; - background-color: transparent; - background-size: 20px 20px; - background-image: repeating-linear-gradient( - -45deg, - #c00, - #c00 2px, - transparent 2px, - transparent 16px - ); -} -.vis_editor__color_picker-clear { - margin-left: 5px; - color: #c00; -} -.vis_editor__color_picker-popover { - position: absolute; - top: 20px; - z-index: 2; -} -.vis_editor__color_picker-cover { - position: fixed; - top: 0px; - right: 0px; - left: 0px; - bottom: 0px; -} - -// data_format_picker -.vis_editor__data_format_picker-container { - display: flex; - align-items: center; - flex-grow: 1; -} -.vis_editor__data_format_picker-custom_row { - display: flex; - align-items: center; - > .vis_editor__label { - margin-left: 10px; - } -} - -// index_pattern.js -.vis_editor__index_pattern-fields { - margin-right: 10px; - flex-grow: 1; -} - -// series.js -// mainRow == .vis_editor__container -.vis_editor__series { - background-color: @white; - padding: 10px; - border-top: 2px solid @lineColor; - &:first-child { - border-top: none; - } -} -.vis_editor__series-row { - .vis_editor__container; - padding: 0 10px 10px; - display: flex; - flex-direction: column; - flex: 1 1 auto; -} -.vis_editor__series-details { - .vis_editor__row; - flex-grow: 1; - > * { - margin-right: 10px; - } - > .vis_editor__sort { - cursor: move; - margin-right: 0px; - } -} - -.vis_editor__series-visibility-toggle { - appearance: none; - background: none; - border: none; -} - -// series_config.js -.vis_editor__series_config-subhead { - .vis_editor__subhead; - margin: 10px 0 5px; -} - -// series_editor.js -.vis_editor__series_editor-container { - margin-bottom: 20px; -} - -//split.js -.vis_editor__split-container { - .vis_editor__row; - flex-grow: 1; -} -.vis_editor__split-filter { - .vis_editor__input; - flex-grow: 1; -} -.vis_editor__split-selects { - .vis_editor__item; -} -.vis_editor__split-aggs { - flex-grow: 1; -} -.vis_editor__split-term_count { - .vis_editor__input; - width: 60px; -} - -// vis_picker.js -.vis_editor__vis_picker-container { - display: flex; - align-items: center; -} - -.vis_editor__vis_picker-item { - appearance: none; - background: none; - border: none; - justify-content: center; - display: flex; - align-items: center; - font-size: 18px; - padding: 5px 0; - margin: 0 10px; - &:hover { - border-bottom: 2px solid @grayDarker; - } - &.selected { - border-bottom: 2px solid @grayDarker; - } -} -.vis_editor__vis_picker-icon { - display: none; - margin-right: 5px; - color: @grayDark; - &:hover, - &.selected { - color: @grayDarker; - } -} -.vis_editor__vis_picker-label { - font-size: 18px; - color: @grayDark; - &:hover, - &.selected { - color: @grayDarker; - } -} - -.vis_editor__vis_picker-controls { - flex: 1 0 auto; - text-align: right; - margin-right: 10px; -} - -// visualization.js -.vis_editor__visualization { - position: relative; - display: flex; - flex-direction: column; - flex: 1 0 auto; - width: 100%; - height: 250px; - line-height: normal; - background-color: @white; - overflow: auto; -} - -.vis_editor__visualization-draghandle { - text-align: center; - color: @grayLight; - cursor: row-resize; - width: 100%; - display: block; - appearance: none; - background: none; - border: none; - &:hover { - color: @gray; - } - &:focus { - color: @esBlue; - box-shadow: none; - } -} - -.vis_editor__visualization-title { - color: @gray; - font-weight: 500; - overflow: hidden; - white-space: nowrap; - font-size: 16px; - margin-bottom: 10px; -} - -// aggs/agg_row -.vis_editor__agg_row-icon { - margin-right: 10px; - color: @gray; - &.last { - color: @grayDark; - } -} - -.vis_editor__series_row { - display: flex; - background-color: @grayLightest; - margin-bottom: 2px; - padding: 10px; - align-items: center; - .vis_editor__note, - .vis_editor__label { - margin-bottom: 5px; - font-size: 12px; - } -} - -.vis_editor__agg_row { - .vis_editor__series_row; -} - -.vis_editor__series_row-item { - display: flex; - flex-grow: 1; -} - -.vis_editor__agg_row-item { - .vis_editor__series_row-item; - margin-bottom: 10px; -} - -// aggs/std_deviation.js -.vis_editor__std_deviation-field { - .vis_editor__row_item; - flex-grow: 2; -} -.vis_editor__std_deviation-sigma_item { - margin-right: 10px; -} -.vis_editor__std_deviation-sigma { - .vis_editor__input; - width: 50px; -} - -.vis_editor__percentile_rank_value { - margin-right: 10px; -} - -// aggs/std_sibling.js -.vis_editor__std_sibling-metric { - .vis_editor__row_item; - flex-grow: 2; -} - -// aggs/vis_config -.vis_editor__vis_config-row { - .vis_editor__row; - margin: 10px 0; -} - -// aggs/series_config -.vis_editor__series_config-container { - background-color: @grayLightest; - padding: 10px; -} - -.vis_editor__series_config-row { - .vis_editor__row; - padding: 5px 0; - font-size: 12px; -} - -.vis_editor__percentiles, -.vis_editor__variables { - .vis_editor__row_item; - margin: 10px 0; -} -.vis_editor__calc_vars { - // background-color: @white; - // padding: 10px; - margin-right: 10px; - margin-bottom: 2px; -} - -.vis_editor__percentiles-row, -.vis_editor__calc_vars-row { - display: flex; - margin-bottom: 10px; - align-items: center; - &:last-child { - margin-bottom: 0; - } -} - -.vis_editor__calc_vars-name { - margin-right: 10px; -} - -.vis_editor__calc_vars-var { - flex-grow: 1; - margin-right: 10px; -} - -.vis_editor__percentiles-content { - display: flex; - align-items: center; - flex-grow: 1; - margin-right: 10px; -} - -.vis_editor__markdown { - display: flex; - background-color: @white; - min-height: 500px; -} - -.vis_editor__markdown-editor { - border: 2px solid @lineColor; - width: 50%; - flex: 1 0 auto; -} - -.vis_editor__markdown-variables { - padding: 10px; - flex: 1 0 auto; - max-height: 500px; - overflow: auto; - width: 50%; - .table a { - text-decoration: none; - } - pre { - border-radius: 0; - border: none; - } -} - -.vis_editor__no-markdown-variables { - margin-top: 60px; - margin-bottom: 10px; - padding-bottom: 60px; - text-align: center; - font-weight: bold; - border-bottom: 1px solid #d9d9d9; -} - -.vis_editor__markdown-code-desc { - margin-bottom: 10px; -} - -.vis_editor__ace-editor { - border: 2px solid @lineColor; -} - -.vis_editor__split-filters { - flex-grow: 1; - display: flex; - padding: 10px 20px; - flex-direction: column; -} - -.vis_editor__split-filter-row { - display: flex; - flex-grow: 1; - margin-bottom: 10px; - align-items: center; - &:last-child { - margin-bottom: 0; - } -} - -.vis_editor__split-filter-item { - flex-grow: 1; - margin-right: 10px; -} - -.vis_editor__split-filter-color { - margin-right: 10px; -} - -.vis_editor__annotations-color, -.vis_editor__annotations-controls { - flex-shrink: 0; -} - -.vis_editor__annotations-row { - display: flex; - padding: 10px; - background-color: @lineColor; - margin-bottom: 2px; -} - -.vis_editor__annotations-missing { - padding: 30px 10px; - font-size: 16px; - p { - font-size: 16px; - } - text-align: center; -} - -.vis_editor__annotations-content { - margin: 0 10px; - flex-grow: 1; - .vis_editor__row { - margin-bottom: 10px; - } - .vis_editor__row-item { - flex-grow: 1; - margin-left: 10px; - &:first-child { - margin-left: 0; - } - .vis_editor__label { - margin-bottom: 4px; - } - } - .vis_editor__row-item-small { - .vis_editor__row-item; - flex-grow: 0; - } -} - -.vis_editor__icon_select-option { - margin: 0 5px; -} -.vis_editor__icon_select-value { - margin: 0 5px 0 0; -} - -.vis_editor__agg_select-heading { - color: @black; - cursor: default; -} - -.vis_editor__agg_select-note { - margin-left: 10px; - color: @gray; - font-size: 0.9em; -} - -.vis_editor__dirty_controls { - padding: 8px 6px; - background-color: @grayLightest; - display: flex; - align-content: center; -} - -.vis_editor__dirty_controls-button { - flex: 0 0 auto; -} - -.vis_editor__dirty_controls-message { - flex: 1 0 auto; - color: @grayLight; - padding: 4px 10px 0; -} - -.vis_editor__dirty_controls-message-dirty { - flex: 1 0 auto; - color: @gray; - padding: 4px 10px 0; -} - -.vis_editor__dirty_controls-toggle-label { - padding: 4px 10px 0; - flex: 0 0 auto; - color: @gray; - font-weight: normal; -} - -.vis_editor__dirty_controls-toggle { - flex: 0 0 auto; -} - -.vis_editor__table-pivot-fields { - border-bottom: 2px solid @lineColor; -} diff --git a/src/core_plugins/metrics/public/less/error.less b/src/core_plugins/metrics/public/less/error.less deleted file mode 100644 index 9b899956a18c0..0000000000000 --- a/src/core_plugins/metrics/public/less/error.less +++ /dev/null @@ -1,50 +0,0 @@ -.metrics_issue { - display: flex; - flex-direction: column; - flex: 1 0 auto; - background-color: #b3ccd5; - color: #0079a5; - justify-content: center; - padding: 20px; -} - -.metrics_issue__title { - text-align: center; - font-size: 18px; - font-weight: bold; -} - -.metrics_error { - display: flex; - flex-direction: column; - flex: 1 0 auto; - background-color: #ffd9d9; - color: #c00; - justify-content: center; - padding: 20px; -} - -.metrics_error__title { - text-align: center; - font-size: 18px; - font-weight: bold; -} - -.metrics_error__additional { - margin-top: 10px; - padding: 0 20px; -} - -.metrics_error__reason { - text-align: center; -} - -.metrics_error__stack { - margin-top: 10px; - color: #fff; - border: 10px solid #fff; - background-color: #000; - font-family: "Courier New", Courier, monospace; - white-space: pre; - padding: 10px; -} diff --git a/src/core_plugins/metrics/public/less/kbn_tabs.less b/src/core_plugins/metrics/public/less/kbn_tabs.less deleted file mode 100644 index fed92633c3a3f..0000000000000 --- a/src/core_plugins/metrics/public/less/kbn_tabs.less +++ /dev/null @@ -1,31 +0,0 @@ -.kbnTabs { - display: flex; -} - -.kbnTabs__tab { - appearance: none; - background: none; - border: none; - margin: 0px 10px; - padding: 5px 0px; - color: @grayDark; - font-size: 18px; -} - -.kbnTabs__tab-active { - .kbnTabs__tab; - color: @grayDarker; - border-bottom: 2px solid @grayDarker; -} - -.kbnTabs__tab:hover { - .kbnTabs__tab-active; -} - -.kbnTabs.sm { - .kbnTabs__tab-active, - .kbnTabs__tab { - font-size: 14px; - padding: 2px 0; - } -} diff --git a/src/core_plugins/metrics/public/less/main.less b/src/core_plugins/metrics/public/less/main.less deleted file mode 100644 index 913d307c4d00e..0000000000000 --- a/src/core_plugins/metrics/public/less/main.less +++ /dev/null @@ -1,41 +0,0 @@ -@black: black; -@grayDarkest: #222; -@grayDarker: #333; -@grayDark: #666; -@gray: #999; -@grayLight: #CCC; -@grayLighter: #DDD; -@grayLightest: #EEE; -@white: white; - -@background: #FFF; -@navBarBackground: #DDD; -@lineColor: #EEE; -@textColor: #999; -@disabledColor: #CCC; -@valueColor: #666; -@topNavColor: #E4E4E4; -@pageColor: #F6F6F6; - -@kibanaGray: #95a5a6; -@esBlue: #0079a5; -@esRed: #d76051; -@esYellow: #fbce47; -@esGreen: #80c383; -@esPink: #e8488b; -@esPurple: #9980b2; - -@esAltGreen: #8ac336; -@esCyan: #59c6c5; - -@import './misc.less'; -@import './editor.less'; -@import './kbn_tabs.less'; -@import './color_rules.less'; -@import './markdown.less'; -@import './sortable.less'; -@import './color_picker.less'; -@import './error.less'; -@import './split_vis.less'; - - diff --git a/src/core_plugins/metrics/public/less/markdown.less b/src/core_plugins/metrics/public/less/markdown.less deleted file mode 100644 index b995f2a177477..0000000000000 --- a/src/core_plugins/metrics/public/less/markdown.less +++ /dev/null @@ -1,60 +0,0 @@ -.thorMarkdown { - display: flex; - flex-direction: column; - flex: 1 0 auto; - position: relative; -} - -.thorMarkdown__content { - display: flex; - flex-direction: column; - flex: 1 0 auto; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - overflow: hidden; - @import './type.less'; - color: rgba(0,0,0,1); - pre, code, tt { - background-color: rgba(0,0,0,0.1); - color: red; - code { - color: rgba(0,0,0,1); - background-color: transparent; - } - border: none; - } - &.middle { - justify-content: center; - } - &.bottom { - justify-content: flex-end; - } - &.scrolling { - overflow: auto; - } -} - -.thorMarkdown.reversed { - .thorMarkdown__content { - .table > thead > tr > th { - color: rgba(255,255,255,0.5); - border-bottom: 2px solid rgba(255,255,255,0.2); - } - .table > tbody > tr > td { - border-top: 1px solid rgba(255,255,255,0.2); - } - color: rgba(255,255,255,1); - pre, code, tt { - background-color: rgba(255,255,255,0.2); - color: #ffa5a8; - code { - color: rgba(255,255,255,1); - background-color: transparent; - } - border: none; - } - } -} diff --git a/src/core_plugins/metrics/public/less/misc.less b/src/core_plugins/metrics/public/less/misc.less deleted file mode 100644 index 2ed8bd72ee6f0..0000000000000 --- a/src/core_plugins/metrics/public/less/misc.less +++ /dev/null @@ -1,118 +0,0 @@ -.thor__input { - padding: 7px 10px; - border-radius: 4px; - border: 1px solid @grayLighter; - &:focus { - outline: none; - box-shadow: 0 0 2px @grayLight; - } -} - -.thor__yes_no { - label { - font-weight: normal; - margin-right: 10px; - input { margin-right: 5px; } - } -} - -.thor__button { - display: inline-block; - vertical-align: middle; - text-align: center; - cursor: pointer; - white-space: nowrap; - border: 1px solid transparent; - background-color: transparent; - padding: 4px 8px; - border-radius: 4px; - margin: 0 0 0 10px; - &.sm { - padding: 2px 6px; - font-size: 0.8em; - margin-left: 5px; - } - &.md { - padding: 3px 7px; - font-size: 0.9em; - margin-left: 5px; - } -} - -.create-buttons(@name; @color) { - .thor__button-outlined-@{name} { - .thor__button; - border-color: @color; - color: @color !important; - &:hover { - border-color: darken(@color, 10%); - color: darken(@color, 10%) !important; - } - } - .thor__button-solid-@{name} { - .thor__button; - background-color: @color; - color: @white !important; - &:hover { - background-color: darken(@color, 10%); - color: @white !important; - } - } -} - - -.create-buttons(gray, @kibanaGray); -.create-buttons(grayLight, @grayLight); -.create-buttons(default, @esBlue); -.create-buttons(primary, @esGreen); -.create-buttons(danger, @esRed); - -.pui-tooltip { font-size: 12px !important; } - -.add_delete__buttons { - > * { - margin-left: 5px; - } - .disabled { - color: @gray; - border-color: @gray; - } -} - -/** - * 1. The absolute positioning broke reports and was fighting with display: flex, - * setting the flex-basis to 100% fixed the issue the abs positioning was trying to fix - */ -.dashboard__visualization { - display: flex; - flex-direction: column; - flex: 1 1 100%; /* 1 */ - padding: 10px; -} - -.dashboard__visualization-title { - color: rgba(0,0,0,0.6); - font-weight: 500; - overflow: hidden; - white-space: nowrap; - font-size: 16px; - margin-bottom: 10px; - flex: 0 0 auto; - &.reversed { - color: rgba(255,255,255,0.8); - } -} - -.tsvb-table__value { - font-size: 1.1em; - text-align: right; -} - -.tsvb-table__trend { - margin-left: 5px; -} - -.tsvb-table__columnName { - text-align: right; -} - diff --git a/src/core_plugins/metrics/public/less/sortable.less b/src/core_plugins/metrics/public/less/sortable.less deleted file mode 100644 index b1b043ca0207f..0000000000000 --- a/src/core_plugins/metrics/public/less/sortable.less +++ /dev/null @@ -1,38 +0,0 @@ -.ui-sortable { - display: block; - position: relative; - overflow: visible; - -webkit-user-select: none; - -moz-user-select: none; - user-select: none; -} - -.ui-sortable:before, -.ui-sortable:after{ - content: " "; - display: table; -} - -.ui-sortable:after{ - clear: both; -} - -.ui-sortable .ui-sortable-item { -} - -.ui-sortable .ui-sortable-item.ui-sortable-dragging { - position: absolute; - z-index: 1688; -} - -.ui-sortable .ui-sortable-placeholder { - display: none; -} - -.ui-sortable .ui-sortable-placeholder.visible { - display: block; - opacity: 0.5; - z-index: -1; -} - - diff --git a/src/core_plugins/metrics/public/less/split_vis.less b/src/core_plugins/metrics/public/less/split_vis.less deleted file mode 100644 index a43e02f8a203b..0000000000000 --- a/src/core_plugins/metrics/public/less/split_vis.less +++ /dev/null @@ -1,16 +0,0 @@ -.splitVis { - display: flex; - flex: 1 0 auto; -} - -.splitVis_split { - display: flex; - flex: 1 0 0; - flex-direction: column; - overflow: hidden; -} - -.splitVis_visualization { - position: relative; - flex: 1 0 auto; -} diff --git a/src/core_plugins/metrics/public/less/type.less b/src/core_plugins/metrics/public/less/type.less deleted file mode 100644 index 0dc3da0a3e429..0000000000000 --- a/src/core_plugins/metrics/public/less/type.less +++ /dev/null @@ -1,94 +0,0 @@ -pre, code, tt { - border-radius: 0; - font: 1em/1.5em 'Andale Mono', 'Lucida Console', monospace; -} -h1 { font-size: 30px; } -h2 { font-size: 26px; } -h3 { font-size: 22px; } -h4 { font-size: 18px; } -h5 { font-size: 16px; } -h6 { font-size: 16px; } - -h1, h2, h3, h4, h5, h6, b, strong { - margin:0 0 15px 0; - font-weight: bold; -} -em, i, dfn { - font-style: italic; -} -dfn { - font-weight:bold; -} -p, code, pre, kbd { - margin:0 0 15px 0; -} -blockquote { - margin:0 15px 15px 15px; -} -cite { - font-style: italic; -} -li ul, li ol { - margin:0 15px; -} -ul, ol { - margin:0 15px 15px 15px; -} -ul { - list-style-type:disc; -} -ol { - list-style-type:decimal; -} -ol ol { - list-style: upper-alpha; -} -ol ol ol { - list-style: lower-roman; -} -ol ol ol ol { - list-style: lower-alpha; -} -dl { - margin:0 0 15px 0; -} -dl dt { - font-weight:bold; -} -dd { - margin-left:1.5em; -} -table { - margin-bottom:1.4em; - width:100%; -} -th { - font-weight:bold; -} -th, td, caption { - padding:4px 15px 4px 5px; -} -tfoot { - font-style:italic; -} -sup, sub { - line-height:0; -} -abbr, acronym { - border-bottom: 1px dotted; -} -address { - margin:0 0 15px; - font-style:italic; -} -del { - text-decoration: line-through; -} -pre { - margin: 15px 0; - white-space: pre; -} -img { - max-width: 100%; -} - diff --git a/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js b/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js index 8d085140b1761..b9d1e8e6b5a58 100644 --- a/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js +++ b/src/core_plugins/metrics/public/lib/__tests__/extract_index_pattern.js @@ -20,35 +20,34 @@ import { extractIndexPatterns } from '../extract_index_patterns'; import { expect } from 'chai'; describe('extractIndexPatterns(vis)', () => { - let vis; + let visParams; + let visFields; beforeEach(() => { - vis = { - fields: { - '*': [] - }, - params: { - index_pattern: '*', - series: [ - { - override_index_pattern: 1, - series_index_pattern: 'example-1-*' - }, - { - override_index_pattern: 1, - series_index_pattern: 'example-2-*' - } - ], - annotations: [ - { index_pattern: 'notes-*' }, - { index_pattern: 'example-1-*' } - ] - } + visFields = { + '*': [] + }; + visParams = { + index_pattern: '*', + series: [ + { + override_index_pattern: 1, + series_index_pattern: 'example-1-*' + }, + { + override_index_pattern: 1, + series_index_pattern: 'example-2-*' + } + ], + annotations: [ + { index_pattern: 'notes-*' }, + { index_pattern: 'example-1-*' } + ] }; }); it('should return index patterns', () => { - vis.fields = {}; - expect(extractIndexPatterns(vis)).to.eql([ + visFields = {}; + expect(extractIndexPatterns(visParams, visFields)).to.eql([ '*', 'example-1-*', 'example-2-*', @@ -56,8 +55,8 @@ describe('extractIndexPatterns(vis)', () => { ]); }); - it('should return index patterns that do not exist in vis.fields', () => { - expect(extractIndexPatterns(vis)).to.eql([ + it('should return index patterns that do not exist in visFields', () => { + expect(extractIndexPatterns(visParams, visFields)).to.eql([ 'example-1-*', 'example-2-*', 'notes-*' diff --git a/src/core_plugins/metrics/public/lib/extract_index_patterns.js b/src/core_plugins/metrics/public/lib/extract_index_patterns.js index c7e4f555955e0..7f800f0349236 100644 --- a/src/core_plugins/metrics/public/lib/extract_index_patterns.js +++ b/src/core_plugins/metrics/public/lib/extract_index_patterns.js @@ -18,24 +18,24 @@ */ import { uniq } from 'lodash'; -export function extractIndexPatterns(vis) { +export function extractIndexPatterns(params, fetchedFields) { const patternsToFetch = []; - if (!vis.fields[vis.params.index_pattern]) { - patternsToFetch.push(vis.params.index_pattern); + if (!fetchedFields[params.index_pattern]) { + patternsToFetch.push(params.index_pattern); } - vis.params.series.forEach(series => { + params.series.forEach(series => { const indexPattern = series.series_index_pattern; - if (series.override_index_pattern && !vis.fields[indexPattern]) { + if (series.override_index_pattern && !fetchedFields[indexPattern]) { patternsToFetch.push(indexPattern); } }); - if (vis.params.annotations) { - vis.params.annotations.forEach(item => { + if (params.annotations) { + params.annotations.forEach(item => { const indexPattern = item.index_pattern; - if (indexPattern && !vis.fields[indexPattern]) { + if (indexPattern && !fetchedFields[indexPattern]) { patternsToFetch.push(indexPattern); } }); diff --git a/src/core_plugins/metrics/public/lib/fetch_fields.js b/src/core_plugins/metrics/public/lib/fetch_fields.js index 5fc68f14378eb..9a2c2d1c78e12 100644 --- a/src/core_plugins/metrics/public/lib/fetch_fields.js +++ b/src/core_plugins/metrics/public/lib/fetch_fields.js @@ -16,36 +16,34 @@ * specific language governing permissions and limitations * under the License. */ +import { kfetch } from 'ui/kfetch'; +import { toastNotifications } from 'ui/notify'; -const FetchFieldsProvider = (Notifier, $http) => { - const notify = new Notifier({ location: 'Metrics' }); - return (indexPatterns = ['*']) => { - if (!Array.isArray(indexPatterns)) indexPatterns = [indexPatterns]; - return new Promise((resolve, reject) => { - const fields = {}; - - Promise.all(indexPatterns.map(pattern => { - const httpResult = $http.get(`../api/metrics/fields?index=${pattern}`) - .then(resp => resp.data) - .catch(resp => { throw resp.data; }); - - return httpResult - .then(resp => { - if (resp.length && pattern) { - fields[pattern] = resp; - } - }) - .catch(resp => { - const err = new Error(resp.message); - err.stack = resp.stack; - notify.error(err); - reject(err); - }); - })).then(() => { - resolve(fields); +async function fetchFields(indexPatterns = ['*']) { + const patterns = Array.isArray(indexPatterns) ? indexPatterns : [indexPatterns]; + try { + const indexFields = await Promise.all(patterns.map((pattern) => { + return kfetch({ + method: 'GET', + pathname: '/api/metrics/fields', + query: { + index: pattern, + } }); + })); + const fields = patterns.reduce((cumulatedFields, currentPattern, index) => { + return { + ...cumulatedFields, + [currentPattern]: indexFields[index] + }; + }, {}); + return fields; + } catch(error) { + toastNotifications.addDanger({ + title: 'Unable to load index_pattern fields', + text: error.message, }); - }; -}; + } +} -export { FetchFieldsProvider }; +export { fetchFields }; diff --git a/src/core_plugins/metrics/public/visualizations/components/_annotation.scss b/src/core_plugins/metrics/public/visualizations/components/_annotation.scss new file mode 100644 index 0000000000000..bc502035a0d78 --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_annotation.scss @@ -0,0 +1,30 @@ +.tvbVisAnnotation { + position: absolute; + z-index: 90; // Specific to not overlap chart tooltip + display: flex; + flex-direction: column; + align-items: center; +} + +.tvbVisAnnotation__line { + flex: 1 0 auto; + width: 2px; +} + +.tvbVisAnnotation__icon { + flex: 0 0 auto; + width: $euiSizeM; + text-align: center; +} + +.tvbVisAnnotation__tooltip { + @include euiBottomShadow($color: $euiColorFullShade); + @include euiFontSizeXS; + padding: $euiSizeS; + animation-duration: .0s; + animation-delay: .0; +} + +.tvbVisAnnotation__timestamp { + color: $euiColorLightShade; +} diff --git a/src/core_plugins/metrics/public/visualizations/components/_gauge.scss b/src/core_plugins/metrics/public/visualizations/components/_gauge.scss new file mode 100644 index 0000000000000..08ce3f991acf2 --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_gauge.scss @@ -0,0 +1,74 @@ +/** + * 1. Text is scaled using a matrix so all font sizes and related metrics + * are being calcuated from a percentage of the base font size of 100% (14px). + */ + +.tvbVisHalfGauge, +.tvbVisCircleGauge { + font-size: 100%; /* 1 */ + display: flex; + flex-direction: column; + flex: 1 0 auto; +} + +.tvbVisHalfGauge__metrics, +.tvbVisCircleGauge__metrics { + position: absolute; + width: 100px; + height: 100px; + text-align: center; + padding: $euiSizeS; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; +} + +.tvbVisHalfGauge__metrics { + height: 70px; + padding: 0px $euiSizeM $euiSizeS; + justify-content: flex-end; +} + +.tvbVisGauge__label { + color: $tvbTextColor; + font-size: 0.5em; /* 1 */ + line-height: 1em; /* 1 */ + text-align: center; + padding: 0 $euiSizeS $euiSizeXS; + + .tvbVisGauge--reversed & { + color: $tvbTextColorReversed; + } +} + +.tvbVisGauge__value { + color: $tvbValueColor; + font-size: .9em; /* 1 */ + line-height: 1em; /* 1 */ + text-align: center; + + .tvbVisGauge--reversed & { + color: $tvbValueColorReversed; + } +} + +.tvbVisGauge__additionalLabel { + @include euiTextTruncate; + font-size: 0.4em; /* 1 */ + line-height: 1.2em; /* 1 */ + width: 100%; + padding: 2px $euiSizeXS; + color: $tvbValueColor; + + .tvbVisGauge--reversed & { + color: $tvbValueColorReversed; + } +} + +.tvbVisGauge__resize { + position: relative; + display: flex; + flex-direction: column; + flex: 1 0 auto; +} diff --git a/src/core_plugins/metrics/public/visualizations/components/_index.scss b/src/core_plugins/metrics/public/visualizations/components/_index.scss new file mode 100644 index 0000000000000..c5ce0ff8c8513 --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_index.scss @@ -0,0 +1,6 @@ +@import './annotation'; +@import './gauge'; +@import './metric'; +@import './legend'; +@import './timeseries_chart'; +@import './top_n'; diff --git a/src/core_plugins/metrics/public/visualizations/components/_legend.scss b/src/core_plugins/metrics/public/visualizations/components/_legend.scss new file mode 100644 index 0000000000000..e6a18e7c9ac11 --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_legend.scss @@ -0,0 +1,91 @@ +// LEGEND + +.tvbLegend { + @include euiFontSizeXS; + display: flex; + width: 200px; + padding: $euiSizeXS 0; + overflow: auto; +} + +.tvbLegend__toggle { + align-self: flex-start; + color: $tvbValueColor; + + .tvbVisTimeSeries--reversed & { + color: $tvbValueColorReversed; + } +} + +.tvbLegend__series { + flex-grow: 1; +} + +.tvbLegend__item { + cursor: pointer; + padding: $euiSizeXS; + border-bottom: 1px solid $tvbLineColor; + display: flex; + max-width: 170px; + + &.disabled { + opacity: 0.5; + } + + &:first-child { + border-top: 1px solid $tvbLineColor; + } + + .tvbVisTimeSeries--reversed & { + border-color: $tvbLineColorReversed; + } +} + +.tvbLegend__button { + text-align: left; + display: flex; + width: 100%; +} + +.tvbLegend__itemLabel { + flex-grow: 1; + @include euiTextTruncate; + + span { + color: $euiTextColor; + margin-left: $euiSizeXS; + + .tvbVisTimeSeries--reversed & { + color: $tvbTextColorReversed; + } + } +} + +.tvbLegend__itemValue { + color: $tvbValueColor; + margin-left: $euiSizeXS; + + .tvbVisTimeSeries--reversed & { + color: $tvbValueColorReversed; + } +} + +.tvbLegend--horizontal { + width: auto; + display: flex; + + .tvbLegend__series { + display: flex; + flex-wrap: wrap; + } + + .tvbLegend__item { + max-width: inherit; + margin-right: $euiSizeM; + border: none; + } + + .tvbLegend__itemLabel { + flex: 0 1 auto; + } +} diff --git a/src/core_plugins/metrics/public/visualizations/components/_metric.scss b/src/core_plugins/metrics/public/visualizations/components/_metric.scss new file mode 100644 index 0000000000000..839f97243151c --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_metric.scss @@ -0,0 +1,103 @@ +@mixin tvbVisMetricReversedColor { + // Some hacking in the CSS to provide the correct text color + // depending on dark/light theme and/or background color provided + // An easier way would be to provide if the theme is dark in the JS, + // but it wasn't passed down. + .tab-dashboard.theme-dark .tvbVisMetric--noBackground &, + .tvbVisMetric--reversed & { + @content; + } +} + +/** + * 1. Text is scaled using a matrix so all font sizes and related metrics + * are being calcuated from a percentage of the base font size of 100% (14px). + */ + +.tvbVisMetric { + font-size: 100%; /* 1 */ + position: relative; + display: flex; + flex-direction: column; + flex: 1 0 auto; +} + +.tvbVisMetric__resize { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: hidden; + display: flex; +} + +.tvbVisMetric__label--primary { + color: $tvbTextColor; + text-align: center; + font-size: 0.5em; /* 1 */ + margin-bottom: 0.25em; /* 1 */ + line-height: 1em; /* 1 */ + + @include tvbVisMetricReversedColor { + color: $tvbTextColorReversed; + } +} + +.tvbVisMetric__value--primary { + color: $tvbValueColor; + text-align: center; + font-size: 1em; /* 1 */ + font-weight: $euiFontWeightBold; + line-height: 1em; /* 1 */ + + @include tvbVisMetricReversedColor { + color: $tvbValueColorReversed; + } +} + +.tvbVisMetric__secondary { + display: flex; + justify-content: center; + align-items: center; + margin-top: 0.05em; /* 1 */ +} + +.tvbVisMetric__label--secondary { + font-size: 0.35em; /* 1 */ + margin-right: 0.3em; /* 1 */ + color: $tvbTextColor; + line-height: 1em; /* 1 */ + + @include tvbVisMetricReversedColor { + color: $tvbTextColorReversed; + } +} + +.tvbVisMetric__value--secondary { + font-size: 0.35em; /* 1 */ + color: $tvbValueColor; + line-height: 1em; /* 1 */ + + @include tvbVisMetricReversedColor { + color: $tvbValueColorReversed; + } +} + +.tvbVisMetric__inner { + position: absolute; + padding: $euiSizeXS $euiSizeS $euiSizeS; +} + +.tvbVisMetric__label--additional { + @include euiTextTruncate; + font-size: 0.25em; /* 1 */ + padding: $euiSizeXS/2 0 0 0; + text-align: center; + color: $tvbValueColor; + line-height: 1.2; // Ensure the descenders don't get cut off + + @include tvbVisMetricReversedColor { + color: $tvbValueColorReversed; + } +} diff --git a/src/core_plugins/metrics/public/visualizations/components/_timeseries_chart.scss b/src/core_plugins/metrics/public/visualizations/components/_timeseries_chart.scss new file mode 100644 index 0000000000000..6f644eb88bdfb --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_timeseries_chart.scss @@ -0,0 +1,116 @@ +.tvbVisTimeSeries { + position: relative; + display: flex; + flex-direction: column; + flex: 1 0 auto; +} + +.tvbVisTimeSeries__content { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + display: flex; + flex: 1 0 auto; + // TODO: Remove once tooltips are portaled + overflow: hidden; // Ensures the tooltip doesn't cause scrollbars +} + +.tvbVisTimeSeries__visualization { + cursor: crosshair; + display: flex; + flex-direction: column; + flex: 1 0 auto; + position: relative; + + > .tvbVisTimeSeries__container { + min-width: 1px; + width: 100%; + height: 100%; + } +} + +.tvbVisTimeSeries__container { + position: relative; + display: flex; + flex-direction: column; + flex: 1 0 auto; +} + +.tvbVisTimeSeries__axisLabel { + @include euiFontSizeXS; + color: $tvbTextColor; + text-align: center; + min-height: 1.2em; + + &.tvbVisTimeSeries__axisLabel--reversed { + color: $tvbTextColorReversed; + } +} + +// TOOLTIP + +// EUITODO: Use EuiTooltip or somehow portal the current one +.tvbTooltip__container { + pointer-events: none; + position: absolute; + z-index: $euiZLevel9; + display: flex; + align-items: center; + padding: 0 $euiSizeS; + transform: translate(0, -50%); +} + +.tvbTooltip__container--right { + flex-direction: row-reverse; +} + +.tvbTooltip { + background-color: tintOrShade($euiColorFullShade, 25%, 90%); + @include euiBottomShadow($color: $euiColorFullShade); + @include euiFontSizeXS; + padding: $euiSizeS; + border-radius: $euiBorderRadius; + color: $euiColorGhost; + max-width: 320px; +} + +.tvbTooltip__caret { + $temp-arrowSize: $euiSizeM; + width: $temp-arrowSize; + height: $temp-arrowSize; + color: tintOrShade($euiColorFullShade, 25%, 90%); + border-radius: 2px; + background-color: tintOrShade($euiColorFullShade, 25%, 90%); + transform-origin: center; + transform: rotateZ(45deg); + + .tvbTooltip__container--left & { + margin-right: (($temp-arrowSize/2) + 1px) * -1; + } + + .tvbTooltip__container--right & { + margin-left: (($temp-arrowSize/2) + 1px) * -1; + } +} + +.tvbTooltip__item { + display: flex; +} + +.tvbTooltip__label { + flex-grow: 1; + margin-left: $euiSizeXS; + margin-right: $euiSizeXS; +} + +.tvbTooltip__icon, +.tvbTooltip__value { + flex-shrink: 0; +} + +.tvbTooltip__timestamp { + color: $euiColorLightShade; + white-space: nowrap; +} diff --git a/src/core_plugins/metrics/public/visualizations/components/_top_n.scss b/src/core_plugins/metrics/public/visualizations/components/_top_n.scss new file mode 100644 index 0000000000000..bdfe2955da042 --- /dev/null +++ b/src/core_plugins/metrics/public/visualizations/components/_top_n.scss @@ -0,0 +1,50 @@ + + +.tvbVisTopN { + position: relative; + overflow: auto; + display: flex; + flex-direction: column; + + tr:hover td { + background-color: $tvbHoverBackgroundColor; + } +} + +.tvbVisTopN__value { + text-align: right; + white-space: nowrap; + line-height: 0; + vertical-align: middle; + color: $tvbValueColor; + padding: $euiSizeXS; + padding-bottom: 0; +} + +.tvbVisTopN__label { + color: $tvbTextColor; + padding: $euiSizeXS 0; +} + +.tvbVisTopN__bar { + padding: $euiSizeXS $euiSizeM; + vertical-align: middle; +} + +.tvbVisTopN__innerBar { + min-height: $euiSize; +} + +.tvbVisTopN--reversed { + tr:hover td { + background-color: $tvbHoverBackgroundColorReversed; + } + + .tvbVisTopN__label { + color: $tvbTextColorReversed; + } + + .tvbVisTopN__value { + color: $tvbValueColorReversed; + } +} diff --git a/src/core_plugins/metrics/public/visualizations/components/annotation.js b/src/core_plugins/metrics/public/visualizations/components/annotation.js index 09ccf8197dc58..4071f92e91ff2 100644 --- a/src/core_plugins/metrics/public/visualizations/components/annotation.js +++ b/src/core_plugins/metrics/public/visualizations/components/annotation.js @@ -21,49 +21,32 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import moment from 'moment'; import reactcss from 'reactcss'; +import { EuiToolTip } from '@elastic/eui'; class Annotation extends Component { constructor(props) { super(props); - this.state = { - showTooltip: false - }; - this.handleMouseOut = this.handleMouseOut.bind(this); - this.handleMouseOver = this.handleMouseOver.bind(this); } renderTooltip() { - if (!this.state.showTooltip) return null; const [ timestamp, messageSource ] = this.props.series; - const reversed = this.props.reversed ? '-reversed' : ''; const messages = messageSource.map((message, i) => { return (
      { message }
      ); }); return ( -
      -
      -
      { moment(timestamp).format('lll') }
      - { messages } -
      -
      +
      +
      { moment(timestamp).format('lll') }
      + { messages }
      ); } - handleMouseOver() { - this.setState({ showTooltip: true }); - } - - handleMouseOut() { - this.setState({ showTooltip: false }); - } - render() { const { color, plot, icon, series } = this.props; const offset = plot.pointOffset({ x: series[0], y: 0 }); @@ -82,18 +65,11 @@ class Annotation extends Component { } }); return( -
      -
      -
      - - { tooltip } -
      +
      +
      + + +
      ); } diff --git a/src/core_plugins/metrics/public/visualizations/components/flot_chart.js b/src/core_plugins/metrics/public/visualizations/components/flot_chart.js index dfbc2f473af90..8e1ea8c9ae2a4 100644 --- a/src/core_plugins/metrics/public/visualizations/components/flot_chart.js +++ b/src/core_plugins/metrics/public/visualizations/components/flot_chart.js @@ -297,11 +297,11 @@ class FlotChart extends Component { this.resize = el} - className="rhythm_chart__timeseries-container" + className="tvbVisTimeSeries__container" >
      this.target = el} - className="rhythm_chart__timeseries-container" + className="tvbVisTimeSeries__container" /> ); diff --git a/src/core_plugins/metrics/public/visualizations/components/gauge.js b/src/core_plugins/metrics/public/visualizations/components/gauge.js index 0fab821bb698e..bf90fe7897df6 100644 --- a/src/core_plugins/metrics/public/visualizations/components/gauge.js +++ b/src/core_plugins/metrics/public/visualizations/components/gauge.js @@ -110,7 +110,7 @@ class Gauge extends Component { let additionalLabel; if (this.props.additionalLabel) { additionalLabel = ( -
      +
      {this.props.additionalLabel}
      ); @@ -118,17 +118,17 @@ class Gauge extends Component { if (type === 'half') { metrics = (
      this.inner = el} style={styles.inner} >
      { title }
      { formatter(value) } @@ -139,18 +139,18 @@ class Gauge extends Component { } else { metrics = (
      this.inner = el} style={styles.inner} >
      { formatter(value) }
      { title }
      @@ -158,13 +158,13 @@ class Gauge extends Component {
      ); } - let className = type === 'half' ? 'thorHalfGauge' : 'thorCircleGauge'; - if (this.props.reversed) className = `reversed ${className}`; + let className = type === 'half' ? 'tvbVisHalfGauge' : 'tvbVisCircleGauge'; + if (this.props.reversed) className = `${className} tvbVisGauge--reversed`; return (
      this.resize = el} - className={`${className}__resize`} + className={`tvbVisGauge__resize`} > { metrics } diff --git a/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js b/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js index 2a76c928d0073..8f9dccadbe60d 100644 --- a/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js +++ b/src/core_plugins/metrics/public/visualizations/components/horizontal_legend.js @@ -21,34 +21,36 @@ import PropTypes from 'prop-types'; import React from 'react'; import createLegendSeries from '../lib/create_legend_series'; import reactcss from 'reactcss'; -import { htmlIdGenerator } from '@elastic/eui'; +import { htmlIdGenerator, EuiButtonIcon } from '@elastic/eui'; function HorizontalLegend(props) { const rows = props.series.map(createLegendSeries(props)); const htmlId = htmlIdGenerator(); const styles = reactcss({ - hideLegned: { + hideLegend: { legend: { display: 'none' } } - }, { hideLegned: !props.showLegend }); - let legendControlClass = 'fa fa-chevron-down'; + }, { hideLegend: !props.showLegend }); + + let legendToggleIcon = 'arrowDown'; if (!props.showLegend) { - legendControlClass = 'fa fa-chevron-up'; + legendToggleIcon = 'arrowUp'; } return ( -
      -
      -
      -
      +
      + +
      { rows }
      diff --git a/src/core_plugins/metrics/public/visualizations/components/metric.js b/src/core_plugins/metrics/public/visualizations/components/metric.js index f4876fab4dbb9..f21de4e69e547 100644 --- a/src/core_plugins/metrics/public/visualizations/components/metric.js +++ b/src/core_plugins/metrics/public/visualizations/components/metric.js @@ -82,41 +82,21 @@ class Metric extends Component { left: this.state.left || 0, transform: `matrix(${scale}, 0, 0, ${scale}, ${translateX}, ${translateY})` }, - primary_text: { - color: 'rgba(0,0,0,0.5)' - }, - primary_value: { - color: '#000' - }, - secondary_text: { - color: 'rgba(0,0,0,0.5)' - }, - secondary_value: { - color: '#000' - } + primary_value: {}, + secondary_value: {} }, reversed: { - primary_text: { - color: 'rgba(255,255,255,0.7)' - }, - primary_value: { - color: '#FFF' - }, - secondary_text: { - color: 'rgba(255,255,255,0.7)' - }, - secondary_value: { - color: '#FFF' - } - + primary_value: {}, + secondary_value: {} } }, this.props); if (this.props.backgroundColor) styles.container.backgroundColor = this.props.backgroundColor; if (metric && metric.color) styles.primary_value.color = metric.color; + let primaryLabel; if (metric && metric.label) { - primaryLabel = (
      { metric.label }
      ); + primaryLabel = (
      { metric.label }
      ); } let secondarySnippet; @@ -126,12 +106,12 @@ class Metric extends Component { if (secondary.color) styles.secondary_value.color = secondary.color; let secondaryLabel; if (secondary.label) { - secondaryLabel = (
      { secondary.label }
      ); + secondaryLabel = (
      { secondary.label }
      ); } secondarySnippet = ( -
      +
      { secondaryLabel } -
      { secondaryValue }
      +
      { secondaryValue }
      ); } @@ -139,25 +119,33 @@ class Metric extends Component { let additionalLabel; if (this.props.additionalLabel) { additionalLabel = ( -
      +
      {this.props.additionalLabel}
      ); } + let className = 'tvbVisMetric'; + if (!styles.container.backgroundColor) { + className += ' tvbVisMetric--noBackground'; + } + if (this.props.reversed) { + className += ' tvbVisMetric--reversed'; + } + return ( -
      +
      this.resize = el} - className="rhythm_metric__resize" + className="tvbVisMetric__resize" > -
      this.inner = el} className="rhythm_metric__inner" style={styles.inner}> -
      +
      this.inner = el} className="tvbVisMetric__inner" style={styles.inner}> +
      { primaryLabel }
      { primaryValue }
      diff --git a/src/core_plugins/metrics/public/visualizations/components/timeseries.js b/src/core_plugins/metrics/public/visualizations/components/timeseries.js index 03fb9414e4045..aaad5bd158a19 100644 --- a/src/core_plugins/metrics/public/visualizations/components/timeseries.js +++ b/src/core_plugins/metrics/public/visualizations/components/timeseries.js @@ -125,9 +125,9 @@ class Timeseries extends Component { } render() { - let className = 'rhythm_chart'; + let className = 'tvbVisTimeSeries'; if (this.props.reversed) { - className += ' reversed'; + className += ' tvbVisTimeSeries--reversed'; } const styles = reactcss({ bottomLegend: { @@ -138,8 +138,8 @@ class Timeseries extends Component { }, { bottomLegend: this.props.legendPosition === 'bottom' }); return (
      -
      -
      +
      +
      v); const value = item.datapoint[2] ? item.datapoint[1] - item.datapoint[2] : item.datapoint[1]; tooltip = ( -
      - -
      -
      -
      - -
      -
      { item.series.label }
      -
      { formatter(value) }
      +
      + +
      +
      + +
      { item.series.label }
      +
      { formatter(value) }
      -
      { moment(item.datapoint[0]).format(this.props.dateFormat) }
      +
      { moment(item.datapoint[0]).format(this.props.dateFormat) }
      -
      ); } @@ -228,13 +181,13 @@ class TimeseriesChart extends Component { }; const annotations = this.state.annotations.map(this.renderAnnotations); - let axisLabelClass = 'rhythm_chart__axis-label'; + let axisLabelClass = 'tvbVisTimeSeries__axisLabel'; if (this.props.reversed) { - axisLabelClass += ' reversed'; + axisLabelClass += ' tvbVisTimeSeries__axisLabel--reversed'; } return ( -
      this.container = el} className="rhythm_chart__timeseries-container"> +
      this.container = el} className="tvbVisTimeSeries__container"> { tooltip } { annotations } diff --git a/src/core_plugins/metrics/public/visualizations/components/top_n.js b/src/core_plugins/metrics/public/visualizations/components/top_n.js index 88dd043a07f97..f0c6745051ab4 100644 --- a/src/core_plugins/metrics/public/visualizations/components/top_n.js +++ b/src/core_plugins/metrics/public/visualizations/components/top_n.js @@ -59,14 +59,14 @@ class TopN extends Component { onClick={this.handleClick({ lastValue, ...item })} style={styles.row} > -
      - + - + ); }; @@ -80,14 +80,14 @@ class TopN extends Component { }, 0); const rows = this.props.series.map(this.renderRow(maxValue)); - let className = 'rhythm_top_n'; + let className = 'tvbVisTopN'; if (this.props.reversed) { - className += ' reversed'; + className += ' tvbVisTopN--reversed'; } return (
      -
      { item.label } + { item.label }
      { value }{ value }
      +
      { rows } diff --git a/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js b/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js index 6b527c132f397..d2183bfbca34f 100644 --- a/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js +++ b/src/core_plugins/metrics/public/visualizations/components/vertical_legend.js @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import React from 'react'; import createLegendSeries from '../lib/create_legend_series'; import reactcss from 'reactcss'; -import { htmlIdGenerator } from '@elastic/eui'; +import { htmlIdGenerator, EuiButtonIcon } from '@elastic/eui'; function VerticalLegend(props) { const rows = props.series.map(createLegendSeries(props)); @@ -38,27 +38,30 @@ function VerticalLegend(props) { control: { order: '2' } }, hideLegend: { - legend: { width: 12 }, + legend: { width: 24 }, series: { display: 'none' }, } }, { hideLegend, leftLegend }); - const openClass = leftLegend ? 'fa-chevron-right' : 'fa-chevron-left'; - const closeClass = leftLegend ? 'fa-chevron-left' : 'fa-chevron-right'; - const legendControlClass = hideLegend ? `fa ${openClass}` : `fa ${closeClass}`; + const openIcon = leftLegend ? 'arrowRight' : 'arrowLeft'; + const closeIcon = leftLegend ? 'arrowLeft' : 'arrowRight'; + const legendToggleIcon = hideLegend ? `${openIcon}` : `${closeIcon}`; return ( -
      -
      -
      -
      +
      + + +
      { rows }
      diff --git a/src/core_plugins/metrics/public/visualizations/less/includes/chart.less b/src/core_plugins/metrics/public/visualizations/less/includes/chart.less deleted file mode 100644 index 2c270e315a54c..0000000000000 --- a/src/core_plugins/metrics/public/visualizations/less/includes/chart.less +++ /dev/null @@ -1,215 +0,0 @@ -.rhythm_chart { - position: relative; - display: flex; - flex-direction: column; - flex: 1 0 auto; -} - -.rhythm_chart__title { - color: @textColor; - margin: 0 0 10px; -} - -.rhythm_chart__content { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - display: flex; - flex: 1 0 auto; -} - -.rhythm_chart__visualization { - cursor: crosshair; - display: flex; - flex-direction: column; - flex: 1 0 auto; - position: relative; - & > div { - min-width: 1px; - width: 100%; - height: 100%; - } -} - -.rhythm_chart__legend-control { - padding: 6px 2px 0 0; - color: @textColor; - font-size: 12px; - - button { - background: none; - border: none; - appearance: none; - padding: 0; - } -} - -.rhythm_chart__legend-series { - flex-grow: 1; -} - -.rhythm_chart__legend { - display: flex; - font-size: 11px; - width: 200px; - padding: 5px 0; - overflow: auto; -} - -.rhythm_chart__legend_button { - text-align: left; - appearance: none; - background: none; - border: none; - display: flex; - width: 100%; - max-width: 170px; -} - -.rhythm_chart__legend_item { - text-align: left; - cursor: pointer; - &.disabled { - opacity: 0.5; - } - padding: 5px; - border-bottom: 1px solid @lineColor; - &:first-child { - border-top: 1px solid @lineColor; - } - display: flex; - max-width: 170px; -} - -.rhythm_chart__legend_label { - flex-grow: 1; - overflow: hidden; - white-space: nowrap; - span { - color: @textColor; - margin-left: 5px; - } -} - -.rhythm_chart__legend_value { - color: @valueColor; - margin-left: 3px; -} - -.rhythm_chart.reversed { - .rhythm_chart__title { color: @textColorReversed; } - .rhythm_chart__legend-control { color: @textColorReversed; } - .rhythm_chart__legend_item { - border-bottom: 1px solid @lineColorReversed; - &:first-child { border-top: 1px solid @lineColorReversed; } - } - .rhythm_chart__legend_label { span { color: @textColorReversed; } } - .rhythm_chart__legend_value { color: @valueColorReversed; } -} - -.rhythm_chart__legend-horizontal, -.rhythm_chart.reversed .rhythm_chart__legend-horizontal { - width: auto; - display: flex; - .rhythm_chart__legend-control { - padding: 5px 5px 0 0; - } - .rhythm_chart__legend-series { - display: flex; - flex-wrap: wrap; - } - .rhythm_chart__legend_label { - flex: 0 1 auto; - } - .rhythm_chart__legend_item { - max-width: inherit; - font-size: 12px; - display: flex; - margin-right: 10px; - border-bottom: none; - &:first-child { border-top: none; } - } -} - -.rhythm_chart__timeseries-container { - position: relative; - display: flex; - flex-direction: column; - flex: 1 0 auto; -} - -.rhythm_chart__axis-label { - font-size: 0.8em; - color: rgba(0,0,0,0.4); - text-align: center; - min-height: 1.2em; - &.reversed { - color: rgba(255,255,255,0.6); - } -} - -.annotation { - position: absolute; - display: flex; - flex-direction: column; - z-index: 90; - align-items: center; -} -.annotation__line { - flex: 1 0 auto; - width: 2px; -} -.annotation__icon { - position: relative; - flex: 0 0 auto; - width: 12px; - text-align: center; - display: flex; - flex-direction: column; - align-items: center; -} -.annotation__tooltip { - position: absolute; - bottom: 20px; - text-align: center; - display: flex; - flex-direction: column; - align-items: center; -} -.annotation__message, -.annotation__timestamp { - font-size: 12px; -} -.annotation__caret { - width: 0; - height: 0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid rgba(0,0,0,0.7); -} -.annotation__caret-reversed { - .annotation__caret; - border-top: none; - border-bottom: 5px solid rgba(0,0,0,0.7); -} -.annotation__tooltip-body { - border-radius: 4px; - padding: 4px; - white-space: nowrap; - color: white; - background-color: rgba(0,0,0,0.7); -} -.annotation__tooltip-body-reversed { - .annotation__tooltip-body; - color: black; - background-color: rgba(255,255,255,0.7); -} -.annotation__timestamp { - color: rgba(255,255,255,0.7); - -} -.annotation__timestamp-reversed { - color: rgba(0,0,0,0.7); -} diff --git a/src/core_plugins/metrics/public/visualizations/less/includes/colors.less b/src/core_plugins/metrics/public/visualizations/less/includes/colors.less deleted file mode 100644 index 3c0c04b60a608..0000000000000 --- a/src/core_plugins/metrics/public/visualizations/less/includes/colors.less +++ /dev/null @@ -1,32 +0,0 @@ -@black: black; -@grayDarkest: #222; -@grayDarker: #333; -@grayDark: #666; -@gray: #999; -@grayLight: #CCC; -@grayLighter: #DDD; -@grayLightest: #EEE; -@white: white; - -@background: @white; -@navBarBackground: @grayLighter; -@inputBorder: @grayLighter; -@lineColor: rgba(0,0,0,0.2); -@lineColorReversed: rgba(255,255,255,0.4); -@textColor: rgba(0,0,0,0.4); -@textColorReversed: rgba(255,255,255,0.6); -@disabledColor: @grayLight; -@valueColor: rgba(0,0,0,0.7); -@valueColorReversed: rgba(255,255,255,0.8); - -@esBlue: #0079a5; -@esRed: #d76051; -@esYellow: #fbce47; -@esGreen: #80c383; -@esPink: #e8488b; -@esPurple: #9980b2; -@esAltGreen: #8ac336; -@esCyan: #59c6c5; - - - diff --git a/src/core_plugins/metrics/public/visualizations/less/includes/gauge.less b/src/core_plugins/metrics/public/visualizations/less/includes/gauge.less deleted file mode 100644 index 8db61e6b84dd2..0000000000000 --- a/src/core_plugins/metrics/public/visualizations/less/includes/gauge.less +++ /dev/null @@ -1,122 +0,0 @@ -.thorCircleGauge { - font-size: 100%; - display: flex; - flex-direction: column; - flex: 1 0 auto; - circle { - opacity: 1; - stroke-opacity: 1; - &:hover { - opacity: 1; - stroke-opacity: 1; - } - } -} - -.thorCircleGauge__metrics { - position: absolute; - width: 100px; - height: 100px; - text-align: center; - display: flex; - padding: 10px; - flex-direction: column; - align-items: center; - justify-content: center; -} - -.thorCircleGauge__label { - font-size: 8px; - line-height: 1; - text-align: center; - color: rgba(0,0,0,0.4); - padding: 0 8px 4px; -} -.thorCircleGauge__value { - font-size: 12px; - line-height: 1; - text-align: center; - color: @black; -} - -.thorGauge_additionalLabel { - font-size: 8px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - width: 100%; - padding: 0 5px; -} - -.thorCircleGauge__resize { - position: relative; - display: flex; - flex-direction: column; - flex: 1 0 auto; -} - -.thorCircleGauge.reversed { - .thorCircleGauge__label { - color: rgba(255,255,255,0.6); - } - .thorCircleGauge__value { - color: @white; - } -} - -.thorHalfGauge { - font-size: 100%; - display: flex; - flex-direction: column; - flex: 1 0 auto; - circle { - opacity: 1; - stroke-opacity: 1; - &:hover { - opacity: 1; - stroke-opacity: 1; - } - } -} - -.thorHalfGauge__metrics { - position: absolute; - width: 100px; - height: 70px; - text-align: center; - display: flex; - padding: 0px 11px 10px; - flex-direction: column; - align-items: center; - justify-content: flex-end; -} - -.thorHalfGauge__label { - font-size: 8px; - line-height: 1; - text-align: center; - color: rgba(0,0,0,0.4); - padding: 0 8px 4px; -} -.thorHalfGauge__value { - font-size: 13px; - line-height: 1; - text-align: center; - color: @black; -} - -.thorHalfGauge__resize { - position: relative; - display: flex; - rowDirection: column; - flex: 1 0 auto; -} - -.thorHalfGauge.reversed { - .thorHalfGauge__label { - color: rgba(255,255,255,0.6); - } - .thorHalfGauge__value { - color: @white; - } -} diff --git a/src/core_plugins/metrics/public/visualizations/less/includes/metric.less b/src/core_plugins/metrics/public/visualizations/less/includes/metric.less deleted file mode 100644 index 41457614b443f..0000000000000 --- a/src/core_plugins/metrics/public/visualizations/less/includes/metric.less +++ /dev/null @@ -1,70 +0,0 @@ -.rhythm_metric { - font-size: 100%; - position: relative; - display: flex; - flex-direction: column; - flex: 1 0 auto; -} - -.rhythm_metric__resize { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - overflow: hidden; - display: flex; -} - -.rhythm_metric__primary { -} - -.rhythm_metric__primary-label { - text-align: center; - color: @textColor; - font-size: 0.5em; - margin-bottom: 0.25em; - line-height: 1em; -} - -.rhythm_metric__primary-value { - text-align: center; - color: @valueColor; - font-size: 1em; - font-weight: bold; - line-height: 1em; -} - -.rhythm_metric__secondary { - display: flex; - justify-content: center; - align-items: center; - margin-top: 0.05em; -} - -.rhythm_metric__secondary-label { - font-size: 0.35em; - margin-right: 0.3em; - color: @textColor; - line-height: 1em; -} - -.rhythm_metric__secondary-value { - font-size: 0.35em; - color: @valueColor; - line-height: 1em; -} - -.rhythm_metric__inner { - position: absolute; - padding: 0.25em 0.5em 0.5em; -} - -.rhythm_metric__additionalLabel { - font-size: 0.25em; - overflow: hidden; - text-overflow: ellipsis; - padding: 2px 0 0 0; - white-space: nowrap; - text-align: center; -} diff --git a/src/core_plugins/metrics/public/visualizations/less/includes/top_n.less b/src/core_plugins/metrics/public/visualizations/less/includes/top_n.less deleted file mode 100644 index b64ac07c78f16..0000000000000 --- a/src/core_plugins/metrics/public/visualizations/less/includes/top_n.less +++ /dev/null @@ -1,41 +0,0 @@ -.rhythm_top_n { - position: relative; - overflow: auto; - display: flex; - flex-direction: column; - - tr:hover { td { background-color: rgba(0,0,0,0.1) } } -} - -.rhythm_top_n__labels, -.rhythm_top_n__value { - text-align: right; - white-space: nowrap; - line-height: 0; - vertical-align: middle; -} - -.rhythm_top_n__label { - color: @textColor; - padding: 4px 0; -} - -.rhythm_top_n__value { - color: @valueColor; - padding: 4px 4px 4px 0; -} - -.rhythm_top_n__bar { - padding: 4px 10px; - vertical-align: middle; -} - -.rhythm_top_n__inner-bar { - min-height: 16px; -} - -.rhythm_top_n.reversed { - tr:hover { td { background-color: rgba(255,255,255,0.1) } } - .rhythm_top_n__label { color: @textColorReversed; } - .rhythm_top_n__value { color: @valueColorReversed; } -} diff --git a/src/core_plugins/metrics/public/visualizations/less/main.less b/src/core_plugins/metrics/public/visualizations/less/main.less deleted file mode 100644 index b04b21908d8fc..0000000000000 --- a/src/core_plugins/metrics/public/visualizations/less/main.less +++ /dev/null @@ -1,5 +0,0 @@ -@import './includes/colors.less'; -@import './includes/chart.less'; -@import './includes/metric.less'; -@import './includes/top_n.less'; -@import './includes/gauge.less'; diff --git a/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js b/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js index eb4a9aab38b0d..59025a7a306f2 100644 --- a/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js +++ b/src/core_plugins/metrics/public/visualizations/lib/create_legend_series.js @@ -19,7 +19,9 @@ import React from 'react'; import _ from 'lodash'; -export default props => (row, i) => { +import { EuiIcon } from '@elastic/eui'; + +export default props => (row) => { function tickFormatter(value) { if (_.isFunction(props.tickFormatter)) return props.tickFormatter(value); @@ -28,7 +30,7 @@ export default props => (row, i) => { const formatter = row.tickFormatter || tickFormatter; const value = formatter(props.seriesValues[row.id]); - const classes = ['rhythm_chart__legend_item']; + const classes = ['tvbLegend__item']; const key = row.id; if (!_.includes(props.seriesFilter, row.id)) classes.push('disabled'); if (row.label == null || row.legend === false) return (
      ); @@ -40,13 +42,13 @@ export default props => (row, i) => { >
      ); diff --git a/src/core_plugins/metrics/server/lib/get_index_pattern_service.js b/src/core_plugins/metrics/server/lib/get_index_pattern_service.js index c8f9d173b3cab..e0bf9cbb2d616 100644 --- a/src/core_plugins/metrics/server/lib/get_index_pattern_service.js +++ b/src/core_plugins/metrics/server/lib/get_index_pattern_service.js @@ -20,11 +20,11 @@ import { IndexPatternsService } from '../../../../server/index_patterns/service'; export const getIndexPatternService = { assign: 'indexPatternsService', - method(req, reply) { + method(req) { const dataCluster = req.server.plugins.elasticsearch.getCluster('data'); const callDataCluster = (...args) => { return dataCluster.callWithRequest(req, ...args); }; - reply(new IndexPatternsService(callDataCluster)); + return new IndexPatternsService(callDataCluster); } }; diff --git a/src/core_plugins/metrics/server/routes/fields.js b/src/core_plugins/metrics/server/routes/fields.js index 1b3472c4c576f..762d551217ee3 100644 --- a/src/core_plugins/metrics/server/routes/fields.js +++ b/src/core_plugins/metrics/server/routes/fields.js @@ -27,15 +27,17 @@ export default (server) => { }, path: '/api/metrics/fields', method: 'GET', - handler: (req, reply) => { - getFields(req) - .then(reply) - .catch((err) => { - if (err.isBoom && err.status === 401) return reply(err); - reply([]); - }); + handler: async (req) => { + try { + return await getFields(req); + } catch (err) { + if (err.isBoom && err.status === 401) { + return err; + } + + return []; + } } }); }; - diff --git a/src/core_plugins/metrics/server/routes/vis.js b/src/core_plugins/metrics/server/routes/vis.js index 1c6428233eee8..9af52211f17aa 100644 --- a/src/core_plugins/metrics/server/routes/vis.js +++ b/src/core_plugins/metrics/server/routes/vis.js @@ -24,13 +24,16 @@ export default (server) => { server.route({ path: '/api/metrics/vis/data', method: 'POST', - handler: (req, reply) => { - getVisData(req) - .then(reply) - .catch(err => { - if (err.isBoom && err.status === 401) return reply(err); - reply(Boom.boomify(err, { statusCode: 500 })); - }); + handler: async (req) => { + try { + return await getVisData(req); + } catch(err) { + if (err.isBoom && err.status === 401) { + return err; + } + + throw Boom.boomify(err, { statusCode: 500 }); + } } }); diff --git a/src/core_plugins/region_map/index.js b/src/core_plugins/region_map/index.js index 6092cc91ac6b3..9083ad9e92ae0 100644 --- a/src/core_plugins/region_map/index.js +++ b/src/core_plugins/region_map/index.js @@ -21,7 +21,8 @@ export default function (kibana) { return new kibana.Plugin({ uiExports: { - visTypes: ['plugins/region_map/region_map_vis'] + visTypes: ['plugins/region_map/region_map_vis'], + styleSheetPaths: `${__dirname}/public/index.scss`, } }); diff --git a/src/core_plugins/region_map/public/_region_map.scss b/src/core_plugins/region_map/public/_region_map.scss new file mode 100644 index 0000000000000..51cbf2f419aaf --- /dev/null +++ b/src/core_plugins/region_map/public/_region_map.scss @@ -0,0 +1,3 @@ +.rgmEMSLink { + font-size: $euiFontSizeXS; +} diff --git a/src/core_plugins/region_map/public/choropleth_layer.js b/src/core_plugins/region_map/public/choropleth_layer.js index 79171e58a4e4d..140acb1122a19 100644 --- a/src/core_plugins/region_map/public/choropleth_layer.js +++ b/src/core_plugins/region_map/public/choropleth_layer.js @@ -21,6 +21,7 @@ import $ from 'jquery'; import L from 'leaflet'; import _ from 'lodash'; import d3 from 'd3'; +import { i18n } from '@kbn/i18n'; import { KibanaMapLayer } from 'ui/vis/map/kibana_map_layer'; import { truncatedColorMaps } from 'ui/vislib/components/color/truncated_colormaps'; import * as topojson from 'topojson-client'; @@ -73,7 +74,7 @@ export default class ChoroplethLayer extends KibanaMapLayer { this._metrics = null; this._joinField = null; - this._colorRamp = truncatedColorMaps[Object.keys(truncatedColorMaps)[0]]; + this._colorRamp = truncatedColorMaps[Object.keys(truncatedColorMaps)[0]].value; this._lineWeight = 1; this._tooltipFormatter = () => ''; this._attribution = attribution; @@ -123,7 +124,10 @@ export default class ChoroplethLayer extends KibanaMapLayer { featureCollection = topojson.feature(data, features);//conversion to geojson } else { //should never happen - throw new Error('Unrecognized format ' + formatType); + throw new Error(i18n.translate('regionMap.choroplethLayer.unrecognizedFormatErrorMessage', { + defaultMessage: 'Unrecognized format {formatType}', + values: { formatType }, + })); } this._sortedFeatures = featureCollection.features.slice(); this._sortFeatures(); @@ -143,15 +147,23 @@ export default class ChoroplethLayer extends KibanaMapLayer { let errorMessage; if (e.status === 404) { - errorMessage = `Server responding with '404' when attempting to fetch ${geojsonUrl}. - Make sure the file exists at that location.`; + errorMessage = i18n.translate('regionMap.choroplethLayer.downloadingVectorData404ErrorMessage', { + defaultMessage: 'Server responding with \'404\' when attempting to fetch {geojsonUrl}. \ +Make sure the file exists at that location.', + values: { geojsonUrl }, + }); } else { - errorMessage = `Cannot download ${geojsonUrl} file. Please ensure the -CORS configuration of the server permits requests from the Kibana application on this host.`; + errorMessage = i18n.translate('regionMap.choroplethLayer.downloadingVectorDataErrorMessage', { + defaultMessage: 'Cannot download {geojsonUrl} file. Please ensure the \ +CORS configuration of the server permits requests from the Kibana application on this host.', + values: { geojsonUrl }, + }); } toastNotifications.addDanger({ - title: 'Error downloading vector data', + title: i18n.translate('regionMap.choroplethLayer.downloadingVectorDataErrorMessageTitle', { + defaultMessage: 'Error downloading vector data', + }), text: errorMessage, }); @@ -323,7 +335,7 @@ CORS configuration of the server permits requests from the Kibana application on } const titleText = this._metricsAgg.makeLabel(); - const $title = $('
      ').addClass('tilemap-legend-title').text(titleText); + const $title = $('
      ').addClass('visMapLegend__title').text(titleText); jqueryDiv.append($title); this._legendColors.forEach((color) => { diff --git a/src/core_plugins/region_map/public/images/icon-vector-map.svg b/src/core_plugins/region_map/public/images/icon-vector-map.svg deleted file mode 100644 index 2eabb777ea55c..0000000000000 --- a/src/core_plugins/region_map/public/images/icon-vector-map.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/core_plugins/region_map/public/index.scss b/src/core_plugins/region_map/public/index.scss new file mode 100644 index 0000000000000..d78c9330e2e79 --- /dev/null +++ b/src/core_plugins/region_map/public/index.scss @@ -0,0 +1,10 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "rgm" to avoid conflicts. +// Examples +// rgmChart +// rgmChart__legend +// rgmChart__legend--small +// rgmChart__legend-isLoading + +@import './region_map'; diff --git a/src/core_plugins/region_map/public/region_map.less b/src/core_plugins/region_map/public/region_map.less deleted file mode 100644 index 0b4bb68528e69..0000000000000 --- a/src/core_plugins/region_map/public/region_map.less +++ /dev/null @@ -1,14 +0,0 @@ -.region-map-vis { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - -} - -region_map-vis-params { - .ems-hotlink { - font-size: 10px; - } -} diff --git a/src/core_plugins/region_map/public/region_map_vis.js b/src/core_plugins/region_map/public/region_map_vis.js index 2fde449c6bb8b..24bf400f69df5 100644 --- a/src/core_plugins/region_map/public/region_map_vis.js +++ b/src/core_plugins/region_map/public/region_map_vis.js @@ -17,7 +17,6 @@ * under the License. */ -import './region_map.less'; import './region_map_vis_params'; import { VisFactoryProvider } from 'ui/vis/vis_factory'; import { CATEGORY } from 'ui/vis/vis_category'; @@ -28,7 +27,7 @@ import { mapToLayerWithId } from './util'; import { RegionMapsVisualizationProvider } from './region_map_visualization'; import { Status } from 'ui/vis/update_status'; -VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmapsConfig, config) { +VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmapsConfig, config, i18n) { const VisFactory = Private(VisFactoryProvider); const RegionMapsVisualization = Private(RegionMapsVisualizationProvider); @@ -38,9 +37,9 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps return VisFactory.createBaseVisualization({ name: 'region_map', - title: 'Region Map', - description: 'Show metrics on a thematic map. Use one of the provided base maps, or add your own. ' + - 'Darker colors represent higher values.', + title: i18n('regionMap.mapVis.regionMapTitle', { defaultMessage: 'Region Map' }), + description: i18n('regionMap.mapVis.regionMapDescription', { defaultMessage: 'Show metrics on a thematic map. Use one of the \ +provided base maps, or add your own. Darker colors represent higher values.' }), category: CATEGORY.MAP, icon: 'visMapRegion', visConfig: { @@ -66,25 +65,26 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps collections: { legendPositions: [{ value: 'bottomleft', - text: 'bottom left', + text: i18n('regionMap.mapVis.regionMapEditorConfig.bottomLeftText', { defaultMessage: 'bottom left' }), }, { value: 'bottomright', - text: 'bottom right', + text: i18n('regionMap.mapVis.regionMapEditorConfig.bottomRightText', { defaultMessage: 'bottom right' }), }, { value: 'topleft', - text: 'top left', + text: i18n('regionMap.mapVis.regionMapEditorConfig.topLeftText', { defaultMessage: 'top left' }), }, { value: 'topright', - text: 'top right', + text: i18n('regionMap.mapVis.regionMapEditorConfig.topRightText', { defaultMessage: 'top right' }), }], - colorSchemas: Object.keys(truncatedColorMaps), - vectorLayers: vectorLayers + colorSchemas: Object.values(truncatedColorMaps).map(value => ({ id: value.id, label: value.label })), + vectorLayers: vectorLayers, + tmsLayers: [] }, schemas: new Schemas([ { group: 'metrics', name: 'metric', - title: 'Value', + title: i18n('regionMap.mapVis.regionMapEditorConfig.schemas.metricTitle', { defaultMessage: 'Value' }), min: 1, max: 1, aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality', 'top_hits', @@ -97,7 +97,7 @@ VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmaps group: 'buckets', name: 'segment', icon: 'fa fa-globe', - title: 'shape field', + title: i18n('regionMap.mapVis.regionMapEditorConfig.schemas.segmentTitle', { defaultMessage: 'shape field' }), min: 1, max: 1, aggFilter: ['terms'] diff --git a/src/core_plugins/region_map/public/region_map_vis_params.html b/src/core_plugins/region_map/public/region_map_vis_params.html index 997050e3f8c5d..0ec64a45c4750 100644 --- a/src/core_plugins/region_map/public/region_map_vis_params.html +++ b/src/core_plugins/region_map/public/region_map_vis_params.html @@ -1,15 +1,20 @@
      -
      - Layer Settings -
      +
      - +
      - + +
      - +
       
      - +
       
      @@ -79,25 +110,35 @@
      -
      Style settings
      +
      - +
      - +
      - + \ No newline at end of file diff --git a/src/core_plugins/region_map/public/region_map_visualization.js b/src/core_plugins/region_map/public/region_map_visualization.js index fd2be9aef49dc..3d1ccf1b22ee2 100644 --- a/src/core_plugins/region_map/public/region_map_visualization.js +++ b/src/core_plugins/region_map/public/region_map_visualization.js @@ -26,7 +26,7 @@ import AggResponsePointSeriesTooltipFormatterProvider from './tooltip_formatter' import 'ui/vis/map/service_settings'; import { toastNotifications } from 'ui/notify'; -export function RegionMapsVisualizationProvider(Private, config) { +export function RegionMapsVisualizationProvider(Private, config, i18n) { const tooltipFormatter = Private(AggResponsePointSeriesTooltipFormatterProvider); const BaseMapsVisualization = Private(BaseMapsVisualizationProvider); @@ -101,7 +101,7 @@ export function RegionMapsVisualizationProvider(Private, config) { this._vis.params.showAllShapes ); this._choroplethLayer.setJoinField(visParams.selectedJoinField.name); - this._choroplethLayer.setColorRamp(truncatedColorMaps[visParams.colorSchema]); + this._choroplethLayer.setColorRamp(truncatedColorMaps[visParams.colorSchema].value); this._choroplethLayer.setLineWeight(visParams.outlineWeight); this._setTooltipFormatter(); @@ -161,8 +161,19 @@ export function RegionMapsVisualizationProvider(Private, config) { const shouldShowWarning = this._vis.params.isDisplayWarning && config.get('visualization:regionmap:showWarnings'); if (event.mismatches.length > 0 && shouldShowWarning) { toastNotifications.addWarning({ - title: `Unable to show ${event.mismatches.length} ${event.mismatches.length > 1 ? 'results' : 'result'} on map`, - text: `Ensure that each of these term matches a shape on that shape's join field: ${event.mismatches.join(', ')}`, + title: i18n('regionMap.visualization.unableToShowMismatchesWarningTitle', { + defaultMessage: 'Unable to show {mismatchesLength} {oneMismatch, plural, one {result} other {results}} on map', + values: { + mismatchesLength: event.mismatches.length, + oneMismatch: event.mismatches.length > 1 ? 0 : 1, + }, + }), + text: i18n('regionMap.visualization.unableToShowMismatchesWarningText', { + defaultMessage: 'Ensure that each of these term matches a shape on that shape\'s join field: {mismatches}', + values: { + mismatches: event.mismatches.join(', '), + }, + }), }); } }); diff --git a/src/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap b/src/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap index 86534c14c7cd1..109846d3bd9d9 100644 --- a/src/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap +++ b/src/core_plugins/status_page/public/components/__snapshots__/server_status.test.js.snap @@ -21,6 +21,7 @@ exports[`render 1`] = ` >

      My Computer diff --git a/src/core_plugins/status_page/public/components/status_table.js b/src/core_plugins/status_page/public/components/status_table.js index 74ca4a9182dac..4aea9ac01c989 100644 --- a/src/core_plugins/status_page/public/components/status_table.js +++ b/src/core_plugins/status_page/public/components/status_table.js @@ -38,7 +38,7 @@ class StatusTable extends Component { static columns = [{ field: 'state', name: '', - render: state => , + render: state => , width: '32px' }, { field: 'id', diff --git a/src/core_plugins/table_vis/index.js b/src/core_plugins/table_vis/index.js index 8aeea4c64a389..3e0cfd1ff555f 100644 --- a/src/core_plugins/table_vis/index.js +++ b/src/core_plugins/table_vis/index.js @@ -23,7 +23,8 @@ export default function (kibana) { uiExports: { visTypes: [ 'plugins/table_vis/table_vis' - ] + ], + styleSheetPaths: `${__dirname}/public/index.scss`, } }); diff --git a/src/core_plugins/table_vis/public/__tests__/_legacy_response_handler.js b/src/core_plugins/table_vis/public/__tests__/_legacy_response_handler.js new file mode 100644 index 0000000000000..07fc069de53d3 --- /dev/null +++ b/src/core_plugins/table_vis/public/__tests__/_legacy_response_handler.js @@ -0,0 +1,154 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import expect from 'expect.js'; +import sinon from 'sinon'; +import ngMock from 'ng_mock'; +import { AggConfig } from '../../../../ui/public/vis/agg_config'; +import AggConfigResult from '../../../../ui/public/vis/agg_config_result'; +import { VisProvider } from '../../../../ui/public/vis'; +import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; +import { splitRowsOnColumn, splitTable, legacyTableResponseHandler } from '../legacy_response_handler'; + +const rows = [ + { 'col-0-2': 'A', 'col-1-3': 100, 'col-2-1': 'Jim' }, + { 'col-0-2': 'A', 'col-1-3': 0, 'col-2-1': 'Dwight' }, + { 'col-0-2': 'B', 'col-1-3': 24, 'col-2-1': 'Angela' }, + { 'col-0-2': 'C', 'col-1-3': 1, 'col-2-1': 'Angela' }, + { 'col-0-2': 'C', 'col-1-3': 7, 'col-2-1': 'Angela' }, + { 'col-0-2': 'C', 'col-1-3': -30, 'col-2-1': 'Jim' }, +]; + +describe('Table Vis Legacy Response Handler', () => { + + let Vis; + let indexPattern; + let columns; + let mockAggConfig; + let mockSplitAggConfig; + + beforeEach(ngMock.module('kibana')); + beforeEach(ngMock.inject(function (Private) { + Vis = Private(VisProvider); + indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider); + const vis = new Vis(indexPattern, { type: 'table', aggs: [] }); + + mockAggConfig = new AggConfig(vis.aggs, { type: 'terms', schema: 'metric' }); + mockSplitAggConfig = new AggConfig(vis.aggs, { type: 'terms', schema: 'split' }); + + sinon.stub(mockSplitAggConfig, 'fieldFormatter').returns(val => val); + sinon.stub(mockSplitAggConfig, 'makeLabel').returns('some label'); + + columns = [ + { id: 'col-0-2', name: 'Team', aggConfig: mockSplitAggConfig }, + { id: 'col-1-3', name: 'Score', aggConfig: mockAggConfig }, + { id: 'col-2-1', name: 'Leader', aggConfig: mockAggConfig }, + ]; + })); + + describe('#splitRowsOnColumn', () => { + it('should be a function', () => { + expect(typeof splitRowsOnColumn).to.be('function'); + }); + + it('.results should return an array with each unique value for the column id', () => { + const expected = ['A', 'B', 'C']; + const actual = splitRowsOnColumn(rows, 'col-0-2'); + expect(actual.results).to.eql(expected); + }); + + it('.results should preserve types in case a result is not a string', () => { + const expected = [0, 1, 7, 24, 100, -30]; + const actual = splitRowsOnColumn(rows, 'col-1-3'); + expect(actual.results).to.eql(expected); + actual.results.forEach(result => expect(typeof result).to.eql('number')); + }); + + it('.rowsGroupedByResult should return an object with rows grouped by value for the column id', () => { + const expected = { + A: [ + { 'col-1-3': 100, 'col-2-1': 'Jim' }, + { 'col-1-3': 0, 'col-2-1': 'Dwight' }, + ], + B: [ + { 'col-1-3': 24, 'col-2-1': 'Angela' }, + ], + C: [ + { 'col-1-3': 1, 'col-2-1': 'Angela' }, + { 'col-1-3': 7, 'col-2-1': 'Angela' }, + { 'col-1-3': -30, 'col-2-1': 'Jim' }, + ], + }; + const actual = splitRowsOnColumn(rows, 'col-0-2'); + expect(actual.rowsGroupedByResult).to.eql(expected); + }); + }); + + describe('#splitTable', () => { + it('should be a function', () => { + expect(typeof splitTable).to.be('function'); + }); + + it('should return an array of objects with the expected keys', () => { + const expected = ['$parent', 'aggConfig', 'title', 'key', 'tables']; + const actual = splitTable(columns, rows, null); + expect(Object.keys(actual[0])).to.eql(expected); + }); + + it('should return a reference to the parent AggConfigResult', () => { + const actual = splitTable(columns, rows, null); + expect(actual[0].$parent).to.be.a(AggConfigResult); + }); + + it('should return the correct split values', () => { + const expected = ['A', 'B', 'C']; + const actual = splitTable(columns, rows, null); + expect(actual.map(i => i.key)).to.eql(expected); + }); + + it('should return the correct titles', () => { + const expected = ['A: some label', 'B: some label', 'C: some label']; + const actual = splitTable(columns, rows, null); + expect(actual.map(i => i.title)).to.eql(expected); + }); + + it('should return nested split tables with the correct number of entries', () => { + const expected = [2, 1, 3]; + const actual = splitTable(columns, rows, null); + expect(actual.map(i => i.tables[0].rows.length)).to.eql(expected); + }); + + it('should return nested split tables with rows of the correct type', () => { + const actual = splitTable(columns, rows, null); + expect(actual[0].tables[0].rows[0][0]).to.be.a(AggConfigResult); + }); + }); + + describe('#legacyTableResponseHandler', () => { + it('should be a function', () => { + expect(typeof legacyTableResponseHandler).to.be('function'); + }); + + it('should return the correct number of tables', async () => { + const actual = await legacyTableResponseHandler({ columns, rows }); + expect(actual.tables).to.have.length(3); + }); + }); + +}); diff --git a/src/core_plugins/table_vis/public/__tests__/index.js b/src/core_plugins/table_vis/public/__tests__/index.js index aa5320faf8806..2508ba5764be8 100644 --- a/src/core_plugins/table_vis/public/__tests__/index.js +++ b/src/core_plugins/table_vis/public/__tests__/index.js @@ -18,5 +18,7 @@ */ import './_table_vis_controller'; +import './_legacy_response_handler'; + describe('Table Vis', function () { }); diff --git a/src/core_plugins/table_vis/public/_table_vis.scss b/src/core_plugins/table_vis/public/_table_vis.scss new file mode 100644 index 0000000000000..d84ae7b81e408 --- /dev/null +++ b/src/core_plugins/table_vis/public/_table_vis.scss @@ -0,0 +1,30 @@ +// SASSTODO: Update naming to BEM +// This chart is actively being re-written to React and EUI +// Putting off renaming to avoid conflicts +.table-vis { + display: flex; + flex-direction: column; + flex: 1 0 100%; +} + +.table-vis-error { + display: flex; + flex-direction: column; + justify-content: center; + flex: 1 0 100%; + text-align: center; +} + +.table-vis-container { + kbn-agg-table-group > .table > tbody > tr > td { + border-top: 0px; + } + + .pagination-other-pages { + justify-content: flex-end; + } + + .pagination-size { + display: none; + } +} diff --git a/src/core_plugins/table_vis/public/images/icon-table.svg b/src/core_plugins/table_vis/public/images/icon-table.svg deleted file mode 100644 index bc903cb561f50..0000000000000 --- a/src/core_plugins/table_vis/public/images/icon-table.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon-table - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/table_vis/public/index.scss b/src/core_plugins/table_vis/public/index.scss new file mode 100644 index 0000000000000..9f67ab1ea40e5 --- /dev/null +++ b/src/core_plugins/table_vis/public/index.scss @@ -0,0 +1,10 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "tbv" to avoid conflicts. +// Examples +// tbvChart +// tbvChart__legend +// tbvChart__legend--small +// tbvChart__legend-isLoading + +@import './table_vis'; diff --git a/src/core_plugins/table_vis/public/legacy_response_handler.js b/src/core_plugins/table_vis/public/legacy_response_handler.js new file mode 100644 index 0000000000000..74ca19df1d1fd --- /dev/null +++ b/src/core_plugins/table_vis/public/legacy_response_handler.js @@ -0,0 +1,105 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { get, findLastIndex } from 'lodash'; +import AggConfigResult from 'ui/vis/agg_config_result'; + +/** + * Takes an array of tabified rows and splits them by column value: + * + * const rows = [ + * { col-1: 'foo', col-2: 'X' }, + * { col-1: 'bar', col-2: 50 }, + * { col-1: 'baz', col-2: 'X' }, + * ]; + * const splitRows = splitRowsOnColumn(rows, 'col-2'); + * splitRows.results; // ['X', 50]; + * splitRows.rowsGroupedByResult; // { X: [{ col-1: 'foo' }, { col-1: 'baz' }], 50: [{ col-1: 'bar' }] } + */ +export function splitRowsOnColumn(rows, columnId) { + const resultsMap = {}; // Used to preserve types, since object keys are always converted to strings. + return { + rowsGroupedByResult: rows.reduce((acc, row) => { + const { [columnId]: splitValue, ...rest } = row; + resultsMap[splitValue] = splitValue; + acc[splitValue] = [...(acc[splitValue] || []), rest]; + return acc; + }, {}), + results: Object.values(resultsMap), + }; +} + +export function splitTable(columns, rows, $parent) { + const splitColumn = columns.find(column => get(column, 'aggConfig.schema.name') === 'split'); + + if (!splitColumn) { + return [{ + $parent, + columns: columns.map(column => ({ title: column.name, ...column })), + rows: rows.map((row, rowIndex) => { + return columns.map(column => { + const aggConfigResult = new AggConfigResult(column.aggConfig, $parent, row[column.id], row[column.id]); + aggConfigResult.rawData = { + table: { columns, rows }, + column: columns.findIndex(c => c.id === column.id), + row: rowIndex, + }; + return aggConfigResult; + }); + }) + }]; + } + + const splitColumnIndex = columns.findIndex(column => column.id === splitColumn.id); + const splitRows = splitRowsOnColumn(rows, splitColumn.id); + + // Check if there are buckets after the first metric. + const firstMetricsColumnIndex = columns.findIndex(column => get(column, 'aggConfig.type.type') === 'metrics'); + const lastBucketsColumnIndex = findLastIndex(columns, column => get(column, 'aggConfig.type.type') === 'buckets'); + const metricsAtAllLevels = firstMetricsColumnIndex < lastBucketsColumnIndex; + + // Calculate metrics:bucket ratio. + const numberOfMetrics = columns.filter(column => get(column, 'aggConfig.type.type') === 'metrics').length; + const numberOfBuckets = columns.filter(column => get(column, 'aggConfig.type.type') === 'buckets').length; + const metricsPerBucket = numberOfMetrics / numberOfBuckets; + + const filteredColumns = columns + .filter((column, i) => { + const isSplitColumn = i === splitColumnIndex; + const isSplitMetric = metricsAtAllLevels && i > splitColumnIndex && i <= splitColumnIndex + metricsPerBucket; + return !isSplitColumn && !isSplitMetric; + }) + .map(column => ({ title: column.name, ...column })); + + return splitRows.results.map(splitValue => { + const $newParent = new AggConfigResult(splitColumn.aggConfig, $parent, splitValue, splitValue); + return { + $parent: $newParent, + aggConfig: splitColumn.aggConfig, + title: `${splitColumn.aggConfig.fieldFormatter()(splitValue)}: ${splitColumn.aggConfig.makeLabel()}`, + key: splitValue, + // Recurse with filtered data to continue the search for additional split columns. + tables: splitTable(filteredColumns, splitRows.rowsGroupedByResult[splitValue], $newParent), + }; + }); +} + +export async function legacyTableResponseHandler(table) { + return { tables: splitTable(table.columns, table.rows, null) }; +} diff --git a/src/core_plugins/table_vis/public/table_vis.html b/src/core_plugins/table_vis/public/table_vis.html index 24cef37caaeb6..c225d34f441bc 100644 --- a/src/core_plugins/table_vis/public/table_vis.html +++ b/src/core_plugins/table_vis/public/table_vis.html @@ -1,7 +1,10 @@

      -

      No results found

      +

      diff --git a/src/core_plugins/table_vis/public/table_vis.js b/src/core_plugins/table_vis/public/table_vis.js index eb49e7d624a6a..0cd14d43253d3 100644 --- a/src/core_plugins/table_vis/public/table_vis.js +++ b/src/core_plugins/table_vis/public/table_vis.js @@ -17,7 +17,7 @@ * under the License. */ -import './table_vis.less'; +import { i18n } from '@kbn/i18n'; import './table_vis_controller'; import './table_vis_params'; import 'ui/agg_table'; @@ -27,6 +27,8 @@ import { CATEGORY } from 'ui/vis/vis_category'; import { Schemas } from 'ui/vis/editors/default/schemas'; import tableVisTemplate from './table_vis.html'; import { VisTypesRegistryProvider } from 'ui/registry/vis_types'; +import { legacyTableResponseHandler } from './legacy_response_handler'; + // we need to load the css ourselves // we also need to load the controller and used by the template @@ -50,9 +52,13 @@ function TableVisTypeProvider(Private) { return VisFactory.createAngularVisualization({ type: 'table', name: 'table', - title: 'Data Table', + title: i18n.translate('tableVis.tableVisTitle', { + defaultMessage: 'Data Table', + }), icon: 'visTable', - description: 'Display values in a table', + description: i18n.translate('tableVis.tableVisDescription', { + defaultMessage: 'Display values in a table', + }), category: CATEGORY.DATA, visConfig: { defaults: { @@ -74,7 +80,9 @@ function TableVisTypeProvider(Private) { { group: 'metrics', name: 'metric', - title: 'Metric', + title: i18n.translate('tableVis.tableVisEditorConfig.schemas.metricTitle', { + defaultMessage: 'Metric', + }), aggFilter: ['!geo_centroid', '!geo_bounds'], min: 1, defaults: [ @@ -84,18 +92,22 @@ function TableVisTypeProvider(Private) { { group: 'buckets', name: 'bucket', - title: 'Split Rows', + title: i18n.translate('tableVis.tableVisEditorConfig.schemas.bucketTitle', { + defaultMessage: 'Split Rows', + }), aggFilter: ['!filter'] }, { group: 'buckets', name: 'split', - title: 'Split Table', + title: i18n.translate('tableVis.tableVisEditorConfig.schemas.splitTitle', { + defaultMessage: 'Split Table', + }), aggFilter: ['!filter'] } ]) }, - responseHandler: 'legacy', + responseHandler: legacyTableResponseHandler, responseHandlerConfig: { asAggConfigResults: true }, diff --git a/src/core_plugins/table_vis/public/table_vis.less b/src/core_plugins/table_vis/public/table_vis.less deleted file mode 100644 index f9bb4e9052d08..0000000000000 --- a/src/core_plugins/table_vis/public/table_vis.less +++ /dev/null @@ -1,27 +0,0 @@ -.table-vis { - display: flex; - flex-direction: column; - flex: 1 0 100%; -} - - .table-vis-error { - display: flex; - flex-direction: column; - justify-content: center; - flex: 1 0 100%; - text-align: center; - } - - .table-vis-container { - kbn-agg-table-group > .table > tbody > tr > td { - border-top: 0px; - } - - .pagination-other-pages { - justify-content: flex-end; - } - - .pagination-size { - display: none; - } - } diff --git a/src/core_plugins/table_vis/public/table_vis_params.html b/src/core_plugins/table_vis/public/table_vis_params.html index b2a1529a96a0a..6e93a05e0027c 100644 --- a/src/core_plugins/table_vis/public/table_vis_params.html +++ b/src/core_plugins/table_vis/public/table_vis_params.html @@ -1,40 +1,60 @@
      - +
      - +
      - +
      - -
      + +
      - px + px
      - px + px
      @@ -42,7 +42,7 @@
      diff --git a/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js b/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js index 179e5c6bf7b3b..9f0fd8088c051 100644 --- a/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js +++ b/src/core_plugins/tagcloud/public/tag_cloud_vis_params.js @@ -31,7 +31,7 @@ uiModules.get('kibana/table_vis') template: tagCloudVisParamsTemplate, link: function ($scope, $element) { const sliderContainer = $element[0]; - const slider = sliderContainer.querySelector('.tag-cloud-fontsize-slider'); + const slider = sliderContainer.querySelector('.tgcFontSizeSlider'); $scope.config = $scope.vis.type.editorConfig; noUiSlider.create(slider, { start: [$scope.editorState.params.minFontSize, $scope.editorState.params.maxFontSize], diff --git a/src/core_plugins/tagcloud/public/tag_cloud_visualization.js b/src/core_plugins/tagcloud/public/tag_cloud_visualization.js index 251673ca30cae..15f545e955150 100644 --- a/src/core_plugins/tagcloud/public/tag_cloud_visualization.js +++ b/src/core_plugins/tagcloud/public/tag_cloud_visualization.js @@ -23,7 +23,7 @@ import { take } from 'rxjs/operators'; import { render, unmountComponentAtNode } from 'react-dom'; import React from 'react'; - +import { I18nProvider } from '@kbn/i18n/react'; import { Label } from './label'; import { FeedbackMessage } from './feedback_message'; @@ -35,7 +35,7 @@ export class TagCloudVisualization { this._containerNode = node; const cloudContainer = document.createElement('div'); - cloudContainer.classList.add('tagcloud-vis'); + cloudContainer.classList.add('tgcVis'); cloudContainer.setAttribute('data-test-subj', 'tagCloudVisualization'); this._containerNode.appendChild(cloudContainer); @@ -57,7 +57,7 @@ export class TagCloudVisualization { this._feedbackNode = document.createElement('div'); this._containerNode.appendChild(this._feedbackNode); this._feedbackMessage = React.createRef(); - render(, this._feedbackNode); + render(, this._feedbackNode); this._labelNode = document.createElement('div'); this._containerNode.appendChild(this._labelNode); diff --git a/src/core_plugins/tests_bundle/index.js b/src/core_plugins/tests_bundle/index.js index b78995ecfe649..6434001ad3a22 100644 --- a/src/core_plugins/tests_bundle/index.js +++ b/src/core_plugins/tests_bundle/index.js @@ -70,6 +70,7 @@ export default (kibana) => { } testGlobs.push(`${plugin.publicDir}/**/__tests__/**/*.js`); + testGlobs.push(`${plugin.publicDir}/**/*.css`); }); } else { // add the modules from all of the apps @@ -79,6 +80,7 @@ export default (kibana) => { for (const plugin of plugins) { testGlobs.push(`${plugin.publicDir}/**/__tests__/**/*.js`); + testGlobs.push(`${plugin.publicDir}/**/*.css`); } } diff --git a/src/core_plugins/tile_map/index.js b/src/core_plugins/tile_map/index.js index f7768f94f901b..9634e1573f53c 100644 --- a/src/core_plugins/tile_map/index.js +++ b/src/core_plugins/tile_map/index.js @@ -21,7 +21,8 @@ export default function (kibana) { return new kibana.Plugin({ uiExports: { - visTypes: ['plugins/tile_map/tile_map_vis'] + visTypes: ['plugins/tile_map/tile_map_vis'], + styleSheetPaths: `${__dirname}/public/index.scss`, } }); } diff --git a/src/core_plugins/tile_map/public/_tile_map.scss b/src/core_plugins/tile_map/public/_tile_map.scss new file mode 100644 index 0000000000000..5e4b20f79fedf --- /dev/null +++ b/src/core_plugins/tile_map/public/_tile_map.scss @@ -0,0 +1,15 @@ +// SASSTODO: Does this selector exist today? +.tilemap { + margin-bottom: 6px; + border: $euiBorderThin; + position: relative; +} + +/** +* 1. Visualizations have some padding by default but tilemaps look nice flush against the edge to maximize viewing +* space. +*/ +// SASSTODO: Does this selector exist today? +.tile_map { + padding: 0; /* 1. */ +} diff --git a/src/core_plugins/tile_map/public/base_maps_visualization.js b/src/core_plugins/tile_map/public/base_maps_visualization.js index c812061d9d9e1..d17ee05247dbe 100644 --- a/src/core_plugins/tile_map/public/base_maps_visualization.js +++ b/src/core_plugins/tile_map/public/base_maps_visualization.js @@ -27,7 +27,7 @@ import { toastNotifications } from 'ui/notify'; const MINZOOM = 0; const MAXZOOM = 22;//increase this to 22. Better for WMS -export function BaseMapsVisualizationProvider(serviceSettings) { +export function BaseMapsVisualizationProvider(serviceSettings, i18n) { /** * Abstract base class for a visualization consisting of a map with a single baselayer. @@ -195,7 +195,9 @@ export function BaseMapsVisualizationProvider(serviceSettings) { } async _updateData() { - throw new Error('Child should implement this method to respond to data-update'); + throw new Error(i18n('tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage', { + defaultMessage: 'Child should implement this method to respond to data-update', + })); } _hasESResponseChanged(data) { diff --git a/src/core_plugins/tile_map/public/coordinate_maps_visualization.js b/src/core_plugins/tile_map/public/coordinate_maps_visualization.js index 7018db87c89d2..fef5d5cbfab97 100644 --- a/src/core_plugins/tile_map/public/coordinate_maps_visualization.js +++ b/src/core_plugins/tile_map/public/coordinate_maps_visualization.js @@ -18,10 +18,10 @@ */ import _ from 'lodash'; +import { i18n } from '@kbn/i18n'; import { GeohashLayer } from './geohash_layer'; import { BaseMapsVisualizationProvider } from './base_maps_visualization'; import { AggConfig } from 'ui/vis/agg_config'; -import './styles/_tilemap.less'; import { TileMapTooltipFormatterProvider } from './editors/_tooltip_formatter'; import { toastNotifications } from 'ui/notify'; @@ -220,7 +220,9 @@ export function CoordinateMapsVisualizationProvider(Notifier, Private) { esResp = await searchSource.fetch(); } catch(error) { toastNotifications.addDanger({ - title: `Unable to get bounds`, + title: i18n.translate('tileMap.coordinateMapsVisualization.unableToGetBoundErrorTitle', { + defaultMessage: 'Unable to get bounds', + }), text: `${error.message}`, }); return; diff --git a/src/core_plugins/tile_map/public/editors/_tooltip_formatter.js b/src/core_plugins/tile_map/public/editors/_tooltip_formatter.js index 4cc73a518f44d..105bc510d8b2e 100644 --- a/src/core_plugins/tile_map/public/editors/_tooltip_formatter.js +++ b/src/core_plugins/tile_map/public/editors/_tooltip_formatter.js @@ -19,7 +19,7 @@ import $ from 'jquery'; -export function TileMapTooltipFormatterProvider($compile, $rootScope) { +export function TileMapTooltipFormatterProvider($compile, $rootScope, i18n) { const $tooltipScope = $rootScope.$new(); const $el = $('
      ').html(require('./_tooltip.html')); @@ -37,11 +37,11 @@ export function TileMapTooltipFormatterProvider($compile, $rootScope) { value: metricAgg.fieldFormatter()(feature.properties.value) }, { - label: 'Latitude', + label: i18n('tileMap.tooltipFormatter.latitudeLabel', { defaultMessage: 'Latitude' }), value: feature.geometry.coordinates[1] }, { - label: 'Longitude', + label: i18n('tileMap.tooltipFormatter.longitudeLabel', { defaultMessage: 'Longitude' }), value: feature.geometry.coordinates[0] } ]; diff --git a/src/core_plugins/tile_map/public/editors/tile_map_vis_params.html b/src/core_plugins/tile_map/public/editors/tile_map_vis_params.html index 9afc714e43e5c..8e810eab3bd8d 100644 --- a/src/core_plugins/tile_map/public/editors/tile_map_vis_params.html +++ b/src/core_plugins/tile_map/public/editors/tile_map_vis_params.html @@ -1,7 +1,11 @@
      - +
      - +
      - +
       
      diff --git a/src/core_plugins/tile_map/public/editors/wms_options.html b/src/core_plugins/tile_map/public/editors/wms_options.html index 49f01466a73e2..a0d9b008e3b9e 100644 --- a/src/core_plugins/tile_map/public/editors/wms_options.html +++ b/src/core_plugins/tile_map/public/editors/wms_options.html @@ -3,16 +3,21 @@
      -
      - Base Layer Settings -
      +
      - +
       
      -
      -
      -

      WMS is an OGC standard for map image services. For more information, go here.

      +
      +
      +

      +
      -
      +
      -
      +
      -
      +
      -
      +
      -
      +
      -

      * if this parameter is incorrect, maps will fail to load.

      +

      diff --git a/src/core_plugins/tile_map/public/editors/wms_options.js b/src/core_plugins/tile_map/public/editors/wms_options.js index 067b7efffb721..47c379b255e10 100644 --- a/src/core_plugins/tile_map/public/editors/wms_options.js +++ b/src/core_plugins/tile_map/public/editors/wms_options.js @@ -21,7 +21,7 @@ import { uiModules } from 'ui/modules'; import wmsOptionsTemplate from './wms_options.html'; const module = uiModules.get('kibana'); -module.directive('wmsOptions', function (serviceSettings) { +module.directive('wmsOptions', function (serviceSettings, i18n) { return { restrict: 'E', template: wmsOptionsTemplate, @@ -31,6 +31,7 @@ module.directive('wmsOptions', function (serviceSettings) { collections: '=', }, link: function ($scope) { + $scope.wmsLinkText = i18n('tileMap.wmsOptions.wmsLinkText', { defaultMessage: 'here' }); new Promise((resolve, reject) => { diff --git a/src/core_plugins/tile_map/public/geohash_layer.js b/src/core_plugins/tile_map/public/geohash_layer.js index 7fa4c1ab51331..570255e51c441 100644 --- a/src/core_plugins/tile_map/public/geohash_layer.js +++ b/src/core_plugins/tile_map/public/geohash_layer.js @@ -19,6 +19,7 @@ import L from 'leaflet'; import _ from 'lodash'; +import { i18n } from '@kbn/i18n'; import { KibanaMapLayer } from 'ui/vis/map/kibana_map_layer'; import { HeatmapMarkers } from './markers/heatmap'; @@ -83,7 +84,12 @@ export class GeohashLayer extends KibanaMapLayer { }, this._zoom, this._featureCollectionMetaData.max); break; default: - throw new Error(`${this._geohashOptions.mapType} mapType not recognized`); + throw new Error(i18n.translate('tileMap.geohashLayer.mapTitle', { + defaultMessage: '{mapType} mapType not recognized', + values: { + mapType: this._geohashOptions.mapType, + }, + })); } diff --git a/src/core_plugins/tile_map/public/images/icon-tilemap.svg b/src/core_plugins/tile_map/public/images/icon-tilemap.svg deleted file mode 100644 index 0888ce38f05a2..0000000000000 --- a/src/core_plugins/tile_map/public/images/icon-tilemap.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - icon-tilemap - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/src/core_plugins/tile_map/public/index.scss b/src/core_plugins/tile_map/public/index.scss new file mode 100644 index 0000000000000..81b89ac3a8149 --- /dev/null +++ b/src/core_plugins/tile_map/public/index.scss @@ -0,0 +1,10 @@ +@import 'src/ui/public/styles/styling_constants'; + +// Prefix all styles with "tlm" to avoid conflicts. +// Examples +// tlmChart +// tlmChart__legend +// tlmChart__legend--small +// tlmChart__legend-isLoading + +@import './tile_map'; diff --git a/src/core_plugins/tile_map/public/markers/scaled_circles.js b/src/core_plugins/tile_map/public/markers/scaled_circles.js index 197f8ab5ebc2c..aeb802365a13a 100644 --- a/src/core_plugins/tile_map/public/markers/scaled_circles.js +++ b/src/core_plugins/tile_map/public/markers/scaled_circles.js @@ -99,7 +99,7 @@ export class ScaledCirclesMarkers extends EventEmitter { } const titleText = this.getLabel(); - const $title = $('
      ').addClass('tilemap-legend-title').text(titleText); + const $title = $('
      ').addClass('visMapLegend__title').text(titleText); jqueryDiv.append($title); this._legendColors.forEach((color) => { @@ -214,7 +214,7 @@ export class ScaledCirclesMarkers extends EventEmitter { function makeLegendColors(colorRampKey) { - const colorRamp = truncatedColorMaps[colorRampKey]; + const colorRamp = _.get(truncatedColorMaps[colorRampKey], 'value'); return colorUtil.getLegendColors(colorRamp); } diff --git a/src/core_plugins/tile_map/public/styles/_tilemap.less b/src/core_plugins/tile_map/public/styles/_tilemap.less deleted file mode 100644 index 2d3b9465fa91b..0000000000000 --- a/src/core_plugins/tile_map/public/styles/_tilemap.less +++ /dev/null @@ -1,294 +0,0 @@ -@import (reference) "~ui/styles/variables"; - -/* _tilemap */ - -.tilemap { - margin-bottom: 6px; - border: 1px solid; - border-color: @tilemap-border; - position: relative; -} - -/** - * 1. Visualizations have some padding by default but tilemaps look nice flush against the edge to maximize viewing - * space. - */ -.tile_map { - padding: 0; /* 1. */ -} - -/* leaflet Dom Util div for map label */ - -.tilemap-legend { - padding: 5px 7px 5px 7px; - margin: 0; - font: 11px/13px Arial, Helvetica, sans-serif; - background: @tilemap-legend-base-bg; - background: @tilemap-legend-bg; - box-shadow: 0 0 12px rgba(0,0,0,0.3); - border-radius: 5px; - text-align: left; - line-height: 15px; - color: @tilemap-color; -} - -.tilemap-legend-title { - font-weight: bold; -} - -.tilemap-legend i { - width: 10px; - height: 10px; - float: left; - margin: 2px 4px 0 0; - opacity: 1; - border-radius: 50%; - border-width: 1px; - border-style: solid; - border-color: @tilemap-legend-i-border; - background: @tilemap-legend-i-bg; -} - -/* top left needs some more styles */ -.leaflet-top.leaflet-left .tilemap-legend-wrapper { - position: absolute; - left: 50px; - white-space: nowrap; -} - -.leaflet-top.leaflet-left .tilemap-legend-wrapper span { - padding-right: 20px; -} - -/* leaflet Dom Util div for map legend */ - -.tilemap-info { - padding: 3px 7px 3px 7px; - margin: 0; - font-size: 12px; - background: @tilemap-info-base-bg; - background: fade(@tilemap-info-bg, 92%); - box-shadow: 0 0 12px rgba(0,0,0,0.3); - border-radius: 5px; -} - -.tilemap-info h2 { - font-size: 12px !important; - margin: 0 !important; - padding: 0; - color: @tilemap-info-header-color; -} - -.leaflet-bar { - border: none !important; - box-shadow: 0 1px 5px rgba(0,0,0,0.65) !important; -} - -.leaflet-control-fit { - text-align: center; - background: @tilemap-leaflet-control-bg; - width: 26px; - height: 26px; - outline: 1px @tilemap-leaflet-control-outline; -} - -/* over-rides leaflet popup styles to look like kibana tooltip */ - -.leaflet-container { - background: @tilemap-leaflet-container-bg !important; - outline: 0 !important; - - //the heatmap layer plugin logs an error to the console when the map is in a 0-sized container - min-width: 1px !important; - min-height: 1px !important; -} - -.leaflet-popup-content-wrapper { - margin: 0; - padding: 0; -} - -.leaflet-popup { - margin-bottom: 16px !important; - pointer-events: none; -} - -.leaflet-popup-content-wrapper { - background: @tooltip-bg !important; - color: @tooltip-color !important; - border-radius: 4px !important; - padding: 0 !important; -} - -.leaflet-popup-content { - margin: 0 !important; - line-height: 24px !important; - font-size: @font-size-base; - font-weight: normal; - word-wrap: break-word; - overflow: hidden; - pointer-events: none; - - > :last-child { - margin-bottom: @tooltip-space; - } - - > * { - margin: @tooltip-space @tooltip-space 0; - } - - table { - td,th { - padding: @tooltip-space-tight; - - &.row-bucket { - word-break: break-all; - } - } - } -} - -.leaflet-popup-tip-container, .leaflet-popup-close-button { - display: none !important; -} - -.leaflet-control-layers-expanded { - padding: 0; - margin: 0; - font: 12px/13px Arial, Helvetica, sans-serif; - line-height: 14px !important; -} - -.leaflet-control-layers-expanded label { - font-weight: normal !important; - margin: 0 !important; - padding: 0 !important; -} - -.leaflet-draw-tooltip { - display: none; -} - -.leaflet-control-attribution { - background-color: @tilemap-leaflet-footer-bg !important; - color: @tilemap-leaflet-footer-color !important; - - p { - display: inline; - } -} - -.leaflet-left { - .leaflet-control { - a, - a:hover { - color: @tilemap-leaflet-control-color; - } - } - - .leaflet-draw-actions a { - background-color: @tilemap-leaflet-control-draw-action-bg; - } -} - -/* filter to desaturate mapquest tiles */ - -img.leaflet-tile { - filter: @tilemap-filter; -} - -img.leaflet-tile.filters-off { - filter: none; -} - -// SASSTODO: Make sure these colors convert to theme variables -.tab-dashboard.theme-dark { - @tilemap-border: @gray13; - @tilemap-legend-base-bg: @gray3; - @tilemap-legend-bg: fade(@tilemap-legend-base-bg, 100%); - @tilemap-color: @gray12; - @tilemap-legend-i-border: @gray9; - @tilemap-legend-i-bg: @gray10; - @tilemap-info-base-bg: @white; - @tilemap-info-bg: fade(@tilemap-info-base-bg, 92%); - @tilemap-info-header-color: @gray4; - @tilemap-leaflet-control-bg: @white; - @tilemap-leaflet-control-outline: @black; - @tilemap-leaflet-control-color: @black; - @tilemap-leaflet-control-draw-action-bg: @gray11; - @tilemap-leaflet-container-bg: @body-bg; - @tilemap-leaflet-popup-border: @gray9; - @tilemap-leaflet-footer-bg: fade(@gray3, 80%); - @tilemap-leaflet-footer-color: @gray12; - @tilemap-filter: invert(1) brightness(1.75) grayscale(1) contrast(1); - - .tilemap { - border-color: @tilemap-border; - } - - .tilemap-legend { - background: @tilemap-legend-base-bg; - background: @tilemap-legend-bg; - color: @tilemap-color; - } - - .tilemap-legend i { - border-color: @tilemap-legend-i-border; - background: @tilemap-legend-i-bg; - } - - .tilemap-info { - background: @tilemap-info-base-bg; - background: fade(@tilemap-info-bg, 92%); - } - - .tilemap-info h2 { - color: @tilemap-info-header-color; - } - - .leaflet-control-fit { - background: @tilemap-leaflet-control-bg; - outline: 1px @tilemap-leaflet-control-outline; - } - - .leaflet-container { - background: @tilemap-leaflet-container-bg !important; - } - - .leaflet-popup-content-wrapper { - background: fadeout(@gray4, 7%) !important; - color: @gray14 !important; - } - - .leaflet-popup-content { - table { - thead tr { - border-bottom-color: @tilemap-leaflet-popup-border; - } - - tbody tr { - border-top-color: @tilemap-leaflet-popup-border; - } - } - } - - img.leaflet-tile { - filter: @tilemap-filter; - } - - .leaflet-control-attribution { - background-color: @tilemap-leaflet-footer-bg !important; - color: @tilemap-leaflet-footer-color !important; - } - - .leaflet-left { - .leaflet-control, - .leaflet-draw-actions { - a, - a:hover { - color: @white; - background-color: @gray7; - } - } - } -} diff --git a/src/core_plugins/tile_map/public/tile_map_vis.js b/src/core_plugins/tile_map/public/tile_map_vis.js index 736939e1dd787..1a3349c879ab2 100644 --- a/src/core_plugins/tile_map/public/tile_map_vis.js +++ b/src/core_plugins/tile_map/public/tile_map_vis.js @@ -17,6 +17,7 @@ * under the License. */ +import { i18n } from '@kbn/i18n'; import 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options'; import './editors/tile_map_vis_params'; import { supports } from 'ui/utils/supports'; @@ -36,9 +37,13 @@ VisTypesRegistryProvider.register(function TileMapVisType(Private, getAppState, return VisFactory.createBaseVisualization({ name: 'tile_map', - title: 'Coordinate Map', + title: i18n.translate('tileMap.vis.mapTitle', { + defaultMessage: 'Coordinate Map', + }), icon: 'visMapCoordinate', - description: 'Plot latitude and longitude coordinates on a map', + description: i18n.translate('tileMap.vis.mapDescription', { + defaultMessage: 'Plot latitude and longitude coordinates on a map', + }), category: CATEGORY.MAP, visConfig: { canDesaturate: !!supports.cssFilters, @@ -60,19 +65,27 @@ VisTypesRegistryProvider.register(function TileMapVisType(Private, getAppState, visualization: CoordinateMapsVisualization, editorConfig: { collections: { - colorSchemas: Object.keys(truncatedColorMaps), + colorSchemas: Object.values(truncatedColorMaps).map(value => ({ id: value.id, label: value.label })), legendPositions: [{ value: 'bottomleft', - text: 'bottom left', + text: i18n.translate('tileMap.vis.map.editorConfig.legendPositions.bottomLeftText', { + defaultMessage: 'bottom left', + }), }, { value: 'bottomright', - text: 'bottom right', + text: i18n.translate('tileMap.vis.map.editorConfig.legendPositions.bottomRightText', { + defaultMessage: 'bottom right', + }), }, { value: 'topleft', - text: 'top left', + text: i18n.translate('tileMap.vis.map.editorConfig.legendPositions.topLeftText', { + defaultMessage: 'top left', + }), }, { value: 'topright', - text: 'top right', + text: i18n.translate('tileMap.vis.map.editorConfig.legendPositions.topRightText', { + defaultMessage: 'top right', + }), }], mapTypes: [ 'Scaled Circle Markers', @@ -87,7 +100,9 @@ VisTypesRegistryProvider.register(function TileMapVisType(Private, getAppState, { group: 'metrics', name: 'metric', - title: 'Value', + title: i18n.translate('tileMap.vis.map.editorConfig.schemas.metricTitle', { + defaultMessage: 'Value', + }), min: 1, max: 1, aggFilter: ['count', 'avg', 'sum', 'min', 'max', 'cardinality', 'top_hits'], @@ -98,7 +113,9 @@ VisTypesRegistryProvider.register(function TileMapVisType(Private, getAppState, { group: 'buckets', name: 'segment', - title: 'Geo Coordinates', + title: i18n.translate('tileMap.vis.map.editorConfig.schemas.geoCoordinatesTitle', { + defaultMessage: 'Geo Coordinates', + }), aggFilter: 'geohash_grid', min: 1, max: 1 diff --git a/src/core_plugins/timelion/index.js b/src/core_plugins/timelion/index.js index d9d8267b92d1a..3a1284eaacf90 100644 --- a/src/core_plugins/timelion/index.js +++ b/src/core_plugins/timelion/index.js @@ -26,9 +26,10 @@ export default function (kibana) { order: -1000, description: 'Time series expressions for everything', icon: 'plugins/timelion/icon.svg', + euiIconType: 'timelionApp', main: 'plugins/timelion/app', - styleSheetPath: `${__dirname}/public/index.scss`, }, + styleSheetPaths: `${__dirname}/public/index.scss`, hacks: [ 'plugins/timelion/lib/panel_registry', 'plugins/timelion/panels/timechart/timechart' @@ -102,7 +103,8 @@ export default function (kibana) { description: `[experimental] Your API key from www.quandl.com`, category: ['timelion'], } - } + }, + translations: [], }, init: require('./init.js'), }); diff --git a/src/core_plugins/timelion/init.js b/src/core_plugins/timelion/init.js index 67c1c1f1e7a1a..eecebfb81fdf0 100644 --- a/src/core_plugins/timelion/init.js +++ b/src/core_plugins/timelion/init.js @@ -17,6 +17,7 @@ * under the License. */ +import { i18n } from '@kbn/i18n'; import _ from 'lodash'; import processFunctionDefinition from './server/lib/process_function_definition'; @@ -33,7 +34,15 @@ export default function (server) { } function getFunction(name) { - if (!functions[name]) throw new Error ('No such function: ' + name); + if (!functions[name]) { + throw new Error( + i18n.translate('timelion.noFunctionErrorMessage', { + defaultMessage: 'No such function: {name}', + values: { name }, + }) + ); + } + return functions[name]; } diff --git a/src/core_plugins/timelion/public/app.js b/src/core_plugins/timelion/public/app.js index bfc4047294cc6..036b53ad826c2 100644 --- a/src/core_plugins/timelion/public/app.js +++ b/src/core_plugins/timelion/public/app.js @@ -91,6 +91,7 @@ app.controller('timelion', function ( kbnUrl, Notifier, Private, + i18n, ) { // Keeping this at app scope allows us to keep the current page when the user @@ -114,22 +115,30 @@ app.controller('timelion', function ( $scope.topNavMenu = [{ key: 'new', - description: 'New Sheet', + description: i18n('timelion.topNavMenu.newDescription', { + defaultMessage: 'New Sheet', + }), run: function () { kbnUrl.change('/'); }, testId: 'timelionNewButton', }, { key: 'add', - description: 'Add a chart', + description: i18n('timelion.topNavMenu.addDescription', { + defaultMessage: 'Add a chart', + }), run: function () { $scope.newCell(); }, testId: 'timelionAddChartButton', }, { key: 'save', - description: 'Save Sheet', + description: i18n('timelion.topNavMenu.saveDescription', { + defaultMessage: 'Save Sheet', + }), template: require('plugins/timelion/partials/save_sheet.html'), testId: 'timelionSaveButton', }, { key: 'delete', - description: 'Delete current sheet', + description: i18n('timelion.topNavMenu.deleteDescription', { + defaultMessage: 'Delete current sheet', + }), disableButton: function () { return !savedSheet.id; }, @@ -137,32 +146,55 @@ app.controller('timelion', function ( const title = savedSheet.title; function doDelete() { savedSheet.delete().then(() => { - toastNotifications.addSuccess(`Deleted '${title}'`); + toastNotifications.addSuccess(i18n( + 'timelion.topNavMenu.delete.modal.successNotificationText', + { + defaultMessage: `Deleted '{title}'`, + values: { title }, + } + )); kbnUrl.change('/'); }).catch(error => fatalError(error, location)); } const confirmModalOptions = { onConfirm: doDelete, - confirmButtonText: 'Delete', - title: `Delete Timelion sheet '${title}'?` + confirmButtonText: i18n('timelion.topNavMenu.delete.modal.confirmButtonLabel', { + defaultMessage: 'Delete', + }), + title: i18n('timelion.topNavMenu.delete.modalTitle', { + defaultMessage: `Delete Timelion sheet '{title}'?`, + values: { title } + }), }; - confirmModal(`You can't recover deleted sheets.`, confirmModalOptions); + + confirmModal( + i18n('timelion.topNavMenu.delete.modal.warningText', { + defaultMessage: `You can't recover deleted sheets.`, + }), + confirmModalOptions + ); }, testId: 'timelionDeleteButton', }, { key: 'open', - description: 'Open Sheet', + description: i18n('timelion.topNavMenu.openDescription', { + defaultMessage: 'Open Sheet', + }), template: require('plugins/timelion/partials/load_sheet.html'), testId: 'timelionOpenButton', }, { key: 'options', - description: 'Options', + description: i18n('timelion.topNavMenu.optionsDescription', { + defaultMessage: 'Options', + }), template: require('plugins/timelion/partials/sheet_options.html'), testId: 'timelionOptionsButton', }, { key: 'help', - description: 'Help', + description: i18n('timelion.topNavMenu.helpDescription', { + defaultMessage: 'Help', + }), template: '', testId: 'timelionDocsButton', }]; @@ -289,7 +321,13 @@ app.controller('timelion', function ( savedSheet.timelion_rows = $scope.state.rows; savedSheet.save().then(function (id) { if (id) { - toastNotifications.addSuccess(`Saved sheet '${savedSheet.title}'`); + toastNotifications.addSuccess( + i18n('timelion.saveSheet.successNotificationText', { + defaultMessage: `Saved sheet '{title}'`, + values: { title: savedSheet.title }, + }) + ); + if (savedSheet.id !== $routeParams.id) { kbnUrl.change('/{{id}}', { id: savedSheet.id }); } @@ -307,7 +345,12 @@ app.controller('timelion', function ( savedExpression.visState.title = title; savedExpression.save().then(function (id) { if (id) { - toastNotifications.addSuccess(`Saved expression '${savedExpression.title}'`); + toastNotifications.addSuccess( + i18n('timelion.saveExpression.successNotificationText', { + defaultMessage: `Saved expression '{title}'`, + values: { title: savedExpression.title }, + }), + ); } }); }); diff --git a/src/core_plugins/timelion/public/directives/cells/cells.html b/src/core_plugins/timelion/public/directives/cells/cells.html index 6f74580fe3513..6be1b089d2deb 100644 --- a/src/core_plugins/timelion/public/directives/cells/cells.html +++ b/src/core_plugins/timelion/public/directives/cells/cells.html @@ -21,18 +21,18 @@ diff --git a/src/core_plugins/timelion/public/directives/chart/chart.js b/src/core_plugins/timelion/public/directives/chart/chart.js index 98269414a8b46..a7ca4c113b56a 100644 --- a/src/core_plugins/timelion/public/directives/chart/chart.js +++ b/src/core_plugins/timelion/public/directives/chart/chart.js @@ -16,12 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - import panelRegistryProvider from '../../lib/panel_registry'; require('ui/modules') .get('apps/timelion', []) - .directive('chart', function (Private) { + .directive('chart', function (Private, i18n) { return { restrict: 'A', scope: { @@ -46,7 +45,12 @@ require('ui/modules') const panelSchema = panelRegistry.byName[seriesList.render.type]; if (!panelSchema) { - $elem.text('No such panel type: ' + seriesList.render.type); + $elem.text( + i18n('timelion.chart.seriesList.noSchemaWarning', { + defaultMessage: 'No such panel type: {renderType}', + values: { renderType: seriesList.render.type }, + }) + ); return; } diff --git a/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.html b/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.html index 9aabde9ea019e..325c7eabb2b03 100644 --- a/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.html +++ b/src/core_plugins/timelion/public/directives/fullscreen/fullscreen.html @@ -4,9 +4,9 @@ diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_input.html b/src/core_plugins/timelion/public/directives/timelion_expression_input.html index c05da60022bbb..d2c740400fb3e 100644 --- a/src/core_plugins/timelion/public/directives/timelion_expression_input.html +++ b/src/core_plugins/timelion/public/directives/timelion_expression_input.html @@ -13,7 +13,7 @@ role="textbox" rows="{{ rows }}" class="timExpressionInput kuiTextArea fullWidth" - placeholder="Try a query with .es(*)" + placeholder="{{ ::'timelion.expressionInputPlaceholder' | i18n: { defaultMessage: 'Try a query with {esQuery}', values: { esQuery: '.es(*)' } } }}" ng-model="sheet" ng-focus="onFocusInput()" ng-keydown="onKeyDownInput($event)" @@ -22,7 +22,7 @@ ng-mousedown="onMouseDownInput()" ng-mouseup="onMouseUpInput()" ng-click="onClickExpression()" - aria-label="Timelion expression" + aria-label="{{ ::'timelion.expressionInputAriaLabel' | i18n: { defaultMessage: 'Timelion expression' } }}" aria-multiline="false" aria-autocomplete="list" aria-controls="timelionSuggestionList" diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js index 1874ab1487b53..81d459f70a5e1 100644 --- a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js +++ b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/arg_value_suggestions.js @@ -67,14 +67,16 @@ export function ArgValueSuggestionsProvider(Private, indexPatterns) { const search = partial ? `${partial}*` : '*'; const resp = await savedObjectsClient.find({ type: 'index-pattern', - fields: ['title'], + fields: ['title', 'type'], search: `${search}`, search_fields: ['title'], perPage: 25 }); - return resp.savedObjects.map(savedObject => { - return { name: savedObject.attributes.title }; - }); + return resp.savedObjects + .filter(savedObject => !savedObject.get('type')) + .map(savedObject => { + return { name: savedObject.attributes.title }; + }); }, metric: async function (partial, functionArgs) { if (!partial || !partial.includes(':')) { diff --git a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html index 62cede14bb7f0..ddb9f21615aee 100644 --- a/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html +++ b/src/core_plugins/timelion/public/directives/timelion_expression_suggestions/timelion_expression_suggestions.html @@ -26,14 +26,27 @@

      .{{suggestion.name}}() - {{suggestion.help}} - {{suggestion.chainable ? '(Chainable)' : '(Data Source)'}} + +

      - Arguments: + {{arg.name}}=({{arg.types.join(' | ')}}) , @@ -43,9 +56,21 @@

      - - - + + + diff --git a/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html b/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html index 8f2456d5e6f2e..cf136b00c9157 100644 --- a/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html +++ b/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.html @@ -1,21 +1,36 @@
      -

      Welcome to Timelion!

      +

      +

      - Timelion is the clawing, gnashing, zebra killing, pluggable time - series interface for everything. If your datastore can - produce a time series, then you have all of the awesome power of - Timelion at your disposal. Timelion lets you compare, combine, and - combobulate datasets across multiple datasources with one - easy-to-master expression syntax. This tutorial focuses on - Elasticsearch, but you'll quickly discover that what you learn here - applies to any datasource Timelion supports. -

      -

      - Ready to get started? Click Next. Want to skip the - tutorial and view the docs? - Jump to the function reference. + + .

      @@ -24,7 +39,7 @@

      Welcome to Timelion!

      ng-click="opts.dontShowHelp()" class="kuiButton kuiButton--hollow" > - Don't show this again + {{translations.dontShowHelpButtonLabel}} @@ -32,7 +47,7 @@

      Welcome to Timelion!

      ng-click="setPage(page+1)" class="kuiButton kuiButton--primary" > - Next + {{translations.nextButtonLabel}}
      @@ -40,20 +55,28 @@

      Welcome to Timelion!

      -

      First time configuration

      -

      - If you're using Logstash, you don't need to configure anything to - start exploring your log data with Timelion. To search other - indices, go to Management / Kibana / Advanced Settings - and configure the timelion:es.default_index - and timelion:es.timefield settings to match your - indices. -

      -

      - You'll also see some other Timelion settings. For now, you don't need - to worry about them. Later, you'll see that you can set most of - them on the fly if you need to. -

      +

      +

      +

      @@ -61,74 +84,139 @@

      First time configuration

      ng-click="setPage(page-1)" class="kuiButton kuiButton--primary" > - Previous + {{translations.previousButtonLabel}} - - Could not validate Elasticsearch settings: - {{es.invalidReason}}. Check your Advanced Settings - and try again. ({{es.invalidCount}}) - + + i18n-id="timelion.help.configuration.notValid.validateButtonLabel" + i18n-default-message="Validate Config" + >
      -

      Good news, Elasticsearch is configured correctly!

      +

      - We validated your default index and your timefield and everything - looks ok. We found data from {{es.stats.min}} to - {{es.stats.max}}. You're probably all set. If this - doesn't look right, see First time - configuration for information about configuring the Elasticsearch - datasource. -

      -

      - You should already see one chart, but you might need to make a - couple adjustments before you see any interesting data: + + +

      +

      • - Intervals +

        - The interval selector at the right of the input bar lets you - control the sampling frequency. It's currently set to - {{state.interval}}. + - You're all set! + - - Set it to auto to let Timelion choose an - appropriate interval. - - If Timelion thinks your combination of time range and interval - will produce too many data points, it throws an error. You can - adjust that limit by configuring timelion:max_buckets - in Management/Kibana/Advanced Settings. + +

      • - Time range -

        - Use the timepicker in the - Kibana toolbar to select the time period that contains the - data you want to visualize. Make sure you select a time - period that includes all or part of the time range shown - above. -

        + +

      -

      - Now, you should see a line chart that displays a count of your - data points over time. -

      +

      @@ -136,7 +224,7 @@

      Good news, Elasticsearch is configured correctly!

      ng-click="setPage(page-1)" class="kuiButton kuiButton--primary" > - Previous + {{translations.previousButtonLabel}} @@ -144,7 +232,7 @@

      Good news, Elasticsearch is configured correctly!

      ng-click="setPage(page+1)" class="kuiButton kuiButton--primary" > - Next + {{translations.nextButtonLabel}}
      @@ -152,60 +240,131 @@

      Good news, Elasticsearch is configured correctly!

      -

      Querying the Elasticsearch datasource

      +

      +

      - Now that we've validated that you have a working Elasticsearch - datasource, you can start submitting queries. For starters, - enter .es(*) in the input bar and hit enter. -

      -

      - This says hey Elasticsearch, find everything in my default - index. If you want to find a subset, you could enter something - like .es(html) to count events that match html, - or .es('user:bob AND bytes:>100') to find events - that contain bob in the user field and have a - bytes field that is greater than 100. Note that this query - is enclosed in single quotes—that's because it contains - spaces. You can enter any + - Lucene query string - - as the first argument to the .es() function. + href="https://www.elastic.co/guide/en/elasticsearch/reference/5.1/query-dsl-query-string-query.html#query-string-syntax" + target="_blank" + rel="noopener noreferrer" + i18n-id="timelion.help.querying.luceneQueryLinkText" + i18n-default-message="Lucene query string" + i18n-context="Part of composite text + timelion.help.querying.paragraph2Part1 + + timelion.help.querying.luceneQueryLinkText + + timelion.help.querying.paragraph2Part2" + > +

      -

      Passing arguments

      +

      +

      +

      - Timelion has a number of shortcuts that make it easy to do common - things. One is that for simple arguments that don't contain spaces or - special characters, you don't need to use quotes. Many functions also - have defaults. For example, .es() and .es(*) - do the same thing. Arguments also have names, so you don't have to - specify them in a specific order. For example, you can enter - .es(index='logstash-*', q='*') to tell the - Elasticsearch datasource use * as the q (query) for the - logstash-* index. -

      -

      Beyond count

      -

      - Counting events is all well and good, but the Elasticsearch datasource - also supports any + - Elasticsearch metric aggregation - - that returns a single value. Some of the most useful are - min, max, avg, sum, - and cardinality. Let's say you want a unique count of the - src_ip field. Simply use the cardinality - metric: .es(*, metric='cardinality:src_ip'). To get the - average of the bytes field, you can use the - avg metric: .es(metric='avg:bytes'). + href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-metrics.html" + target="_blank" + rel="noopener noreferrer" + i18n-id="timelion.help.querying.countMetricAggregationLinkText" + i18n-default-message="Elasticsearch metric aggregation" + i18n-context="Part of composite text + timelion.help.querying.countTextPart1 + + timelion.help.querying.countMetricAggregationLinkText + + timelion.help.querying.countTextPart2" + > +

      @@ -214,7 +373,7 @@

      Beyond count

      ng-click="setPage(page-1)" class="kuiButton kuiButton--primary" > - Previous + {{translations.previousButtonLabel}} @@ -222,7 +381,7 @@

      Beyond count

      ng-click="setPage(page+1)" class="kuiButton kuiButton--primary" > - Next + {{translations.nextButtonLabel}}
      @@ -230,60 +389,95 @@

      Beyond count

      -

      Expressing yourself with expressions

      -

      - Every expression starts with a datasource function. From there, you - can append new functions to the datasource to transform and augment - it. -

      -

      - By the way, from here on out you probably know more about your data - than we do. Feel free to replace the sample queries with something - more meaningful! -

      -

      - We're going to experiment, so click Add in the Kibana - toolbar to add another chart or three. Then, select a chart, copy - one of the following expressions, paste it into the input bar, - and hit enter. Rinse, repeat to try out the other expressions. -

      +

      +

      +

      +

      Argument NameAccepted TypesInformation
      {{arg.name}}
      - + - + - + - +
      .es(*), .es(US)Double the fun. Two expressions on the same - chart.
      .es(*).color(#f66), .es(US).bars(1) - Custom styling. Colorizes the first series red - and uses 1 pixel wide bars for the second series. -
      .es(*).color(#f66).lines(fill=3), .es(US).bars(1).points(radius=3, weight=1) - Named arguments. Forget trying to remember what - order you need to specify arguments in, use named arguments to make - the expressions easier to read and write. -
      (.es(*), .es(GB)).points() - Grouped expressions. You can also chain groups - of expressions to functions. Here, both series are shown as - points instead of lines. -

      - Timelion provides additional view transformation functions you can use - to customize the appearance of your charts. For the complete list, see - the Function reference. + + .

      @@ -292,7 +486,7 @@

      Expressing yourself with expressions

      ng-click="setPage(page-1)" class="kuiButton kuiButton--primary" > - Previous + {{translations.previousButtonLabel}} @@ -300,50 +494,93 @@

      Expressing yourself with expressions

      ng-click="setPage(page+1)" class="kuiButton kuiButton--primary" > - Next + {{translations.nextButtonLabel}}
      -

      Transforming your data: the real fun begins!

      -

      - Now that you've mastered the basics, it's time to unleash the power of - Timelion. Let's figure out what percentage some subset of our data - represents of the whole, over time. For example, what percentage of - our web traffic comes from the US? -

      +

      +

      +

      +

      +

      +

      - First, we need to find all events that contain US: - .es('US'). -

      -

      - Next, we want to calculate the ratio of US events to the whole. To - divide 'US' by everything, we can use the - divide function: .es('US').divide(.es()). -

      -

      - Not bad, but this gives us a number between 0 and 1. To convert it - to a percentage, simply multiply by 100: - .es('US').divide(.es()).multiply(100). -

      -

      - Now we know what percentage of our traffic comes from the US, and - can see how it has changed over time! - Timelion has a number of built-in arithmetic functions, such as - sum, subtract, multiply, and - divide. Many of these can take a series or a number. - There are also other useful data transformation functions, such as - movingaverage, abs, and - derivative. -

      -

      Now that you're familiar with the syntax, refer to the - Function reference to see - how to use all of the available Timelion functions. You can view - the reference at any time by clicking Docs - in the Kibana toolbar. To get back to this tutorial, click the - Tutorial link at the top of the reference. + + +

      @@ -352,7 +589,7 @@

      Transforming your data: the real fun begins!

      ng-click="setPage(page-1)" class="kuiButton kuiButton--primary" > - Previous + {{translations.previousButtonLabel}} @@ -361,29 +598,34 @@

      Transforming your data: the real fun begins!

      ng-click="opts.dontShowHelp()" class="kuiButton kuiButton--hollow" > - Don't show this again + {{translations.dontShowHelpButtonLabel}}
      -

      - Help -

      +

      - +
      - Click any function for more information. Just getting started? + - Check out the tutorial - . + >.
      @@ -409,9 +651,21 @@

      ng-show="function.args.length > (function.chainable ? 1: 0)" > - Argument Name - Accepted Types - Information + + +
      - - This function does not accept any arguments. - Well that's simple, isn't it? - +

      @@ -436,26 +690,50 @@

      - +
      -
      General editing
      +
      +
      Ctrl/Cmd + Enter
      -
      Submit request
      +
      -
      When auto-complete is visible
      -
      Down arrow
      -
      Switch focus to auto-complete menu. Use arrows to further select a term
      +
      + +
      +
      +
      Enter/Tab
      -
      Select the currently selected or the top most term in auto-complete menu
      +
      Esc
      -
      Close auto-complete menu
      +
      diff --git a/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.js b/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.js index e970bca3b49b5..f9a44fc03b6d2 100644 --- a/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.js +++ b/src/core_plugins/timelion/public/directives/timelion_help/timelion_help.js @@ -24,7 +24,7 @@ import moment from 'moment'; const app = uiModules.get('apps/timelion', []); -app.directive('timelionHelp', function ($http) { +app.directive('timelionHelp', function ($http, i18n) { return { restrict: 'E', template, @@ -38,6 +38,52 @@ app.directive('timelionHelp', function ($http) { $scope.es = { invalidCount: 0 }; + + $scope.translations = { + nextButtonLabel: i18n('timelion.help.nextPageButtonLabel', { + defaultMessage: 'Next', + }), + previousButtonLabel: i18n('timelion.help.previousPageButtonLabel', { + defaultMessage: 'Previous', + }), + dontShowHelpButtonLabel: i18n('timelion.help.dontShowHelpButtonLabel', { + defaultMessage: `Don't show this again`, + }), + strongNextText: i18n('timelion.help.welcome.content.strongNextText', { + defaultMessage: 'Next', + }), + emphasizedEverythingText: i18n('timelion.help.welcome.content.emphasizedEverythingText', { + defaultMessage: 'everything', + }), + notValidAdvancedSettingsPath: i18n('timelion.help.configuration.notValid.advancedSettingsPathText', { + defaultMessage: 'Management / Kibana / Advanced Settings' + }), + validAdvancedSettingsPath: i18n('timelion.help.configuration.valid.advancedSettingsPathText', { + defaultMessage: 'Management/Kibana/Advanced Settings', + }), + esAsteriskQueryDescription: i18n('timelion.help.querying.esAsteriskQueryDescriptionText', { + defaultMessage: 'hey Elasticsearch, find everything in my default index', + }), + esIndexQueryDescription: i18n('timelion.help.querying.esIndexQueryDescriptionText', { + defaultMessage: 'use * as the q (query) for the logstash-* index', + }), + strongAddText: i18n('timelion.help.expressions.strongAddText', { + defaultMessage: 'Add', + }), + twoExpressionsDescriptionTitle: i18n('timelion.help.expressions.examples.twoExpressionsDescriptionTitle', { + defaultMessage: 'Double the fun.', + }), + customStylingDescriptionTitle: i18n('timelion.help.expressions.examples.customStylingDescriptionTitle', { + defaultMessage: 'Custom styling.', + }), + namedArgumentsDescriptionTitle: i18n('timelion.help.expressions.examples.namedArgumentsDescriptionTitle', { + defaultMessage: 'Named arguments.', + }), + groupedExpressionsDescriptionTitle: i18n('timelion.help.expressions.examples.groupedExpressionsDescriptionTitle', { + defaultMessage: 'Grouped expressions.', + }), + }; + getFunctions(); checkElasticsearch(); } @@ -73,7 +119,7 @@ app.directive('timelionHelp', function ($http) { } catch (e) { if (_.get(resp, 'data.resp.message')) return _.get(resp, 'data.resp.message'); if (_.get(resp, 'data.resp.output.payload.message')) return _.get(resp, 'data.resp.output.payload.message'); - return 'Unknown error'; + return i18n('timelion.help.unknownErrorMessage', { defaultMessage: 'Unknown error' }); } }()); } diff --git a/src/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.html b/src/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.html index fcac264341dee..fcc1c1f531c9e 100644 --- a/src/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.html +++ b/src/core_plugins/timelion/public/directives/timelion_interval/timelion_interval.html @@ -1,13 +1,13 @@ Save entire Timelion sheet

      ng-disabled="!opts.savedSheet.title" type="submit" class="kuiButton kuiButton--primary kuiVerticalRhythmSmall" - > - Save - + i18n-id="timelion.topNavMenu.save.saveEntireSheet.submitButtonLabel" + i18n-default-message="Save" + >

      - + {{opts.state.sheet[opts.state.selected]}}
      - - + +
      - +
      diff --git a/src/core_plugins/timelion/public/partials/sheet_options.html b/src/core_plugins/timelion/public/partials/sheet_options.html index 3331e54129cd2..e3a9ae21c89cd 100644 --- a/src/core_plugins/timelion/public/partials/sheet_options.html +++ b/src/core_plugins/timelion/public/partials/sheet_options.html @@ -1,11 +1,17 @@
      -

      - Sheet options -

      +

      - +
      - + -
      - - diff --git a/src/ui/public/query_bar/directive/query_bar.js b/src/ui/public/query_bar/directive/query_bar.js deleted file mode 100644 index 7179c1294afe6..0000000000000 --- a/src/ui/public/query_bar/directive/query_bar.js +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { compact } from 'lodash'; -import { uiModules } from '../../modules'; -import { callAfterBindingsWorkaround } from '../../compat'; -import template from './query_bar.html'; -import suggestionTemplate from './suggestion.html'; -import { getAutocompleteProvider } from '../../autocomplete_providers'; -import './suggestion.less'; -import '../../directives/match_pairs'; -import './query_popover'; -import { getFromLegacyIndexPattern } from '../../index_patterns/static_utils'; - -const module = uiModules.get('kibana'); - -module.directive('queryBar', function () { - - return { - restrict: 'E', - template: template, - scope: { - query: '=', - appName: '=?', - onSubmit: '&', - disableAutoFocus: '=', - indexPatterns: '=' - }, - controllerAs: 'queryBar', - bindToController: true, - - controller: callAfterBindingsWorkaround(function ($scope, $element, $http, $timeout, config, PersistedLog, indexPatterns, debounce) { - this.appName = this.appName || 'global'; - this.focusedTypeaheadItemID = ''; - - this.getIndexPatterns = () => { - if (compact(this.indexPatterns).length) return Promise.resolve(this.indexPatterns); - return Promise.all([indexPatterns.getDefault()]); - }; - - this.submit = () => { - if (this.localQuery.query) { - this.persistedLog.add(this.localQuery.query); - } - this.onSubmit({ $query: this.localQuery }); - this.suggestions = []; - }; - - this.selectLanguage = (language) => { - this.localQuery.language = language; - this.localQuery.query = ''; - this.submit(); - }; - - this.suggestionTemplate = suggestionTemplate; - - this.handleKeyDown = (event) => { - if (['ArrowLeft', 'ArrowRight', 'Home', 'End'].includes(event.key)) { - this.updateSuggestions(); - } - }; - - this.updateSuggestions = debounce(async () => { - const suggestions = await this.getSuggestions(); - if (!this._isScopeDestroyed) { - $scope.$apply(() => this.suggestions = suggestions); - } - }, 100); - - this.getSuggestions = async () => { - const { localQuery: { query, language } } = this; - const recentSearchSuggestions = this.getRecentSearchSuggestions(query); - - const autocompleteProvider = getAutocompleteProvider(language); - if (!autocompleteProvider) return recentSearchSuggestions; - - const legacyIndexPatterns = await this.getIndexPatterns(); - const indexPatterns = getFromLegacyIndexPattern(legacyIndexPatterns); - const getAutocompleteSuggestions = autocompleteProvider({ config, indexPatterns }); - - const { selectionStart, selectionEnd } = $element.find('input')[0]; - const suggestions = await getAutocompleteSuggestions({ query, selectionStart, selectionEnd }); - return [...suggestions, ...recentSearchSuggestions]; - }; - - // TODO: Figure out a better way to set selection - this.onSuggestionSelect = ({ type, text, start, end }) => { - const { query } = this.localQuery; - const inputEl = $element.find('input')[0]; - const { selectionStart, selectionEnd } = inputEl; - const value = query.substr(0, selectionStart) + query.substr(selectionEnd); - - this.localQuery.query = inputEl.value = value.substr(0, start) + text + value.substr(end); - inputEl.setSelectionRange(start + text.length, start + text.length); - - if (type === 'recentSearch') { - this.submit(); - } else { - this.updateSuggestions(); - } - }; - - this.getRecentSearchSuggestions = (query) => { - if (!this.persistedLog) return []; - const recentSearches = this.persistedLog.get(); - const matchingRecentSearches = recentSearches.filter(search => search.includes(query)); - return matchingRecentSearches.map(recentSearch => { - const text = recentSearch; - const start = 0; - const end = query.length; - return { type: 'recentSearch', text, start, end }; - }); - }; - - $scope.$watch('queryBar.localQuery.language', (language) => { - if (!language) return; - this.persistedLog = new PersistedLog(`typeahead:${this.appName}-${language}`, { - maxLength: config.get('history:limit'), - filterDuplicates: true - }); - this.updateSuggestions(); - }); - - $scope.$watch('queryBar.query', (newQuery) => { - this.localQuery = { - ...newQuery - }; - }, true); - - $scope.$watch('queryBar.indexPatterns', () => { - this.updateSuggestions(); - }); - - $scope.$on('$destroy', () => { - this.updateSuggestions.cancel(); - this._isScopeDestroyed = true; - }); - }) - }; -}); diff --git a/src/ui/public/query_bar/directive/query_popover.js b/src/ui/public/query_bar/directive/query_popover.js deleted file mode 100644 index 6c8cdd69ad571..0000000000000 --- a/src/ui/public/query_bar/directive/query_popover.js +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import React from 'react'; -import ReactDOM from 'react-dom'; -import { uiModules } from '../../modules'; -import { documentationLinks } from '../../documentation_links/documentation_links'; -import { - EuiPopover, - EuiButtonEmpty, - EuiForm, - EuiFormRow, - EuiSwitch, - EuiLink, - EuiText, - EuiSpacer, - EuiHorizontalRule, - EuiPopoverTitle, -} from '@elastic/eui'; - -const luceneQuerySyntaxDocs = documentationLinks.query.luceneQuerySyntax; -const kueryQuerySyntaxDocs = documentationLinks.query.kueryQuerySyntax; - -const module = uiModules.get('app/kibana', ['react']); -module.directive('queryPopover', function (localStorage) { - - return { - restrict: 'E', - scope: { - language: '<', - onSelectLanguage: '&', - }, - link: function ($scope, $element) { - $scope.isPopoverOpen = false; - - function togglePopover() { - $scope.$evalAsync(() => { - $scope.isPopoverOpen = !$scope.isPopoverOpen; - }); - } - - function closePopover() { - $scope.$evalAsync(() => { - $scope.isPopoverOpen = false; - }); - } - - function onSwitchChange() { - $scope.$evalAsync(() => { - const newLanguage = $scope.language === 'lucene' ? 'kuery' : 'lucene'; - localStorage.set('kibana.userQueryLanguage', newLanguage); - $scope.onSelectLanguage({ $language: newLanguage }); - }); - } - - function render() { - const button = ( - - Options - - ); - - const popover = ( - - Syntax options -
      - -

      - Our experimental autocomplete and simple syntax features can help you create your queries. Just start - typing and you’ll see matches related to your data. - - See docs {( - - here - - )}. -

      -
      - - - - - - - - - - - - -

      - Not ready yet? Find our lucene docs {( - - here - - )}. -

      -
      -
      -
      - ); - - ReactDOM.render(popover, $element[0]); - } - - $scope.$watch('isPopoverOpen', render); - $scope.$watch('language', render); - } - }; - -}); - - diff --git a/src/ui/public/query_bar/directive/suggestion.html b/src/ui/public/query_bar/directive/suggestion.html deleted file mode 100644 index a68ea51767b88..0000000000000 --- a/src/ui/public/query_bar/directive/suggestion.html +++ /dev/null @@ -1,23 +0,0 @@ -
      -
      -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      - -
      -
      -
      -
      {{item.text}}
      -
      -
      diff --git a/src/ui/public/query_bar/directive/suggestion.less b/src/ui/public/query_bar/directive/suggestion.less deleted file mode 100644 index 6af1af218b358..0000000000000 --- a/src/ui/public/query_bar/directive/suggestion.less +++ /dev/null @@ -1,155 +0,0 @@ -@import (reference) "~ui/styles/variables"; - -.suggestionItem { - display: flex; - align-items: stretch; - flex-grow: 1; - align-items: center; - font-size: 13px; - white-space: nowrap; -} - -.suggestionItem__text, .suggestionItem__type, .suggestionItem__description { - flex-grow: 1; - flex-basis: 0%; - display: flex; - flex-direction: column; -} - -.suggestionItem__type { - flex-grow: 0; - flex-basis: auto; - width: 32px; - height: 32px; - text-align: center; - overflow: hidden; - padding: 4px; -} - -&.suggestionItem--field { - .suggestionItem__type { - background-color: tint(@globalColorOrange, 90%); - color: @globalColorOrange; - } -} - -&.suggestionItem--value { - .suggestionItem__type { - background-color: tint(@globalColorTeal, 90%); - color: @globalColorTeal; - } - - .suggestionItem__text { - width: auto; - } -} - -&.suggestionItem--operator { - .suggestionItem__type { - background-color: tint(@globalColorBlue, 90%); - color: @globalColorBlue; - } -} - -&.suggestionItem--conjunction { - .suggestionItem__type { - background-color: tint(@globalColorPurple, 90%); - color: @globalColorPurple; - } -} - -&.suggestionItem--recentSearch { - .suggestionItem__type { - background-color: @globalColorLightGray; - color: @globalColorMediumGray; - } - - .suggestionItem__text { - width: auto; - } -} - -.suggestionItem__text { - flex-grow: 0; /* 2 */ - flex-basis: auto; /* 2 */ - font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace; - margin-right: 32px; - width: 250px; - overflow: hidden; - text-overflow: ellipsis; - padding: 4px 8px; - color: #111; -} - -.suggestionItem__description { - color: @globalColorDarkGray; - overflow: hidden; - text-overflow: ellipsis; -} - -.suggestionItem__callout { - font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace; - background: @globalColorLightestGray; - color: #000; - padding: 0 4px; - display: inline-block; -} - -.suggestionTypeahead { - .typeahead { - .typeahead-items { - max-height: 60vh; - overflow-y: auto; - - .typeahead-item { - padding: 0; - border-bottom: none; - line-height: normal; - - &:hover { - cursor: pointer; - } - - &.active { - background-color: @globalColorLightestGray; - - .suggestionItem__callout { - background: #fff; - } - - .suggestionItem__text { - color: #000; - } - - .suggestionItem__type { - color: #000; - } - - .suggestionItem--field { - .suggestionItem__type { - background-color: tint(@globalColorOrange, 80%); - } - } - - .suggestionItem--value { - .suggestionItem__type { - background-color: tint(@globalColorTeal, 80%); - } - } - - .suggestionItem--operator { - .suggestionItem__type { - background-color: tint(@globalColorBlue, 80%); - } - } - - .suggestionItem--conjunction { - .suggestionItem__type { - background-color: tint(@globalColorPurple, 80%); - } - } - } - } - } - } -} diff --git a/src/ui/public/query_bar/index.js b/src/ui/public/query_bar/index.js deleted file mode 100644 index 23566906b6487..0000000000000 --- a/src/ui/public/query_bar/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import './directive/query_bar'; diff --git a/src/ui/public/query_bar/index.ts b/src/ui/public/query_bar/index.ts new file mode 100644 index 0000000000000..6b41af67783b4 --- /dev/null +++ b/src/ui/public/query_bar/index.ts @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { QueryBar } from './components'; diff --git a/src/ui/public/query_bar/lib/match_pairs.ts b/src/ui/public/query_bar/lib/match_pairs.ts new file mode 100644 index 0000000000000..d5cfb4f99c9d5 --- /dev/null +++ b/src/ui/public/query_bar/lib/match_pairs.ts @@ -0,0 +1,146 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * This helper automatically handles matching pairs. + * Specifically, it does the following: + * + * 1. If the key is a closer, and the character in front of the cursor is the + * same, simply move the cursor forward. + * 2. If the key is an opener, insert the opener at the beginning of the + * selection, and the closer at the end of the selection, and move the + * selection forward. + * 3. If the backspace is hit, and the characters before and after the cursor + * are a pair, remove both characters and move the cursor backward. + */ + +const pairs = ['()', '[]', '{}', `''`, '""']; +const openers = pairs.map(pair => pair[0]); +const closers = pairs.map(pair => pair[1]); + +interface MatchPairsOptions { + value: string; + selectionStart: number; + selectionEnd: number; + key: string; + metaKey: boolean; + updateQuery: (query: string, selectionStart: number, selectionEnd: number) => void; + preventDefault: () => void; +} + +export function matchPairs({ + value, + selectionStart, + selectionEnd, + key, + metaKey, + updateQuery, + preventDefault, +}: MatchPairsOptions) { + if (shouldMoveCursorForward(key, value, selectionStart, selectionEnd)) { + preventDefault(); + updateQuery(value, selectionStart + 1, selectionEnd + 1); + } else if (shouldInsertMatchingCloser(key, value, selectionStart, selectionEnd)) { + preventDefault(); + const newValue = + value.substr(0, selectionStart) + + key + + value.substring(selectionStart, selectionEnd) + + closers[openers.indexOf(key)] + + value.substr(selectionEnd); + updateQuery(newValue, selectionStart + 1, selectionEnd + 1); + } else if (shouldRemovePair(key, metaKey, value, selectionStart, selectionEnd)) { + preventDefault(); + const newValue = value.substr(0, selectionEnd - 1) + value.substr(selectionEnd + 1); + updateQuery(newValue, selectionStart - 1, selectionEnd - 1); + } +} + +function shouldMoveCursorForward( + key: string, + value: string, + selectionStart: number, + selectionEnd: number +) { + if (!closers.includes(key)) { + return false; + } + + // Never move selection forward for multi-character selections + if (selectionStart !== selectionEnd) { + return false; + } + + // Move selection forward if the key is the same as the closer in front of the selection + return value.charAt(selectionEnd) === key; +} + +function shouldInsertMatchingCloser( + key: string, + value: string, + selectionStart: number, + selectionEnd: number +) { + if (!openers.includes(key)) { + return false; + } + + // Always insert for multi-character selections + if (selectionStart !== selectionEnd) { + return true; + } + + const precedingCharacter = value.charAt(selectionStart - 1); + const followingCharacter = value.charAt(selectionStart + 1); + + // Don't insert if the preceding character is a backslash + if (precedingCharacter === '\\') { + return false; + } + + // Don't insert if it's a quote and the either of the preceding/following characters is alphanumeric + return !( + ['"', `'`].includes(key) && + (isAlphanumeric(precedingCharacter) || isAlphanumeric(followingCharacter)) + ); +} + +function shouldRemovePair( + key: string, + metaKey: boolean, + value: string, + selectionStart: number, + selectionEnd: number +) { + if (key !== 'Backspace' || metaKey) { + return false; + } + + // Never remove for multi-character selections + if (selectionStart !== selectionEnd) { + return false; + } + + // Remove if the preceding/following characters are a pair + return pairs.includes(value.substr(selectionEnd - 1, 2)); +} + +function isAlphanumeric(value = '') { + return value.match(/[a-zA-Z0-9_]/); +} diff --git a/src/ui/public/registry/_registry.d.ts b/src/ui/public/registry/_registry.d.ts new file mode 100644 index 0000000000000..425ab45036519 --- /dev/null +++ b/src/ui/public/registry/_registry.d.ts @@ -0,0 +1,31 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { IndexedArray, IndexedArrayConfig } from '../indexed_array'; + +interface UIRegistry extends IndexedArray { + register(privateModule: T): UIRegistry; +} + +interface UIRegistrySpec extends IndexedArrayConfig { + name: string; + filter?(item: T): boolean; +} + +declare function uiRegistry(spec: UIRegistrySpec): UIRegistry; diff --git a/src/ui/public/registry/chrome_header_nav_controls.ts b/src/ui/public/registry/chrome_header_nav_controls.ts new file mode 100644 index 0000000000000..5207113db6899 --- /dev/null +++ b/src/ui/public/registry/chrome_header_nav_controls.ts @@ -0,0 +1,37 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { NavControl } from '../chrome/directives/header_global_nav'; +import { IndexedArray } from '../indexed_array'; +import { uiRegistry, UIRegistry } from './_registry'; + +interface BySideDictionary { + // this key should be from NavControlSide + [side: string]: IndexedArray; +} + +export interface ChromeHeaderNavControlsRegistry extends UIRegistry { + bySide: BySideDictionary; +} + +export const chromeHeaderNavControlsRegistry: ChromeHeaderNavControlsRegistry = uiRegistry({ + name: 'chromeHeaderNavControls', + order: ['order'], + group: ['side'], +}) as ChromeHeaderNavControlsRegistry; diff --git a/src/ui/public/registry/chrome_nav_controls.js b/src/ui/public/registry/chrome_nav_controls.js index 85072a09ab656..b6c935b9cc333 100644 --- a/src/ui/public/registry/chrome_nav_controls.js +++ b/src/ui/public/registry/chrome_nav_controls.js @@ -23,4 +23,3 @@ export const chromeNavControlsRegistry = uiRegistry({ name: 'chromeNavControls', order: ['order'] }); - diff --git a/src/ui/public/registry/feature_catalogue.d.ts b/src/ui/public/registry/feature_catalogue.d.ts new file mode 100644 index 0000000000000..f45e30f3778d6 --- /dev/null +++ b/src/ui/public/registry/feature_catalogue.d.ts @@ -0,0 +1,40 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export enum FeatureCatalogueCategory { + ADMIN = 'admin', + DATA = 'data', + OTHER = 'other', +} + +interface FeatureCatalogueObject { + id: string; + title: string; + description: string; + icon: string; + path: string; + showOnHomePage: boolean; + category: FeatureCatalogueCategory; +} + +type FeatureCatalogueRegistryFunction = () => FeatureCatalogueObject; + +export const FeatureCatalogueRegistryProvider: { + register: (fn: FeatureCatalogueRegistryFunction) => void; +}; diff --git a/src/ui/public/routes/index.d.ts b/src/ui/public/routes/index.d.ts new file mode 100644 index 0000000000000..9e1a3bbd534ee --- /dev/null +++ b/src/ui/public/routes/index.d.ts @@ -0,0 +1,23 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { uiRoutes, UIRoutes } from 'ui/routes/routes'; + +export default uiRoutes; +export { UIRoutes }; diff --git a/src/ui/public/routes/route_manager.d.ts b/src/ui/public/routes/route_manager.d.ts new file mode 100644 index 0000000000000..e872027cd1a69 --- /dev/null +++ b/src/ui/public/routes/route_manager.d.ts @@ -0,0 +1,38 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +/** + * WARNING: these types are incomplete + */ + +interface RouteConfiguration { + controller?: string | ((...args: any[]) => void); + redirectTo?: string; + reloadOnSearch?: boolean; + resolve?: object; + template?: string; +} + +interface RouteManager { + when(path: string, routeConfiguration: RouteConfiguration): RouteManager; + otherwise(routeConfiguration: RouteConfiguration): RouteManager; + defaults(path: string | RegExp, defaults: RouteConfiguration): RouteManager; +} + +export default RouteManager; diff --git a/src/ui/public/routes/routes.d.ts b/src/ui/public/routes/routes.d.ts new file mode 100644 index 0000000000000..1a0a89612bf1d --- /dev/null +++ b/src/ui/public/routes/routes.d.ts @@ -0,0 +1,27 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import RouteManager from 'ui/routes/route_manager'; + +interface DefaultRouteManager extends RouteManager { + enable(): void; +} + +export const uiRoutes: DefaultRouteManager; +export type UIRoutes = DefaultRouteManager; diff --git a/src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap b/src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap index 815661b15213b..cd291871ae71a 100644 --- a/src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap +++ b/src/ui/public/share/components/__snapshots__/share_context_menu.test.js.snap @@ -50,12 +50,14 @@ exports[`should render context menu panel when there are more than one panel 1`] "icon": "console", "name": "Embed code", "panel": 2, + "sortOrder": 0, }, Object { "data-test-subj": "sharePanel-Permalinks", "icon": "link", "name": "Permalinks", "panel": 1, + "sortOrder": 0, }, ], "title": "Share this dashboard", diff --git a/src/ui/public/share/components/share_context_menu.tsx b/src/ui/public/share/components/share_context_menu.tsx index 74b221509b6ff..3093fe33ae2b6 100644 --- a/src/ui/public/share/components/share_context_menu.tsx +++ b/src/ui/public/share/components/share_context_menu.tsx @@ -20,10 +20,10 @@ import React, { Component } from 'react'; import './share_panel_content.less'; -import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui'; +import { EuiContextMenuPanelDescriptor } from '@elastic/eui'; import { EuiContextMenu } from '@elastic/eui'; -import { ShareAction, ShareActionProvider } from 'ui/share/share_action'; +import { ShareAction, ShareActionProvider, ShareContextMenuPanelItem } from 'ui/share/share_action'; import { UrlPanelContent } from './url_panel_content'; interface Props { @@ -51,7 +51,7 @@ export class ShareContextMenu extends Component { private getPanels = () => { const panels: EuiContextMenuPanelDescriptor[] = []; - const menuItems: EuiContextMenuPanelItemDescriptor[] = []; + const menuItems: ShareContextMenuPanelItem[] = []; const permalinkPanel = { id: panels.length + 1, @@ -68,6 +68,7 @@ export class ShareContextMenu extends Component { name: 'Permalinks', icon: 'link', panel: permalinkPanel.id, + sortOrder: 0, }); panels.push(permalinkPanel); @@ -89,6 +90,7 @@ export class ShareContextMenu extends Component { name: 'Embed code', icon: 'console', panel: embedPanel.id, + sortOrder: 0, }); } @@ -132,10 +134,23 @@ export class ShareContextMenu extends Component { items: menuItems .map(menuItem => { menuItem['data-test-subj'] = `sharePanel-${menuItem.name.replace(' ', '')}`; + if (!menuItem.sortOrder) { + menuItem.sortOrder = 0; + } return menuItem; }) + // Sorts ascending on sort order first and then ascending on name .sort((a, b) => { - return a.name.toLowerCase().localeCompare(b.name.toLowerCase()); + if (a.sortOrder > b.sortOrder) { + return 1; + } + if (a.sortOrder < b.sortOrder) { + return -1; + } + if (a.name.toLowerCase().localeCompare(b.name.toLowerCase()) > 0) { + return 1; + } + return -1; }), }; panels.push(topLevelMenuPanel); diff --git a/src/ui/public/share/components/url_panel_content.tsx b/src/ui/public/share/components/url_panel_content.tsx index 932ea0887ccac..e31fa49d80429 100644 --- a/src/ui/public/share/components/url_panel_content.tsx +++ b/src/ui/public/share/components/url_panel_content.tsx @@ -20,7 +20,6 @@ // TODO: Remove once typescript definitions are in EUI declare module '@elastic/eui' { export const EuiCopy: React.SFC; - export const EuiForm: React.SFC; } import React, { Component } from 'react'; diff --git a/src/ui/public/share/share_action.ts b/src/ui/public/share/share_action.ts index abd5c56d57770..963143e72caa8 100644 --- a/src/ui/public/share/share_action.ts +++ b/src/ui/public/share/share_action.ts @@ -47,8 +47,12 @@ export interface ShareActionProps { onClose: () => void; } +export interface ShareContextMenuPanelItem extends EuiContextMenuPanelItemDescriptor { + sortOrder: number; +} + export interface ShareAction { - shareMenuItem: EuiContextMenuPanelItemDescriptor; + shareMenuItem: ShareContextMenuPanelItem; panel: EuiContextMenuPanelDescriptor; } diff --git a/src/ui/public/state_management/app_state.d.ts b/src/ui/public/state_management/app_state.d.ts index 314583746fca1..3a1dbc8d9d70e 100644 --- a/src/ui/public/state_management/app_state.d.ts +++ b/src/ui/public/state_management/app_state.d.ts @@ -16,5 +16,6 @@ * specific language governing permissions and limitations * under the License. */ +import { State } from './state'; -export type AppState = any; +export type AppState = State; diff --git a/src/ui/public/state_management/global_state.d.ts b/src/ui/public/state_management/global_state.d.ts new file mode 100644 index 0000000000000..66a85d88956c7 --- /dev/null +++ b/src/ui/public/state_management/global_state.d.ts @@ -0,0 +1,22 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { State } from './state'; + +export type GlobalState = State; diff --git a/src/ui/public/state_management/state.d.ts b/src/ui/public/state_management/state.d.ts new file mode 100644 index 0000000000000..39e4e672d0203 --- /dev/null +++ b/src/ui/public/state_management/state.d.ts @@ -0,0 +1,26 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export interface State { + [key: string]: any; + translateHashToRison: ( + stateHashOrRison: string | string[] | undefined + ) => string | string[] | undefined; + getQueryParamName: () => string; +} diff --git a/src/ui/public/state_management/state_hashing/get_unhashable_states_provider.js b/src/ui/public/state_management/state_hashing/get_unhashable_states_provider.js deleted file mode 100644 index 693da1b990c45..0000000000000 --- a/src/ui/public/state_management/state_hashing/get_unhashable_states_provider.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export function getUnhashableStatesProvider(getAppState, globalState) { - return function getUnhashableStates() { - return [getAppState(), globalState].filter(Boolean); - }; -} diff --git a/src/ui/public/state_management/state_hashing/get_unhashable_states_provider.ts b/src/ui/public/state_management/state_hashing/get_unhashable_states_provider.ts new file mode 100644 index 0000000000000..6c43947640ed3 --- /dev/null +++ b/src/ui/public/state_management/state_hashing/get_unhashable_states_provider.ts @@ -0,0 +1,28 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { AppState } from '../app_state'; +import { GlobalState } from '../global_state'; +import { State } from '../state'; + +export function getUnhashableStatesProvider(getAppState: () => AppState, globalState: GlobalState) { + return function getUnhashableStates(): State[] { + return [getAppState(), globalState].filter(Boolean); + }; +} diff --git a/src/ui/public/state_management/state_hashing/unhash_query_string.js b/src/ui/public/state_management/state_hashing/unhash_query_string.js deleted file mode 100644 index be1f9c94a3c5a..0000000000000 --- a/src/ui/public/state_management/state_hashing/unhash_query_string.js +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { mapValues } from 'lodash'; - -export function unhashQueryString(parsedQueryString, states) { - return mapValues(parsedQueryString, (val, key) => { - const state = states.find(s => key === s.getQueryParamName()); - return state ? state.translateHashToRison(val) : val; - }); -} diff --git a/src/ui/public/state_management/state_hashing/unhash_query_string.ts b/src/ui/public/state_management/state_hashing/unhash_query_string.ts new file mode 100644 index 0000000000000..242b840282f39 --- /dev/null +++ b/src/ui/public/state_management/state_hashing/unhash_query_string.ts @@ -0,0 +1,37 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { mapValues } from 'lodash'; +import { ParsedUrlQuery } from 'querystring'; +import { State } from '../state'; + +/** + * Takes in a parsed url query and state objects, finding the state objects that match the query parameters and expanding + * the hashed state. For example, a url query string like '?_a=@12353&_g=@19028df' will become + * '?_a=[expanded app state here]&_g=[expanded global state here]. This is used when storeStateInSessionStorage is turned on. + */ +export function unhashQueryString( + parsedQueryString: ParsedUrlQuery, + states: State[] +): ParsedUrlQuery { + return mapValues(parsedQueryString, (val, key) => { + const state = states.find(s => key === s.getQueryParamName()); + return state ? state.translateHashToRison(val) : val; + }); +} diff --git a/src/ui/public/state_management/state_monitor_factory.js b/src/ui/public/state_management/state_monitor_factory.js deleted file mode 100644 index b09195a1dd3b7..0000000000000 --- a/src/ui/public/state_management/state_monitor_factory.js +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { cloneDeep, isEqual, set, isPlainObject } from 'lodash'; - -export const stateMonitorFactory = { - create: (state, customInitialState) => stateMonitor(state, customInitialState) -}; - -function stateMonitor(state, customInitialState) { - let destroyed = false; - let ignoredProps = []; - let changeHandlers = []; - let initialState; - - setInitialState(customInitialState); - - function setInitialState(customInitialState) { - // state.toJSON returns a reference, clone so we can mutate it safely - initialState = cloneDeep(customInitialState) || cloneDeep(state.toJSON()); - } - - function removeIgnoredProps(state) { - ignoredProps.forEach(path => { - set(state, path, true); - }); - return state; - } - - function getStatus() { - // state.toJSON returns a reference, clone so we can mutate it safely - const currentState = removeIgnoredProps(cloneDeep(state.toJSON())); - const isClean = isEqual(currentState, initialState); - - return { - clean: isClean, - dirty: !isClean, - }; - } - - function dispatchChange(type = null, keys = []) { - const status = getStatus(); - changeHandlers.forEach(changeHandler => { - changeHandler(status, type, keys); - }); - } - - function dispatchFetch(keys) { - dispatchChange('fetch_with_changes', keys); - } - - function dispatchSave(keys) { - dispatchChange('save_with_changes', keys); - } - - function dispatchReset(keys) { - dispatchChange('reset_with_changes', keys); - } - - return { - setInitialState(customInitialState) { - if (!isPlainObject(customInitialState)) throw new TypeError('The default state must be an object'); - - // check the current status - const previousStatus = getStatus(); - - // update the initialState and apply ignoredProps - setInitialState(customInitialState); - removeIgnoredProps(initialState); - - // fire the change handler if the status has changed - if (!isEqual(previousStatus, getStatus())) dispatchChange(); - }, - - ignoreProps(props) { - ignoredProps = ignoredProps.concat(props); - removeIgnoredProps(initialState); - return this; - }, - - onChange(callback) { - if (destroyed) throw new Error('Monitor has been destroyed'); - if (typeof callback !== 'function') throw new Error('onChange handler must be a function'); - - changeHandlers.push(callback); - - // Listen for state events. - state.on('fetch_with_changes', dispatchFetch); - state.on('save_with_changes', dispatchSave); - state.on('reset_with_changes', dispatchReset); - - // if the state is already dirty, fire the change handler immediately - const status = getStatus(); - if (status.dirty) dispatchChange(); - - return this; - }, - - destroy() { - destroyed = true; - changeHandlers = undefined; - state.off('fetch_with_changes', dispatchFetch); - state.off('save_with_changes', dispatchSave); - state.off('reset_with_changes', dispatchReset); - } - }; -} diff --git a/src/ui/public/state_management/state_monitor_factory.ts b/src/ui/public/state_management/state_monitor_factory.ts new file mode 100644 index 0000000000000..2ed138d24bf14 --- /dev/null +++ b/src/ui/public/state_management/state_monitor_factory.ts @@ -0,0 +1,143 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +import { cloneDeep, isEqual, isPlainObject, set } from 'lodash'; +import { State } from './state'; + +export const stateMonitorFactory = { + create: (state: State, customInitialState: State) => stateMonitor(state, customInitialState), +}; + +interface StateStatus { + clean: boolean; + dirty: boolean; +} + +type ChangeHandlerFn = (status: StateStatus, type: string | null, keys: string[]) => void; + +function stateMonitor(state: State, customInitialState: State) { + let destroyed = false; + let ignoredProps: string[] = []; + let changeHandlers: ChangeHandlerFn[] | undefined = []; + let initialState: State; + + setInitialState(customInitialState); + + function setInitialState(innerCustomInitialState: State) { + // state.toJSON returns a reference, clone so we can mutate it safely + initialState = cloneDeep(innerCustomInitialState) || cloneDeep(state.toJSON()); + } + + function removeIgnoredProps(innerState: State) { + ignoredProps.forEach(path => { + set(innerState, path, true); + }); + return innerState; + } + + function getStatus(): StateStatus { + // state.toJSON returns a reference, clone so we can mutate it safely + const currentState = removeIgnoredProps(cloneDeep(state.toJSON())); + const isClean = isEqual(currentState, initialState); + + return { + clean: isClean, + dirty: !isClean, + }; + } + + function dispatchChange(type: string | null = null, keys: string[] = []) { + const status = getStatus(); + if (!changeHandlers) { + throw new Error('Change handlers is undefined, this object has been destroyed'); + } + changeHandlers.forEach(changeHandler => { + changeHandler(status, type, keys); + }); + } + + function dispatchFetch(keys: string[]) { + dispatchChange('fetch_with_changes', keys); + } + + function dispatchSave(keys: string[]) { + dispatchChange('save_with_changes', keys); + } + + function dispatchReset(keys: string[]) { + dispatchChange('reset_with_changes', keys); + } + + return { + setInitialState(innerCustomInitialState: State) { + if (!isPlainObject(innerCustomInitialState)) { + throw new TypeError('The default state must be an object'); + } + + // check the current status + const previousStatus = getStatus(); + + // update the initialState and apply ignoredProps + setInitialState(innerCustomInitialState); + removeIgnoredProps(initialState); + + // fire the change handler if the status has changed + if (!isEqual(previousStatus, getStatus())) { + dispatchChange(); + } + }, + + ignoreProps(props: string[]) { + ignoredProps = ignoredProps.concat(props); + removeIgnoredProps(initialState); + return this; + }, + + onChange(callback: ChangeHandlerFn) { + if (destroyed || !changeHandlers) { + throw new Error('Monitor has been destroyed'); + } + if (typeof callback !== 'function') { + throw new Error('onChange handler must be a function'); + } + + changeHandlers.push(callback); + + // Listen for state events. + state.on('fetch_with_changes', dispatchFetch); + state.on('save_with_changes', dispatchSave); + state.on('reset_with_changes', dispatchReset); + + // if the state is already dirty, fire the change handler immediately + const status = getStatus(); + if (status.dirty) { + dispatchChange(); + } + + return this; + }, + + destroy() { + destroyed = true; + changeHandlers = undefined; + state.off('fetch_with_changes', dispatchFetch); + state.off('save_with_changes', dispatchSave); + state.off('reset_with_changes', dispatchReset); + }, + }; +} diff --git a/src/ui/public/storage/directive.js b/src/ui/public/storage/directive.js new file mode 100644 index 0000000000000..a5bb2ee3b6b0b --- /dev/null +++ b/src/ui/public/storage/directive.js @@ -0,0 +1,32 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + +import { uiModules } from '../modules'; +import { Storage } from './storage'; + +const createService = function (type) { + return function ($window) { + return new Storage($window[type]); + }; +}; + +uiModules.get('kibana/storage') + .service('localStorage', createService('localStorage')) + .service('sessionStorage', createService('sessionStorage')); diff --git a/src/ui/public/storage/index.js b/src/ui/public/storage/index.js deleted file mode 100644 index d2a214ea3d30a..0000000000000 --- a/src/ui/public/storage/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export { Storage } from './storage'; diff --git a/src/ui/public/storage/index.ts b/src/ui/public/storage/index.ts new file mode 100644 index 0000000000000..17bbb61b2b8d5 --- /dev/null +++ b/src/ui/public/storage/index.ts @@ -0,0 +1,22 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import './directive'; + +export { Storage } from './storage'; diff --git a/src/ui/public/storage/storage.js b/src/ui/public/storage/storage.js deleted file mode 100644 index aea032be4fd6b..0000000000000 --- a/src/ui/public/storage/storage.js +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { uiModules } from '../modules'; -import angular from 'angular'; - -export function Storage(store) { - const self = this; - self.store = store; - - self.get = function (key) { - try { - return JSON.parse(self.store.getItem(key)); - } catch (e) { - return null; - } - }; - - self.set = function (key, value) { - try { - return self.store.setItem(key, angular.toJson(value)); - } catch (e) { - return false; - } - }; - - self.remove = function (key) { - return self.store.removeItem(key); - }; - - self.clear = function () { - return self.store.clear(); - }; -} - -const createService = function (type) { - return function ($window) { - return new Storage($window[type]); - }; -}; - -uiModules.get('kibana/storage') - .service('localStorage', createService('localStorage')) - .service('sessionStorage', createService('sessionStorage')); diff --git a/src/ui/public/storage/storage.ts b/src/ui/public/storage/storage.ts new file mode 100644 index 0000000000000..703886c1e034c --- /dev/null +++ b/src/ui/public/storage/storage.ts @@ -0,0 +1,66 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import angular from 'angular'; + +// This is really silly, but I wasn't prepared to rename the kibana Storage class everywhere it is used +// and this is the only way I could figure out how to use the type definition for a built in object +// in a file that creates a type with the same name as that built in object. +import { WebStorage } from './web_storage'; + +export class Storage { + public store: WebStorage; + + constructor(store: WebStorage) { + this.store = store; + } + + public get = (key: string) => { + if (!this.store) { + return null; + } + + const storageItem = this.store.getItem(key); + if (storageItem === null) { + return null; + } + + try { + return JSON.parse(storageItem); + } catch (error) { + return null; + } + }; + + public set = (key: string, value: any) => { + try { + return this.store.setItem(key, angular.toJson(value)); + } catch (e) { + return false; + } + }; + + public remove = (key: string) => { + return this.store.removeItem(key); + }; + + public clear = () => { + return this.store.clear(); + }; +} diff --git a/src/ui/public/storage/web_storage.ts b/src/ui/public/storage/web_storage.ts new file mode 100644 index 0000000000000..d5f775431143d --- /dev/null +++ b/src/ui/public/storage/web_storage.ts @@ -0,0 +1,20 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export type WebStorage = Storage; diff --git a/src/ui/public/styles/_mixins.scss b/src/ui/public/styles/_mixins.scss index b0141997b2d32..0621c22a9f8eb 100644 --- a/src/ui/public/styles/_mixins.scss +++ b/src/ui/public/styles/_mixins.scss @@ -8,7 +8,7 @@ } } -// EUI TODO: Add this +// EUITODO: Add this @mixin kibanaCircleLogo() { display: inline-block; @include size($euiSizeXXL * 2); @@ -23,3 +23,33 @@ } } +@mixin kibana-resizer($size: ($euiSizeM + 2px), $direction: horizontal) { + display: flex; + flex: 0 0 $size; + background-color: $euiColorLightestShade; + align-items: center; + justify-content: center; + margin: 0; + user-select: none; + + @if ($direction == horizontal) { + cursor: ew-resize; + width: $size; + } @else if ($direction == vertical) { + cursor: ns-resize; + height: $size; + width: 100%; + } @else { + @warn("Direction unknown for kibana-resizer"); + } + + &:hover { + background-color: tintOrShade($euiColorPrimary, 80%, 60%); + } + + &:focus, + &.active { + background-color: $euiColorPrimary; + color: $euiColorEmptyShade; + } +} diff --git a/src/ui/public/styles/local_search.less b/src/ui/public/styles/local_search.less index a9720be338cf9..43098e683768a 100644 --- a/src/ui/public/styles/local_search.less +++ b/src/ui/public/styles/local_search.less @@ -3,6 +3,7 @@ * won't overlap if the user increases their default browser font size * This is sized for the 'Uses lucene query syntax' link */ -.kuiLocalSearchInput { +.kuiLocalSearchInput, +.kuiLocalSearchAssistedInput__input { padding-right: 6em; /* 1 */ } diff --git a/src/ui/public/styles/variables/for-theme.less b/src/ui/public/styles/variables/for-theme.less index bc84a60b533f7..935e8851db9af 100644 --- a/src/ui/public/styles/variables/for-theme.less +++ b/src/ui/public/styles/variables/for-theme.less @@ -1,4 +1,3 @@ -@tilemap-leaflet-footer-bg: red; @font-size-smaller: ceil((@font-size-base * 0.75)); @input-border-width: 1px; @@ -217,37 +216,6 @@ // Legend ====================================================================== @legend-item-color: #666; - -// Tilemap ===================================================================== -@tilemap-border: #ddd; -@tilemap-legend-base-bg: @white; -@tilemap-legend-bg: fade(@tilemap-legend-base-bg, 8%); -@tilemap-color: #666; - -@tilemap-legend-i-border: #999; -@tilemap-legend-i-bg: #aaa; - - -@tilemap-info-base-bg: @white; -@tilemap-info-bg: fade(@tilemap-info-base-bg, 92%); -@tilemap-info-header-color: #444; - -@tilemap-leaflet-control-bg: @white; -@tilemap-leaflet-control-outline: @black; -@tilemap-leaflet-control-color: @black; - -@tilemap-leaflet-control-draw-action-bg: #ddd; - -@tilemap-leaflet-container-bg: @white; - -@tilemap-leaflet-popup-border: @gray; - -@tilemap-leaflet-footer-bg: fade(#fff, 30%); -@tilemap-leaflet-footer-color: #333; - -@tilemap-filter: brightness(1.03) grayscale(0.83) contrast(1.07); - - // Tooltip ===================================================================== @tooltip-space: 8px; @tooltip-space-tight: @tooltip-space / 2; diff --git a/src/ui/public/time_buckets/calc_auto_interval.js b/src/ui/public/time_buckets/calc_auto_interval.js deleted file mode 100644 index 4ed5d9cd22f16..0000000000000 --- a/src/ui/public/time_buckets/calc_auto_interval.js +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import moment from 'moment'; -const { duration: d } = moment; - -// these are the rounding rules used by roundInterval() - -const roundingRules = [ - [ d(500, 'ms'), d(100, 'ms') ], - [ d(5, 'second'), d(1, 'second') ], - [ d(7.5, 'second'), d(5, 'second') ], - [ d(15, 'second'), d(10, 'second') ], - [ d(45, 'second'), d(30, 'second') ], - [ d(3, 'minute'), d(1, 'minute') ], - [ d(9, 'minute'), d(5, 'minute') ], - [ d(20, 'minute'), d(10, 'minute') ], - [ d(45, 'minute'), d(30, 'minute') ], - [ d(2, 'hour'), d(1, 'hour') ], - [ d(6, 'hour'), d(3, 'hour') ], - [ d(24, 'hour'), d(12, 'hour') ], - [ d(1, 'week'), d(1, 'd') ], - [ d(3, 'week'), d(1, 'week') ], - [ d(1, 'year'), d(1, 'month') ], - [ Infinity, d(1, 'year') ] -]; - -const revRoundingRules = roundingRules.slice(0).reverse(); - -function find(rules, check, last) { - function pick(buckets, duration) { - const target = duration / buckets; - let lastResp; - - for (let i = 0; i < rules.length; i++) { - const rule = rules[i]; - const resp = check(rule[0], rule[1], target); - - if (resp == null) { - if (!last) continue; - if (lastResp) return lastResp; - break; - } - - if (!last) return resp; - lastResp = resp; - } - - // fallback to just a number of milliseconds, ensure ms is >= 1 - const ms = Math.max(Math.floor(target), 1); - return moment.duration(ms, 'ms'); - } - - return function (buckets, duration) { - const interval = pick(buckets, duration); - if (interval) return moment.duration(interval._data); - }; -} - -export const calcAutoInterval = { - near: find(revRoundingRules, function near(bound, interval, target) { - if (bound > target) return interval; - }, true), - - lessThan: find(revRoundingRules, function (bound, interval, target) { - if (interval < target) return interval; - }), - - atLeast: find(revRoundingRules, function atLeast(bound, interval, target) { - if (interval <= target) return interval; - }), -}; diff --git a/src/ui/public/time_buckets/calc_auto_interval.test.ts b/src/ui/public/time_buckets/calc_auto_interval.test.ts new file mode 100644 index 0000000000000..7c95da6a74dd3 --- /dev/null +++ b/src/ui/public/time_buckets/calc_auto_interval.test.ts @@ -0,0 +1,136 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import moment from 'moment'; + +import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval'; + +describe('calcAutoIntervalNear', () => { + test('1h/0 buckets = 0ms buckets', () => { + const interval = calcAutoIntervalNear(0, Number(moment.duration(1, 'h'))); + expect(interval.asMilliseconds()).toBe(0); + }); + + test('undefined/100 buckets = 0ms buckets', () => { + const interval = calcAutoIntervalNear(0, undefined as any); + expect(interval.asMilliseconds()).toBe(0); + }); + + test('1ms/100 buckets = 1ms buckets', () => { + const interval = calcAutoIntervalNear(100, Number(moment.duration(1, 'ms'))); + expect(interval.asMilliseconds()).toBe(1); + }); + + test('200ms/100 buckets = 2ms buckets', () => { + const interval = calcAutoIntervalNear(100, Number(moment.duration(200, 'ms'))); + expect(interval.asMilliseconds()).toBe(2); + }); + + test('1s/1000 buckets = 1ms buckets', () => { + const interval = calcAutoIntervalNear(1000, Number(moment.duration(1, 's'))); + expect(interval.asMilliseconds()).toBe(1); + }); + + test('1000h/1000 buckets = 1h buckets', () => { + const interval = calcAutoIntervalNear(1000, Number(moment.duration(1000, 'hours'))); + expect(interval.asHours()).toBe(1); + }); + + test('1h/100 buckets = 30s buckets', () => { + const interval = calcAutoIntervalNear(100, Number(moment.duration(1, 'hours'))); + expect(interval.asSeconds()).toBe(30); + }); + + test('1d/25 buckets = 1h buckets', () => { + const interval = calcAutoIntervalNear(25, Number(moment.duration(1, 'day'))); + expect(interval.asHours()).toBe(1); + }); + + test('1y/1000 buckets = 12h buckets', () => { + const interval = calcAutoIntervalNear(1000, Number(moment.duration(1, 'year'))); + expect(interval.asHours()).toBe(12); + }); + + test('1y/10000 buckets = 1h buckets', () => { + const interval = calcAutoIntervalNear(10000, Number(moment.duration(1, 'year'))); + expect(interval.asHours()).toBe(1); + }); + + test('1y/100000 buckets = 5m buckets', () => { + const interval = calcAutoIntervalNear(100000, Number(moment.duration(1, 'year'))); + expect(interval.asMinutes()).toBe(5); + }); +}); + +describe('calcAutoIntervalLessThan', () => { + test('1h/0 buckets = 0ms buckets', () => { + const interval = calcAutoIntervalLessThan(0, Number(moment.duration(1, 'h'))); + expect(interval.asMilliseconds()).toBe(0); + }); + + test('undefined/100 buckets = 0ms buckets', () => { + const interval = calcAutoIntervalLessThan(0, undefined as any); + expect(interval.asMilliseconds()).toBe(0); + }); + + test('1ms/100 buckets = 1ms buckets', () => { + const interval = calcAutoIntervalLessThan(100, Number(moment.duration(1, 'ms'))); + expect(interval.asMilliseconds()).toBe(1); + }); + + test('200ms/100 buckets = 2ms buckets', () => { + const interval = calcAutoIntervalLessThan(100, Number(moment.duration(200, 'ms'))); + expect(interval.asMilliseconds()).toBe(2); + }); + + test('1s/1000 buckets = 1ms buckets', () => { + const interval = calcAutoIntervalLessThan(1000, Number(moment.duration(1, 's'))); + expect(interval.asMilliseconds()).toBe(1); + }); + + test('1000h/1000 buckets = 1h buckets', () => { + const interval = calcAutoIntervalLessThan(1000, Number(moment.duration(1000, 'hours'))); + expect(interval.asHours()).toBe(1); + }); + + test('1h/100 buckets = 30s buckets', () => { + const interval = calcAutoIntervalLessThan(100, Number(moment.duration(1, 'hours'))); + expect(interval.asSeconds()).toBe(30); + }); + + test('1d/25 buckets = 30m buckets', () => { + const interval = calcAutoIntervalLessThan(25, Number(moment.duration(1, 'day'))); + expect(interval.asMinutes()).toBe(30); + }); + + test('1y/1000 buckets = 3h buckets', () => { + const interval = calcAutoIntervalLessThan(1000, Number(moment.duration(1, 'year'))); + expect(interval.asHours()).toBe(3); + }); + + test('1y/10000 buckets = 30m buckets', () => { + const interval = calcAutoIntervalLessThan(10000, Number(moment.duration(1, 'year'))); + expect(interval.asMinutes()).toBe(30); + }); + + test('1y/100000 buckets = 5m buckets', () => { + const interval = calcAutoIntervalLessThan(100000, Number(moment.duration(1, 'year'))); + expect(interval.asMinutes()).toBe(5); + }); +}); diff --git a/src/ui/public/time_buckets/calc_auto_interval.ts b/src/ui/public/time_buckets/calc_auto_interval.ts new file mode 100644 index 0000000000000..c3478772669c4 --- /dev/null +++ b/src/ui/public/time_buckets/calc_auto_interval.ts @@ -0,0 +1,145 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import moment from 'moment'; + +const boundsDescending = [ + { + bound: Infinity, + interval: Number(moment.duration(1, 'year')), + }, + { + bound: Number(moment.duration(1, 'year')), + interval: Number(moment.duration(1, 'month')), + }, + { + bound: Number(moment.duration(3, 'week')), + interval: Number(moment.duration(1, 'week')), + }, + { + bound: Number(moment.duration(1, 'week')), + interval: Number(moment.duration(1, 'd')), + }, + { + bound: Number(moment.duration(24, 'hour')), + interval: Number(moment.duration(12, 'hour')), + }, + { + bound: Number(moment.duration(6, 'hour')), + interval: Number(moment.duration(3, 'hour')), + }, + { + bound: Number(moment.duration(2, 'hour')), + interval: Number(moment.duration(1, 'hour')), + }, + { + bound: Number(moment.duration(45, 'minute')), + interval: Number(moment.duration(30, 'minute')), + }, + { + bound: Number(moment.duration(20, 'minute')), + interval: Number(moment.duration(10, 'minute')), + }, + { + bound: Number(moment.duration(9, 'minute')), + interval: Number(moment.duration(5, 'minute')), + }, + { + bound: Number(moment.duration(3, 'minute')), + interval: Number(moment.duration(1, 'minute')), + }, + { + bound: Number(moment.duration(45, 'second')), + interval: Number(moment.duration(30, 'second')), + }, + { + bound: Number(moment.duration(15, 'second')), + interval: Number(moment.duration(10, 'second')), + }, + { + bound: Number(moment.duration(7.5, 'second')), + interval: Number(moment.duration(5, 'second')), + }, + { + bound: Number(moment.duration(5, 'second')), + interval: Number(moment.duration(1, 'second')), + }, + { + bound: Number(moment.duration(500, 'ms')), + interval: Number(moment.duration(100, 'ms')), + }, +]; + +function getPerBucketMs(count: number, duration: number) { + const ms = duration / count; + return isFinite(ms) ? ms : NaN; +} + +function normalizeMinimumInterval(targetMs: number) { + const value = isNaN(targetMs) ? 0 : Math.max(Math.floor(targetMs), 1); + return moment.duration(value); +} + +/** + * Using some simple rules we pick a "pretty" interval that will + * produce around the number of buckets desired given a time range. + * + * @param targetBucketCount desired number of buckets + * @param duration time range the agg covers + */ +export function calcAutoIntervalNear(targetBucketCount: number, duration: number) { + const targetPerBucketMs = getPerBucketMs(targetBucketCount, duration); + + // Find the first bound which is smaller than our target. + const lowerBoundIndex = boundsDescending.findIndex(({ bound }) => { + const boundMs = Number(bound); + return boundMs <= targetPerBucketMs; + }); + + // The bound immediately preceeding that lower bound contains the + // interval most closely matching our target. + if (lowerBoundIndex !== -1) { + const nearestInterval = boundsDescending[lowerBoundIndex - 1].interval; + return moment.duration(nearestInterval); + } + + // If the target is smaller than any of our bounds, then we'll use it for the interval as-is. + return normalizeMinimumInterval(targetPerBucketMs); +} + +/** + * Pick a "pretty" interval that produces no more than the maxBucketCount + * for the given time range. + * + * @param maxBucketCount maximum number of buckets to create + * @param duration amount of time covered by the agg + */ +export function calcAutoIntervalLessThan(maxBucketCount: number, duration: number) { + const maxPerBucketMs = getPerBucketMs(maxBucketCount, duration); + + for (const { interval } of boundsDescending) { + // Find the highest interval which meets our per bucket limitation. + if (interval <= maxPerBucketMs) { + return moment.duration(interval); + } + } + + // If the max is smaller than any of our intervals, then we'll use it for the interval as-is. + return normalizeMinimumInterval(maxPerBucketMs); +} diff --git a/src/ui/public/time_buckets/calc_es_interval.js b/src/ui/public/time_buckets/calc_es_interval.js index 6b15e1fb1f540..ff591bcff0660 100644 --- a/src/ui/public/time_buckets/calc_es_interval.js +++ b/src/ui/public/time_buckets/calc_es_interval.js @@ -18,6 +18,7 @@ */ import dateMath from '@kbn/datemath'; +import { parseEsInterval } from 'ui/utils/parse_es_interval'; const unitsDesc = dateMath.unitsDesc; const largeMax = unitsDesc.indexOf('M'); @@ -30,7 +31,7 @@ const largeMax = unitsDesc.indexOf('M'); * @param {moment.duration} duration * @return {object} */ -export function calcEsInterval(duration) { +export function convertDurationToNormalizedEsInterval(duration) { for (let i = 0; i < unitsDesc.length; i++) { const unit = unitsDesc[i]; const val = duration.as(unit); @@ -59,3 +60,12 @@ export function calcEsInterval(duration) { expression: ms + 'ms' }; } + +export function convertIntervalToEsInterval(interval) { + const { value, unit } = parseEsInterval(interval); + return { + value, + unit, + expression: interval, + }; +} diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js index b49a6651c3afe..a828b856b1dbd 100644 --- a/src/ui/public/time_buckets/time_buckets.js +++ b/src/ui/public/time_buckets/time_buckets.js @@ -21,8 +21,11 @@ import _ from 'lodash'; import moment from 'moment'; import chrome from '../chrome'; import { parseInterval } from '../utils/parse_interval'; -import { calcAutoInterval } from './calc_auto_interval'; -import { calcEsInterval } from './calc_es_interval'; +import { calcAutoIntervalLessThan, calcAutoIntervalNear } from './calc_auto_interval'; +import { + convertDurationToNormalizedEsInterval, + convertIntervalToEsInterval, +} from './calc_es_interval'; import { fieldFormats } from '../registry/field_formats'; const config = chrome.getUiSettingsClient(); @@ -152,6 +155,10 @@ TimeBuckets.prototype.getDuration = function () { * @param {object|string|moment.duration} input - see desc */ TimeBuckets.prototype.setInterval = function (input) { + // Preserve the original units because they're lost when the interval is converted to a + // moment duration object. + this.originalInterval = input; + let interval = input; // selection object -> val @@ -215,16 +222,22 @@ TimeBuckets.prototype.setInterval = function (input) { * * @return {[type]} [description] */ -TimeBuckets.prototype.getInterval = function () { +TimeBuckets.prototype.getInterval = function (useNormalizedEsInterval = true) { const self = this; const duration = self.getDuration(); - return decorateInterval(maybeScaleInterval(readInterval())); + const parsedInterval = readInterval(); + + if(useNormalizedEsInterval) { + return decorateInterval(maybeScaleInterval(parsedInterval)); + } else { + return decorateInterval(parsedInterval); + } // either pull the interval from state or calculate the auto-interval function readInterval() { const interval = self._i; if (moment.isDuration(interval)) return interval; - return calcAutoInterval.near(config.get('histogram:barTarget'), duration); + return calcAutoIntervalNear(config.get('histogram:barTarget'), Number(duration)); } // check to see if the interval should be scaled, and scale it if so @@ -236,7 +249,7 @@ TimeBuckets.prototype.getInterval = function () { let scaled; if (approxLen > maxLength) { - scaled = calcAutoInterval.lessThan(maxLength, duration); + scaled = calcAutoIntervalLessThan(maxLength, Number(duration)); } else { return interval; } @@ -253,7 +266,9 @@ TimeBuckets.prototype.getInterval = function () { // append some TimeBuckets specific props to the interval function decorateInterval(interval) { - const esInterval = calcEsInterval(interval); + const esInterval = useNormalizedEsInterval + ? convertDurationToNormalizedEsInterval(interval) + : convertIntervalToEsInterval(self.originalInterval); interval.esValue = esInterval.value; interval.esUnit = esInterval.unit; interval.expression = esInterval.expression; @@ -341,12 +356,12 @@ TimeBuckets.__cached__ = function (self) { function cachedGetter(prop) { return { - value: function cachedGetter() { + value: function cachedGetter(...rest) { if (cache.hasOwnProperty(prop)) { return cache[prop]; } - return cache[prop] = self[prop](); + return cache[prop] = self[prop](...rest); } }; } diff --git a/src/ui/public/timefilter/timefilter.test.js b/src/ui/public/timefilter/timefilter.test.js index a7b3cb38d1239..7071a6c7f7a70 100644 --- a/src/ui/public/timefilter/timefilter.test.js +++ b/src/ui/public/timefilter/timefilter.test.js @@ -19,10 +19,11 @@ jest.mock('ui/chrome', () => ({ + getBasePath: () => `/some/base/path`, getUiSettingsClient: () => { return { get: (key) => { - switch(key) { + switch (key) { case 'timepicker:timeDefaults': return { from: 'now-15m', to: 'now', mode: 'quick' }; case 'timepicker:refreshIntervalDefaults': @@ -107,7 +108,7 @@ describe('setRefreshInterval', () => { let update; let fetch; - beforeEach(() => { + beforeEach(() => { update = sinon.spy(); fetch = sinon.spy(); timefilter.setRefreshInterval({ @@ -191,7 +192,7 @@ describe('setRefreshInterval', () => { describe('isTimeRangeSelectorEnabled', () => { let update; - beforeEach(() => { + beforeEach(() => { update = sinon.spy(); timefilter.on('enabledUpdated', update); }); @@ -212,7 +213,7 @@ describe('isTimeRangeSelectorEnabled', () => { describe('isAutoRefreshSelectorEnabled', () => { let update; - beforeEach(() => { + beforeEach(() => { update = sinon.spy(); timefilter.on('enabledUpdated', update); }); diff --git a/src/ui/public/typeahead/__tests__/typeahead.js b/src/ui/public/typeahead/__tests__/typeahead.js deleted file mode 100644 index 3b9e49aa077e7..0000000000000 --- a/src/ui/public/typeahead/__tests__/typeahead.js +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import expect from 'expect.js'; -import sinon from 'sinon'; -import ngMock from 'ng_mock'; -import '../typeahead'; -import { comboBoxKeyCodes } from '@elastic/eui'; -const { UP, DOWN, ENTER, TAB, ESCAPE } = comboBoxKeyCodes; - -describe('Typeahead directive', function () { - let $compile; - let scope; - let element; - - beforeEach(ngMock.module('kibana')); - - beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) { - $compile = _$compile_; - scope = _$rootScope_.$new(); - const html = ` - - - - `; - element = $compile(html)(scope); - scope.items = ['foo', 'bar', 'baz']; - scope.onSelect = sinon.spy(); - scope.$digest(); - })); - - describe('before focus', function () { - it('should be hidden', function () { - scope.$digest(); - expect(element.find('.typeahead-popover').hasClass('ng-hide')).to.be(true); - }); - }); - - describe('after focus', function () { - beforeEach(function () { - element.find('input').triggerHandler('focus'); - scope.$digest(); - }); - - it('should still be hidden', function () { - expect(element.find('.typeahead-popover').hasClass('ng-hide')).to.be(true); - }); - - it('should show when a key is pressed unless there are no items', function () { - element.find('.typeahead').triggerHandler({ - type: 'keypress', - keyCode: 'A'.charCodeAt(0) - }); - - scope.$digest(); - - expect(element.find('.typeahead-popover').hasClass('ng-hide')).to.be(false); - - scope.items = []; - scope.$digest(); - - expect(element.find('.typeahead-popover').hasClass('ng-hide')).to.be(true); - }); - - it('should hide when escape is pressed', function () { - element.find('.typeahead').triggerHandler({ - type: 'keydown', - keyCode: ESCAPE - }); - - scope.$digest(); - - expect(element.find('.typeahead-popover').hasClass('ng-hide')).to.be(true); - }); - - it('should select the next option on arrow down', function () { - let expectedActiveIndex = -1; - for (let i = 0; i < scope.items.length + 1; i++) { - expectedActiveIndex++; - if (expectedActiveIndex > scope.items.length - 1) expectedActiveIndex = 0; - - element.find('.typeahead').triggerHandler({ - type: 'keydown', - keyCode: DOWN - }); - - scope.$digest(); - - expect(element.find('.typeahead-item.active').length).to.be(1); - expect(element.find('.typeahead-item').eq(expectedActiveIndex).hasClass('active')).to.be(true); - } - }); - - it('should select the previous option on arrow up', function () { - let expectedActiveIndex = scope.items.length; - for (let i = 0; i < scope.items.length + 1; i++) { - expectedActiveIndex--; - if (expectedActiveIndex < 0) expectedActiveIndex = scope.items.length - 1; - - element.find('.typeahead').triggerHandler({ - type: 'keydown', - keyCode: UP - }); - - scope.$digest(); - - expect(element.find('.typeahead-item.active').length).to.be(1); - expect(element.find('.typeahead-item').eq(expectedActiveIndex).hasClass('active')).to.be(true); - } - }); - - it('should fire the onSelect handler with the selected item on enter', function () { - const typeaheadEl = element.find('.typeahead'); - - typeaheadEl.triggerHandler({ - type: 'keydown', - keyCode: DOWN - }); - - typeaheadEl.triggerHandler({ - type: 'keydown', - keyCode: ENTER - }); - - scope.$digest(); - - sinon.assert.calledOnce(scope.onSelect); - sinon.assert.calledWith(scope.onSelect, scope.items[0]); - }); - - it('should fire the onSelect handler with the selected item on tab', function () { - const typeaheadEl = element.find('.typeahead'); - - typeaheadEl.triggerHandler({ - type: 'keydown', - keyCode: DOWN - }); - - typeaheadEl.triggerHandler({ - type: 'keydown', - keyCode: TAB - }); - - scope.$digest(); - - sinon.assert.calledOnce(scope.onSelect); - sinon.assert.calledWith(scope.onSelect, scope.items[0]); - }); - - it('should select the option on hover', function () { - const hoverIndex = 0; - element.find('.typeahead-item').eq(hoverIndex).triggerHandler('mouseenter'); - - scope.$digest(); - - expect(element.find('.typeahead-item.active').length).to.be(1); - expect(element.find('.typeahead-item').eq(hoverIndex).hasClass('active')).to.be(true); - }); - - it('should fire the onSelect handler with the selected item on click', function () { - const clickIndex = 1; - const clickEl = element.find('.typeahead-item').eq(clickIndex); - clickEl.triggerHandler('mouseenter'); - clickEl.triggerHandler('click'); - - scope.$digest(); - - sinon.assert.calledOnce(scope.onSelect); - sinon.assert.calledWith(scope.onSelect, scope.items[clickIndex]); - }); - - it('should update the list when the items change', function () { - scope.items = ['qux']; - scope.$digest(); - expect(expect(element.find('.typeahead-item').length).to.be(scope.items.length)); - }); - - it('should default to showing the item itself in the list', function () { - scope.items.forEach((item, i) => { - expect(element.find('kbn-typeahead-item').eq(i).html()).to.be(item); - }); - }); - - it('should use a custom template if specified to show the item in the list', function () { - scope.items = [{ - label: 'foo', - value: 1 - }]; - scope.itemTemplate = '
      {{item.label}}
      '; - scope.$digest(); - expect(element.find('.label').html()).to.be(scope.items[0].label); - }); - }); -}); diff --git a/src/ui/public/typeahead/index.js b/src/ui/public/typeahead/index.js deleted file mode 100644 index 2237c60b66ef1..0000000000000 --- a/src/ui/public/typeahead/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import './typeahead'; diff --git a/src/ui/public/typeahead/typeahead.html b/src/ui/public/typeahead/typeahead.html deleted file mode 100644 index 39b1fa2b802a5..0000000000000 --- a/src/ui/public/typeahead/typeahead.html +++ /dev/null @@ -1,40 +0,0 @@ -
      - -
      -
      -
      - - -
      -
      -
      -
      diff --git a/src/ui/public/typeahead/typeahead.js b/src/ui/public/typeahead/typeahead.js deleted file mode 100644 index e2f173fee35ff..0000000000000 --- a/src/ui/public/typeahead/typeahead.js +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import template from './typeahead.html'; -import { uiModules } from '../modules'; -import { comboBoxKeyCodes } from '@elastic/eui'; -import '../directives/scroll_bottom'; -import './typeahead.less'; -import './typeahead_input'; -import './typeahead_item'; - -const { UP, DOWN, ENTER, TAB, ESCAPE } = comboBoxKeyCodes; -const typeahead = uiModules.get('kibana/typeahead'); - -typeahead.directive('kbnTypeahead', function () { - return { - template, - transclude: true, - restrict: 'E', - scope: { - items: '=', - itemTemplate: '=', - onSelect: '&', - onFocusChange: '&' - }, - bindToController: true, - controllerAs: 'typeahead', - controller: function ($scope, $element) { - this.isHidden = true; - this.selectedIndex = null; - this.elementID = $element.attr('id'); - - this.submit = () => { - const item = this.items[this.selectedIndex]; - this.onSelect({ item }); - this.selectedIndex = null; - }; - - this.selectPrevious = () => { - if (this.selectedIndex !== null && this.selectedIndex > 0) { - this.selectedIndex--; - } else { - this.selectedIndex = this.items.length - 1; - } - this.scrollSelectedIntoView(); - }; - - this.selectNext = () => { - if (this.selectedIndex !== null && this.selectedIndex < this.items.length - 1) { - this.selectedIndex++; - } else { - this.selectedIndex = 0; - } - this.scrollSelectedIntoView(); - }; - - this.scrollSelectedIntoView = () => { - const parent = $element.find('.typeahead-items')[0]; - const child = $element.find('.typeahead-item').eq(this.selectedIndex)[0]; - parent.scrollTop = Math.min(parent.scrollTop, child.offsetTop); - parent.scrollTop = Math.max(parent.scrollTop, child.offsetTop + child.offsetHeight - parent.offsetHeight); - }; - - this.isVisible = () => { - // Blur fires before click. If we only checked isFocused, then click events would never fire. - const isFocusedOrMousedOver = this.isFocused || this.isMousedOver; - return !this.isHidden && this.items && this.items.length > 0 && isFocusedOrMousedOver; - }; - - this.resetLimit = () => { - this.limit = 50; - }; - - this.increaseLimit = () => { - this.limit += 50; - }; - - this.onKeyDown = (event) => { - const { keyCode } = event; - - if (keyCode === ESCAPE) this.isHidden = true; - - if ([TAB, ENTER].includes(keyCode) && !this.hidden && this.selectedIndex !== null) { - event.preventDefault(); - this.submit(); - } else if (keyCode === UP && this.items.length > 0) { - event.preventDefault(); - this.isHidden = false; - this.selectPrevious(); - } else if (keyCode === DOWN && this.items.length > 0) { - event.preventDefault(); - this.isHidden = false; - this.selectNext(); - } else { - this.selectedIndex = null; - } - }; - - this.onKeyPress = () => { - this.isHidden = false; - }; - - this.onItemClick = () => { - this.submit(); - $scope.$broadcast('focus'); - $scope.$evalAsync(() => this.isHidden = false); - }; - - this.onFocus = () => { - this.isFocused = true; - this.isHidden = true; - this.resetLimit(); - }; - - this.onBlur = () => { - this.isFocused = false; - }; - - this.onMouseEnter = () => { - this.isMousedOver = true; - }; - - this.onMouseLeave = () => { - this.isMousedOver = false; - }; - - $scope.$watch('typeahead.selectedIndex', (newIndex) => { - this.onFocusChange({ $focusedItemID: newIndex !== null ? `${this.elementID}-typeahead-item-${newIndex}` : '' }); - }); - } - }; -}); diff --git a/src/ui/public/typeahead/typeahead.less b/src/ui/public/typeahead/typeahead.less deleted file mode 100644 index 94bd5ca32b15e..0000000000000 --- a/src/ui/public/typeahead/typeahead.less +++ /dev/null @@ -1,55 +0,0 @@ -@import (reference) "~ui/styles/variables"; -@import (reference) "~ui/styles/mixins"; - -.typeahead { - position: relative; - - .typeahead-popover { - border: 1px solid; - border-color: @typeahead-item-border; - color: @typeahead-item-color; - background-color: @typeahead-item-bg; - position: absolute; - top: 32px; - z-index: @zindex-typeahead; - box-shadow: 0px 4px 8px rgba(0,0,0,.1); - width: 100%; - border-radius: 4px; - - .typeahead-items { - max-height: 500px; - overflow-y: auto; - } - - .typeahead-item { - height: 32px; - line-height: 32px; - white-space: nowrap; - font-size: 12px; - vertical-align: middle; - } - - .typeahead-item:last-child { - border-bottom: 0px; - border-radius: 0 0 4px 4px; - } - - .typeahead-item:first-child { - border-bottom: 0px; - border-radius: 4px 4px 0 0; - } - - .typeahead-item.active { - background-color: @globalColorLightestGray; - } - } -} - -.inline-form .typeahead.visible .input-group { - > :first-child { - .border-bottom-radius(0); - } - > :last-child { - .border-bottom-radius(0); - } -} diff --git a/src/ui/public/typeahead/typeahead_input.js b/src/ui/public/typeahead/typeahead_input.js deleted file mode 100644 index b273426af2c42..0000000000000 --- a/src/ui/public/typeahead/typeahead_input.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { uiModules } from '../modules'; -const typeahead = uiModules.get('kibana/typeahead'); - -typeahead.directive('kbnTypeaheadInput', function () { - return { - restrict: 'A', - require: '^kbnTypeahead', - link: function ($scope, $el, $attr, typeahead) { - // disable browser autocomplete - $el.attr('autocomplete', 'off'); - - $el.on('focus', () => { - // For some reason if we don't have the $evalAsync in here, then blur events happen outside the angular lifecycle - $scope.$evalAsync(() => typeahead.onFocus()); - }); - - $el.on('blur', () => { - $scope.$evalAsync(() => typeahead.onBlur()); - }); - - $scope.$on('focus', () => { - $el.focus(); - }); - - $scope.$on('$destroy', () => { - $el.off(); - }); - } - }; -}); diff --git a/src/ui/public/typeahead/typeahead_item.js b/src/ui/public/typeahead/typeahead_item.js deleted file mode 100644 index c613aa3b9bd38..0000000000000 --- a/src/ui/public/typeahead/typeahead_item.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { uiModules } from '../modules'; -const typeahead = uiModules.get('kibana/typeahead'); - -typeahead.directive('kbnTypeaheadItem', function ($compile) { - return { - restrict: 'E', - scope: { - item: '=', - template: '=' - }, - link: (scope, element) => { - element.html(scope.template || '{{item}}'); - $compile(element.contents())(scope); - } - }; -}); diff --git a/src/ui/public/utils/__tests__/brush_event.test.js b/src/ui/public/utils/__tests__/brush_event.test.js index 4f6c221b8650a..701586bad9255 100644 --- a/src/ui/public/utils/__tests__/brush_event.test.js +++ b/src/ui/public/utils/__tests__/brush_event.test.js @@ -19,10 +19,11 @@ jest.mock('ui/chrome', () => ({ + getBasePath: () => `/some/base/path`, getUiSettingsClient: () => { return { get: (key) => { - switch(key) { + switch (key) { case 'timepicker:timeDefaults': return { from: 'now-15m', to: 'now', mode: 'quick' }; case 'timepicker:refreshIntervalDefaults': diff --git a/src/ui/public/utils/__tests__/cidr_mask.js b/src/ui/public/utils/__tests__/cidr_mask.js deleted file mode 100644 index bd2bbea23860e..0000000000000 --- a/src/ui/public/utils/__tests__/cidr_mask.js +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import expect from 'expect.js'; -import { CidrMask } from '../cidr_mask'; - -describe('CidrMask', function () { - it('should throw errors with invalid CIDR masks', function () { - expect(function () { - new CidrMask(); - }).to.throwError(); - - expect(function () { - new CidrMask(''); - }).to.throwError(); - - expect(function () { - new CidrMask('hello, world'); - }).to.throwError(); - - expect(function () { - new CidrMask('0.0.0.0'); - }).to.throwError(); - - expect(function () { - new CidrMask('0.0.0.0/0'); - }).to.throwError(); - - expect(function () { - new CidrMask('0.0.0.0/33'); - }).to.throwError(); - - expect(function () { - new CidrMask('256.0.0.0/32'); - }).to.throwError(); - - expect(function () { - new CidrMask('0.0.0.0/32/32'); - }).to.throwError(); - - expect(function () { - new CidrMask('1.2.3/1'); - }).to.throwError(); - }); - - it('should correctly grab IP address and prefix length', function () { - let mask = new CidrMask('0.0.0.0/1'); - expect(mask.initialAddress.toString()).to.be('0.0.0.0'); - expect(mask.prefixLength).to.be(1); - - mask = new CidrMask('128.0.0.1/31'); - expect(mask.initialAddress.toString()).to.be('128.0.0.1'); - expect(mask.prefixLength).to.be(31); - }); - - it('should calculate a range of IP addresses', function () { - let mask = new CidrMask('0.0.0.0/1'); - let range = mask.getRange(); - expect(range.from.toString()).to.be('0.0.0.0'); - expect(range.to.toString()).to.be('127.255.255.255'); - - mask = new CidrMask('1.2.3.4/2'); - range = mask.getRange(); - expect(range.from.toString()).to.be('0.0.0.0'); - expect(range.to.toString()).to.be('63.255.255.255'); - - mask = new CidrMask('67.129.65.201/27'); - range = mask.getRange(); - expect(range.from.toString()).to.be('67.129.65.192'); - expect(range.to.toString()).to.be('67.129.65.223'); - }); - - it('toString()', function () { - let mask = new CidrMask('.../1'); - expect(mask.toString()).to.be('0.0.0.0/1'); - - mask = new CidrMask('128.0.0.1/31'); - expect(mask.toString()).to.be('128.0.0.1/31'); - }); -}); diff --git a/src/ui/public/utils/__tests__/cidr_mask.ts b/src/ui/public/utils/__tests__/cidr_mask.ts new file mode 100644 index 0000000000000..5375552d0ad05 --- /dev/null +++ b/src/ui/public/utils/__tests__/cidr_mask.ts @@ -0,0 +1,82 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// @ts-ignore +import expect from 'expect.js'; +import { CidrMask } from '../cidr_mask'; + +describe('CidrMask', () => { + it('should throw errors with invalid CIDR masks', () => { + expect( + () => + // @ts-ignore + new CidrMask() + ).to.throwError(); + + expect(() => new CidrMask('')).to.throwError(); + + expect(() => new CidrMask('hello, world')).to.throwError(); + + expect(() => new CidrMask('0.0.0.0')).to.throwError(); + + expect(() => new CidrMask('0.0.0.0/0')).to.throwError(); + + expect(() => new CidrMask('0.0.0.0/33')).to.throwError(); + + expect(() => new CidrMask('256.0.0.0/32')).to.throwError(); + + expect(() => new CidrMask('0.0.0.0/32/32')).to.throwError(); + + expect(() => new CidrMask('1.2.3/1')).to.throwError(); + }); + + it('should correctly grab IP address and prefix length', () => { + let mask = new CidrMask('0.0.0.0/1'); + expect(mask.initialAddress.toString()).to.be('0.0.0.0'); + expect(mask.prefixLength).to.be(1); + + mask = new CidrMask('128.0.0.1/31'); + expect(mask.initialAddress.toString()).to.be('128.0.0.1'); + expect(mask.prefixLength).to.be(31); + }); + + it('should calculate a range of IP addresses', () => { + let mask = new CidrMask('0.0.0.0/1'); + let range = mask.getRange(); + expect(range.from.toString()).to.be('0.0.0.0'); + expect(range.to.toString()).to.be('127.255.255.255'); + + mask = new CidrMask('1.2.3.4/2'); + range = mask.getRange(); + expect(range.from.toString()).to.be('0.0.0.0'); + expect(range.to.toString()).to.be('63.255.255.255'); + + mask = new CidrMask('67.129.65.201/27'); + range = mask.getRange(); + expect(range.from.toString()).to.be('67.129.65.192'); + expect(range.to.toString()).to.be('67.129.65.223'); + }); + + it('toString()', () => { + let mask = new CidrMask('.../1'); + expect(mask.toString()).to.be('0.0.0.0/1'); + + mask = new CidrMask('128.0.0.1/31'); + expect(mask.toString()).to.be('128.0.0.1/31'); + }); +}); diff --git a/src/ui/public/utils/__tests__/ipv4_address.js b/src/ui/public/utils/__tests__/ipv4_address.js deleted file mode 100644 index 9fe29b5f70860..0000000000000 --- a/src/ui/public/utils/__tests__/ipv4_address.js +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import Ipv4Address from '../ipv4_address'; -import expect from 'expect.js'; - -describe('Ipv4Address', function () { - it('should throw errors with invalid IP addresses', function () { - expect(function () { - new Ipv4Address(); - }).to.throwError(); - - expect(function () { - new Ipv4Address(''); - }).to.throwError(); - - expect(function () { - new Ipv4Address('hello, world'); - }).to.throwError(); - - expect(function () { - new Ipv4Address('0.0.0'); - }).to.throwError(); - - expect(function () { - new Ipv4Address('256.0.0.0'); - }).to.throwError(); - - expect(function () { - new Ipv4Address('-1.0.0.0'); - }).to.throwError(); - - expect(function () { - new Ipv4Address(Number.MAX_SAFE_INTEGER); - }).to.throwError(); - }); - - it('should allow creation with an integer or string', function () { - expect(new Ipv4Address(2116932386).toString()).to.be(new Ipv4Address('126.45.211.34').toString()); - }); - - it('should correctly calculate the decimal representation of an IP address', function () { - let ipAddress = new Ipv4Address('0.0.0.0'); - expect(ipAddress.valueOf()).to.be(0); - - ipAddress = new Ipv4Address('0.0.0.1'); - expect(ipAddress.valueOf()).to.be(1); - - ipAddress = new Ipv4Address('126.45.211.34'); - expect(ipAddress.valueOf()).to.be(2116932386); - }); - - it('toString()', function () { - let ipAddress = new Ipv4Address('0.000.00000.1'); - expect(ipAddress.toString()).to.be('0.0.0.1'); - - ipAddress = new Ipv4Address('123.123.123.123'); - expect(ipAddress.toString()).to.be('123.123.123.123'); - }); -}); diff --git a/src/ui/public/utils/__tests__/ipv4_address.ts b/src/ui/public/utils/__tests__/ipv4_address.ts new file mode 100644 index 0000000000000..5e967da189e87 --- /dev/null +++ b/src/ui/public/utils/__tests__/ipv4_address.ts @@ -0,0 +1,65 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +// @ts-ignore +import expect from 'expect.js'; +import Ipv4Address from '../ipv4_address'; + +describe('Ipv4Address', () => { + it('should throw errors with invalid IP addresses', () => { + // @ts-ignore + expect(() => new Ipv4Address()).to.throwError(); + + expect(() => new Ipv4Address('')).to.throwError(); + + expect(() => new Ipv4Address('hello, world')).to.throwError(); + + expect(() => new Ipv4Address('0.0.0')).to.throwError(); + + expect(() => new Ipv4Address('256.0.0.0')).to.throwError(); + + expect(() => new Ipv4Address('-1.0.0.0')).to.throwError(); + + expect(() => new Ipv4Address(Number.MAX_SAFE_INTEGER)).to.throwError(); + }); + + it('should allow creation with an integer or string', () => { + expect(new Ipv4Address(2116932386).toString()).to.be( + new Ipv4Address('126.45.211.34').toString() + ); + }); + + it('should correctly calculate the decimal representation of an IP address', () => { + let ipAddress = new Ipv4Address('0.0.0.0'); + expect(ipAddress.valueOf()).to.be(0); + + ipAddress = new Ipv4Address('0.0.0.1'); + expect(ipAddress.valueOf()).to.be(1); + + ipAddress = new Ipv4Address('126.45.211.34'); + expect(ipAddress.valueOf()).to.be(2116932386); + }); + + it('toString()', () => { + let ipAddress = new Ipv4Address('0.000.00000.1'); + expect(ipAddress.toString()).to.be('0.0.0.1'); + + ipAddress = new Ipv4Address('123.123.123.123'); + expect(ipAddress.toString()).to.be('123.123.123.123'); + }); +}); diff --git a/src/ui/public/utils/base_object.js b/src/ui/public/utils/base_object.js deleted file mode 100644 index 1964caaeedd91..0000000000000 --- a/src/ui/public/utils/base_object.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import _ from 'lodash'; -import rison from 'rison-node'; -import angular from 'angular'; - -export function BaseObject(attributes) { - // Set the attributes or default to an empty object - _.assign(this, attributes); -} - -/** - * Returns the attributes for the object - * @returns {object} - */ -BaseObject.prototype.toObject = function () { - // return just the data. - return _.omit(this, function (value, key) { - return key.charAt(0) === '$' || key.charAt(0) === '_' || _.isFunction(value); - }); -}; - -/** - * Serialize the model to RISON - * @returns {string} - */ -BaseObject.prototype.toRISON = function () { - // Use Angular to remove the private vars, and JSON.stringify to serialize - return rison.encode(JSON.parse(angular.toJson(this))); -}; - -/** - * Serialize the model to JSON - * @returns {object} - */ -BaseObject.prototype.toJSON = function () { - return this.toObject(); -}; diff --git a/src/ui/public/utils/base_object.ts b/src/ui/public/utils/base_object.ts new file mode 100644 index 0000000000000..63c7ebf6de5bb --- /dev/null +++ b/src/ui/public/utils/base_object.ts @@ -0,0 +1,47 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import angular from 'angular'; +import _ from 'lodash'; +// @ts-ignore -- awaiting https://github.com/w33ble/rison-node/issues/1 +import rison from 'rison-node'; + +export class BaseObject { + // Set the attributes or default to an empty object + constructor(attributes: Record = {}) { + // Set the attributes or default to an empty object + _.assign(this, attributes); + } + + public toObject() { + // return just the data. + return _.omit(this, (value: any, key: string) => { + return key.charAt(0) === '$' || key.charAt(0) === '_' || _.isFunction(value); + }); + } + + public toRISON() { + // Use Angular to remove the private vars, and JSON.stringify to serialize + return rison.encode(JSON.parse(angular.toJson(this))); + } + + public toJSON() { + return this.toObject(); + } +} diff --git a/src/ui/public/utils/cidr_mask.js b/src/ui/public/utils/cidr_mask.js deleted file mode 100644 index 24408e0fc85fc..0000000000000 --- a/src/ui/public/utils/cidr_mask.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import Ipv4Address from './ipv4_address'; -const NUM_BITS = 32; - -function throwError(mask) { - throw Error('Invalid CIDR mask: ' + mask); -} - -export function CidrMask(mask) { - const splits = mask.split('\/'); - if (splits.length !== 2) throwError(mask); - this.initialAddress = new Ipv4Address(splits[0]); - this.prefixLength = Number(splits[1]); - if (this.prefixLength < 1 || this.prefixLength > NUM_BITS) throwError(mask); -} - -CidrMask.prototype.getRange = function () { - const variableBits = NUM_BITS - this.prefixLength; - const fromAddress = this.initialAddress.valueOf() >> variableBits << variableBits >>> 0; // >>> 0 coerces to unsigned - const numAddresses = Math.pow(2, variableBits); - return { - from: new Ipv4Address(fromAddress).toString(), - to: new Ipv4Address(fromAddress + numAddresses - 1).toString() - }; -}; - -CidrMask.prototype.toString = function () { - return this.initialAddress.toString() + '/' + this.prefixLength; -}; - diff --git a/src/ui/public/utils/cidr_mask.ts b/src/ui/public/utils/cidr_mask.ts new file mode 100644 index 0000000000000..531b5ae5412be --- /dev/null +++ b/src/ui/public/utils/cidr_mask.ts @@ -0,0 +1,57 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import Ipv4Address from './ipv4_address'; +const NUM_BITS = 32; + +function throwError(mask: string) { + throw Error('Invalid CIDR mask: ' + mask); +} + +export class CidrMask { + public readonly initialAddress: Ipv4Address; + public readonly prefixLength: number; + + constructor(mask: string) { + const splits = mask.split('/'); + if (splits.length !== 2) { + throwError(mask); + } + this.initialAddress = new Ipv4Address(splits[0]); + this.prefixLength = Number(splits[1]); + if (this.prefixLength < 1 || this.prefixLength > NUM_BITS) { + throwError(mask); + } + } + + public getRange() { + const variableBits = NUM_BITS - this.prefixLength; + // tslint:disable-next-line:no-bitwise + const fromAddress = ((this.initialAddress.valueOf() >> variableBits) << variableBits) >>> 0; // >>> 0 coerces to unsigned + const numAddresses = Math.pow(2, variableBits); + return { + from: new Ipv4Address(fromAddress).toString(), + to: new Ipv4Address(fromAddress + numAddresses - 1).toString(), + }; + } + + public toString() { + return this.initialAddress.toString() + '/' + this.prefixLength; + } +} diff --git a/src/ui/public/utils/collection.js b/src/ui/public/utils/collection.js deleted file mode 100644 index c3fda1648001d..0000000000000 --- a/src/ui/public/utils/collection.js +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import _ from 'lodash'; - -/** - * move an obj either up or down in the collection by - * injecting it either before/after the prev/next obj that - * satisfied the qualifier - * - * or, just from one index to another... - * - * @param {array} objs - the list to move the object within - * @param {number|any} obj - the object that should be moved, or the index that the object is currently at - * @param {number|boolean} below - the index to move the object to, or whether it should be moved up or down - * @param {function} qualifier - a lodash-y callback, object = _.where, string = _.pluck - * @return {array} - the objs argument - */ -export function move(objs, obj, below, qualifier) { - const origI = _.isNumber(obj) ? obj : objs.indexOf(obj); - if (origI === -1) return objs; - - if (_.isNumber(below)) { - // move to a specific index - objs.splice(below, 0, objs.splice(origI, 1)[0]); - return objs; - } - - below = !!below; - qualifier = _.callback(qualifier); - - const above = !below; - const finder = below ? _.findIndex : _.findLastIndex; - - // find the index of the next/previous obj that meets the qualifications - const targetI = finder(objs, function (otherAgg, otherI) { - if (below && otherI <= origI) return; - if (above && otherI >= origI) return; - return !!qualifier(otherAgg, otherI); - }); - - if (targetI === -1) return objs; - - // place the obj at it's new index - objs.splice(targetI, 0, objs.splice(origI, 1)[0]); -} - -/** - * Like _.groupBy, but allows specifying multiple groups for a - * single object. - * - * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a') - * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]} - * - * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a') - * // Object {'1,2,3': Array[1], '1,4': Array[1]} - * - * @param {array} collection - the list of values to organize - * @param {Function} callback - either a property name, or a callback. - * @return {object} - */ -export function organizeBy(collection, callback) { - const buckets = {}; - const prop = typeof callback === 'function' ? false : callback; - - function add(key, obj) { - if (!buckets[key]) buckets[key] = []; - buckets[key].push(obj); - } - - _.each(collection, function (obj) { - const keys = prop === false ? callback(obj) : obj[prop]; - - if (!Array.isArray(keys)) { - add(keys, obj); - return; - } - - let length = keys.length; - while (length-- > 0) { - add(keys[length], obj); - } - }); - - return buckets; -} - -/** - * Efficient and safe version of [].push(dest, source); - * - * @param {Array} source - the array to pull values from - * @param {Array} dest - the array to push values into - * @return {Array} dest - */ -export function pushAll(source, dest) { - const start = dest.length; - const adding = source.length; - - // allocate - http://goo.gl/e2i0S0 - dest.length = start + adding; - - // fill sparse positions - let i = -1; - while (++i < adding) dest[start + i] = source[i]; - - return dest; -} \ No newline at end of file diff --git a/src/ui/public/utils/collection.ts b/src/ui/public/utils/collection.ts new file mode 100644 index 0000000000000..61a7388575c93 --- /dev/null +++ b/src/ui/public/utils/collection.ts @@ -0,0 +1,141 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import _ from 'lodash'; + +/** + * move an obj either up or down in the collection by + * injecting it either before/after the prev/next obj that + * satisfied the qualifier + * + * or, just from one index to another... + * + * @param {array} objs - the list to move the object within + * @param {number|any} obj - the object that should be moved, or the index that the object is currently at + * @param {number|boolean} below - the index to move the object to, or whether it should be moved up or down + * @param {function} qualifier - a lodash-y callback, object = _.where, string = _.pluck + * @return {array} - the objs argument + */ +export function move( + objs: object[], + obj: object | number, + below: number | boolean, + qualifier: (object: object, index: number) => any +): object[] { + const origI = _.isNumber(obj) ? obj : objs.indexOf(obj); + if (origI === -1) { + return objs; + } + + if (_.isNumber(below)) { + // move to a specific index + objs.splice(below, 0, objs.splice(origI, 1)[0]); + return objs; + } + + below = !!below; + qualifier = _.callback(qualifier); + + const above = !below; + const finder = below ? _.findIndex : _.findLastIndex; + + // find the index of the next/previous obj that meets the qualifications + const targetI = finder(objs, (otherAgg, otherI) => { + if (below && otherI <= origI) { + return; + } + if (above && otherI >= origI) { + return; + } + return !!qualifier(otherAgg, otherI); + }); + + if (targetI === -1) { + return objs; + } + + // place the obj at it's new index + objs.splice(targetI, 0, objs.splice(origI, 1)[0]); + return objs; +} + +/** + * Like _.groupBy, but allows specifying multiple groups for a + * single object. + * + * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a') + * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]} + * + * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a') + * // Object {'1,2,3': Array[1], '1,4': Array[1]} + * + * @param {array} collection - the list of values to organize + * @param {Function} callback - either a property name, or a callback. + * @return {object} + */ +export function organizeBy(collection: object[], callback: (obj: object) => string | string) { + const buckets: { [key: string]: object[] } = {}; + const prop = typeof callback === 'function' ? false : callback; + + function add(key: string, obj: object) { + if (!buckets[key]) { + buckets[key] = []; + } + buckets[key].push(obj); + } + + _.each(collection, (obj: object) => { + const keys = prop === false ? callback(obj) : obj[prop]; + + if (!Array.isArray(keys)) { + add(keys, obj); + return; + } + + let length = keys.length; + while (length-- > 0) { + add(keys[length], obj); + } + }); + + return buckets; +} + +/** + * Efficient and safe version of [].push(dest, source); + * + * @param {Array} source - the array to pull values from + * @param {Array} dest - the array to push values into + * @return {Array} dest + */ +export function pushAll(source: any[], dest: any[]): any[] { + const start = dest.length; + const adding = source.length; + + // allocate - http://goo.gl/e2i0S0 + dest.length = start + adding; + + // fill sparse positions + let i = -1; + while (++i < adding) { + dest[start + i] = source[i]; + } + + return dest; +} diff --git a/src/ui/public/utils/find_by_param.js b/src/ui/public/utils/find_by_param.js deleted file mode 100644 index 403960fbcb43b..0000000000000 --- a/src/ui/public/utils/find_by_param.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import _ from 'lodash'; - -// given an object or array of objects, return the value of the passed param -// if the param is missing, return undefined -export function findByParam(values, param) { - if (Array.isArray(values)) { // point series chart - const index = _.findIndex(values, param); - if (index === -1) return; - return values[index][param]; - } - return values[param]; // pie chart -} diff --git a/src/ui/public/utils/find_by_param.ts b/src/ui/public/utils/find_by_param.ts new file mode 100644 index 0000000000000..de32fc955a8cd --- /dev/null +++ b/src/ui/public/utils/find_by_param.ts @@ -0,0 +1,38 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import _ from 'lodash'; + +interface AnyObject { + [key: string]: any; +} + +// given an object or array of objects, return the value of the passed param +// if the param is missing, return undefined +export function findByParam(values: AnyObject | AnyObject[], param: string) { + if (Array.isArray(values)) { + // point series chart + const index = _.findIndex(values, param); + if (index === -1) { + return; + } + return values[index][param]; + } + return values[param]; // pie chart +} diff --git a/src/ui/public/utils/ipv4_address.js b/src/ui/public/utils/ipv4_address.js deleted file mode 100644 index 950f3534758ec..0000000000000 --- a/src/ui/public/utils/ipv4_address.js +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -const NUM_BYTES = 4; -const BYTE_SIZE = 256; - -function throwError(ipAddress) { - throw Error('Invalid IPv4 address: ' + ipAddress); -} - -function isIntegerInRange(integer, min, max) { - return !isNaN(integer) - && integer >= min - && integer < max - && integer % 1 === 0; -} - -// eslint-disable-next-line @elastic/kibana-custom/no-default-export -export default function Ipv4Address(ipAddress) { - this.value = ipAddress; - - if (typeof ipAddress === 'string') { - this.value = 0; - - const bytes = ipAddress.split('.'); - if (bytes.length !== NUM_BYTES) throwError(ipAddress); - - for (let i = 0; i < bytes.length; i++) { - const byte = Number(bytes[i]); - if (!isIntegerInRange(byte, 0, BYTE_SIZE)) throwError(ipAddress); - this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte; - } - } - - if (!isIntegerInRange(this.value, 0, Math.pow(BYTE_SIZE, NUM_BYTES))) throwError(ipAddress); -} - -Ipv4Address.prototype.toString = function () { - let value = this.value; - const bytes = []; - for (let i = 0; i < NUM_BYTES; i++) { - bytes.unshift(value % 256); - value = Math.floor(value / 256); - } - return bytes.join('.'); -}; - -Ipv4Address.prototype.valueOf = function () { - return this.value; -}; \ No newline at end of file diff --git a/src/ui/public/utils/ipv4_address.ts b/src/ui/public/utils/ipv4_address.ts new file mode 100644 index 0000000000000..b8bf3917c471d --- /dev/null +++ b/src/ui/public/utils/ipv4_address.ts @@ -0,0 +1,76 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +const NUM_BYTES = 4; +const BYTE_SIZE = 256; + +function throwError(ipAddress: string | number) { + throw Error('Invalid IPv4 address: ' + ipAddress); +} + +function isIntegerInRange(integer: number, min: number, max: number) { + return ( + !isNaN(integer as number) && integer >= min && integer < max && (integer as number) % 1 === 0 + ); +} + +// eslint-disable-next-line @elastic/kibana-custom/no-default-export +// tslint:disable:no-default-export +export default class Ipv4Address { + private value: number; + + constructor(ipAddress: string | number) { + if (typeof ipAddress === 'string') { + this.value = 0; + + const bytes = ipAddress.split('.'); + if (bytes.length !== NUM_BYTES) { + throwError(ipAddress); + } + + for (let i = 0; i < bytes.length; i++) { + const byte = Number(bytes[i]); + if (!isIntegerInRange(byte, 0, BYTE_SIZE)) { + throwError(ipAddress); + } + this.value += Math.pow(BYTE_SIZE, NUM_BYTES - 1 - i) * byte; + } + } else { + this.value = ipAddress; + } + + if (!isIntegerInRange(this.value, 0, Math.pow(BYTE_SIZE, NUM_BYTES))) { + throwError(ipAddress); + } + } + + public toString() { + let value = this.value; + const bytes = []; + for (let i = 0; i < NUM_BYTES; i++) { + bytes.unshift(value % 256); + value = Math.floor(value / 256); + } + return bytes.join('.'); + } + + public valueOf() { + return this.value; + } +} diff --git a/src/ui/public/utils/key_map.js b/src/ui/public/utils/key_map.js deleted file mode 100644 index 75c0c39adddce..0000000000000 --- a/src/ui/public/utils/key_map.js +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export const keyMap = { - 8: 'backspace', - 9: 'tab', - 13: 'enter', - 16: 'shift', - 17: 'ctrl', - 18: 'alt', - 19: 'pause', - 20: 'capsLock', - 27: 'escape', - 32: 'space', - 33: 'pageUp', - 34: 'pageDown', - 35: 'end', - 36: 'home', - 37: 'left', - 38: 'up', - 39: 'right', - 40: 'down', - 45: 'insert', - 46: 'delete', - 48: '0', - 49: '1', - 50: '2', - 51: '3', - 52: '4', - 53: '5', - 54: '6', - 55: '7', - 56: '8', - 57: '9', - 65: 'a', - 66: 'b', - 67: 'c', - 68: 'd', - 69: 'e', - 70: 'f', - 71: 'g', - 72: 'h', - 73: 'i', - 74: 'j', - 75: 'k', - 76: 'l', - 77: 'm', - 78: 'n', - 79: 'o', - 80: 'p', - 81: 'q', - 82: 'r', - 83: 's', - 84: 't', - 85: 'u', - 86: 'v', - 87: 'w', - 88: 'x', - 89: 'y', - 90: 'z', - 91: 'leftWindowKey', - 92: 'rightWindowKey', - 93: 'selectKey', - 96: '0', - 97: '1', - 98: '2', - 99: '3', - 100: '4', - 101: '5', - 102: '6', - 103: '7', - 104: '8', - 105: '9', - 106: 'multiply', - 107: 'add', - 109: 'subtract', - 110: 'period', - 111: 'divide', - 112: 'f1', - 113: 'f2', - 114: 'f3', - 115: 'f4', - 116: 'f5', - 117: 'f6', - 118: 'f7', - 119: 'f8', - 120: 'f9', - 121: 'f10', - 122: 'f11', - 123: 'f12', - 144: 'numLock', - 145: 'scrollLock', - 186: 'semiColon', - 187: 'equalSign', - 188: 'comma', - 189: 'dash', - 190: 'period', - 191: 'forwardSlash', - 192: 'graveAccent', - 219: 'openBracket', - 220: 'backSlash', - 221: 'closeBracket', - 222: 'singleQuote', - 224: 'meta' -}; diff --git a/src/ui/public/utils/key_map.ts b/src/ui/public/utils/key_map.ts new file mode 100644 index 0000000000000..aac3c6b2db3e0 --- /dev/null +++ b/src/ui/public/utils/key_map.ts @@ -0,0 +1,121 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export const keyMap: { [key: number]: string } = { + 8: 'backspace', + 9: 'tab', + 13: 'enter', + 16: 'shift', + 17: 'ctrl', + 18: 'alt', + 19: 'pause', + 20: 'capsLock', + 27: 'escape', + 32: 'space', + 33: 'pageUp', + 34: 'pageDown', + 35: 'end', + 36: 'home', + 37: 'left', + 38: 'up', + 39: 'right', + 40: 'down', + 45: 'insert', + 46: 'delete', + 48: '0', + 49: '1', + 50: '2', + 51: '3', + 52: '4', + 53: '5', + 54: '6', + 55: '7', + 56: '8', + 57: '9', + 65: 'a', + 66: 'b', + 67: 'c', + 68: 'd', + 69: 'e', + 70: 'f', + 71: 'g', + 72: 'h', + 73: 'i', + 74: 'j', + 75: 'k', + 76: 'l', + 77: 'm', + 78: 'n', + 79: 'o', + 80: 'p', + 81: 'q', + 82: 'r', + 83: 's', + 84: 't', + 85: 'u', + 86: 'v', + 87: 'w', + 88: 'x', + 89: 'y', + 90: 'z', + 91: 'leftWindowKey', + 92: 'rightWindowKey', + 93: 'selectKey', + 96: '0', + 97: '1', + 98: '2', + 99: '3', + 100: '4', + 101: '5', + 102: '6', + 103: '7', + 104: '8', + 105: '9', + 106: 'multiply', + 107: 'add', + 109: 'subtract', + 110: 'period', + 111: 'divide', + 112: 'f1', + 113: 'f2', + 114: 'f3', + 115: 'f4', + 116: 'f5', + 117: 'f6', + 118: 'f7', + 119: 'f8', + 120: 'f9', + 121: 'f10', + 122: 'f11', + 123: 'f12', + 144: 'numLock', + 145: 'scrollLock', + 186: 'semiColon', + 187: 'equalSign', + 188: 'comma', + 189: 'dash', + 190: 'period', + 191: 'forwardSlash', + 192: 'graveAccent', + 219: 'openBracket', + 220: 'backSlash', + 221: 'closeBracket', + 222: 'singleQuote', + 224: 'meta', +}; diff --git a/src/ui/public/utils/migrateLegacyQuery.js b/src/ui/public/utils/migrateLegacyQuery.js deleted file mode 100644 index 9d09a3159e0a2..0000000000000 --- a/src/ui/public/utils/migrateLegacyQuery.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { has } from 'lodash'; - -/** - * Creates a standardized query object from old queries that were either strings or pure ES query DSL - * - * @param query - a legacy query, what used to be stored in SearchSource's query property - * @return Object - */ -export function migrateLegacyQuery(query) { - - // Lucene was the only option before, so language-less queries are all lucene - if (!has(query, 'language')) { - return { query: query, language: 'lucene' }; - } - - return query; -} diff --git a/src/ui/public/utils/migrate_legacy_query.ts b/src/ui/public/utils/migrate_legacy_query.ts new file mode 100644 index 0000000000000..4beccb38b2b9d --- /dev/null +++ b/src/ui/public/utils/migrate_legacy_query.ts @@ -0,0 +1,35 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { has } from 'lodash'; + +/** + * Creates a standardized query object from old queries that were either strings or pure ES query DSL + * + * @param query - a legacy query, what used to be stored in SearchSource's query property + * @return Object + */ +export function migrateLegacyQuery(query: object): object { + // Lucene was the only option before, so language-less queries are all lucene + if (!has(query, 'language')) { + return { query, language: 'lucene' }; + } + + return query; +} diff --git a/src/ui/public/utils/numeric.js b/src/ui/public/utils/numeric.js deleted file mode 100644 index fefc72687f295..0000000000000 --- a/src/ui/public/utils/numeric.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import _ from 'lodash'; - -export function isNumeric(v) { - return !_.isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !_.isNaN(parseFloat(v)))); -} diff --git a/src/ui/public/utils/numeric.ts b/src/ui/public/utils/numeric.ts new file mode 100644 index 0000000000000..1342498cf5dc3 --- /dev/null +++ b/src/ui/public/utils/numeric.ts @@ -0,0 +1,24 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import _ from 'lodash'; + +export function isNumeric(v: any): boolean { + return !_.isNaN(v) && (typeof v === 'number' || (!Array.isArray(v) && !_.isNaN(parseFloat(v)))); +} diff --git a/src/ui/public/utils/parse_es_interval.test.ts b/src/ui/public/utils/parse_es_interval.test.ts deleted file mode 100644 index 05b29a5fb69e7..0000000000000 --- a/src/ui/public/utils/parse_es_interval.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { parseEsInterval } from './parse_es_interval'; - -describe('parseEsInterval', () => { - it('should correctly parse an interval containing unit and single value', () => { - expect(parseEsInterval('1ms')).toEqual({ value: 1, unit: 'ms', type: 'fixed' }); - expect(parseEsInterval('1s')).toEqual({ value: 1, unit: 's', type: 'fixed' }); - expect(parseEsInterval('1m')).toEqual({ value: 1, unit: 'm', type: 'calendar' }); - expect(parseEsInterval('1h')).toEqual({ value: 1, unit: 'h', type: 'calendar' }); - expect(parseEsInterval('1d')).toEqual({ value: 1, unit: 'd', type: 'calendar' }); - expect(parseEsInterval('1w')).toEqual({ value: 1, unit: 'w', type: 'calendar' }); - expect(parseEsInterval('1M')).toEqual({ value: 1, unit: 'M', type: 'calendar' }); - expect(parseEsInterval('1y')).toEqual({ value: 1, unit: 'y', type: 'calendar' }); - }); - - it('should correctly parse an interval containing unit and multiple value', () => { - expect(parseEsInterval('250ms')).toEqual({ value: 250, unit: 'ms', type: 'fixed' }); - expect(parseEsInterval('90s')).toEqual({ value: 90, unit: 's', type: 'fixed' }); - expect(parseEsInterval('60m')).toEqual({ value: 60, unit: 'm', type: 'fixed' }); - expect(parseEsInterval('12h')).toEqual({ value: 12, unit: 'h', type: 'fixed' }); - expect(parseEsInterval('7d')).toEqual({ value: 7, unit: 'd', type: 'fixed' }); - }); - - it('should throw an error for intervals containing calendar unit and multiple value', () => { - expect(() => parseEsInterval('4w')).toThrowError(); - expect(() => parseEsInterval('12M')).toThrowError(); - expect(() => parseEsInterval('10y')).toThrowError(); - }); - - it('should throw an error for invalid interval formats', () => { - expect(() => parseEsInterval('1')).toThrowError(); - expect(() => parseEsInterval('h')).toThrowError(); - expect(() => parseEsInterval('0m')).toThrowError(); - expect(() => parseEsInterval('0.5h')).toThrowError(); - }); -}); diff --git a/src/ui/public/utils/parse_es_interval.ts b/src/ui/public/utils/parse_es_interval.ts deleted file mode 100644 index 984f7e278d4fb..0000000000000 --- a/src/ui/public/utils/parse_es_interval.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -import dateMath from '@kbn/datemath'; - -const ES_INTERVAL_STRING_REGEX = new RegExp( - '^([1-9][0-9]*)\\s*(' + dateMath.units.join('|') + ')$' -); - -/** - * Extracts interval properties from an ES interval string. Disallows unrecognized interval formats - * and fractional values. Converts some intervals from "calendar" to "fixed" when the number of - * units is larger than 1, and throws an error for others. - * - * Conversion rules: - * - * | Interval | Single unit type | Multiple units type | - * | -------- | ---------------- | ------------------- | - * | ms | fixed | fixed | - * | s | fixed | fixed | - * | m | fixed | fixed | - * | h | calendar | fixed | - * | d | calendar | fixed | - * | w | calendar | N/A - disallowed | - * | M | calendar | N/A - disallowed | - * | y | calendar | N/A - disallowed | - * - */ -export function parseEsInterval(interval: string): { value: number; unit: string; type: string } { - const matches = String(interval) - .trim() - .match(ES_INTERVAL_STRING_REGEX); - - if (!matches) { - throw Error(`Invalid interval format: ${interval}`); - } - - const value = matches && parseFloat(matches[1]); - const unit = matches && matches[2]; - const type = unit && dateMath.unitsMap[unit].type; - - if (type === 'calendar' && value !== 1) { - throw Error(`Invalid calendar interval: ${interval}, value must be 1`); - } - - return { - value, - unit, - type: (type === 'mixed' && value === 1) || type === 'calendar' ? 'calendar' : 'fixed', - }; -} diff --git a/src/ui/public/utils/parse_es_interval/index.ts b/src/ui/public/utils/parse_es_interval/index.ts new file mode 100644 index 0000000000000..152037138072f --- /dev/null +++ b/src/ui/public/utils/parse_es_interval/index.ts @@ -0,0 +1,22 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export { parseEsInterval, ParsedInterval } from './parse_es_interval'; +export { InvalidEsCalendarIntervalError } from './invalid_es_calendar_interval_error'; +export { InvalidEsIntervalFormatError } from './invalid_es_interval_format_error'; diff --git a/src/ui/public/utils/parse_es_interval/invalid_es_calendar_interval_error.ts b/src/ui/public/utils/parse_es_interval/invalid_es_calendar_interval_error.ts new file mode 100644 index 0000000000000..cf4844944e5df --- /dev/null +++ b/src/ui/public/utils/parse_es_interval/invalid_es_calendar_interval_error.ts @@ -0,0 +1,52 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { Unit } from '@kbn/datemath'; +import { i18n } from '@kbn/i18n'; + +export class InvalidEsCalendarIntervalError extends Error { + constructor( + public readonly interval: string, + public readonly value: number, + public readonly unit: Unit, + public readonly type: string + ) { + super( + i18n.translate('common.ui.parseEsInterval.invalidEsCalendarIntervalErrorMessage', { + defaultMessage: 'Invalid calendar interval: {interval}, value must be 1', + values: { interval }, + }) + ); + + this.name = 'InvalidEsCalendarIntervalError'; + this.value = value; + this.unit = unit; + this.type = type; + + // captureStackTrace is only available in the V8 engine, so any browser using + // a different JS engine won't have access to this method. + if (Error.captureStackTrace) { + Error.captureStackTrace(this, InvalidEsCalendarIntervalError); + } + + // Babel doesn't support traditional `extends` syntax for built-in classes. + // https://babeljs.io/docs/en/caveats/#classes + Object.setPrototypeOf(this, InvalidEsCalendarIntervalError.prototype); + } +} diff --git a/src/ui/public/utils/parse_es_interval/invalid_es_interval_format_error.ts b/src/ui/public/utils/parse_es_interval/invalid_es_interval_format_error.ts new file mode 100644 index 0000000000000..ac6b85f447b29 --- /dev/null +++ b/src/ui/public/utils/parse_es_interval/invalid_es_interval_format_error.ts @@ -0,0 +1,43 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { i18n } from '@kbn/i18n'; + +export class InvalidEsIntervalFormatError extends Error { + constructor(public readonly interval: string) { + super( + i18n.translate('common.ui.parseEsInterval.invalidEsIntervalFormatErrorMessage', { + defaultMessage: 'Invalid interval format: {interval}', + values: { interval }, + }) + ); + + this.name = 'InvalidEsIntervalFormatError'; + + // captureStackTrace is only available in the V8 engine, so any browser using + // a different JS engine won't have access to this method. + if (Error.captureStackTrace) { + Error.captureStackTrace(this, InvalidEsIntervalFormatError); + } + + // Babel doesn't support traditional `extends` syntax for built-in classes. + // https://babeljs.io/docs/en/caveats/#classes + Object.setPrototypeOf(this, InvalidEsIntervalFormatError.prototype); + } +} diff --git a/src/ui/public/utils/parse_es_interval/parse_es_interval.test.ts b/src/ui/public/utils/parse_es_interval/parse_es_interval.test.ts new file mode 100644 index 0000000000000..c18ff4c7acead --- /dev/null +++ b/src/ui/public/utils/parse_es_interval/parse_es_interval.test.ts @@ -0,0 +1,69 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { InvalidEsCalendarIntervalError } from './invalid_es_calendar_interval_error'; +import { InvalidEsIntervalFormatError } from './invalid_es_interval_format_error'; +import { parseEsInterval } from './parse_es_interval'; + +describe('parseEsInterval', () => { + it('should correctly parse an interval containing unit and single value', () => { + expect(parseEsInterval('1ms')).toEqual({ value: 1, unit: 'ms', type: 'fixed' }); + expect(parseEsInterval('1s')).toEqual({ value: 1, unit: 's', type: 'fixed' }); + expect(parseEsInterval('1m')).toEqual({ value: 1, unit: 'm', type: 'calendar' }); + expect(parseEsInterval('1h')).toEqual({ value: 1, unit: 'h', type: 'calendar' }); + expect(parseEsInterval('1d')).toEqual({ value: 1, unit: 'd', type: 'calendar' }); + expect(parseEsInterval('1w')).toEqual({ value: 1, unit: 'w', type: 'calendar' }); + expect(parseEsInterval('1M')).toEqual({ value: 1, unit: 'M', type: 'calendar' }); + expect(parseEsInterval('1y')).toEqual({ value: 1, unit: 'y', type: 'calendar' }); + }); + + it('should correctly parse an interval containing unit and multiple value', () => { + expect(parseEsInterval('250ms')).toEqual({ value: 250, unit: 'ms', type: 'fixed' }); + expect(parseEsInterval('90s')).toEqual({ value: 90, unit: 's', type: 'fixed' }); + expect(parseEsInterval('60m')).toEqual({ value: 60, unit: 'm', type: 'fixed' }); + expect(parseEsInterval('12h')).toEqual({ value: 12, unit: 'h', type: 'fixed' }); + expect(parseEsInterval('7d')).toEqual({ value: 7, unit: 'd', type: 'fixed' }); + }); + + it('should throw a InvalidEsCalendarIntervalError for intervals containing calendar unit and multiple value', () => { + const intervals = ['4w', '12M', '10y']; + expect.assertions(intervals.length); + + intervals.forEach(interval => { + try { + parseEsInterval(interval); + } catch (error) { + expect(error instanceof InvalidEsCalendarIntervalError).toBe(true); + } + }); + }); + + it('should throw a InvalidEsIntervalFormatError for invalid interval formats', () => { + const intervals = ['1', 'h', '0m', '0.5h']; + expect.assertions(intervals.length); + + intervals.forEach(interval => { + try { + parseEsInterval(interval); + } catch (error) { + expect(error instanceof InvalidEsIntervalFormatError).toBe(true); + } + }); + }); +}); diff --git a/src/ui/public/utils/parse_es_interval/parse_es_interval.ts b/src/ui/public/utils/parse_es_interval/parse_es_interval.ts new file mode 100644 index 0000000000000..657ba5f93ac0b --- /dev/null +++ b/src/ui/public/utils/parse_es_interval/parse_es_interval.ts @@ -0,0 +1,75 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import dateMath, { Unit } from '@kbn/datemath'; + +import { InvalidEsCalendarIntervalError } from './invalid_es_calendar_interval_error'; +import { InvalidEsIntervalFormatError } from './invalid_es_interval_format_error'; + +const ES_INTERVAL_STRING_REGEX = new RegExp( + '^([1-9][0-9]*)\\s*(' + dateMath.units.join('|') + ')$' +); + +export type ParsedInterval = ReturnType; + +/** + * Extracts interval properties from an ES interval string. Disallows unrecognized interval formats + * and fractional values. Converts some intervals from "calendar" to "fixed" when the number of + * units is larger than 1, and throws an error for others. + * + * Conversion rules: + * + * | Interval | Single unit type | Multiple units type | + * | -------- | ---------------- | ------------------- | + * | ms | fixed | fixed | + * | s | fixed | fixed | + * | m | calendar | fixed | + * | h | calendar | fixed | + * | d | calendar | fixed | + * | w | calendar | N/A - disallowed | + * | M | calendar | N/A - disallowed | + * | y | calendar | N/A - disallowed | + * + */ +export function parseEsInterval(interval: string) { + const matches = String(interval) + .trim() + .match(ES_INTERVAL_STRING_REGEX); + + if (!matches) { + throw new InvalidEsIntervalFormatError(interval); + } + + const value = parseFloat(matches[1]); + const unit = matches[2] as Unit; + const type = dateMath.unitsMap[unit].type; + + if (type === 'calendar' && value !== 1) { + throw new InvalidEsCalendarIntervalError(interval, value, unit, type); + } + + return { + value, + unit, + type: + (type === 'mixed' && value === 1) || type === 'calendar' + ? ('calendar' as 'calendar') + : ('fixed' as 'fixed'), + }; +} diff --git a/src/ui/public/utils/sort_prefix_first.js b/src/ui/public/utils/sort_prefix_first.js deleted file mode 100644 index 4ed30fa21f393..0000000000000 --- a/src/ui/public/utils/sort_prefix_first.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { partition } from 'lodash'; - -export function sortPrefixFirst(array, prefix, property) { - if (!prefix) return array; - const lowerCasePrefix = ('' + prefix).toLowerCase(); - - const partitions = partition(array, entry => { - const value = ('' + (property ? entry[property] : entry)).toLowerCase(); - return value.startsWith(lowerCasePrefix); - }); - return [ ...partitions[0], ...partitions[1] ]; -} diff --git a/src/ui/public/utils/sort_prefix_first.ts b/src/ui/public/utils/sort_prefix_first.ts new file mode 100644 index 0000000000000..4d1a8d7f39866 --- /dev/null +++ b/src/ui/public/utils/sort_prefix_first.ts @@ -0,0 +1,33 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { partition } from 'lodash'; + +export function sortPrefixFirst(array: any[], prefix?: string | number, property?: string): any[] { + if (!prefix) { + return array; + } + const lowerCasePrefix = ('' + prefix).toLowerCase(); + + const partitions = partition(array, entry => { + const value = ('' + (property ? entry[property] : entry)).toLowerCase(); + return value.startsWith(lowerCasePrefix); + }); + return [...partitions[0], ...partitions[1]]; +} diff --git a/src/ui/public/utils/string_utils.js b/src/ui/public/utils/string_utils.js deleted file mode 100644 index 9d194b6e89bf1..0000000000000 --- a/src/ui/public/utils/string_utils.js +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export class StringUtils { - - /** - * Returns a version of the string with the first letter capitalized. - * @param str {string} - * @returns {string} - */ - static upperFirst(str) { - return str ? str.charAt(0).toUpperCase() + str.slice(1) : ''; - } -} diff --git a/src/ui/public/utils/string_utils.ts b/src/ui/public/utils/string_utils.ts new file mode 100644 index 0000000000000..22a57aeb07933 --- /dev/null +++ b/src/ui/public/utils/string_utils.ts @@ -0,0 +1,29 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +export class StringUtils { + /** + * Returns a version of the string with the first letter capitalized. + * @param str {string} + * @returns {string} + */ + public static upperFirst(str: string): string { + return str ? str.charAt(0).toUpperCase() + str.slice(1) : ''; + } +} diff --git a/src/ui/public/utils/subscribe_with_scope.test.ts b/src/ui/public/utils/subscribe_with_scope.test.ts new file mode 100644 index 0000000000000..c65fa26d7fe17 --- /dev/null +++ b/src/ui/public/utils/subscribe_with_scope.test.ts @@ -0,0 +1,154 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +const mockFatalError = jest.fn(); +jest.mock('ui/notify/fatal_error', () => ({ + fatalError: mockFatalError, +})); + +import * as Rx from 'rxjs'; +import { subscribeWithScope } from './subscribe_with_scope'; + +let $rootScope: Scope; + +class Scope { + public $$phase?: string; + public $root = $rootScope; + public $apply = jest.fn((fn: () => void) => fn()); +} + +$rootScope = new Scope(); + +afterEach(() => { + jest.clearAllMocks(); +}); + +it('subscribes to the passed observable, returns subscription', () => { + const $scope = new Scope(); + + const unsubSpy = jest.fn(); + const subSpy = jest.fn(() => unsubSpy); + const observable = new Rx.Observable(subSpy); + + const subscription = subscribeWithScope($scope as any, observable); + expect(subSpy).toHaveBeenCalledTimes(1); + expect(unsubSpy).not.toHaveBeenCalled(); + + subscription.unsubscribe(); + + expect(subSpy).toHaveBeenCalledTimes(1); + expect(unsubSpy).toHaveBeenCalledTimes(1); +}); + +it('calls observer.next() if already in a digest cycle, wraps in $scope.$apply if not', () => { + const subject = new Rx.Subject(); + const nextSpy = jest.fn(); + const $scope = new Scope(); + + subscribeWithScope($scope as any, subject, { next: nextSpy }); + + subject.next(); + expect($scope.$apply).toHaveBeenCalledTimes(1); + expect(nextSpy).toHaveBeenCalledTimes(1); + + jest.clearAllMocks(); + + $rootScope.$$phase = '$digest'; + subject.next(); + expect($scope.$apply).not.toHaveBeenCalled(); + expect(nextSpy).toHaveBeenCalledTimes(1); +}); + +it('reports fatalError if observer.next() throws', () => { + const $scope = new Scope(); + subscribeWithScope($scope as any, Rx.of(undefined), { + next() { + throw new Error('foo bar'); + }, + }); + + expect(mockFatalError.mock.calls).toMatchInlineSnapshot(` +Array [ + Array [ + [Error: foo bar], + ], +] +`); +}); + +it('reports fatal error if observer.error is not defined and observable errors', () => { + const $scope = new Scope(); + const error = new Error('foo'); + error.stack = `${error.message}\n---stack trace ---`; + subscribeWithScope($scope as any, Rx.throwError(error)); + + expect(mockFatalError.mock.calls).toMatchInlineSnapshot(` +Array [ + Array [ + [Error: Uncaught error in subscribeWithScope(): foo +---stack trace ---], + ], +] +`); +}); + +it('reports fatal error if observer.error throws', () => { + const $scope = new Scope(); + subscribeWithScope($scope as any, Rx.throwError(new Error('foo')), { + error: () => { + throw new Error('foo'); + }, + }); + + expect(mockFatalError.mock.calls).toMatchInlineSnapshot(` +Array [ + Array [ + [Error: foo], + ], +] +`); +}); + +it('does not report fatal error if observer.error handles the error', () => { + const $scope = new Scope(); + subscribeWithScope($scope as any, Rx.throwError(new Error('foo')), { + error: () => { + // noop, swallow error + }, + }); + + expect(mockFatalError.mock.calls).toEqual([]); +}); + +it('reports fatal error if observer.complete throws', () => { + const $scope = new Scope(); + subscribeWithScope($scope as any, Rx.EMPTY, { + complete: () => { + throw new Error('foo'); + }, + }); + + expect(mockFatalError.mock.calls).toMatchInlineSnapshot(` +Array [ + Array [ + [Error: foo], + ], +] +`); +}); diff --git a/src/ui/public/utils/subscribe_with_scope.ts b/src/ui/public/utils/subscribe_with_scope.ts new file mode 100644 index 0000000000000..b179c07cbcd1b --- /dev/null +++ b/src/ui/public/utils/subscribe_with_scope.ts @@ -0,0 +1,76 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { IScope } from 'angular'; +import * as Rx from 'rxjs'; +import { fatalError } from 'ui/notify/fatal_error'; + +function callInDigest($scope: IScope, fn: (...args: T) => void, ...args: T) { + try { + // this is terrible, but necessary to synchronously deliver subscription values + // to angular scopes. This is required by some APIs, like the `config` service, + // and beneficial for root level directives where additional digest cycles make + // kibana sluggish to load. + // + // If you copy this code elsewhere you better have a good reason :) + if ($scope.$root.$$phase) { + fn(...args); + } else { + $scope.$apply(() => fn(...args)); + } + } catch (error) { + fatalError(error); + } +} + +/** + * Subscribe to an observable at a $scope, ensuring that the digest cycle + * is run for subscriber hooks and routing errors to fatalError if not handled. + */ +export function subscribeWithScope( + $scope: IScope, + observable: Rx.Observable, + observer?: Rx.PartialObserver +) { + return observable.subscribe({ + next(value) { + if (observer && observer.next) { + callInDigest($scope, observer.next, value); + } + }, + error(error) { + callInDigest($scope, () => { + if (observer && observer.error) { + observer.error(error); + } else { + throw new Error( + `Uncaught error in subscribeWithScope(): ${ + error ? error.stack || error.message : error + }` + ); + } + }); + }, + complete() { + if (observer && observer.complete) { + callInDigest($scope, observer.complete); + } + }, + }); +} diff --git a/src/ui/public/vis/__tests__/_vis.js b/src/ui/public/vis/__tests__/_vis.js index a5765b8b8fe94..f40e88ec99a7b 100644 --- a/src/ui/public/vis/__tests__/_vis.js +++ b/src/ui/public/vis/__tests__/_vis.js @@ -24,8 +24,6 @@ import expect from 'expect.js'; import { VisProvider } from '..'; import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern'; import { VisTypesRegistryProvider } from '../../registry/vis_types'; -import { DataAdapter, RequestAdapter } from '../../inspector/adapters'; -import { Inspector } from '../../inspector/inspector'; describe('Vis Class', function () { let indexPattern; @@ -118,145 +116,6 @@ describe('Vis Class', function () { }); }); - describe('inspector', () => { - - describe('hasInspector()', () => { - it('should forward to inspectors hasInspector', () => { - const vis = new Vis(indexPattern, state({ - inspectorAdapters: { - data: true, - requests: true, - } - })); - sinon.spy(Inspector, 'isAvailable'); - vis.hasInspector(); - expect(Inspector.isAvailable.calledOnce).to.be(true); - const adapters = Inspector.isAvailable.lastCall.args[0]; - expect(adapters.data).to.be.a(DataAdapter); - expect(adapters.requests).to.be.a(RequestAdapter); - }); - - it('should return hasInspectors result', () => { - const vis = new Vis(indexPattern, state({})); - const stub = sinon.stub(Inspector, 'isAvailable'); - stub.returns(true); - expect(vis.hasInspector()).to.be(true); - stub.returns(false); - expect(vis.hasInspector()).to.be(false); - }); - - afterEach(() => { - Inspector.isAvailable.restore(); - }); - }); - - describe('openInspector()', () => { - - beforeEach(() => { - sinon.stub(Inspector, 'open'); - }); - - it('should call openInspector with all attached inspectors', () => { - const Foodapter = class {}; - const vis = new Vis(indexPattern, state({ - inspectorAdapters: { - data: true, - custom: { - foo: Foodapter - } - } - })); - vis.openInspector(); - expect(Inspector.open.calledOnce).to.be(true); - const adapters = Inspector.open.lastCall.args[0]; - expect(adapters).to.be(vis.API.inspectorAdapters); - }); - - it('should pass the vis title to the openInspector call', () => { - const vis = new Vis(indexPattern, { ...state(), title: 'beautifulVis' }); - vis.openInspector(); - expect(Inspector.open.calledOnce).to.be(true); - const params = Inspector.open.lastCall.args[1]; - expect(params.title).to.be('beautifulVis'); - }); - - afterEach(() => { - Inspector.open.restore(); - }); - }); - - describe('inspectorAdapters', () => { - - it('should register none for none requestHandler', () => { - const vis = new Vis(indexPattern, state({ requestHandler: 'none' })); - expect(vis.API.inspectorAdapters).to.eql({}); - }); - - it('should attach data and request handler for courier', () => { - const vis = new Vis(indexPattern, state({ requestHandler: 'courier' })); - expect(vis.API.inspectorAdapters.data).to.be.a(DataAdapter); - expect(vis.API.inspectorAdapters.requests).to.be.a(RequestAdapter); - }); - - it('should allow enabling data adapter manually', () => { - const vis = new Vis(indexPattern, state({ - requestHandler: 'none', - inspectorAdapters: { - data: true, - } - })); - expect(vis.API.inspectorAdapters.data).to.be.a(DataAdapter); - }); - - it('should allow enabling requests adapter manually', () => { - const vis = new Vis(indexPattern, state({ - requestHandler: 'none', - inspectorAdapters: { - requests: true, - } - })); - expect(vis.API.inspectorAdapters.requests).to.be.a(RequestAdapter); - }); - - it('should allow adding custom inspector adapters via the custom key', () => { - const Foodapter = class {}; - const Bardapter = class {}; - const vis = new Vis(indexPattern, state({ - requestHandler: 'none', - inspectorAdapters: { - custom: { - foo: Foodapter, - bar: Bardapter, - } - } - })); - expect(vis.API.inspectorAdapters.foo).to.be.a(Foodapter); - expect(vis.API.inspectorAdapters.bar).to.be.a(Bardapter); - }); - - it('should not share adapter instances between vis instances', () => { - const Foodapter = class {}; - const visState = state({ - inspectorAdapters: { - data: true, - custom: { - foo: Foodapter - } - } - }); - const vis1 = new Vis(indexPattern, visState); - const vis2 = new Vis(indexPattern, visState); - expect(vis1.API.inspectorAdapters.foo).to.be.a(Foodapter); - expect(vis2.API.inspectorAdapters.foo).to.be.a(Foodapter); - expect(vis1.API.inspectorAdapters.foo).not.to.be(vis2.API.inspectorAdapters.foo); - expect(vis1.API.inspectorAdapters.data).to.be.a(DataAdapter); - expect(vis2.API.inspectorAdapters.data).to.be.a(DataAdapter); - expect(vis1.API.inspectorAdapters.data).not.to.be(vis2.API.inspectorAdapters.data); - }); - }); - - }); - describe('vis addFilter method', () => { let aggConfig; let data; diff --git a/src/ui/public/vis/_index.scss b/src/ui/public/vis/_index.scss index 92d0edf345f0b..df72751181ac7 100644 --- a/src/ui/public/vis/_index.scss +++ b/src/ui/public/vis/_index.scss @@ -1,2 +1,3 @@ @import './editors/components/index'; @import './editors/default/index'; +@import './map/index'; diff --git a/src/ui/public/vis/agg_config.js b/src/ui/public/vis/agg_config.js index 881a3457905a8..6832d3d694fdc 100644 --- a/src/ui/public/vis/agg_config.js +++ b/src/ui/public/vis/agg_config.js @@ -26,6 +26,7 @@ import _ from 'lodash'; import { fieldFormats } from '../registry/field_formats'; +import { i18n } from '@kbn/i18n'; class AggConfig { @@ -265,8 +266,11 @@ class AggConfig { } if (!this.type) return ''; - let pre = percentageMode ? 'Percentage of ' : ''; - return pre += this.type.makeLabel(this); + return percentageMode ? + i18n.translate('common.ui.vis.aggConfig.percentageOfLabel', { + defaultMessage: 'Percentage of {label}', + values: { label: this.type.makeLabel(this) }, + }) : `${this.type.makeLabel(this)}`; } getIndexPattern() { diff --git a/src/ui/public/vis/default_feedback_message.js b/src/ui/public/vis/default_feedback_message.js index 90e309b161b28..f840ba961b9c3 100644 --- a/src/ui/public/vis/default_feedback_message.js +++ b/src/ui/public/vis/default_feedback_message.js @@ -17,5 +17,11 @@ * under the License. */ -export const defaultFeedbackMessage = `Have feedback? Please create an issue in -GitHub.`; +import { i18n } from '@kbn/i18n'; + +export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage', + { + defaultMessage: 'Have feedback? Please create an issue in {link}.', + values: { link: 'GitHub' } + } +); diff --git a/src/ui/public/vis/editors/default/_default.scss b/src/ui/public/vis/editors/default/_default.scss index 18015462121b5..b1de3b8343e21 100644 --- a/src/ui/public/vis/editors/default/_default.scss +++ b/src/ui/public/vis/editors/default/_default.scss @@ -77,23 +77,7 @@ */ .visEditor__resizer { - display: flex; - flex: 0 0 $vis-editor-resizer-width; - width: $vis-editor-resizer-width; - cursor: ew-resize; - background-color: $euiColorLightestShade; - align-items: center; - margin: 0; - user-select: none; - - &:hover { - background-color: tintOrShade($euiColorPrimary, 80%, 60%); - } - - &.active { - background-color: $euiColorPrimary; - color: $euiColorEmptyShade; - } + @include kibana-resizer($vis-editor-resizer-width); @include euiBreakpoint('xs', 's', 'm') { display: none; @@ -117,7 +101,8 @@ } .visualize { - @include flex-parent(); + display: flex; + flex-direction: column; flex: 1 1 100%; } diff --git a/src/ui/public/vis/editors/default/advanced_toggle.html b/src/ui/public/vis/editors/default/advanced_toggle.html index d5d7a7ea24057..cd4ca036906c5 100644 --- a/src/ui/public/vis/editors/default/advanced_toggle.html +++ b/src/ui/public/vis/editors/default/advanced_toggle.html @@ -1,6 +1,10 @@ diff --git a/src/ui/public/vis/editors/default/agg.html b/src/ui/public/vis/editors/default/agg.html index baba3554a9c3b..a303a19aeaab7 100644 --- a/src/ui/public/vis/editors/default/agg.html +++ b/src/ui/public/vis/editors/default/agg.html @@ -3,7 +3,7 @@
      diff --git a/src/ui/public/vis/editors/default/agg_group.html b/src/ui/public/vis/editors/default/agg_group.html index a1718f72b351e..69320f91105e5 100644 --- a/src/ui/public/vis/editors/default/agg_group.html +++ b/src/ui/public/vis/editors/default/agg_group.html @@ -1,6 +1,6 @@

      + + + { + if (bucket.sample && bucket.y > 0) { + history.replace({ + ...location, + search: fromQuery({ + ...toQuery(location.search), + transactionId: bucket.sample.transactionId, + traceId: bucket.sample.traceId + }) + }); + } + }} + formatX={timeFormatter} + formatYShort={this.formatYShort} + formatYLong={this.formatYLong} + verticalLineHover={(bucket: IChartPoint) => + bucket.y > 0 && !bucket.sample + } + backgroundHover={(bucket: IChartPoint) => + bucket.y > 0 && bucket.sample + } + tooltipHeader={(bucket: IChartPoint) => + `${timeFormatter(bucket.x0, { withUnit: false })} - ${timeFormatter( + bucket.x, + { withUnit: false } + )} ${unit}` + } + tooltipFooter={(bucket: IChartPoint) => + !bucket.sample && 'No sample available for this bucket' + } + /> +
      + ); + } +} + +function unitShort(type: string | undefined) { + return type === 'request' ? 'req.' : 'trans.'; +} + +function unitLong(type: string | undefined, count: number) { + const suffix = count > 1 ? 's' : ''; + + return type === 'request' ? `request${suffix}` : `transaction${suffix}`; +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/view.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/view.js deleted file mode 100644 index 3e01ddf7cfedb..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/view.js +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; -import d3 from 'd3'; -import Histogram from '../../../shared/charts/Histogram'; -import { toQuery, fromQuery, history } from '../../../../utils/url'; -import { HeaderSmall } from '../../../shared/UIComponents'; -import EmptyMessage from '../../../shared/EmptyMessage'; -import { getTimeFormatter, timeUnit } from '../../../../utils/formatters'; -import SamplingTooltip from './SamplingTooltip'; - -export function getFormattedBuckets(buckets, bucketSize) { - if (!buckets) { - return null; - } - - return buckets.map(({ sampled, count, key, transactionId }) => { - return { - sampled, - transactionId, - x0: key, - x: key + bucketSize, - y: count, - style: count > 0 && sampled ? { cursor: 'pointer' } : {} - }; - }); -} - -class Distribution extends Component { - formatYShort = t => { - return `${t} ${unitShort(this.props.urlParams.transactionType)}`; - }; - - formatYLong = t => { - return `${t} ${unitLong(this.props.urlParams.transactionType, t)}`; - }; - - render() { - const { location, distribution } = this.props; - - const buckets = getFormattedBuckets( - distribution.buckets, - distribution.bucketSize - ); - - const isEmpty = distribution.totalHits === 0; - const xMax = d3.max(buckets, d => d.x); - const timeFormatter = getTimeFormatter(xMax); - const unit = timeUnit(xMax); - - if (isEmpty) { - return ; - } - - const bucketIndex = buckets.findIndex( - bucket => bucket.transactionId === this.props.urlParams.transactionId - ); - - return ( -
      - - Response time distribution - - - { - if (bucket.sampled && bucket.y > 0) { - history.replace({ - ...location, - search: fromQuery({ - ...toQuery(location.search), - transactionId: bucket.transactionId - }) - }); - } - }} - formatX={timeFormatter} - formatYShort={this.formatYShort} - formatYLong={this.formatYLong} - verticalLineHover={bucket => bucket.y > 0 && !bucket.sampled} - backgroundHover={bucket => bucket.y > 0 && bucket.sampled} - tooltipHeader={bucket => - `${timeFormatter(bucket.x0, false)} - ${timeFormatter( - bucket.x, - false - )} ${unit}` - } - tooltipFooter={bucket => - !bucket.sampled && 'No sample available for this bucket' - } - /> -
      - ); - } -} - -function unitShort(type) { - return type === 'request' ? 'req.' : 'trans.'; -} - -function unitLong(type, count) { - const suffix = count > 1 ? 's' : ''; - - return type === 'request' ? `request${suffix}` : `transaction${suffix}`; -} - -Distribution.propTypes = { - urlParams: PropTypes.object.isRequired, - location: PropTypes.object.isRequired, - distribution: PropTypes.object -}; - -export default Distribution; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/ActionMenu.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/ActionMenu.tsx new file mode 100644 index 0000000000000..bce2ba669644a --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/ActionMenu.tsx @@ -0,0 +1,153 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButton, + EuiContextMenuItem, + EuiContextMenuPanel, + EuiPopover +} from '@elastic/eui'; +import React from 'react'; +import { + PROCESSOR_EVENT, + TRACE_ID, + TRANSACTION_ID +} from 'x-pack/plugins/apm/common/constants'; +import { KibanaLink } from 'x-pack/plugins/apm/public/utils/url'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; + +function getDiscoverQuery(transactionId: string, traceId?: string) { + let query = `${PROCESSOR_EVENT}:"transaction" AND ${TRANSACTION_ID}:"${transactionId}"`; + if (traceId) { + query += ` AND ${TRACE_ID}:"${traceId}"`; + } + return { + _a: { + interval: 'auto', + query: { + language: 'lucene', + query + } + } + }; +} + +function getInfraMetricsQuery(transaction: Transaction) { + const plus5 = new Date(transaction['@timestamp']); + const minus5 = new Date(transaction['@timestamp']); + + plus5.setMinutes(plus5.getMinutes() + 5); + minus5.setMinutes(minus5.getMinutes() - 5); + + return { + from: minus5.getTime(), + to: plus5.getTime() + }; +} + +function ActionMenuButton({ onClick }: { onClick: () => void }) { + return ( + + Actions + + ); +} + +interface ActionMenuProps { + readonly transaction: Transaction; +} + +interface ActionMenuState { + readonly isOpen: boolean; +} + +export const DiscoverTransactionLink: React.SFC = ({ + transaction, + children +}) => { + const traceId = + transaction.version === 'v2' ? transaction.trace.id : undefined; + return ( + + ); +}; + +export class ActionMenu extends React.Component< + ActionMenuProps, + ActionMenuState +> { + public state = { + isOpen: false + }; + + public toggle = () => { + this.setState(state => ({ isOpen: !state.isOpen })); + }; + + public close = () => { + this.setState({ isOpen: false }); + }; + + public getInfraActions(transaction: Transaction) { + const { system } = transaction.context; + + if (!system || !system.hostname) { + return []; + } + + return [ + + + View host metrics (beta) + + , + + + View host logs (beta) + + + ]; + } + + public render() { + const { transaction } = this.props; + + const items = [ + + + View sample document + + , + ...this.getInfraActions(transaction) + ]; + + return ( + } + isOpen={this.state.isOpen} + closePopover={this.close} + anchorPosition="downRight" + panelPaddingSize="none" + > + + + ); + } +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/Span.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/Span.js deleted file mode 100644 index 1266e6eea0c46..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/Span.js +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import styled from 'styled-components'; -import { get } from 'lodash'; -import PropTypes from 'prop-types'; -import { toQuery, fromQuery, history } from '../../../../../utils/url'; -import SpanDetails from './SpanDetails'; -import Modal from '../../../../shared/Modal'; - -import { - unit, - units, - colors, - px, - fontFamilyCode, - fontSizes -} from '../../../../../style/variables'; -import { - SPAN_DURATION, - SPAN_START, - SPAN_ID, - SPAN_NAME -} from '../../../../../../common/constants'; - -const SpanBar = styled.div` - position: relative; - height: ${unit}px; -`; -const SpanLabel = styled.div` - white-space: nowrap; - position: relative; - direction: rtl; - text-align: left; - margin: ${px(units.quarter)} 0 0; - font-family: ${fontFamilyCode}; - font-size: ${fontSizes.small}; -`; - -const Container = styled.div` - position: relative; - display: block; - user-select: none; - padding: ${px(units.half)} ${props => px(props.timelineMargins.right)} - ${px(units.eighth)} ${props => px(props.timelineMargins.left)}; - border-top: 1px solid ${colors.gray4}; - background-color: ${props => (props.isSelected ? colors.gray5 : 'initial')}; - cursor: pointer; - &:hover { - background-color: ${colors.gray5}; - } -`; - -function getLocationPath(location) { - return location.href.split('?')[0]; -} - -class Span extends React.Component { - componentDidMount() { - this.locationPath = getLocationPath(window.location); - } - - onClose = () => { - // Hack: If the modal is open, and the user clicks the back button, the url changes, the modal will be destroyed, - // and the onClose handler will fire, causing it to change the url again. We want to avoid the url changing the second time. - // Therefore we - const currentLocationPath = getLocationPath(window.location); - const didNavigate = this.locationPath !== currentLocationPath; - if (!didNavigate) { - this.resetSpanId(); - } - }; - - resetSpanId = () => { - const { location } = this.props; - const { spanId, ...currentQuery } = toQuery(location.search); - - if (spanId === 'null') { - return; - } - - history.replace({ - ...location, - search: fromQuery({ - ...currentQuery, - spanId: null - }) - }); - }; - - render() { - const { - timelineMargins, - totalDuration, - span, - spanTypeLabel, - color, - isSelected, - transactionId, - location - } = this.props; - - const width = (get({ span }, SPAN_DURATION) / totalDuration) * 100; - const left = (get({ span }, SPAN_START) / totalDuration) * 100; - - const spanId = get({ span }, SPAN_ID); - const spanName = get({ span }, SPAN_NAME); - - return ( - { - history.replace({ - ...location, - search: fromQuery({ - ...toQuery(location.search), - spanId - }) - }); - }} - timelineMargins={timelineMargins} - isSelected={isSelected} - > - - - ‎ - {spanName} - ‎ - - - - - - - ); - } -} - -Span.propTypes = { - location: PropTypes.object.isRequired, - totalDuration: PropTypes.number.isRequired -}; - -export default Span; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/SpanDetails/index.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/SpanDetails/index.js deleted file mode 100644 index 3ef67277a68c7..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/SpanDetails/index.js +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import styled from 'styled-components'; -import numeral from '@elastic/numeral'; -import { get } from 'lodash'; -import PropTypes from 'prop-types'; -import Stacktrace from '../../../../../shared/Stacktrace'; -import DiscoverButton from '../../../../../shared/DiscoverButton'; -import { asMillis } from '../../../../../../utils/formatters'; -import { Indicator } from '../../../../../shared/charts/Legend'; -import { - SPAN_DURATION, - SPAN_NAME, - SERVICE_LANGUAGE_NAME -} from '../../../../../../../common/constants'; -import { - unit, - units, - px, - colors, - borderRadius, - fontFamilyCode, - fontSizes, - truncate -} from '../../../../../../style/variables'; -import TooltipOverlay, { - fieldNameHelper -} from '../../../../../shared/TooltipOverlay'; - -import SyntaxHighlighter, { - registerLanguage -} from 'react-syntax-highlighter/dist/light'; -import { xcode } from 'react-syntax-highlighter/dist/styles'; - -import sql from 'react-syntax-highlighter/dist/languages/sql'; -import { HeaderXSmall } from '../../../../../shared/UIComponents'; - -registerLanguage('sql', sql); - -const DetailsWrapper = styled.div` - display: flex; - justify-content: space-between; - align-items: flex-end; - border-bottom: 1px solid ${colors.gray4}; - padding: ${px(unit)} 0; - position: relative; -`; - -const DetailsElement = styled.div` - min-width: 0; - max-width: 50%; - line-height: 1.5; -`; - -const DetailsHeader = styled.div` - font-size: ${fontSizes.small}; - color: ${colors.gray3}; - - span { - cursor: help; - } -`; - -const DetailsText = styled.div` - font-size: ${fontSizes.large}; -`; - -const SpanName = styled.div` - ${truncate('100%')}; -`; - -const LegendIndicator = styled(Indicator)` - display: inline-block; -`; - -const StackTraceContainer = styled.div` - margin-top: ${px(unit)}; -`; - -const DatabaseStatement = styled.div` - margin-top: ${px(unit)}; - padding: ${px(units.half)} ${px(unit)}; - background: ${colors.yellow}; - border-radius: ${borderRadius}; - border: 1px solid ${colors.gray4}; - font-family: ${fontFamilyCode}; -`; - -function SpanDetails({ span, spanTypeLabel, spanTypeColor, totalDuration }) { - const spanDocId = get(span, 'docId'); - const spanDuration = get({ span }, SPAN_DURATION); - const relativeDuration = spanDuration / totalDuration; - const spanName = get({ span }, SPAN_NAME); - const stackframes = span.stacktrace; - const codeLanguage = get(span, SERVICE_LANGUAGE_NAME); - const dbContext = get(span, 'context.db'); - - const discoverQuery = { - _a: { - interval: 'auto', - query: { - language: 'lucene', - query: `_id:${spanDocId}` - }, - sort: { '@timestamp': 'desc' } - } - }; - - return ( -
      - - - - - Name - - - - - {spanName || 'N/A'} - - - - - - - Type - - - - - {spanTypeLabel} - - - - - - Duration - - - {asMillis(spanDuration)} - - - % of total time - {numeral(relativeDuration).format('0.00%')} - - - - {`View span in Discover`} - - - - - - - - - -
      - ); -} - -function DatabaseContext({ dbContext }) { - if (!dbContext || !dbContext.statement) { - return null; - } - - if (dbContext.type !== 'sql') { - return {dbContext.statement}; - } - - return ( -
      - DB Statement - - - {dbContext.statement} - - -
      - ); -} - -SpanDetails.propTypes = { - span: PropTypes.object.isRequired, - totalDuration: PropTypes.number.isRequired -}; - -export default SpanDetails; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/TimelineHeader.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/TimelineHeader.js deleted file mode 100644 index 4abea517a7a8f..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/TimelineHeader.js +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import styled from 'styled-components'; -import Legend from '../../../../shared/charts/Legend'; -import { - fontSizes, - colors, - unit, - units, - px, - truncate -} from '../../../../../style/variables'; - -import TooltipOverlay from '../../../../shared/TooltipOverlay'; - -const TimelineHeaderContainer = styled.div` - display: flex; - justify-content: space-between; - padding: ${px(unit * 1.5)} ${px(units.plus)} 0 ${px(units.plus)}; - line-height: 1.5; -`; - -const Heading = styled.div` - font-size: ${fontSizes.large}; - color: ${colors.gray2}; - ${truncate('90%')}; -`; - -const Legends = styled.div` - display: flex; - - div { - margin-right: ${px(unit)}; - &:last-child { - margin-right: 0; - } - } -`; - -export default function TimelineHeader({ legends, transactionName }) { - return ( - - - {transactionName || 'N/A'} - - - {legends.map(({ color, label }) => ( - - ))} - - - ); -} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/index.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/index.js deleted file mode 100644 index 4ecae0f2067cb..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/index.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { connect } from 'react-redux'; -import Spans from './view'; -import { getUrlParams } from '../../../../../store/urlParams'; - -function mapStateToProps(state = {}) { - return { - urlParams: getUrlParams(state), - location: state.location - }; -} - -const mapDispatchToProps = {}; -export default connect( - mapStateToProps, - mapDispatchToProps -)(Spans); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/view.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/view.js deleted file mode 100644 index 9d7d283043101..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/Spans/view.js +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React, { PureComponent } from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { get, uniq, first, zipObject, difference, isEmpty } from 'lodash'; -import Span from './Span'; -import TimelineHeader from './TimelineHeader'; -import { SPAN_ID } from '../../../../../../common/constants'; -import { colors } from '../../../../../style/variables'; -import { StickyContainer } from 'react-sticky'; -import Timeline from '../../../../shared/charts/Timeline'; -import EmptyMessage from '../../../../shared/EmptyMessage'; -import { getFeatureDocs } from '../../../../../utils/documentation'; -import { ExternalLink } from '../../../../../utils/url'; -import { SpansRequest } from '../../../../../store/reactReduxRequest/spans'; - -const Container = styled.div` - transition: 0.1s padding ease; - position: relative; - overflow: hidden; -`; - -const DroppedSpansContainer = styled.div` - border-top: 1px solid #ddd; - height: 43px; - line-height: 43px; - text-align: center; - color: ${colors.gray2}; -`; - -const TIMELINE_HEADER_HEIGHT = 100; -const TIMELINE_MARGINS = { - top: TIMELINE_HEADER_HEIGHT, - left: 50, - right: 50, - bottom: 0 -}; - -class Spans extends PureComponent { - render() { - const { - agentName, - urlParams, - location, - droppedSpans, - agentMarks - } = this.props; - return ( - { - if (isEmpty(spans.data.spans)) { - return ( - - ); - } - - const spanTypes = uniq( - spans.data.spanTypes.map(({ type }) => getPrimaryType(type)) - ); - - const getSpanColor = getColorByType(spanTypes); - - const totalDuration = spans.data.duration; - const spanContainerHeight = 58; - const timelineHeight = spanContainerHeight * spans.data.spans.length; - - return ( -
      - - - ({ - label: getSpanLabel(type), - color: getSpanColor(type) - }))} - transactionName={urlParams.transactionName} - /> - } - agentMarks={agentMarks} - duration={totalDuration} - height={timelineHeight} - margins={TIMELINE_MARGINS} - /> -
      - {spans.data.spans.map(span => ( - - ))} -
      -
      -
      - - {droppedSpans > 0 && ( - - {droppedSpans} spans dropped due to limit of{' '} - {spans.data.spans.length}.{' '} - - - )} -
      - ); - }} - /> - ); - } -} - -function DroppedSpansDocsLink({ agentName }) { - const docs = getFeatureDocs('dropped-spans', agentName); - - if (!docs || !docs.url) { - return null; - } - - return ( - - Learn more in the documentation. - - ); -} - -function getColorByType(types) { - const assignedColors = { - app: colors.apmBlue, - cache: colors.apmGreen, - components: colors.apmGreen, - ext: colors.apmPurple, - xhr: colors.apmPurple, - template: colors.apmRed2, - resource: colors.apmRed2, - custom: colors.apmTan, - db: colors.apmOrange, - 'hard-navigation': colors.apmYellow - }; - - const unknownTypes = difference(types, Object.keys(assignedColors)); - const unassignedColors = zipObject(unknownTypes, [ - colors.apmYellow, - colors.apmRed, - colors.apmBrown, - colors.apmPink - ]); - - return type => assignedColors[type] || unassignedColors[type]; -} - -function getSpanLabel(type) { - switch (type) { - case 'db': - return 'DB'; - case 'hard-navigation': - return 'Navigation timing'; - default: - return type; - } -} - -function getPrimaryType(type) { - return first(type.split('.')); -} - -Spans.propTypes = { - agentMarks: PropTypes.array, - agentName: PropTypes.string.isRequired, - droppedSpans: PropTypes.number.isRequired, - location: PropTypes.object.isRequired, - urlParams: PropTypes.object.isRequired -}; - -export default Spans; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/StickyTransactionProperties.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/StickyTransactionProperties.js deleted file mode 100644 index 55cedaedec4f8..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/StickyTransactionProperties.js +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import PropTypes from 'prop-types'; -import { get } from 'lodash'; -import { StickyProperties } from '../../../shared/StickyProperties'; -import { - TRANSACTION_DURATION, - TRANSACTION_RESULT, - USER_ID, - REQUEST_URL_FULL -} from '../../../../../common/constants'; -import { asTime } from '../../../../utils/formatters'; - -export default function StickyTransactionProperties({ transaction }) { - const timestamp = get(transaction, '@timestamp'); - const url = get(transaction, REQUEST_URL_FULL, 'N/A'); - const duration = get(transaction, TRANSACTION_DURATION); - const stickyProperties = [ - { - label: 'Timestamp', - fieldName: '@timestamp', - val: timestamp - }, - { - fieldName: REQUEST_URL_FULL, - label: 'URL', - val: url, - truncated: true - }, - { - label: 'Duration', - fieldName: TRANSACTION_DURATION, - val: duration ? asTime(duration) : 'N/A' - }, - { - label: 'Result', - fieldName: TRANSACTION_RESULT, - val: get(transaction, TRANSACTION_RESULT, 'N/A') - }, - { - label: 'User ID', - fieldName: USER_ID, - val: get(transaction, USER_ID, 'N/A') - } - ]; - - return ; -} - -StickyTransactionProperties.propTypes = { - transaction: PropTypes.object.isRequired -}; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/StickyTransactionProperties.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/StickyTransactionProperties.tsx new file mode 100644 index 0000000000000..a057c2eabc476 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/StickyTransactionProperties.tsx @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { get } from 'lodash'; +import React from 'react'; +import { + REQUEST_URL_FULL, + TRANSACTION_DURATION, + TRANSACTION_RESULT, + USER_ID +} from '../../../../../common/constants'; +import { Transaction } from '../../../../../typings/Transaction'; +import { asPercent, asTime } from '../../../../utils/formatters'; +// @ts-ignore +import { + IStickyProperty, + StickyProperties +} from '../../../shared/StickyProperties'; + +interface Props { + transaction: Transaction; + totalDuration?: number; +} + +export function StickyTransactionProperties({ + transaction, + totalDuration +}: Props) { + const timestamp = transaction['@timestamp']; + const url = get(transaction, REQUEST_URL_FULL, 'N/A'); + const duration = transaction.transaction.duration.us; + const stickyProperties: IStickyProperty[] = [ + { + label: 'Timestamp', + fieldName: '@timestamp', + val: timestamp, + truncated: true, + width: '50%' + }, + { + fieldName: REQUEST_URL_FULL, + label: 'URL', + val: url, + truncated: true, + width: '50%' + }, + { + label: 'Duration', + fieldName: TRANSACTION_DURATION, + val: asTime(duration), + width: '25%' + }, + { + label: '% of trace', + val: asPercent(duration, totalDuration, 'N/A'), + width: '25%' + }, + { + label: 'Result', + fieldName: TRANSACTION_RESULT, + val: get(transaction, TRANSACTION_RESULT, 'N/A'), + width: '25%' + }, + { + label: 'User ID', + fieldName: USER_ID, + val: get(transaction, USER_ID, 'N/A'), + truncated: true, + width: '25%' + } + ]; + + return ; +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/TransactionPropertiesTable.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/TransactionPropertiesTable.tsx new file mode 100644 index 0000000000000..db186e532aea3 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/TransactionPropertiesTable.tsx @@ -0,0 +1,107 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiSpacer, + // @ts-ignore + EuiTab, + // @ts-ignore + EuiTabs +} from '@elastic/eui'; +import { capitalize, first, get } from 'lodash'; +import React from 'react'; +import styled from 'styled-components'; +import { Transaction } from '../../../../../typings/Transaction'; +import { IUrlParams } from '../../../../store/urlParams'; +import { px, units } from '../../../../style/variables'; +import { fromQuery, history, toQuery } from '../../../../utils/url'; +import { + getPropertyTabNames, + PropertiesTable +} from '../../../shared/PropertiesTable'; +import { WaterfallContainer } from './WaterfallContainer'; +import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers'; + +const TableContainer = styled.div` + padding: ${px(units.plus)} ${px(units.plus)} 0; +`; + +// Ensure the selected tab exists or use the first +function getCurrentTab(tabs: string[] = [], selectedTab?: string) { + return selectedTab && tabs.includes(selectedTab) ? selectedTab : first(tabs); +} + +const TIMELINE_TAB = 'timeline'; + +function getTabs(transactionData: Transaction) { + const dynamicProps = Object.keys(transactionData.context || {}); + return [TIMELINE_TAB, ...getPropertyTabNames(dynamicProps)]; +} + +interface TransactionPropertiesTableProps { + location: any; + transaction: Transaction; + urlParams: IUrlParams; + waterfall: IWaterfall; +} + +export function TransactionPropertiesTable({ + location, + transaction, + urlParams, + waterfall +}: TransactionPropertiesTableProps) { + const tabs = getTabs(transaction); + const currentTab = getCurrentTab(tabs, urlParams.detailTab); + const agentName = transaction.context.service.agent.name; + + return ( +
      + + {tabs.map(key => { + return ( + { + history.replace({ + ...location, + search: fromQuery({ + ...toQuery(location.search), + detailTab: key + }) + }); + }} + isSelected={currentTab === key} + key={key} + > + {capitalize(key)} + + ); + })} + + + + + {currentTab === TIMELINE_TAB && ( + + )} + + {currentTab !== TIMELINE_TAB && ( + + + + )} +
      + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/TransactionPropertiesTableForFlyout.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/TransactionPropertiesTableForFlyout.tsx new file mode 100644 index 0000000000000..25632040ae325 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/TransactionPropertiesTableForFlyout.tsx @@ -0,0 +1,78 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui'; +import { capitalize, first, get } from 'lodash'; +import React from 'react'; +import { Transaction } from '../../../../../typings/Transaction'; +import { IUrlParams } from '../../../../store/urlParams'; +// @ts-ignore +import { fromQuery, history, toQuery } from '../../../../utils/url'; +import { + getPropertyTabNames, + PropertiesTable +} from '../../../shared/PropertiesTable'; +// @ts-ignore +import { Tab } from '../../../shared/UIComponents'; + +// Ensure the selected tab exists or use the first +function getCurrentTab(tabs: string[] = [], selectedTab?: string) { + return selectedTab && tabs.includes(selectedTab) ? selectedTab : first(tabs); +} + +function getTabs(transactionData: Transaction) { + const dynamicProps = Object.keys(transactionData.context || {}); + return getPropertyTabNames(dynamicProps); +} + +interface Props { + location: any; + transaction: Transaction; + urlParams: IUrlParams; +} + +export const TransactionPropertiesTableForFlyout: React.SFC = ({ + location, + transaction, + urlParams +}) => { + const tabs = getTabs(transaction); + const currentTab = getCurrentTab(tabs, urlParams.flyoutDetailTab); + const agentName = transaction.context.service.agent.name; + + return ( +
      + + {tabs.map(key => { + return ( + { + history.replace({ + ...location, + search: fromQuery({ + ...toQuery(location.search), + flyoutDetailTab: key + }) + }); + }} + isSelected={currentTab === key} + key={key} + > + {capitalize(key)} + + ); + })} + + + +
      + ); +}; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/ServiceLegends.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/ServiceLegends.tsx new file mode 100644 index 0000000000000..a909fcc20dfb9 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/ServiceLegends.tsx @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiTitle } from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; +import { px, unit } from '../../../../../style/variables'; +// @ts-ignore +import Legend from '../../../../shared/charts/Legend'; +import { IServiceColors } from './Waterfall/waterfall_helpers/waterfall_helpers'; + +const Legends = styled.div` + display: flex; + + > * { + margin-right: ${px(unit)}; + &:last-child { + margin-right: 0; + } + } +`; + +interface Props { + serviceColors: IServiceColors; +} + +export function ServiceLegends({ serviceColors }: Props) { + return ( + + + Services + + {Object.entries(serviceColors).map(([label, color]) => ( + + ))} + + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx new file mode 100644 index 0000000000000..dc26045151f17 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/FlyoutTopLevelProperties.tsx @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { + SERVICE_NAME, + TRANSACTION_NAME +} from 'x-pack/plugins/apm/common/constants'; +import { StickyProperties } from 'x-pack/plugins/apm/public/components/shared/StickyProperties'; +import { TransactionLink } from 'x-pack/plugins/apm/public/components/shared/TransactionLink'; +import { KibanaLink } from 'x-pack/plugins/apm/public/utils/url'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; + +interface Props { + transaction?: Transaction; +} + +export function FlyoutTopLevelProperties({ transaction }: Props) { + if (!transaction) { + return null; + } + + const stickyProperties = [ + { + label: 'Service', + fieldName: SERVICE_NAME, + val: ( + + {transaction.context.service.name} + + ), + width: '50%' + }, + { + label: 'Transaction', + fieldName: TRANSACTION_NAME, + val: ( + + {transaction.transaction.name} + + ), + width: '50%' + } + ]; + + return ; +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx new file mode 100644 index 0000000000000..93266464ecdf5 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/DatabaseContext.tsx @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React, { Fragment } from 'react'; +import styled from 'styled-components'; +import { + borderRadius, + colors, + fontFamilyCode, + px, + unit, + units +} from '../../../../../../../style/variables'; + +import SyntaxHighlighter, { + registerLanguage + // @ts-ignore +} from 'react-syntax-highlighter/dist/light'; + +// @ts-ignore +import { xcode } from 'react-syntax-highlighter/dist/styles'; + +// @ts-ignore +import sql from 'react-syntax-highlighter/dist/languages/sql'; + +import { EuiTitle } from '@elastic/eui'; +import { DbContext } from '../../../../../../../../typings/Span'; + +registerLanguage('sql', sql); + +const DatabaseStatement = styled.div` + margin-top: ${px(unit)}; + padding: ${px(units.half)} ${px(unit)}; + background: ${colors.yellow}; + border-radius: ${borderRadius}; + border: 1px solid ${colors.gray4}; + font-family: ${fontFamilyCode}; +`; + +interface Props { + dbContext?: DbContext; +} + +export function DatabaseContext({ dbContext }: Props) { + if (!dbContext || !dbContext.statement) { + return null; + } + + if (dbContext.type !== 'sql') { + return {dbContext.statement}; + } + + return ( + + +

      Database statement

      +
      + + + {dbContext.statement} + + +
      + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx new file mode 100644 index 0000000000000..8ac9c0b7e0b65 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/StickySpanProperties.tsx @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { first } from 'lodash'; +import React from 'react'; +import { + SPAN_DURATION, + SPAN_NAME, + SPAN_TYPE +} from 'x-pack/plugins/apm/common/constants'; +import { Span } from '../../../../../../../../typings/Span'; +import { asMillis, asPercent } from '../../../../../../../utils/formatters'; +import { StickyProperties } from '../../../../../../shared/StickyProperties'; + +function getSpanLabel(type: string) { + switch (type) { + case 'db': + return 'DB'; + case 'hard-navigation': + return 'Navigation timing'; + default: + return type; + } +} + +function getPrimaryType(type: string) { + return first(type.split('.')); +} + +interface Props { + span: Span; + totalDuration?: number; +} + +export function StickySpanProperties({ span, totalDuration }: Props) { + if (!totalDuration) { + return null; + } + + const spanName = span.span.name; + const spanDuration = span.span.duration.us; + const spanTypeLabel = getSpanLabel(getPrimaryType(span.span.type)); + const stickyProperties = [ + { + label: 'Name', + fieldName: SPAN_NAME, + val: spanName || 'N/A', + truncated: true, + width: '50%' + }, + { + fieldName: SPAN_TYPE, + label: 'Type', + val: spanTypeLabel, + truncated: true, + widht: '50%' + }, + { + fieldName: SPAN_DURATION, + label: 'Duration', + val: asMillis(spanDuration), + width: '50%' + }, + { + label: '% of transaction', + val: asPercent(spanDuration, totalDuration), + width: '50%' + } + ]; + + return ; +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/index.tsx new file mode 100644 index 0000000000000..7f8b02856aa25 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/SpanFlyout/index.tsx @@ -0,0 +1,110 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiFlexGroup, + EuiFlexItem, + EuiFlyout, + EuiFlyoutBody, + EuiFlyoutHeader, + EuiHorizontalRule, + EuiPortal, + EuiTitle +} from '@elastic/eui'; +import { get } from 'lodash'; +import React from 'react'; +import styled from 'styled-components'; + +// @ts-ignore +import { + SERVICE_LANGUAGE_NAME, + SPAN_HEX_ID, + SPAN_ID +} from '../../../../../../../../common/constants'; +import { px, unit } from '../../../../../../../style/variables'; + +// @ts-ignore +import Stacktrace from '../../../../../../shared/Stacktrace'; + +import { DatabaseContext } from './DatabaseContext'; +import { StickySpanProperties } from './StickySpanProperties'; + +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { Span } from '../../../../../../../../typings/Span'; +import { DiscoverButton } from '../../../../../../shared/DiscoverButton'; +import { FlyoutTopLevelProperties } from '../FlyoutTopLevelProperties'; + +const StackTraceContainer = styled.div` + margin-top: ${px(unit)}; +`; + +function getDiscoverQuery(span: Span) { + return { + _a: { + interval: 'auto', + query: { + language: 'lucene', + query: + span.version === 'v2' + ? `${SPAN_HEX_ID}:"${span.span.hex_id}"` + : `${SPAN_ID}:"${span.span.id}"` + } + } + }; +} + +interface Props { + span?: Span; + parentTransaction?: Transaction; + totalDuration?: number; + onClose: () => void; +} + +export function SpanFlyout({ + span, + parentTransaction, + totalDuration, + onClose +}: Props) { + if (!span) { + return null; + } + const stackframes = span.span.stacktrace; + const codeLanguage: string = get(span, SERVICE_LANGUAGE_NAME); + const dbContext = span.context.db; + + return ( + + + + + + +

      Span details

      +
      +
      + + + + {`View span in Discover`} + + +
      +
      + + + + + + + + + + +
      +
      + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx new file mode 100644 index 0000000000000..e3d380ae9fb35 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/TransactionFlyout/index.tsx @@ -0,0 +1,144 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButtonEmpty, + EuiCallOut, + EuiFlexGroup, + EuiFlexItem, + EuiFlyout, + EuiFlyoutBody, + EuiFlyoutHeader, + EuiHorizontalRule, + EuiLink, + EuiPortal, + EuiTitle +} from '@elastic/eui'; +import { get } from 'lodash'; +import React from 'react'; +import styled from 'styled-components'; +import { IUrlParams } from 'x-pack/plugins/apm/public/store/urlParams'; +import { APM_AGENT_DROPPED_SPANS_DOCS } from 'x-pack/plugins/apm/public/utils/documentation/agents'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { DiscoverTransactionLink } from '../../../ActionMenu'; +import { StickyTransactionProperties } from '../../../StickyTransactionProperties'; +import { TransactionPropertiesTableForFlyout } from '../../../TransactionPropertiesTableForFlyout'; +import { FlyoutTopLevelProperties } from '../FlyoutTopLevelProperties'; +import { IWaterfall } from '../waterfall_helpers/waterfall_helpers'; + +interface Props { + onClose: () => void; + transaction?: Transaction; + location: any; // TODO: import location type from react router or history types? + urlParams: IUrlParams; + waterfall: IWaterfall; +} + +const ResponsiveFlyout = styled(EuiFlyout)` + width: 100%; + + @media (min-width: 800px) { + width: 90%; + } + + @media (min-width: 1000px) { + width: 70%; + } + + @media (min-width: 1400px) { + width: 50%; + } + + @media (min-width: 2000px) { + width: 35%; + } +`; + +function DroppedSpansWarning({ + transactionDoc +}: { + transactionDoc: Transaction; +}) { + const dropped: number = get( + transactionDoc, + 'transaction.span_count.dropped.total', + 0 + ); + + if (dropped === 0) { + return null; + } + + const url = + APM_AGENT_DROPPED_SPANS_DOCS[transactionDoc.context.service.agent.name]; + + const docsLink = url ? ( + + Learn more. + + ) : null; + + return ( + + + The APM agent that reported this transaction dropped {dropped} spans or + more based on its configuration. {docsLink} + + + + ); +} + +export function TransactionFlyout({ + transaction: transactionDoc, + onClose, + location, + urlParams, + waterfall +}: Props) { + if (!transactionDoc) { + return null; + } + + return ( + + + + + + +

      Transaction details

      +
      +
      + + + + + View transaction in Discover + + + +
      +
      + + + + + + + + +
      +
      + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/WaterfallItem.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/WaterfallItem.tsx new file mode 100644 index 0000000000000..b917db2c25685 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/WaterfallItem.tsx @@ -0,0 +1,146 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import styled from 'styled-components'; + +import { EuiIcon } from '@elastic/eui'; +import { + colors, + fontFamily, + fontFamilyCode, + fontSize, + fontSizes, + px, + unit, + units +} from '../../../../../../style/variables'; +import { IWaterfallItem } from './waterfall_helpers/waterfall_helpers'; + +interface ItemBarProps { + type: 'transaction' | 'span'; + left: number; + width: number; + color: string; +} + +const ItemBar = styled('div')` + box-sizing: border-box; + position: relative; + height: ${px(unit)}; + min-width: 2px; + background-color: ${props => props.color}; +`; + +// Note: "direction: rtl;" is here to prevent text from running off of +// the right edge and instead pushing it to the left. For an example of +// how this works, see here: https://codepen.io/sqren/pen/JrXNjY +const SpanLabel = styled.div` + white-space: nowrap; + position: relative; + direction: rtl; + text-align: left; + margin: ${px(units.quarter)} 0 0; + font-family: ${fontFamilyCode}; + font-size: ${fontSizes.small}; +`; + +const TransactionLabel = styled(SpanLabel)` + font-weight: 600; + font-family: ${fontFamily}; + font-size: ${fontSize}; +`; + +interface IContainerProps { + item: IWaterfallItem; + timelineMargins: ITimelineMargins; + isSelected: boolean; +} + +const Container = styled('div')` + position: relative; + display: block; + user-select: none; + padding: ${px(units.half)} ${props => px(props.timelineMargins.right)} + ${props => px(props.item.docType === 'span' ? units.half : units.quarter)} + ${props => px(props.timelineMargins.left)}; + border-top: 1px solid ${colors.gray4}; + background-color: ${props => (props.isSelected ? colors.gray5 : 'initial')}; + cursor: pointer; + &:hover { + background-color: ${colors.gray5}; + } +`; + +interface ITimelineMargins { + right: number; + left: number; + top: number; + bottom: number; +} + +interface IWaterfallItemProps { + timelineMargins: ITimelineMargins; + totalDuration?: number; + item: IWaterfallItem; + color: string; + isSelected: boolean; + onClick: () => any; +} + +function Prefix({ item }: { item: IWaterfallItem }) { + if (item.docType !== 'transaction') { + return null; + } + + return ( + + {' '} + + ); +} + +export function WaterfallItem({ + timelineMargins, + totalDuration, + item, + color, + isSelected, + onClick +}: IWaterfallItemProps) { + if (!totalDuration) { + return null; + } + + const width = (item.duration / totalDuration) * 100; + const left = ((item.offset + item.skew) / totalDuration) * 100; + const Label = item.docType === 'transaction' ? TransactionLabel : SpanLabel; + + // Note: the appears *after* the item name in the DOM order + // because this label is styled with "direction: rtl;" so that the name + // itself doesn't flow outside the box to the right. + return ( + + + + + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/index.tsx new file mode 100644 index 0000000000000..57d293cfb55ef --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/index.tsx @@ -0,0 +1,159 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React, { Component } from 'react'; +// @ts-ignore +import { StickyContainer } from 'react-sticky'; +import styled from 'styled-components'; + +import { IUrlParams } from '../../../../../../store/urlParams'; + +// @ts-ignore +import { fromQuery, history, toQuery } from '../../../../../../utils/url'; +// @ts-ignore +import Timeline from '../../../../../shared/charts/Timeline'; +import { AgentMark } from '../get_agent_marks'; +import { SpanFlyout } from './SpanFlyout'; +import { TransactionFlyout } from './TransactionFlyout'; +import { + IServiceColors, + IWaterfall, + IWaterfallItem +} from './waterfall_helpers/waterfall_helpers'; +import { WaterfallItem } from './WaterfallItem'; + +const Container = styled.div` + transition: 0.1s padding ease; + position: relative; + overflow: hidden; +`; + +const TIMELINE_MARGINS = { + top: 40, + left: 50, + right: 50, + bottom: 0 +}; + +interface Props { + agentMarks: AgentMark[]; + urlParams: IUrlParams; + waterfall: IWaterfall; + location: any; + serviceColors: IServiceColors; +} + +export class Waterfall extends Component { + public onOpenFlyout = (item: IWaterfallItem) => { + this.setQueryParams({ + flyoutDetailTab: undefined, + waterfallItemId: String(item.id) + }); + }; + + public onCloseFlyout = () => { + this.setQueryParams({ + flyoutDetailTab: undefined, + waterfallItemId: undefined + }); + }; + + public getWaterfallItem = (item: IWaterfallItem) => { + const { serviceColors, waterfall, urlParams }: Props = this.props; + + return ( + this.onOpenFlyout(item)} + /> + ); + }; + + public getFlyOut = () => { + const { waterfall, location, urlParams } = this.props; + + const currentItem = + urlParams.waterfallItemId && + waterfall.itemsById[urlParams.waterfallItemId]; + + if (!currentItem) { + return null; + } + + switch (currentItem.docType) { + case 'span': + const parentTransaction = waterfall.getTransactionById( + currentItem.parentId + ); + + return ( + + ); + case 'transaction': + return ( + + ); + default: + return null; + } + }; + + public render() { + const { waterfall } = this.props; + const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found + const waterfallHeight = itemContainerHeight * waterfall.items.length; + + return ( + + + +
      + {waterfall.items.map(this.getWaterfallItem)} +
      +
      + + {this.getFlyOut()} +
      + ); + } + + private setQueryParams(params: Partial) { + const { location } = this.props; + history.replace({ + ...location, + search: fromQuery({ + ...toQuery(location.search), + ...params + }) + }); + } +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap new file mode 100644 index 0000000000000..9fd18e285d0d4 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap @@ -0,0 +1,89 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`waterfall_helpers getWaterfallItems should order items correctly 1`] = ` +Array [ + Object { + "childIds": Array [ + "b2", + "b", + ], + "docType": "transaction", + "duration": 9480, + "id": "a", + "name": "APIRestController#products", + "offset": 0, + "serviceName": "opbeans-java", + "skew": 0, + "timestamp": 1536763736366000, + "transaction": Object {}, + }, + Object { + "childIds": Array [], + "docType": "span", + "duration": 4694, + "id": "b2", + "name": "GET [0:0:0:0:0:0:0:1]", + "offset": 1000, + "parentId": "a", + "serviceName": "opbeans-java", + "skew": 0, + "span": Object { + "transaction": Object { + "id": "a", + }, + }, + "timestamp": 1536763736367000, + }, + Object { + "childIds": Array [ + "c", + ], + "docType": "span", + "duration": 4694, + "id": "b", + "name": "GET [0:0:0:0:0:0:0:1]", + "offset": 2000, + "parentId": "a", + "serviceName": "opbeans-java", + "skew": 0, + "span": Object { + "transaction": Object { + "id": "a", + }, + }, + "timestamp": 1536763736368000, + }, + Object { + "childIds": Array [ + "d", + ], + "docType": "transaction", + "duration": 3581, + "id": "c", + "name": "APIRestController#productsRemote", + "offset": 3000, + "parentId": "b", + "serviceName": "opbeans-java", + "skew": 0, + "timestamp": 1536763736369000, + "transaction": Object {}, + }, + Object { + "childIds": Array [], + "docType": "span", + "duration": 210, + "id": "d", + "name": "SELECT", + "offset": 5000, + "parentId": "c", + "serviceName": "opbeans-java", + "skew": 0, + "span": Object { + "transaction": Object { + "id": "c", + }, + }, + "timestamp": 1536763736371000, + }, +] +`; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json new file mode 100644 index 0000000000000..e12fe757ef1ee --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/spans.json @@ -0,0 +1,47 @@ +[ + { + "@timestamp": "2018-09-12T15:16:05.351Z", + "processor": { + "name": "transaction", + "event": "span" + }, + "span": { + "parent_id": "e070bc3c732087f8", + "trace_id": "7d4d29bea37e48ac8ba1f962d5eb8a41", + "name": "SELECT", + "type": "db.h2.sql", + "start": { + "us": 9249 + }, + "duration": { + "us": 1380 + }, + "hex_id": "8143a38f3367fd97" + }, + "transaction": { + "id": "e070bc3c732087f8" + }, + "context": { + "db": { + "statement": "select order0_.id as col_0_0_, order0_.created_at as col_1_0_, customer1_.full_name as col_2_0_ from orders order0_ left outer join customers customer1_ on order0_.customer_id=customer1_.id", + "type": "sql", + "user": "SA" + }, + "service": { + "name": "opbeans-java", + "agent": { + "version": "0.7.0-SNAPSHOT", + "name": "java" + } + } + }, + "beat": { + "version": "7.0.0-alpha1", + "name": "361022bff072", + "hostname": "361022bff072" + }, + "host": { + "name": "361022bff072" + } + } +] diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json new file mode 100644 index 0000000000000..401b8473ec3fc --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/mock_responses/transaction.json @@ -0,0 +1,93 @@ +{ + "@timestamp": "2018-09-12T15:16:05.341Z", + "processor": { + "name": "transaction", + "event": "transaction" + }, + "transaction": { + "duration": { + "us": 9069543 + }, + "type": "request", + "result": "HTTP 2xx", + "trace_id": "7d4d29bea37e48ac8ba1f962d5eb8a41", + "sampled": true, + "span_count": { + "started": 1, + "dropped": { + "total": 0 + } + }, + "id": "e070bc3c732087f8", + "name": "APIRestController#orders" + }, + "context": { + "request": { + "url": { + "full": "http://localhost:8080/api/orders", + "hostname": "localhost", + "port": "8080", + "pathname": "/api/orders", + "protocol": "http" + }, + "socket": { + "encrypted": false, + "remote_address": "0:0:0:0:0:0:0:1" + }, + "http_version": "1.1", + "method": "GET", + "headers": { + "accept-encoding": "gzip, deflate", + "host": "localhost:8080", + "connection": "keep-alive", + "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/70.0.3508.0 Safari/537.36", + "accept": "*/*", + "referer": "http://localhost:8080/orders" + } + }, + "response": { + "finished": true, + "headers_sent": true, + "status_code": 200, + "headers": { + "Transfer-Encoding": "chunked", + "Date": "Wed, 12 Sep 2018 15:16:07 GMT", + "Content-Type": "application/json;charset=UTF-8" + } + }, + "system": { + "architecture": "x86_64", + "platform": "Srens-MacBook-Pro.local", + "ip": "172.18.0.1", + "hostname": "Mac OS X" + }, + "process": { + "ppid": 10060, + "title": "/Library/Java/JavaVirtualMachines/jdk-10.0.2.jdk/Contents/Home/bin/java", + "pid": 10069 + }, + "service": { + "language": { + "version": "10.0.2", + "name": "Java" + }, + "runtime": { + "name": "Java", + "version": "10.0.2" + }, + "name": "opbeans-java", + "agent": { + "name": "java", + "version": "0.7.0-SNAPSHOT" + } + } + }, + "beat": { + "version": "7.0.0-alpha1", + "name": "361022bff072", + "hostname": "361022bff072" + }, + "host": { + "name": "361022bff072" + } +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts new file mode 100644 index 0000000000000..00e4709e261c0 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.test.ts @@ -0,0 +1,177 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { groupBy } from 'lodash'; +import { Span } from 'x-pack/plugins/apm/typings/Span'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { + getClockSkew, + getWaterfallItems, + IWaterfallItem +} from './waterfall_helpers'; + +describe('waterfall_helpers', () => { + describe('getWaterfallItems', () => { + it('should order items correctly', () => { + const items: IWaterfallItem[] = [ + { + id: 'd', + parentId: 'c', + serviceName: 'opbeans-java', + name: 'SELECT', + duration: 210, + timestamp: 1536763736371000, + offset: 0, + skew: 0, + docType: 'span', + span: { + transaction: { + id: 'c' + } + } as Span + }, + { + id: 'b', + parentId: 'a', + serviceName: 'opbeans-java', + name: 'GET [0:0:0:0:0:0:0:1]', + duration: 4694, + timestamp: 1536763736368000, + offset: 0, + skew: 0, + docType: 'span', + span: { + transaction: { + id: 'a' + } + } as Span + }, + { + id: 'b2', + parentId: 'a', + serviceName: 'opbeans-java', + name: 'GET [0:0:0:0:0:0:0:1]', + duration: 4694, + timestamp: 1536763736367000, + offset: 0, + skew: 0, + docType: 'span', + span: { + transaction: { + id: 'a' + } + } as Span + }, + { + id: 'c', + parentId: 'b', + serviceName: 'opbeans-java', + name: 'APIRestController#productsRemote', + duration: 3581, + timestamp: 1536763736369000, + offset: 0, + skew: 0, + docType: 'transaction', + transaction: {} as Transaction + }, + { + id: 'a', + serviceName: 'opbeans-java', + name: 'APIRestController#products', + duration: 9480, + timestamp: 1536763736366000, + offset: 0, + skew: 0, + docType: 'transaction', + transaction: {} as Transaction + } + ]; + + const childrenByParentId = groupBy( + items, + hit => (hit.parentId ? hit.parentId : 'root') + ); + const entryTransactionItem = childrenByParentId.root[0]; + expect( + getWaterfallItems(childrenByParentId, entryTransactionItem) + ).toMatchSnapshot(); + }); + }); + + describe('getClockSkew', () => { + it('should adjust when child starts before parent', () => { + const child = { + docType: 'transaction', + timestamp: 0, + duration: 50 + } as IWaterfallItem; + + const parent = { + timestamp: 100, + duration: 100, + skew: 5 + } as IWaterfallItem; + + expect(getClockSkew(child, parent)).toBe(130); + }); + + it('should adjust when child starts after parent has ended', () => { + const child = { + docType: 'transaction', + timestamp: 250, + duration: 50 + } as IWaterfallItem; + + const parent = { + timestamp: 100, + duration: 100, + skew: 5 + } as IWaterfallItem; + + expect(getClockSkew(child, parent)).toBe(-120); + }); + + it('should not adjust when child starts within parent duration', () => { + const child = { + docType: 'transaction', + timestamp: 150, + duration: 50 + } as IWaterfallItem; + + const parent = { + timestamp: 100, + duration: 100, + skew: 5 + } as IWaterfallItem; + + expect(getClockSkew(child, parent)).toBe(0); + }); + + it('should return parent skew for spans', () => { + const child = { + docType: 'span' + } as IWaterfallItem; + + const parent = { + timestamp: 100, + duration: 100, + skew: 5 + } as IWaterfallItem; + + expect(getClockSkew(child, parent)).toBe(5); + }); + + it('should handle missing parent', () => { + const child = { + docType: 'transaction' + } as IWaterfallItem; + + const parent = undefined; + + expect(getClockSkew(child, parent)).toBe(0); + }); + }); +}); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts new file mode 100644 index 0000000000000..43c28e4ef29f8 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts @@ -0,0 +1,314 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + first, + flatten, + groupBy, + indexBy, + isEmpty, + sortBy, + uniq, + zipObject +} from 'lodash'; +import { colors } from 'x-pack/plugins/apm/public/style/variables'; +import { Span } from '../../../../../../../../typings/Span'; +import { Transaction } from '../../../../../../../../typings/Transaction'; + +export interface IWaterfallIndex { + [key: string]: IWaterfallItem; +} + +export interface IWaterfallGroup { + [key: string]: IWaterfallItem[]; +} + +export interface IWaterfall { + traceRoot?: Transaction; + traceRootDuration?: number; + + /** + * Duration in us + */ + duration: number; + services: string[]; + items: IWaterfallItem[]; + itemsById: IWaterfallIndex; + getTransactionById: (id?: IWaterfallItem['id']) => Transaction | undefined; + serviceColors: IServiceColors; +} + +interface IWaterfallItemBase { + id: string | number; + parentId?: string; + serviceName: string; + name: string; + + /** + * Duration in us + */ + duration: number; + + /** + * start timestamp in us + */ + timestamp: number; + + /** + * offset from first item in us + */ + offset: number; + + /** + * skew from timestamp in us + */ + skew: number; + childIds?: Array; +} + +interface IWaterfallItemTransaction extends IWaterfallItemBase { + transaction: Transaction; + docType: 'transaction'; +} + +interface IWaterfallItemSpan extends IWaterfallItemBase { + span: Span; + docType: 'span'; +} + +export type IWaterfallItem = IWaterfallItemSpan | IWaterfallItemTransaction; + +function getTransactionItem( + transaction: Transaction +): IWaterfallItemTransaction { + if (transaction.version === 'v1') { + return { + id: transaction.transaction.id, + serviceName: transaction.context.service.name, + name: transaction.transaction.name, + duration: transaction.transaction.duration.us, + timestamp: new Date(transaction['@timestamp']).getTime() * 1000, + offset: 0, + skew: 0, + docType: 'transaction', + transaction + }; + } + + return { + id: transaction.transaction.id, + parentId: transaction.parent && transaction.parent.id, + serviceName: transaction.context.service.name, + name: transaction.transaction.name, + duration: transaction.transaction.duration.us, + timestamp: transaction.timestamp.us, + offset: 0, + skew: 0, + docType: 'transaction', + transaction + }; +} + +function getSpanItem(span: Span): IWaterfallItemSpan { + if (span.version === 'v1') { + return { + id: span.span.id, + parentId: span.span.parent || span.transaction.id, + serviceName: span.context.service.name, + name: span.span.name, + duration: span.span.duration.us, + timestamp: + new Date(span['@timestamp']).getTime() * 1000 + span.span.start.us, + offset: 0, + skew: 0, + docType: 'span', + span + }; + } + + return { + id: span.span.hex_id, + parentId: span.parent && span.parent.id, + serviceName: span.context.service.name, + name: span.span.name, + duration: span.span.duration.us, + timestamp: span.timestamp.us, + offset: 0, + skew: 0, + docType: 'span', + span + }; +} + +export function getClockSkew( + item: IWaterfallItem, + parentItem?: IWaterfallItem +) { + if (!parentItem) { + return 0; + } + + switch (item.docType) { + // don't calculate skew for spans. Just use parent's skew + case 'span': + return parentItem.skew; + + // transaction is the inital entry in a service. Calculate skew for this, and it will be propogated to all child spans + case 'transaction': { + const parentStart = parentItem.timestamp + parentItem.skew; + const parentEnd = parentStart + parentItem.duration; + + // determine if child starts before the parent + const offsetStart = parentStart - item.timestamp; + + // determine if child starts after the parent has ended + const offsetEnd = item.timestamp - parentEnd; + + // child transaction starts before parent OR + // child transaction starts after parent has ended + if (offsetStart > 0 || offsetEnd > 0) { + const latency = Math.max(parentItem.duration - item.duration, 0) / 2; + return offsetStart + latency; + + // child transaction starts withing parent duration and no adjustment is needed + } else { + return 0; + } + } + } +} + +export function getWaterfallItems( + childrenByParentId: IWaterfallGroup, + entryTransactionItem: IWaterfallItem +) { + function getSortedChildren( + item: IWaterfallItem, + parentItem?: IWaterfallItem + ): IWaterfallItem[] { + const children = sortBy(childrenByParentId[item.id] || [], 'timestamp'); + + item.childIds = children.map(child => child.id); + item.offset = item.timestamp - entryTransactionItem.timestamp; + item.skew = getClockSkew(item, parentItem); + + const deepChildren = flatten( + children.map(child => getSortedChildren(child, item)) + ); + return [item, ...deepChildren]; + } + + return getSortedChildren(entryTransactionItem); +} + +function getTraceRoot(childrenByParentId: IWaterfallGroup) { + const item = first(childrenByParentId.root); + if (item && item.docType === 'transaction') { + return item.transaction; + } +} + +function getServices(items: IWaterfallItem[]) { + const serviceNames = items.map(item => item.serviceName); + return uniq(serviceNames); +} + +export interface IServiceColors { + [key: string]: string; +} + +function getServiceColors(services: string[]) { + const assignedColors = [ + colors.apmBlue, + colors.apmGreen, + colors.apmPurple, + colors.apmRed2, + colors.apmTan, + colors.apmOrange, + colors.apmYellow + ]; + + return zipObject(services, assignedColors) as IServiceColors; +} + +function getDuration(items: IWaterfallItem[]) { + const timestampStart = items[0].timestamp; + const timestampEnd = Math.max( + ...items.map(item => item.timestamp + item.duration + item.skew) + ); + return timestampEnd - timestampStart; +} + +function createGetTransactionById(itemsById: IWaterfallIndex) { + return (id?: IWaterfallItem['id']) => { + if (!id) { + return; + } + + const item = itemsById[id]; + if (item.docType === 'transaction') { + return item.transaction; + } + }; +} + +export function getWaterfall( + hits: Array, + entryTransaction: Transaction +): IWaterfall { + if (isEmpty(hits)) { + return { + services: [], + duration: 0, + items: [], + itemsById: {}, + getTransactionById: () => undefined, + serviceColors: {} + }; + } + + const filteredHits = hits + .filter(hit => { + const docType = hit.processor.event; + return ['span', 'transaction'].includes(docType); + }) + .map(hit => { + const docType = hit.processor.event; + switch (docType) { + case 'span': + return getSpanItem(hit as Span); + case 'transaction': + return getTransactionItem(hit as Transaction); + default: + throw new Error(`Unknown type ${docType}`); + } + }); + + const childrenByParentId = groupBy( + filteredHits, + hit => (hit.parentId ? hit.parentId : 'root') + ); + const entryTransactionItem = getTransactionItem(entryTransaction); + const itemsById: IWaterfallIndex = indexBy(filteredHits, 'id'); + const items = getWaterfallItems(childrenByParentId, entryTransactionItem); + const traceRoot = getTraceRoot(childrenByParentId); + const duration = getDuration(items); + const traceRootDuration = traceRoot && traceRoot.transaction.duration.us; + const services = getServices(items); + const getTransactionById = createGetTransactionById(itemsById); + const serviceColors = getServiceColors(services); + + return { + traceRoot, + traceRootDuration, + duration, + services, + items, + itemsById, + getTransactionById, + serviceColors + }; +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/get_agent_marks.test.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/get_agent_marks.test.ts new file mode 100644 index 0000000000000..295682df068ec --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/get_agent_marks.test.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { getAgentMarks } from './get_agent_marks'; + +describe('getAgentMarks', () => { + it('should sort the marks', () => { + const transaction: Transaction = { + transaction: { + marks: { + agent: { + domInteractive: 117, + timeToFirstByte: 10, + domComplete: 118 + } + } + } + } as any; + expect(getAgentMarks(transaction)).toEqual([ + { name: 'timeToFirstByte', us: 10000 }, + { name: 'domInteractive', us: 117000 }, + { name: 'domComplete', us: 118000 } + ]); + }); + + it('should return empty array if marks are missing', () => { + const transaction: Transaction = { + transaction: {} + } as any; + expect(getAgentMarks(transaction)).toEqual([]); + }); +}); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/get_agent_marks.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/get_agent_marks.ts new file mode 100644 index 0000000000000..0aeb1d48b9456 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/get_agent_marks.ts @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { sortBy } from 'lodash'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; + +export interface AgentMark { + name: string; + us: number; +} + +export function getAgentMarks(transaction: Transaction): AgentMark[] { + if (!transaction.transaction.marks) { + return []; + } + + return sortBy( + Object.entries(transaction.transaction.marks.agent).map(([name, ms]) => ({ + name, + us: ms * 1000 + })), + 'us' + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/index.tsx new file mode 100644 index 0000000000000..5d78ce85d0775 --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/WaterfallContainer/index.tsx @@ -0,0 +1,66 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +// @ts-ignore +import { + SERVICE_NAME, + TRACE_ID, + TRANSACTION_ID +} from '../../../../../../common/constants'; +import { Transaction } from '../../../../../../typings/Transaction'; + +import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui'; + +import { IUrlParams } from 'x-pack/plugins/apm/public/store/urlParams'; +import { getAgentMarks } from './get_agent_marks'; +import { ServiceLegends } from './ServiceLegends'; +import { Waterfall } from './Waterfall'; +import { IWaterfall } from './Waterfall/waterfall_helpers/waterfall_helpers'; + +interface Props { + urlParams: IUrlParams; + transaction: Transaction; + location: any; + waterfall: IWaterfall; +} + +export function WaterfallContainer({ + location, + urlParams, + transaction, + waterfall +}: Props) { + const agentMarks = getAgentMarks(transaction); + if (!waterfall) { + return null; + } + + return ( +
      + + + + + + + Beta + + + + +
      + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/__jest__/view.test.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/__jest__/view.test.js deleted file mode 100644 index f26588b861615..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/__jest__/view.test.js +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { getAgentMarks } from '../view'; - -describe('TransactionDetailsView', () => { - describe('getAgentMarks', () => { - it('should be sorted', () => { - const transaction = { - transaction: { - marks: { - agent: { - domInteractive: 117, - timeToFirstByte: 10, - domComplete: 118 - } - } - } - }; - expect(getAgentMarks(transaction)).toEqual([ - { name: 'timeToFirstByte', timeLabel: 10000, timeAxis: 10000 }, - { name: 'domInteractive', timeLabel: 117000, timeAxis: 117000 }, - { name: 'domComplete', timeLabel: 118000, timeAxis: 118000 } - ]); - }); - - it('should ensure they are not too close', () => { - const transaction = { - transaction: { - duration: { - us: 1000 * 1000 - }, - marks: { - agent: { - a: 0, - b: 10, - c: 11, - d: 12, - e: 968, - f: 969, - timeToFirstByte: 970, - domInteractive: 980, - domComplete: 990 - } - } - } - }; - expect(getAgentMarks(transaction)).toEqual([ - { timeLabel: 0, name: 'a', timeAxis: 0 }, - { timeLabel: 10000, name: 'b', timeAxis: 20000 }, - { timeLabel: 11000, name: 'c', timeAxis: 40000 }, - { timeLabel: 12000, name: 'd', timeAxis: 60000 }, - { timeLabel: 968000, name: 'e', timeAxis: 910000 }, - { timeLabel: 969000, name: 'f', timeAxis: 930000 }, - { timeLabel: 970000, name: 'timeToFirstByte', timeAxis: 950000 }, - { timeLabel: 980000, name: 'domInteractive', timeAxis: 970000 }, - { timeLabel: 990000, name: 'domComplete', timeAxis: 990000 } - ]); - }); - }); -}); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/index.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/index.js deleted file mode 100644 index 977acf2025cbf..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/index.js +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { connect } from 'react-redux'; -import Transaction from './view'; - -function mapStateToProps(state = {}) { - return { - location: state.location - }; -} - -const mapDispatchToProps = {}; -export default connect( - mapStateToProps, - mapDispatchToProps -)(Transaction); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/index.tsx new file mode 100644 index 0000000000000..a21293abef9df --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/index.tsx @@ -0,0 +1,129 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButton, + EuiButtonEmpty, + EuiFlexGroup, + EuiFlexItem, + EuiPanel, + EuiSpacer, + EuiTitle, + EuiToolTip +} from '@elastic/eui'; +import React from 'react'; +import { Transaction as ITransaction } from '../../../../../typings/Transaction'; +import { IUrlParams } from '../../../../store/urlParams'; +import { TransactionLink } from '../../../shared/TransactionLink'; +import { DiscoverTransactionLink } from './ActionMenu'; +import { StickyTransactionProperties } from './StickyTransactionProperties'; +import { TransactionPropertiesTable } from './TransactionPropertiesTable'; +import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers'; + +function MaybeViewTraceLink({ + transaction, + waterfall +}: { + transaction: ITransaction; + waterfall: IWaterfall; +}) { + // the traceroot cannot be found, so we cannot link to it + if (!waterfall.traceRoot) { + return ( + + + + View full trace + + + + ); + } + + const isRoot = + transaction.transaction.id === waterfall.traceRoot.transaction.id; + + // the user is already viewing the full trace, so don't link to it + if (isRoot) { + return ( + + + + View full trace + + + + ); + + // the user is viewing a zoomed in version of the trace. Link to the full trace + } else { + return ( + + + View full trace + + + ); + } +} + +interface Props { + transaction: ITransaction; + urlParams: IUrlParams; + location: Location; + waterfall: IWaterfall; +} + +export const Transaction: React.SFC = ({ + transaction, + urlParams, + location, + waterfall +}) => { + return ( + + + + +
      Transaction sample
      +
      +
      + + + + + + + View transaction in Discover + + + + + + +
      + + + + + + + + +
      + ); +}; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/view.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/view.js deleted file mode 100644 index 0844cc054cad8..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Transaction/view.js +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { - unit, - units, - colors, - px, - borderRadius -} from '../../../../style/variables'; -import { Tab, HeaderMedium } from '../../../shared/UIComponents'; -import { isEmpty, capitalize, get, sortBy, last } from 'lodash'; - -import StickyTransactionProperties from './StickyTransactionProperties'; -import { - PropertiesTable, - getPropertyTabNames -} from '../../../shared/PropertiesTable'; -import Spans from './Spans'; -import DiscoverButton from '../../../shared/DiscoverButton'; -import { - TRANSACTION_ID, - PROCESSOR_EVENT, - SERVICE_AGENT_NAME, - TRANSACTION_DURATION -} from '../../../../../common/constants'; -import { fromQuery, toQuery, history } from '../../../../utils/url'; -import EmptyMessage from '../../../shared/EmptyMessage'; - -const Container = styled.div` - position: relative; - border: 1px solid ${colors.gray4}; - border-radius: ${borderRadius}; - margin-top: ${px(units.plus)}; -`; - -const HeaderContainer = styled.div` - display: flex; - justify-content: space-between; - padding: ${px(units.plus)} ${px(units.plus)} 0; - margin-bottom: ${px(unit)}; -`; - -const TabContainer = styled.div` - padding: 0 ${px(units.plus)}; - border-bottom: 1px solid ${colors.gray4}; -`; - -const TabContentContainer = styled.div` - border-radius: 0 0 ${borderRadius} ${borderRadius}; -`; - -const PropertiesTableContainer = styled.div` - padding: ${px(units.plus)} ${px(units.plus)} 0; -`; - -const DEFAULT_TAB = 'timeline'; - -export function getAgentMarks(transaction) { - const duration = get(transaction, TRANSACTION_DURATION); - const threshold = (duration / 100) * 2; - - return sortBy( - Object.entries(get(transaction, 'transaction.marks.agent', [])), - '1' - ) - .map(([name, ms]) => ({ - name, - timeLabel: ms * 1000, - timeAxis: ms * 1000 - })) - .reduce((acc, curItem) => { - const prevTime = get(last(acc), 'timeAxis'); - const nextValidTime = prevTime + threshold; - const isTooClose = prevTime != null && nextValidTime > curItem.timeAxis; - const canFit = nextValidTime <= duration; - - if (isTooClose && canFit) { - acc.push({ ...curItem, timeAxis: nextValidTime }); - } else { - acc.push(curItem); - } - return acc; - }, []) - .reduceRight((acc, curItem) => { - const prevTime = get(last(acc), 'timeAxis'); - const nextValidTime = prevTime - threshold; - const isTooClose = prevTime != null && nextValidTime < curItem.timeAxis; - const canFit = nextValidTime >= 0; - - if (isTooClose && canFit) { - acc.push({ ...curItem, timeAxis: nextValidTime }); - } else { - acc.push(curItem); - } - return acc; - }, []) - .reverse(); -} - -// Ensure the selected tab exists or use the default -function getCurrentTab(tabs = [], detailTab) { - return tabs.includes(detailTab) ? detailTab : DEFAULT_TAB; -} - -function getTabs(transactionData) { - const dynamicProps = Object.keys(transactionData.context || {}); - return getPropertyTabNames(dynamicProps); -} - -function Transaction({ transaction, location, urlParams }) { - const { transactionId } = urlParams; - - if (isEmpty(transaction)) { - return ( - - ); - } - - const agentName = get(transaction, SERVICE_AGENT_NAME); - const tabs = getTabs(transaction); - const currentTab = getCurrentTab(tabs, urlParams.detailTab); - - const discoverQuery = { - _a: { - interval: 'auto', - query: { - language: 'lucene', - query: `${PROCESSOR_EVENT}:transaction AND ${TRANSACTION_ID}:${transactionId}` - }, - sort: { '@timestamp': 'desc' } - } - }; - - return ( - - - - Transaction sample - - - {`View transaction in Discover`} - - - - - - - {[DEFAULT_TAB, ...tabs].map(key => { - return ( - { - history.replace({ - ...location, - search: fromQuery({ - ...toQuery(location.search), - detailTab: key - }) - }); - }} - selected={currentTab === key} - key={key} - > - {capitalize(key)} - - ); - })} - - - - {currentTab === DEFAULT_TAB ? ( - - ) : ( - - - - )} - - - ); -} - -Transaction.propTypes = { - urlParams: PropTypes.object.isRequired, - transaction: PropTypes.object -}; - -Transaction.defaultProps = { - transaction: {} -}; - -export default Transaction; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.js deleted file mode 100644 index e6855e5a068dc..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { connect } from 'react-redux'; -import TransactionsDetails from './view'; -import { getUrlParams } from '../../../store/urlParams'; - -function mapStateToProps(state = {}) { - return { - location: state.location, - urlParams: getUrlParams(state) - }; -} - -const mapDispatchToProps = {}; -export default connect( - mapStateToProps, - mapDispatchToProps -)(TransactionsDetails); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.ts new file mode 100644 index 0000000000000..6ab8c0116337a --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.ts @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { connect } from 'react-redux'; +import { TransactionDetailsView } from 'x-pack/plugins/apm/public/components/app/TransactionDetails/view'; +import { getUrlParams } from 'x-pack/plugins/apm/public/store/urlParams'; +import { IReduxState } from '../../../store/rootReducer'; + +function mapStateToProps(state = {} as IReduxState) { + return { + location: state.location, + urlParams: getUrlParams(state) + }; +} + +export const TransactionDetails = connect(mapStateToProps)( + TransactionDetailsView +); diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/view.js b/x-pack/plugins/apm/public/components/app/TransactionDetails/view.js deleted file mode 100644 index d1c48d31ba5cf..0000000000000 --- a/x-pack/plugins/apm/public/components/app/TransactionDetails/view.js +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { EuiSpacer } from '@elastic/eui'; -import { HeaderLarge } from '../../shared/UIComponents'; -import Transaction from './Transaction'; -import Distribution from './Distribution'; -import { TransactionDetailsChartsRequest } from '../../../store/reactReduxRequest/transactionDetailsCharts'; -import Charts from '../../shared/charts/TransactionCharts'; -import { TransactionDistributionRequest } from '../../../store/reactReduxRequest/transactionDistribution'; -import { TransactionDetailsRequest } from '../../../store/reactReduxRequest/transactionDetails'; -import { KueryBar } from '../../shared/KueryBar'; - -function TransactionDetails({ urlParams, location }) { - return ( -
      - {urlParams.transactionName} - - - - - - ( - - )} - /> - - ( - - )} - /> - - ( - - )} - /> -
      - ); -} - -export default TransactionDetails; diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/view.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/view.tsx new file mode 100644 index 0000000000000..97dcc67da090b --- /dev/null +++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/view.tsx @@ -0,0 +1,96 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiSpacer } from '@elastic/eui'; +import React from 'react'; +import { RRRRenderResponse } from 'react-redux-request'; +import { TransactionDetailsRequest } from '../../../store/reactReduxRequest/transactionDetails'; +// @ts-ignore +import { TransactionDetailsChartsRequest } from '../../../store/reactReduxRequest/transactionDetailsCharts'; +import { TransactionDistributionRequest } from '../../../store/reactReduxRequest/transactionDistribution'; +import { WaterfallRequest } from '../../../store/reactReduxRequest/waterfall'; +import { IUrlParams } from '../../../store/urlParams'; +// @ts-ignore +import TransactionCharts from '../../shared/charts/TransactionCharts'; +import EmptyMessage from '../../shared/EmptyMessage'; +// @ts-ignore +import { KueryBar } from '../../shared/KueryBar'; +// @ts-ignore +import { HeaderLarge } from '../../shared/UIComponents'; +import { Distribution } from './Distribution'; +import { Transaction } from './Transaction'; + +interface Props { + urlParams: IUrlParams; + location: any; +} + +export function TransactionDetailsView({ urlParams, location }: Props) { + return ( +
      + {urlParams.transactionName} + + + + + + ) => ( + + )} + /> + + ( + + )} + /> + + + + { + if (!transaction) { + return ( + + ); + } + + return ( + { + return ( + + ); + }} + /> + ); + }} + /> +
      + ); +} diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Button.js b/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Button.js index b7f8589dbd588..e2dee18bf0520 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Button.js +++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Button.js @@ -22,7 +22,7 @@ export default class DynamicBaselineButton extends Component { title: 'Machine Learning', items: [ { - name: 'Anomaly detection (BETA)', + name: 'Anomaly detection', icon: , onClick: () => { this.closePopover(); diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Flyout.js b/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Flyout.js index 076bc403d3138..69b8775c57c53 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Flyout.js +++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/Flyout.js @@ -18,8 +18,7 @@ import { EuiFlyoutHeader, EuiText, EuiTitle, - EuiSpacer, - EuiBetaBadge + EuiSpacer } from '@elastic/eui'; import { KibanaLink, ViewMLJob } from '../../../../utils/url'; @@ -120,10 +119,6 @@ export default class DynamicBaselineFlyout extends Component {

      Enable anomaly detection on response times

      - {hasDynamicBaseline && ( diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/__jest__/__snapshots__/Button.test.js.snap b/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/__jest__/__snapshots__/Button.test.js.snap index 6e57f557d1bd4..8c6ae37b38e90 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/__jest__/__snapshots__/Button.test.js.snap +++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/DynamicBaseline/__jest__/__snapshots__/Button.test.js.snap @@ -34,7 +34,7 @@ exports[`MLButton should render initial state 1`] = ` size="m" type="stats" />, - "name": "Anomaly detection (BETA)", + "name": "Anomaly detection", "onClick": [Function], }, Object { diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/List/index.js b/x-pack/plugins/apm/public/components/app/TransactionOverview/List/index.js index 97b257275ad63..54657ded388f5 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionOverview/List/index.js +++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/List/index.js @@ -4,21 +4,15 @@ * you may not use this file except in compliance with the Elastic License. */ -import React, { Component } from 'react'; -import PropTypes from 'prop-types'; +import React from 'react'; import styled from 'styled-components'; -import { EuiBasicTable } from '@elastic/eui'; -import orderBy from 'lodash.orderby'; import TooltipOverlay from '../../../shared/TooltipOverlay'; import { RelativeLink, legacyEncodeURIComponent } from '../../../../utils/url'; -import { - asMillisWithDefault, - asDecimal, - tpmUnit -} from '../../../../utils/formatters'; +import { asMillis, asDecimal, tpmUnit } from '../../../../utils/formatters'; +import { ImpactBar } from '../../../shared/ImpactBar'; import { fontFamilyCode, truncate } from '../../../../style/variables'; -import ImpactSparkline from './ImpactSparkLine'; +import { ManagedTable } from '../../../shared/ManagedTable'; function tpmLabel(type) { return type === 'request' ? 'Req. per minute' : 'Trans. per minute'; @@ -28,129 +22,75 @@ function avgLabel(agentName) { return agentName === 'js-base' ? 'Page load time' : 'Avg. resp. time'; } -function paginateItems({ items, pageIndex, pageSize }) { - return items.slice(pageIndex * pageSize, (pageIndex + 1) * pageSize); -} - const TransactionNameLink = styled(RelativeLink)` ${truncate('100%')}; font-family: ${fontFamilyCode}; `; -class List extends Component { - state = { - page: { - index: 0, - size: 25 +export default function TransactionList({ + items, + agentName, + serviceName, + type, + ...rest +}) { + const columns = [ + { + field: 'name', + name: 'Name', + width: '50%', + sortable: true, + render: transactionName => { + const transactionUrl = `${serviceName}/transactions/${legacyEncodeURIComponent( + type + )}/${legacyEncodeURIComponent(transactionName)}`; + + return ( + + + {transactionName || 'N/A'} + + + ); + } + }, + { + field: 'averageResponseTime', + name: avgLabel(agentName), + sortable: true, + dataType: 'number', + render: value => asMillis(value) + }, + { + field: 'p95', + name: '95th percentile', + sortable: true, + dataType: 'number', + render: value => asMillis(value) }, - sort: { - field: 'impactRelative', - direction: 'desc' + { + field: 'transactionsPerMinute', + name: tpmLabel(type), + sortable: true, + dataType: 'number', + render: value => `${asDecimal(value)} ${tpmUnit(type)}` + }, + { + field: 'impact', + name: 'Impact', + sortable: true, + dataType: 'number', + render: value => } - }; - - onTableChange = ({ page = {}, sort = {} }) => { - this.setState({ page, sort }); - }; - - render() { - const { agentName, serviceName, type } = this.props; - - const columns = [ - { - field: 'name', - name: 'Name', - width: '50%', - sortable: true, - render: transactionName => { - const transactionUrl = `${serviceName}/transactions/${legacyEncodeURIComponent( - type - )}/${legacyEncodeURIComponent(transactionName)}`; - - return ( - - - {transactionName || 'N/A'} - - - ); - } - }, - { - field: 'avg', - name: avgLabel(agentName), - sortable: true, - dataType: 'number', - render: value => asMillisWithDefault(value) - }, - { - field: 'p95', - name: '95th percentile', - sortable: true, - dataType: 'number', - render: value => asMillisWithDefault(value) - }, - { - field: 'tpm', - name: tpmLabel(type), - sortable: true, - dataType: 'number', - render: value => `${asDecimal(value)} ${tpmUnit(type)}` - }, - { - field: 'impactRelative', - name: 'Impact', - sortable: true, - dataType: 'number', - render: value => - } - ]; - - const sortedItems = orderBy( - this.props.items, - this.state.sort.field, - this.state.sort.direction - ); - - const paginatedItems = paginateItems({ - items: sortedItems, - pageIndex: this.state.page.index, - pageSize: this.state.page.size - }); - - return ( - - ); - } + ]; + + return ( + + ); } - -List.propTypes = { - agentName: PropTypes.string, - items: PropTypes.array, - serviceName: PropTypes.string, - type: PropTypes.string -}; - -export default List; - -// const renderFooterText = () => { -// return items.length === 500 -// ? 'Showing first 500 results ordered by response time' -// : ''; -// }; diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.js b/x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.js index 4fee02f262763..0e3e5b6420825 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.js +++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.js @@ -9,6 +9,34 @@ import { shallow } from 'enzyme'; import TransactionOverview from '../view'; import { toJson } from '../../../../utils/testHelpers'; +jest.mock( + 'ui/chrome', + () => ({ + getBasePath: () => `/some/base/path`, + getInjected: key => { + if (key === 'mlEnabled') { + return true; + } + throw new Error(`inexpected key ${key}`); + }, + getUiSettingsClient: () => { + return { + get: key => { + switch (key) { + case 'timepicker:timeDefaults': + return { from: 'now-15m', to: 'now', mode: 'quick' }; + case 'timepicker:refreshIntervalDefaults': + return { display: 'Off', pause: false, value: 0 }; + default: + throw new Error(`Unexpected config key: ${key}`); + } + } + }; + } + }), + { virtual: true } +); + const setup = () => { const props = { license: { diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/view.js b/x-pack/plugins/apm/public/components/app/TransactionOverview/view.js index 129238b0adc03..591102bd814cf 100644 --- a/x-pack/plugins/apm/public/components/app/TransactionOverview/view.js +++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/view.js @@ -67,7 +67,7 @@ class TransactionOverview extends Component { const { hasDynamicBaseline, license, location, urlParams } = this.props; const { serviceName, transactionType } = urlParams; - const mlEnabled = chrome.getInjected('mlEnabled'); + const mlEnabled = chrome.getInjected('mlEnabled', false); const ChartHeaderContent = hasDynamicBaseline && get(license.data, 'features.ml.isAvailable') ? ( diff --git a/x-pack/plugins/apm/public/components/shared/DiscoverButton.js b/x-pack/plugins/apm/public/components/shared/DiscoverButton.js deleted file mode 100644 index af241b297f97f..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/DiscoverButton.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { KibanaLink } from '../../utils/url'; -import { EuiButton } from '@elastic/eui'; - -function DiscoverButton({ query, children }) { - return ( - - - {children || 'View in Discover'} - - - ); -} - -export default DiscoverButton; diff --git a/x-pack/plugins/apm/public/components/shared/DiscoverButton.tsx b/x-pack/plugins/apm/public/components/shared/DiscoverButton.tsx new file mode 100644 index 0000000000000..377153f927f33 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/DiscoverButton.tsx @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { EuiButtonEmpty } from '@elastic/eui'; +import React from 'react'; +import { StringMap } from 'x-pack/plugins/apm/typings/common'; +import { KibanaLink } from '../../utils/url'; + +interface Props { + query: StringMap; + children: any; +} + +export function DiscoverButton({ query, children, ...rest }: Props) { + return ( + + + {children || 'View in Discover'} + + + ); +} diff --git a/x-pack/plugins/apm/public/components/shared/EmptyMessage.js b/x-pack/plugins/apm/public/components/shared/EmptyMessage.js deleted file mode 100644 index 45d1b453370cc..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/EmptyMessage.js +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import PropTypes from 'prop-types'; -import { EuiEmptyPrompt } from '@elastic/eui'; - -function EmptyMessage({ heading, subheading, hideSubheading }) { - if (!subheading) { - subheading = 'Try another time range or reset the search filter.'; - } - - return ( - {heading || 'No data found.'}

      } - body={!hideSubheading && subheading} - /> - ); -} - -EmptyMessage.propTypes = { - heading: PropTypes.string, - hideSubheading: PropTypes.bool -}; - -EmptyMessage.defaultProps = { - hideSubheading: false -}; - -export default EmptyMessage; diff --git a/x-pack/plugins/apm/public/components/shared/EmptyMessage.tsx b/x-pack/plugins/apm/public/components/shared/EmptyMessage.tsx new file mode 100644 index 0000000000000..274d063555d14 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/EmptyMessage.tsx @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiEmptyPrompt } from '@elastic/eui'; +import React from 'react'; + +function EmptyMessage({ + heading = 'No data found.', + subheading = 'Try another time range or reset the search filter.', + hideSubheading = false +}) { + return ( + {heading || 'No data found.'}
      } + body={!hideSubheading && subheading} + /> + ); +} + +// tslint:disable-next-line:no-default-export +export default EmptyMessage; diff --git a/x-pack/plugins/apm/public/components/shared/HOCUtils.js b/x-pack/plugins/apm/public/components/shared/HOCUtils.js deleted file mode 100644 index 042d5086cf445..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/HOCUtils.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export function getDisplayName(WrappedComponent) { - return WrappedComponent.displayName || WrappedComponent.name || 'Component'; -} diff --git a/x-pack/plugins/apm/public/components/shared/ImpactBar/__test__/ImpactBar.test.js b/x-pack/plugins/apm/public/components/shared/ImpactBar/__test__/ImpactBar.test.js new file mode 100644 index 0000000000000..d4b3f223f726f --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/ImpactBar/__test__/ImpactBar.test.js @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { shallow } from 'enzyme'; +import React from 'react'; +import { ImpactBar } from '..'; + +describe('ImpactBar component', () => { + it('should render with default values', () => { + expect(shallow()).toMatchSnapshot(); + }); + + it('should render with overridden values', () => { + expect( + shallow() + ).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/apm/public/components/shared/ImpactBar/__test__/__snapshots__/ImpactBar.test.js.snap b/x-pack/plugins/apm/public/components/shared/ImpactBar/__test__/__snapshots__/ImpactBar.test.js.snap new file mode 100644 index 0000000000000..67378b5634040 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/ImpactBar/__test__/__snapshots__/ImpactBar.test.js.snap @@ -0,0 +1,21 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ImpactBar component should render with default values 1`] = ` + +`; + +exports[`ImpactBar component should render with overridden values 1`] = ` + +`; diff --git a/x-pack/plugins/apm/public/components/shared/ImpactBar/index.tsx b/x-pack/plugins/apm/public/components/shared/ImpactBar/index.tsx new file mode 100644 index 0000000000000..53f21c4e247c0 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/ImpactBar/index.tsx @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiProgress } from '@elastic/eui'; +import React from 'react'; +import { StringMap } from '../../../../typings/common'; + +// TODO: extend from EUI's EuiProgress prop interface +export interface ImpactBarProps extends StringMap { + value: number; + max?: number; +} + +export function ImpactBar({ value, max = 100, ...rest }: ImpactBarProps) { + return ( + + ); +} diff --git a/x-pack/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js b/x-pack/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js index 42da4d3ba267a..719eb3bc43d3e 100644 --- a/x-pack/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js +++ b/x-pack/plugins/apm/public/components/shared/KueryBar/Typeahead/index.js @@ -6,11 +6,9 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; import Suggestions from './Suggestions'; import ClickOutside from './ClickOutside'; -import { EuiFieldSearch, EuiProgress, EuiToolTip } from '@elastic/eui'; -import { units, fontSizes, colors } from '../../../../style/variables'; +import { EuiFieldSearch, EuiProgress } from '@elastic/eui'; const KEY_CODES = { LEFT: 37, @@ -22,16 +20,6 @@ const KEY_CODES = { TAB: 9 }; -const BetaLabel = styled.div` - position: absolute; - top: 0; - right: 0; - font-size: ${fontSizes.small}; - transform: translateY(calc(-100% - ${units.quarter}px)); - cursor: pointer; - color: ${colors.gray2}; -`; - export class Typeahead extends Component { state = { isSuggestionsVisible: false, @@ -173,12 +161,6 @@ export class Typeahead extends Component { style={{ position: 'relative' }} >
      - - -
      Beta
      -
      -
      - { + let people; + let columns; + + beforeEach(() => { + people = [ + { name: 'Jess', age: 29 }, + { name: 'Becky', age: 43 }, + { name: 'Thomas', age: 31 } + ]; + columns = [ + { + field: 'name', + name: 'Name', + sortable: true, + render: name => `Name: ${name}` + }, + { field: 'age', name: 'Age', render: age => `Age: ${age}` } + ]; + }); + + it('should render a page-full of items, with defaults', () => { + expect( + shallow() + ).toMatchSnapshot(); + }); + + it('should render when specifying initial values', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/apm/public/components/shared/ManagedTable/__test__/__snapshots__/ManagedTable.test.js.snap b/x-pack/plugins/apm/public/components/shared/ManagedTable/__test__/__snapshots__/ManagedTable.test.js.snap new file mode 100644 index 0000000000000..59679bfe11641 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/ManagedTable/__test__/__snapshots__/ManagedTable.test.js.snap @@ -0,0 +1,103 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ManagedTable component should render a page-full of items, with defaults 1`] = ` + +`; + +exports[`ManagedTable component should render when specifying initial values 1`] = ` + +`; diff --git a/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx b/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx new file mode 100644 index 0000000000000..1b426121fce63 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx @@ -0,0 +1,95 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { EuiBasicTable } from '@elastic/eui'; +import { get, sortByOrder } from 'lodash'; +import React, { Component } from 'react'; +import { StringMap } from '../../../../typings/common'; + +// TODO: this should really be imported from EUI +export interface ITableColumn { + field: string; + name: string; + dataType?: string; + align?: string; + width?: string; + sortable?: boolean; + render?: (value: any, item?: any) => any; +} + +export interface IManagedTableProps { + items: Array>; + columns: ITableColumn[]; + initialPageIndex?: number; + initialPageSize?: number; + hidePerPageOptions?: boolean; + initialSort?: { + field: string; + direction: 'asc' | 'desc'; + }; + noItemsMessage?: any; +} + +export class ManagedTable extends Component { + constructor(props: IManagedTableProps) { + super(props); + + const defaultSort = { + field: get(props, 'columns[0].field', ''), + direction: 'asc' + }; + + const { + initialPageIndex = 0, + initialPageSize = 10, + initialSort = defaultSort + } = props; + + this.state = { + page: { index: initialPageIndex, size: initialPageSize }, + sort: initialSort + }; + } + + public onTableChange = ({ page = {}, sort = {} }) => { + this.setState({ page, sort }); + }; + + public getCurrentItems() { + const { items } = this.props; + const { sort = {}, page = {} } = this.state; + // TODO: Use _.orderBy once we upgrade to lodash 4+ + const sorted = sortByOrder(items, sort.field, sort.direction); + return sorted.slice(page.index * page.size, (page.index + 1) * page.size); + } + + public render() { + const { + columns, + noItemsMessage, + items, + hidePerPageOptions = true + } = this.props; + const { page, sort } = this.state; + + return ( + + ); + } +} diff --git a/x-pack/plugins/apm/public/components/shared/Modal.js b/x-pack/plugins/apm/public/components/shared/Modal.js deleted file mode 100644 index 07e8d9ada9961..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/Modal.js +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import Portal from 'react-portal'; -import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import { Close } from './Icons'; -import { fontSizes, units, colors } from '../../style/variables'; -import { rgba } from 'polished'; - -const Header = styled.div` - display: flex; - justify-content: space-between; - align-items: center; -`; - -const HeaderTitle = styled.div` - font-size: ${fontSizes.xlarge}; -`; - -const CloseButton = styled(Close)` - cursor: pointer; - font-size: ${fontSizes.large}; -`; - -const ModalFixed = styled.div` - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; -`; - -const ModalOverlay = styled(ModalFixed)` - z-index: 10; - background: ${rgba(colors.gray2, 0.8)}; - height: 100%; -`; - -const ModalOuterContainer = styled(ModalFixed)` - z-index: 20; - overflow-x: hidden; - overflow-y: auto; -`; - -const ModalInnerContainer = styled.div` - position: relative; - background: white; - min-width: 800px; - width: 80%; - left: 50%; - transform: translateX(-50%); - padding: ${units.double}px; - border-radius: ${units.quarter}px; - margin: ${units.quadruple}px 0; -`; - -class Modal extends React.Component { - shouldComponentUpdate(nextProps) { - // TODO: Make sure this doesn't cause rendering issues - return this.props.isOpen !== nextProps.isOpen; - } - - componentWillUnmount() { - document.body.style.overflow = ''; - } - - onOpen = () => { - document.body.style.overflow = 'hidden'; - this.props.onOpen(); - }; - - onClose = () => { - document.body.style.overflow = ''; - this.props.onClose(); - }; - - close = () => this.props.close(); - - render() { - if (!this.props.isOpen) { - return null; - } - - return ( - -
      - - - e.stopPropagation()}> -
      - {this.props.header} - -
      - {this.props.children} -
      -
      -
      -
      - ); - } -} - -Modal.propTypes = { - children: PropTypes.oneOfType([PropTypes.array, PropTypes.object]), - onOpen: PropTypes.func, - onClose: PropTypes.func, - close: PropTypes.func, - isOpen: PropTypes.bool -}; - -Modal.defaultProps = { - onOpen: () => {}, - onClose: () => {}, - close: () => {} -}; - -export default Modal; diff --git a/x-pack/plugins/apm/public/components/shared/PropertiesTable/NestedKeyValueTable.tsx b/x-pack/plugins/apm/public/components/shared/PropertiesTable/NestedKeyValueTable.tsx index 37671e7975f91..4804adbc80e4a 100644 --- a/x-pack/plugins/apm/public/components/shared/PropertiesTable/NestedKeyValueTable.tsx +++ b/x-pack/plugins/apm/public/components/shared/PropertiesTable/NestedKeyValueTable.tsx @@ -7,6 +7,8 @@ import _ from 'lodash'; import React from 'react'; import styled from 'styled-components'; + +import { StringMap } from '../../../../typings/common'; import { colors, fontFamilyCode, @@ -15,6 +17,8 @@ import { units } from '../../../style/variables'; +export type KeySorter = (data: StringMap, parentKey?: string) => string[]; + const Table = styled.table` font-family: ${fontFamilyCode}; font-size: ${fontSizes.small}; @@ -31,6 +35,7 @@ const Row = styled.tr` const Cell = styled.td` vertical-align: top; padding: ${px(units.half)} 0; + line-height: 1.5; ${Row}:first-child> & { padding-top: 0; diff --git a/x-pack/plugins/apm/public/components/shared/PropertiesTable/__test__/PropertiesTable.test.js b/x-pack/plugins/apm/public/components/shared/PropertiesTable/__test__/PropertiesTable.test.js index 7cee0b14c57af..0a90bedc95d32 100644 --- a/x-pack/plugins/apm/public/components/shared/PropertiesTable/__test__/PropertiesTable.test.js +++ b/x-pack/plugins/apm/public/components/shared/PropertiesTable/__test__/PropertiesTable.test.js @@ -12,9 +12,9 @@ import { sortKeysByConfig, getPropertyTabNames } from '..'; -import { getFeatureDocs } from '../../../../utils/documentation'; +import { getAgentFeatureDocsUrl } from '../../../../utils/documentation/agents'; -jest.mock('../../../../utils/documentation'); +jest.mock('../../../../utils/documentation/agents'); jest.mock('../propertyConfig.json', () => [ { key: 'testProperty', @@ -105,32 +105,13 @@ describe('getPropertyTabNames', () => { }); describe('AgentFeatureTipMessage component', () => { - let mockDocs; - const featureName = ''; - const agentName = ''; - - beforeEach(() => { - mockDocs = { - text: 'Mock Docs Text', - url: 'mock-url' - }; - getFeatureDocs.mockImplementation(() => mockDocs); - }); + const featureName = 'user'; + const agentName = 'nodejs'; it('should render when docs are returned', () => { - expect( - shallow( - - ) - ).toMatchSnapshot(); - expect(getFeatureDocs).toHaveBeenCalledWith(featureName, agentName); - }); + const mockDocs = 'mock-url'; + getAgentFeatureDocsUrl.mockImplementation(() => mockDocs); - it('should render when docs are returned, but missing a url', () => { - delete mockDocs.url; expect( shallow( { /> ) ).toMatchSnapshot(); + expect(getAgentFeatureDocsUrl).toHaveBeenCalledWith(featureName, agentName); }); it('should render null empty string when no docs are returned', () => { - mockDocs = null; + getAgentFeatureDocsUrl.mockImplementation(() => null); expect( shallow( - - Mock Docs Text + You can configure your agent to add contextual information about your users. `; -exports[`AgentFeatureTipMessage component should render when docs are returned, but missing a url 1`] = ` - - - Mock Docs Text - - -`; - exports[`PropertiesTable component should render empty when data has no keys 1`] = ` - - - No data available - + + No data available + + `; exports[`PropertiesTable component should render empty when data isn't present 1`] = ` - - - No data available - + + No data available + + `; @@ -68,7 +56,7 @@ exports[`PropertiesTable component should render with data 1`] = ` /> `; diff --git a/x-pack/plugins/apm/public/components/shared/PropertiesTable/index.tsx b/x-pack/plugins/apm/public/components/shared/PropertiesTable/index.tsx index 979a3cab39097..856dcd7bb07ad 100644 --- a/x-pack/plugins/apm/public/components/shared/PropertiesTable/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/PropertiesTable/index.tsx @@ -8,11 +8,20 @@ import { EuiIcon } from '@elastic/eui'; import _ from 'lodash'; import React from 'react'; import styled from 'styled-components'; -import { colors, fontSize, px, unit, units } from '../../../style/variables'; -import { getFeatureDocs } from '../../../utils/documentation'; + +import { StringMap } from '../../../../typings/common'; +import { + colors, + fontSize, + fontSizes, + px, + unit, + units +} from '../../../style/variables'; +import { getAgentFeatureDocsUrl } from '../../../utils/documentation/agents'; // @ts-ignore import { ExternalLink } from '../../../utils/url'; -import { NestedKeyValueTable } from './NestedKeyValueTable'; +import { KeySorter, NestedKeyValueTable } from './NestedKeyValueTable'; import PROPERTY_CONFIG from './propertyConfig.json'; const indexedPropertyConfig = _.indexBy(PROPERTY_CONFIG, 'key'); @@ -29,6 +38,15 @@ const TableInfo = styled.div` line-height: 1.5; `; +const TableInfoHeader = styled(TableInfo)` + font-size: ${fontSizes.large}; + color: ${colors.black2}; +`; + +const EuiIconWithSpace = styled(EuiIcon)` + margin-right: ${px(units.half)}; +`; + export function getPropertyTabNames(selected: string[]): string[] { return PROPERTY_CONFIG.filter( ({ key, required }: { key: string; required: boolean }) => @@ -36,28 +54,36 @@ export function getPropertyTabNames(selected: string[]): string[] { ).map(({ key }: { key: string }) => key); } +function getAgentFeatureText(featureName: string) { + switch (featureName) { + case 'user': + return 'You can configure your agent to add contextual information about your users.'; + case 'tags': + return 'You can configure your agent to add filterable tags on transactions.'; + case 'custom': + return 'You can configure your agent to add custom contextual information on transactions.'; + } +} + export function AgentFeatureTipMessage({ featureName, agentName }: { featureName: string; - agentName: string; -}): JSX.Element | null { - const docs = getFeatureDocs(featureName, agentName); - - if (!docs) { + agentName?: string; +}) { + const docsUrl = getAgentFeatureDocsUrl(featureName, agentName); + if (!docsUrl) { return null; } return ( - - {docs.text}{' '} - {docs.url && ( - - Learn more in the documentation. - - )} + + {getAgentFeatureText(featureName)}{' '} + + Learn more in the documentation. + ); } @@ -78,30 +104,23 @@ export function PropertiesTable({ }: { propData: StringMap; propKey: string; - agentName: string; + agentName?: string; }) { - if (_.isEmpty(propData)) { - return ( - - - No data available - - - ); - } + const hasPropData = !_.isEmpty(propData); return ( - - + {hasPropData ? ( + + ) : ( + No data available + )} + ); } diff --git a/x-pack/plugins/apm/public/components/shared/PropertiesTable/types.d.ts b/x-pack/plugins/apm/public/components/shared/PropertiesTable/types.d.ts deleted file mode 100644 index 057011fc8ab98..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/PropertiesTable/types.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -type KeySorter = (data: StringMap, parentKey?: string) => string[]; diff --git a/x-pack/plugins/apm/public/components/shared/SetupInstructionsLink.tsx b/x-pack/plugins/apm/public/components/shared/SetupInstructionsLink.tsx new file mode 100644 index 0000000000000..e57754364fdc8 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/SetupInstructionsLink.tsx @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton } from '@elastic/eui'; +import React from 'react'; +// @ts-ignore +import { KibanaLink } from '../../utils/url'; + +export function SetupInstructionsLink({ + buttonFill = false +}: { + buttonFill?: boolean; +}) { + return ( + + + Setup Instructions + + + ); +} diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/index.js b/x-pack/plugins/apm/public/components/shared/Stacktrace/index.js index 2e93f5c17c0e3..0bec4149914d4 100644 --- a/x-pack/plugins/apm/public/components/shared/Stacktrace/index.js +++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/index.js @@ -11,8 +11,7 @@ import CodePreview from '../../shared/CodePreview'; import { Ellipsis } from '../../shared/Icons'; import { units, px } from '../../../style/variables'; import EmptyMessage from '../../shared/EmptyMessage'; -import { EuiLink } from '@elastic/eui'; -import { HeaderXSmall } from '../UIComponents'; +import { EuiLink, EuiTitle } from '@elastic/eui'; const LibraryFrameToggle = styled.div` margin: 0 0 ${px(units.plus)} 0; @@ -75,7 +74,9 @@ class Stacktrace extends PureComponent { return (
      - Stacktraces + +

      Stack traces

      +
      {getCollapsedLibraryFrames(stackframes).map((item, i) => { if (!item.libraryFrame) { return ( diff --git a/x-pack/plugins/apm/public/components/shared/StickyProperties/StickyProperties.test.js b/x-pack/plugins/apm/public/components/shared/StickyProperties/StickyProperties.test.js index b35069a44f219..4cc7d9b978a40 100644 --- a/x-pack/plugins/apm/public/components/shared/StickyProperties/StickyProperties.test.js +++ b/x-pack/plugins/apm/public/components/shared/StickyProperties/StickyProperties.test.js @@ -6,9 +6,9 @@ import React from 'react'; import { StickyProperties } from './index'; -import { mount } from 'enzyme'; +import { shallow } from 'enzyme'; import { USER_ID, REQUEST_URL_FULL } from '../../../../common/constants'; -import { toJson, mockMoment } from '../../../utils/testHelpers'; +import { mockMoment } from '../../../utils/testHelpers'; describe('StickyProperties', () => { beforeEach(mockMoment); @@ -43,10 +43,10 @@ describe('StickyProperties', () => { } ]; - const wrapper = mount( + const wrapper = shallow( ); - expect(toJson(wrapper)).toMatchSnapshot(); + expect(wrapper).toMatchSnapshot(); }); }); diff --git a/x-pack/plugins/apm/public/components/shared/StickyProperties/__snapshots__/StickyProperties.test.js.snap b/x-pack/plugins/apm/public/components/shared/StickyProperties/__snapshots__/StickyProperties.test.js.snap index e71121fbe578e..0788f6fd759a5 100644 --- a/x-pack/plugins/apm/public/components/shared/StickyProperties/__snapshots__/StickyProperties.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/StickyProperties/__snapshots__/StickyProperties.test.js.snap @@ -1,168 +1,176 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`StickyProperties should render 1`] = ` -.c0 { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - padding: 0 24px; - width: 100%; - -webkit-box-pack: start; - -webkit-justify-content: flex-start; - -ms-flex-pack: start; - justify-content: flex-start; - -webkit-flex-wrap: wrap; - -ms-flex-wrap: wrap; - flex-wrap: wrap; -} - -.c1 { - width: 33%; - margin-bottom: 16px; -} - -.c2 { - margin-bottom: 8px; - font-size: 12px; - color: #999999; -} - -.c2 span { - cursor: help; -} - -.c4 { - color: #999999; -} - -.c3 { - display: inline-block; - line-height: 16px; -} - -.c5 { - display: inline-block; - line-height: 16px; - max-width: 100%; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; -} - -
      -
      -
      - + + @timestamp + + } + delay="regular" + position="top" > - Timestamp - -
      -
      - 1337 minutes ago (mocking 1536405447) - - - ( - 1st of January (mocking 1536405447) - ) - -
      -
      -
      + Timestamp + + + + + + -
      - + + context.request.url.full + + } + delay="regular" + position="top" > - URL - -
      - + URL + + + + - https://www.elastic.co/test - -
      -
      + https://www.elastic.co/test + + + + -
      - + + context.request.method + + } + delay="regular" + position="top" > - Request method - -
      -
      + + Request method + + + + GET -
      -
      -
      + + -
      - + + error.exception.handled + + } + delay="regular" + position="top" > - Handled - -
      -
      + + Handled + + + + true -
      -
      -
      + + -
      - + + context.user.id + + } + delay="regular" + position="top" > - User ID - -
      -
      + + User ID + + + + 1337 -
      -
      -
      + + + `; diff --git a/x-pack/plugins/apm/public/components/shared/StickyProperties/index.js b/x-pack/plugins/apm/public/components/shared/StickyProperties/index.js deleted file mode 100644 index 3c690e3031c6a..0000000000000 --- a/x-pack/plugins/apm/public/components/shared/StickyProperties/index.js +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import styled from 'styled-components'; -import moment from 'moment'; - -import { - unit, - units, - px, - fontSizes, - colors, - truncate -} from '../../../style/variables'; - -import TooltipOverlay, { fieldNameHelper } from '../../shared/TooltipOverlay'; - -const PropertiesContainer = styled.div` - display: flex; - padding: 0 ${px(units.plus)}; - width: 100%; - justify-content: flex-start; - flex-wrap: wrap; -`; - -const Property = styled.div` - width: 33%; - margin-bottom: ${px(unit)}; -`; - -const PropertyLabel = styled.div` - margin-bottom: ${px(units.half)}; - font-size: ${fontSizes.small}; - color: ${colors.gray3}; - - span { - cursor: help; - } -`; - -const PropertyValueDimmed = styled.span` - color: ${colors.gray3}; -`; - -const PropertyValue = styled.div` - display: inline-block; - line-height: ${px(unit)}; -`; - -const PropertyValueTruncated = styled.span` - display: inline-block; - line-height: ${px(unit)}; - ${truncate('100%')}; -`; - -function TimestampValue({ timestamp }) { - const time = moment(timestamp); - const timeAgo = timestamp ? time.fromNow() : 'N/A'; - const timestampFull = timestamp - ? time.format('MMMM Do YYYY, HH:mm:ss.SSS') - : 'N/A'; - - return ( - - {timeAgo} ({timestampFull}) - - ); -} - -function getPropertyLabel({ fieldName, label }) { - if (fieldName) { - return ( - - - {label} - - - ); - } - - return {label}; -} - -function getPropertyValue({ val, fieldName, truncated = false }) { - if (fieldName === '@timestamp') { - return ; - } - - if (truncated) { - return ( - - {String(val)} - - ); - } - - return {String(val)}; -} - -export function StickyProperties({ stickyProperties }) { - return ( - - {stickyProperties && - stickyProperties.map((prop, i) => ( - - {getPropertyLabel(prop)} - {getPropertyValue(prop)} - - ))} - - ); -} diff --git a/x-pack/plugins/apm/public/components/shared/StickyProperties/index.tsx b/x-pack/plugins/apm/public/components/shared/StickyProperties/index.tsx new file mode 100644 index 0000000000000..c0ef09d8ae338 --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/StickyProperties/index.tsx @@ -0,0 +1,150 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import { EuiToolTip } from '@elastic/eui'; +import moment from 'moment'; +import React from 'react'; +import styled from 'styled-components'; +import { + colors, + fontFamilyCode, + fontSizes, + px, + truncate, + unit, + units +} from '../../../style/variables'; + +export interface IStickyProperty { + val: any; + label: string; + fieldName?: string; + width?: 0 | string; + truncated?: boolean; +} + +const TooltipFieldName = styled.span` + font-family: ${fontFamilyCode}; +`; + +const PropertyLabel = styled.div` + margin-bottom: ${px(units.half)}; + font-size: ${fontSizes.small}; + color: ${colors.gray3}; + + span { + cursor: help; + } +`; + +const PropertyValueDimmed = styled.span` + color: ${colors.gray3}; +`; + +const PropertyValue = styled.div` + display: inline-block; + line-height: ${px(unit)}; +`; + +const PropertyValueTruncated = styled.span` + display: inline-block; + line-height: ${px(unit)}; + ${truncate('100%')}; +`; + +function TimestampValue({ timestamp }: { timestamp: Date }) { + const time = moment(timestamp); + const timeAgo = timestamp ? time.fromNow() : 'N/A'; + const timestampFull = timestamp + ? time.format('MMMM Do YYYY, HH:mm:ss.SSS') + : 'N/A'; + + return ( + + {timeAgo} ({timestampFull}) + + ); +} + +function getPropertyLabel({ fieldName, label }: Partial) { + if (fieldName) { + return ( + + {fieldName}}> + {label} + + + ); + } + + return {label}; +} + +function getPropertyValue({ + val, + fieldName, + truncated = false +}: Partial) { + if (fieldName === '@timestamp') { + return ; + } + + if (truncated) { + return ( + + {String(val)} + + ); + } + + return {val}; +} + +export function StickyProperties({ + stickyProperties +}: { + stickyProperties: IStickyProperty[]; +}) { + /** + * Note: the padding and margin styles here are strange because + * EUI flex groups and items have a default "gutter" applied that + * won't allow percentage widths to line up correctly, so we have + * to turn the gutter off with gutterSize: none. When we do that, + * the top/bottom spacing *also* collapses, so we have to add + * padding between each item without adding it to the outside of + * the flex group itself. + * + * Hopefully we can make EUI handle this better and remove all this. + */ + const itemStyles = { + padding: '1em 1em 1em 0' + }; + const groupStyles = { + marginTop: '-1em', + marginBottom: '-1em' + }; + + return ( + + {stickyProperties && + stickyProperties.map(({ width = 0, ...prop }, i) => { + return ( + + {getPropertyLabel(prop)} + {getPropertyValue(prop)} + + ); + })} + + ); +} diff --git a/x-pack/plugins/apm/public/components/shared/TooltipOverlay.js b/x-pack/plugins/apm/public/components/shared/TooltipOverlay.js index 2addcc925ea91..c49fc01a4c124 100644 --- a/x-pack/plugins/apm/public/components/shared/TooltipOverlay.js +++ b/x-pack/plugins/apm/public/components/shared/TooltipOverlay.js @@ -5,15 +5,9 @@ */ import React from 'react'; -import styled from 'styled-components'; -import { fontFamilyCode } from '../../style/variables'; import { Tooltip } from 'pivotal-ui/react/tooltip'; import { OverlayTrigger } from 'pivotal-ui/react/overlay-trigger'; -const TooltipFieldName = styled.span` - font-family: ${fontFamilyCode}; -`; - function TooltipOverlay({ children, content, delay = 1000 }) { return ( - Field name:
      - {name} - - ); -} - export default TooltipOverlay; diff --git a/x-pack/plugins/apm/public/components/shared/TransactionLink.tsx b/x-pack/plugins/apm/public/components/shared/TransactionLink.tsx new file mode 100644 index 0000000000000..eab7735b5073e --- /dev/null +++ b/x-pack/plugins/apm/public/components/shared/TransactionLink.tsx @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Transaction } from '../../../typings/Transaction'; +import { KibanaLink, legacyEncodeURIComponent } from '../../utils/url'; + +interface TransactionLinkProps { + transaction?: Transaction; +} + +/** + * Return the path and query used to build a trace link, + * given either a v2 Transaction or a Transaction Group + */ +export function getLinkProps(transaction: Transaction) { + const serviceName = transaction.context.service.name; + const transactionType = transaction.transaction.type; + const traceId = + transaction.version === 'v2' ? transaction.trace.id : undefined; + const transactionId = transaction.transaction.id; + const name = transaction.transaction.name; + + const encodedName = legacyEncodeURIComponent(name); + + return { + hash: `/${serviceName}/transactions/${transactionType}/${encodedName}`, + query: { + traceId, + transactionId + } + }; +} + +export const TransactionLink: React.SFC = ({ + transaction, + children +}) => { + if (!transaction) { + return null; + } + + const linkProps = getLinkProps(transaction); + + if (!linkProps) { + // TODO: Should this case return unlinked children, null, or something else? + return {children}; + } + + return ( + + {children} + + ); +}; diff --git a/x-pack/plugins/apm/public/components/shared/UIComponents.js b/x-pack/plugins/apm/public/components/shared/UIComponents.js index 97030a3fa6d79..e286b68c7e495 100644 --- a/x-pack/plugins/apm/public/components/shared/UIComponents.js +++ b/x-pack/plugins/apm/public/components/shared/UIComponents.js @@ -5,14 +5,7 @@ */ import styled from 'styled-components'; -import { - unit, - units, - px, - fontSizes, - colors, - fontSize -} from '../../style/variables'; +import { unit, units, px, fontSizes, colors } from '../../style/variables'; import { RelativeLink } from '../../utils/url'; export const HeaderContainer = styled.div` @@ -47,12 +40,6 @@ export const HeaderSmall = styled.h3` ${props => props.css}; `; -export const HeaderXSmall = styled.h4` - margin: ${px(units.plus)} 0; - font-size: ${fontSize}; - ${props => props.css}; -`; - export const Tab = styled.div` display: inline-block; font-size: ${fontSizes.large}; diff --git a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js index 24e1711608cfb..615de4c170065 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js @@ -16,7 +16,7 @@ import { timeUnit } from '../../../../../utils/formatters'; import { toJson } from '../../../../../utils/testHelpers'; -import { getFormattedBuckets } from '../../../../app/TransactionDetails/Distribution/view'; +import { getFormattedBuckets } from '../../../../app/TransactionDetails/Distribution/index'; describe('Histogram', () => { let wrapper; @@ -38,9 +38,9 @@ describe('Histogram', () => { formatYShort={t => `${asDecimal(t)} occ.`} formatYLong={t => `${asDecimal(t)} occurrences`} tooltipHeader={bucket => - `${timeFormatter(bucket.x0, false)} - ${timeFormatter( + `${timeFormatter(bucket.x0, { withUnit: false })} - ${timeFormatter( bucket.x, - false + { withUnit: false } )} ${unit}` } width={800} @@ -98,9 +98,10 @@ describe('Histogram', () => { it('should update state with "hoveredBucket"', () => { expect(wrapper.state()).toEqual({ hoveredBucket: { - sampled: true, + sample: { + transactionId: '99c50a5b-44b4-4289-a3d1-a2815d128192' + }, style: { cursor: 'pointer' }, - transactionId: '99c50a5b-44b4-4289-a3d1-a2815d128192', x: 869010, x0: 811076, y: 49 @@ -124,9 +125,10 @@ describe('Histogram', () => { it('should call onClick with bucket', () => { expect(onClick).toHaveBeenCalledWith({ - sampled: true, + sample: { + transactionId: '99c50a5b-44b4-4289-a3d1-a2815d128192' + }, style: { cursor: 'pointer' }, - transactionId: '99c50a5b-44b4-4289-a3d1-a2815d128192', x: 869010, x0: 811076, y: 49 diff --git a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap index 2dfbab058941d..24e63fa08719d 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap @@ -115,7 +115,7 @@ exports[`Histogram Initially should have default markup 1`] = ` textAnchor="middle" transform="translate(0, 18)" > - 0 + 0 ms {agentMark.name} - {asTime(agentMark.timeLabel)} + {asTime(agentMark.us)}
      } > diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js b/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js index 32c9db3fe762a..e0ad041564a37 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/TimelineAxis.js @@ -6,7 +6,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import _ from 'lodash'; +import { inRange } from 'lodash'; import { Sticky } from 'react-sticky'; import { XYPlot, XAxis } from 'react-vis'; import LastTickValue from './LastTickValue'; @@ -14,14 +14,26 @@ import AgentMarker from './AgentMarker'; import { colors, px } from '../../../../style/variables'; import { getTimeFormatter } from '../../../../utils/formatters'; -// Remove last tick if it's too close to xMax -const getXAxisTickValues = (tickValues, xMax) => - _.last(tickValues) * 1.05 > xMax ? tickValues.slice(0, -1) : tickValues; +// Remove any tick that is too close to traceRootDuration +const getXAxisTickValues = (tickValues, traceRootDuration) => { + if (traceRootDuration == null) { + return tickValues; + } -function TimelineAxis({ header, plotValues, agentMarks }) { + const padding = (tickValues[1] - tickValues[0]) / 2; + const lowerBound = traceRootDuration - padding; + const upperBound = traceRootDuration + padding; + + return tickValues.filter(value => { + const isInRange = inRange(value, lowerBound, upperBound); + return !isInRange && value !== traceRootDuration; + }); +}; + +function TimelineAxis({ plotValues, agentMarks, traceRootDuration }) { const { margins, tickValues, width, xDomain, xMax, xScale } = plotValues; const tickFormat = getTimeFormatter(xMax); - const xAxisTickValues = getXAxisTickValues(tickValues, xMax); + const xAxisTickValues = getXAxisTickValues(tickValues, traceRootDuration); return ( @@ -38,13 +50,12 @@ function TimelineAxis({ header, plotValues, agentMarks }) { ...style }} > - {header} - + {traceRootDuration && ( + + )} {agentMarks.map(agentMark => ( ))} diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js b/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js index 317f01290f403..a459b625ae820 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/VerticalLines.js @@ -11,18 +11,16 @@ import { colors } from '../../../../style/variables'; class VerticalLines extends PureComponent { render() { + const { traceRootDuration } = this.props; const { width, height, margins, xDomain, - tickValues, - xMax + tickValues } = this.props.plotValues; - const agentMarkTimes = this.props.agentMarks.map( - ({ timeAxis }) => timeAxis - ); + const agentMarkTimes = this.props.agentMarks.map(({ us }) => us); return (
      + + {traceRootDuration && ( + + )}
      ); diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js index 2b92ae4c9fbf2..ba30c70c59672 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/Timeline.test.js @@ -9,7 +9,6 @@ import { mount } from 'enzyme'; import { StickyContainer } from 'react-sticky'; import Timeline from '../index'; -import props from './props.json'; import { mockMoment, toJson } from '../../../../../utils/testHelpers'; describe('Timeline', () => { @@ -18,9 +17,28 @@ describe('Timeline', () => { }); it('should render with data', () => { + const props = { + traceRootDuration: 200000, + width: 1000, + duration: 200000, + height: 116, + margins: { + top: 100, + left: 50, + right: 50, + bottom: 0 + }, + animation: null, + agentMarks: [ + { name: 'timeToFirstByte', us: 100000 }, + { name: 'domInteractive', us: 110000 }, + { name: 'domComplete', us: 190000 } + ] + }; + const wrapper = mount( - Hello - i am a header
      } {...props} /> + ); diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap index dc61c85c9db76..ab80ff30a4ca8 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/__test__/__snapshots__/Timeline.test.js.snap @@ -57,21 +57,18 @@ exports[`Timeline should render with data 1`] = ` } } > -
      - Hello - i am a header -
      - 0 + 0 ms 20 ms @@ -189,7 +186,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(175.8817293082474, 0)" + transform="translate(180, 0)" > 40 ms @@ -231,7 +228,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(263.82259396237106, 0)" + transform="translate(270, 0)" > 60 ms @@ -273,7 +270,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(351.7634586164948, 0)" + transform="translate(360, 0)" > 80 ms @@ -315,7 +312,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(439.7043232706185, 0)" + transform="translate(450, 0)" > 100 ms @@ -357,7 +354,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(527.6451879247421, 0)" + transform="translate(540, 0)" > 120 ms @@ -399,7 +396,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(615.5860525788659, 0)" + transform="translate(630, 0)" > 140 ms @@ -441,7 +438,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(703.5269172329896, 0)" + transform="translate(720, 0)" > 160 ms @@ -483,7 +480,7 @@ exports[`Timeline should render with data 1`] = ` }, } } - transform="translate(791.4677818871132, 0)" + transform="translate(810, 0)" > 180 ms @@ -519,21 +516,22 @@ exports[`Timeline should render with data 1`] = ` - 205 ms + 200 ms
      @@ -685,8 +685,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={175.8817293082474} - x2={175.8817293082474} + x1={180} + x2={180} y1={0} y2={116} /> @@ -697,8 +697,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={263.82259396237106} - x2={263.82259396237106} + x1={270} + x2={270} y1={0} y2={116} /> @@ -709,8 +709,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={351.7634586164948} - x2={351.7634586164948} + x1={360} + x2={360} y1={0} y2={116} /> @@ -721,8 +721,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={439.7043232706185} - x2={439.7043232706185} + x1={450} + x2={450} y1={0} y2={116} /> @@ -733,8 +733,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={527.6451879247421} - x2={527.6451879247421} + x1={540} + x2={540} y1={0} y2={116} /> @@ -745,8 +745,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={615.5860525788659} - x2={615.5860525788659} + x1={630} + x2={630} y1={0} y2={116} /> @@ -757,8 +757,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={703.5269172329896} - x2={703.5269172329896} + x1={720} + x2={720} y1={0} y2={116} /> @@ -769,8 +769,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={791.4677818871132} - x2={791.4677818871132} + x1={810} + x2={810} y1={0} y2={116} /> @@ -781,8 +781,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#f5f5f5", } } - x1={879.408646541237} - x2={879.408646541237} + x1={900} + x2={900} y1={0} y2={116} /> @@ -798,8 +798,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#999999", } } - x1={439.7043232706185} - x2={439.7043232706185} + x1={450} + x2={450} y1={0} y2={116} /> @@ -810,8 +810,8 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#999999", } } - x1={483.6747555976803} - x2={483.6747555976803} + x1={495.00000000000006} + x2={495.00000000000006} y1={0} y2={116} /> @@ -822,11 +822,16 @@ exports[`Timeline should render with data 1`] = ` "stroke": "#999999", } } - x1={835.4382142141751} - x2={835.4382142141751} + x1={855} + x2={855} y1={0} y2={116} /> + + state.duration, - state => state.height, - state => state.margins, - state => state.width, - getPlotValues - ); - render() { - const { width, duration, header, agentMarks } = this.props; + const { + width, + duration, + agentMarks, + traceRootDuration, + height, + margins + } = this.props; if (duration == null || !width) { return null; } - - const plotValues = this.getPlotValues(this.props); + const plotValues = getPlotValues({ width, duration, height, margins }); return (
      + -
      ); } @@ -45,7 +46,7 @@ class Timeline extends PureComponent { Timeline.propTypes = { agentMarks: PropTypes.array, - duration: PropTypes.number.isRequired, + duration: PropTypes.number, height: PropTypes.number.isRequired, header: PropTypes.node, margins: PropTypes.object.isRequired, diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/plotUtils.js b/x-pack/plugins/apm/public/components/shared/charts/Timeline/plotUtils.js index 383a5a26b8ac0..e3004edd7b3d9 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/plotUtils.js +++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/plotUtils.js @@ -6,7 +6,7 @@ import { scaleLinear } from 'd3-scale'; -export function getPlotValues(duration, height, margins, width) { +export function getPlotValues({ width, duration, height, margins }) { const xMin = 0; const xMax = duration; const xScale = scaleLinear() diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.js b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.js index 72c77caba9a34..6d42bc2d8230d 100644 --- a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.js +++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.js @@ -5,11 +5,12 @@ */ import React, { Component } from 'react'; +import { EuiTitle } from '@elastic/eui'; import PropTypes from 'prop-types'; import CustomPlot from '../CustomPlot'; import { asMillis, tpmUnit, asInteger } from '../../../../utils/formatters'; import styled from 'styled-components'; -import { units, unit, px, fontSizes } from '../../../../style/variables'; +import { units, unit, px } from '../../../../style/variables'; import { timefilter } from 'ui/timefilter'; import moment from 'moment'; @@ -41,11 +42,6 @@ const ChartHeader = styled.div` margin-bottom: ${px(units.half)}; `; -const ChartTitle = styled.div` - font-weight: 600; - font-size: ${fontSizes.large}; -`; - export class Charts extends Component { state = { hoverX: null @@ -67,11 +63,7 @@ export class Charts extends Component { }; getResponseTimeTooltipFormatter = (p = {}) => { - if (this.props.charts.noHits) { - return '- ms'; - } else { - return p.y == null ? 'N/A' : asMillis(p.y); - } + return this.props.charts.noHits ? '- ms' : asMillis(p.y); }; getTPMFormatter = t => { @@ -92,7 +84,9 @@ export class Charts extends Component { - {responseTimeLabel(transactionType)} + +
      {responseTimeLabel(transactionType)}
      +
      {this.props.ChartHeaderContent}
      - {tpmLabel(transactionType)} + +
      {tpmLabel(transactionType)}
      +
      { + const showPluginBreadcrumbs = !chrome + .getUiSettingsClient() + .get('k7design', false); + ReactDOM.render( - + , document.getElementById('react-apm-breadcrumbs') ); diff --git a/x-pack/plugins/apm/public/services/rest/apm.js b/x-pack/plugins/apm/public/services/rest/apm.js deleted file mode 100644 index 3fd48afba9a3e..0000000000000 --- a/x-pack/plugins/apm/public/services/rest/apm.js +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { camelizeKeys } from 'humps'; -import { convertKueryToEsQuery } from '../kuery'; -import { callApi } from './callApi'; -import { getAPMIndexPattern } from './savedObjects'; - -export async function loadLicense() { - return callApi({ - pathname: `/api/xpack/v1/info` - }); -} - -export async function loadServerStatus() { - return callApi({ - pathname: `/api/apm/status/server` - }); -} - -export async function loadAgentStatus() { - return callApi({ - pathname: `/api/apm/status/agent` - }); -} - -export async function getEncodedEsQuery(kuery) { - if (!kuery) { - return; - } - - const indexPattern = await getAPMIndexPattern(); - - if (!indexPattern) { - return; - } - - const esFilterQuery = convertKueryToEsQuery(kuery, indexPattern); - return encodeURIComponent(JSON.stringify(esFilterQuery)); -} - -export async function loadServiceList({ start, end, kuery }) { - return callApi({ - pathname: `/api/apm/services`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }); -} - -export async function loadServiceDetails({ serviceName, start, end, kuery }) { - return callApi({ - pathname: `/api/apm/services/${serviceName}`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }); -} - -export async function loadTransactionList({ - serviceName, - start, - end, - kuery, - transactionType -}) { - return callApi({ - pathname: `/api/apm/services/${serviceName}/transactions`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery), - transaction_type: transactionType - } - }); -} - -export async function loadTransactionDistribution({ - serviceName, - start, - end, - transactionName, - kuery -}) { - return callApi({ - pathname: `/api/apm/services/${serviceName}/transactions/distribution`, - query: { - start, - end, - transaction_name: transactionName, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }); -} - -export async function loadSpans({ serviceName, start, end, transactionId }) { - return callApi({ - pathname: `/api/apm/services/${serviceName}/transactions/${transactionId}/spans`, - query: { - start, - end - } - }); -} - -export async function loadTransaction({ - serviceName, - start, - end, - transactionId, - kuery -}) { - const res = await callApi( - { - pathname: `/api/apm/services/${serviceName}/transactions/${transactionId}`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }, - { - camelcase: false - } - ); - const camelizedRes = camelizeKeys(res); - if (res.context) { - camelizedRes.context = res.context; - } - return camelizedRes; -} - -export async function loadCharts({ - serviceName, - start, - end, - kuery, - transactionType, - transactionName -}) { - return callApi({ - pathname: `/api/apm/services/${serviceName}/transactions/charts`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery), - transaction_type: transactionType, - transaction_name: transactionName - } - }); -} - -export async function loadErrorGroupList({ - serviceName, - start, - end, - kuery, - size, - sortField, - sortDirection -}) { - return callApi({ - pathname: `/api/apm/services/${serviceName}/errors`, - query: { - start, - end, - size, - sortField, - sortDirection, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }); -} - -export async function loadErrorGroupDetails({ - serviceName, - start, - end, - kuery, - errorGroupId -}) { - const res = await callApi( - { - pathname: `/api/apm/services/${serviceName}/errors/${errorGroupId}`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }, - { - camelcase: false - } - ); - const camelizedRes = camelizeKeys(res); - if (res.error.context) { - camelizedRes.error.context = res.error.context; - } - return camelizedRes; -} - -export async function loadErrorDistribution({ - serviceName, - start, - end, - kuery, - errorGroupId -}) { - return callApi({ - pathname: `/api/apm/services/${serviceName}/errors/${errorGroupId}/distribution`, - query: { - start, - end, - esFilterQuery: await getEncodedEsQuery(kuery) - } - }); -} diff --git a/x-pack/plugins/apm/public/services/rest/apm.ts b/x-pack/plugins/apm/public/services/rest/apm.ts new file mode 100644 index 0000000000000..3a390492f8c72 --- /dev/null +++ b/x-pack/plugins/apm/public/services/rest/apm.ts @@ -0,0 +1,316 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { camelizeKeys } from 'humps'; +import { ServiceResponse } from 'x-pack/plugins/apm/server/lib/services/get_service'; +import { ServiceListItemResponse } from 'x-pack/plugins/apm/server/lib/services/get_services'; +import { IDistributionResponse } from 'x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution'; +import { Span } from 'x-pack/plugins/apm/typings/Span'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { ITransactionGroup } from 'x-pack/plugins/apm/typings/TransactionGroup'; +import { WaterfallResponse } from 'x-pack/plugins/apm/typings/waterfall'; +import { IUrlParams } from '../../store/urlParams'; +// @ts-ignore +import { convertKueryToEsQuery } from '../kuery'; +// @ts-ignore +import { callApi } from './callApi'; +// @ts-ignore +import { getAPMIndexPattern } from './savedObjects'; + +export async function loadLicense() { + return callApi({ + pathname: `/api/xpack/v1/info` + }); +} + +export async function loadServerStatus() { + return callApi({ + pathname: `/api/apm/status/server` + }); +} + +export async function loadAgentStatus() { + return callApi({ + pathname: `/api/apm/status/agent` + }); +} + +export async function getEncodedEsQuery(kuery?: string) { + if (!kuery) { + return; + } + + const indexPattern = await getAPMIndexPattern(); + + if (!indexPattern) { + return; + } + + const esFilterQuery = convertKueryToEsQuery(kuery, indexPattern); + return encodeURIComponent(JSON.stringify(esFilterQuery)); +} + +export async function loadServiceList({ + start, + end, + kuery +}: IUrlParams): Promise { + return callApi({ + pathname: `/api/apm/services`, + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }); +} + +export async function loadServiceDetails({ + serviceName, + start, + end, + kuery +}: IUrlParams): Promise { + return callApi({ + pathname: `/api/apm/services/${serviceName}`, + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }); +} + +export async function loadTraceList({ + start, + end, + kuery +}: IUrlParams): Promise { + const groups: ITransactionGroup[] = await callApi({ + pathname: '/api/apm/traces', + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }); + + return groups.map(group => { + group.sample = addVersion(group.sample); + return group; + }); +} + +export async function loadTransactionList({ + serviceName, + start, + end, + kuery, + transactionType +}: IUrlParams): Promise { + const groups: ITransactionGroup[] = await callApi({ + pathname: `/api/apm/services/${serviceName}/transactions`, + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery), + transaction_type: transactionType + } + }); + + return groups.map(group => { + group.sample = addVersion(group.sample); + return group; + }); +} + +export async function loadTransactionDistribution({ + serviceName, + start, + end, + transactionName, + kuery +}: IUrlParams): Promise { + return callApi({ + pathname: `/api/apm/services/${serviceName}/transactions/distribution`, + query: { + start, + end, + transaction_name: transactionName, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }); +} + +function addVersion( + item: T +): T { + if (item != null) { + item.version = item.hasOwnProperty('trace') ? 'v2' : 'v1'; + } + + return item; +} + +function addSpanId(hit: Span, i: number) { + if (!hit.span.id) { + hit.span.id = i; + } + return hit; +} + +export async function loadSpans({ + serviceName, + start, + end, + transactionId +}: IUrlParams): Promise { + const hits: Span[] = await callApi({ + pathname: `/api/apm/services/${serviceName}/transactions/${transactionId}/spans`, + query: { + start, + end + } + }); + + return hits.map(addVersion).map(addSpanId); +} + +export async function loadTrace({ traceId, start, end }: IUrlParams) { + const hits: WaterfallResponse = await callApi( + { + pathname: `/api/apm/traces/${traceId}`, + query: { + start, + end + } + }, + { + camelcase: false + } + ); + + return hits.map(addVersion); +} + +export async function loadTransaction({ + serviceName, + start, + end, + transactionId, + traceId, + kuery +}: IUrlParams) { + const result: Transaction | null = await callApi( + { + pathname: `/api/apm/services/${serviceName}/transactions/${transactionId}`, + query: { + traceId, + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }, + { + camelcase: false + } + ); + + return addVersion(result); +} + +export async function loadCharts({ + serviceName, + start, + end, + kuery, + transactionType, + transactionName +}: IUrlParams) { + return callApi({ + pathname: `/api/apm/services/${serviceName}/transactions/charts`, + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery), + transaction_type: transactionType, + transaction_name: transactionName + } + }); +} + +interface ErrorGroupListParams extends IUrlParams { + size: number; + sortField: string; + sortDirection: string; +} + +export async function loadErrorGroupList({ + serviceName, + start, + end, + kuery, + size, + sortField, + sortDirection +}: ErrorGroupListParams) { + return callApi({ + pathname: `/api/apm/services/${serviceName}/errors`, + query: { + start, + end, + size, + sortField, + sortDirection, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }); +} + +export async function loadErrorGroupDetails({ + serviceName, + start, + end, + kuery, + errorGroupId +}: IUrlParams) { + const res = await callApi( + { + pathname: `/api/apm/services/${serviceName}/errors/${errorGroupId}`, + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }, + { + camelcase: false + } + ); + const camelizedRes = camelizeKeys(res); + if (res.error.context) { + camelizedRes.error.context = res.error.context; + } + return camelizedRes; +} + +export async function loadErrorDistribution({ + serviceName, + start, + end, + kuery, + errorGroupId +}: IUrlParams) { + return callApi({ + pathname: `/api/apm/services/${serviceName}/errors/${errorGroupId}/distribution`, + query: { + start, + end, + esFilterQuery: await getEncodedEsQuery(kuery) + } + }); +} diff --git a/x-pack/plugins/apm/public/store/__jest__/rootReducer.test.js b/x-pack/plugins/apm/public/store/__jest__/rootReducer.test.js index 46e96d5303b22..2db1f1f23eb26 100644 --- a/x-pack/plugins/apm/public/store/__jest__/rootReducer.test.js +++ b/x-pack/plugins/apm/public/store/__jest__/rootReducer.test.js @@ -4,11 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import reducer from '../rootReducer'; +import { rootReducer } from '../rootReducer'; describe('root reducer', () => { it('should return the initial state', () => { - expect(reducer(undefined, {})).toEqual({ + expect(rootReducer(undefined, {})).toEqual({ location: { hash: '', pathname: '', search: '' }, reactReduxRequest: {}, urlParams: {} diff --git a/x-pack/plugins/apm/public/store/__jest__/urlParams.test.js b/x-pack/plugins/apm/public/store/__jest__/urlParams.test.js index bd849be83c0df..c55e8e66724c4 100644 --- a/x-pack/plugins/apm/public/store/__jest__/urlParams.test.js +++ b/x-pack/plugins/apm/public/store/__jest__/urlParams.test.js @@ -4,12 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import reducer, { updateTimePicker } from '../urlParams'; +import { urlParamsReducer, updateTimePicker } from '../urlParams'; import { LOCATION_UPDATE } from '../location'; describe('urlParams', () => { it('should handle LOCATION_UPDATE for transactions section', () => { - const state = reducer( + const state = urlParamsReducer( {}, { type: LOCATION_UPDATE, @@ -34,7 +34,7 @@ describe('urlParams', () => { }); it('should handle LOCATION_UPDATE for error section', () => { - const state = reducer( + const state = urlParamsReducer( {}, { type: LOCATION_UPDATE, @@ -56,7 +56,7 @@ describe('urlParams', () => { }); it('should handle TIMEPICKER_UPDATE', () => { - const state = reducer( + const state = urlParamsReducer( {}, updateTimePicker({ min: 'minTime', diff --git a/x-pack/plugins/apm/public/store/config/configureStore.dev.js b/x-pack/plugins/apm/public/store/config/configureStore.dev.js index e2f37391ee317..8187e87507858 100644 --- a/x-pack/plugins/apm/public/store/config/configureStore.dev.js +++ b/x-pack/plugins/apm/public/store/config/configureStore.dev.js @@ -7,7 +7,7 @@ import { createStore, applyMiddleware, compose } from 'redux'; import thunk from 'redux-thunk'; import throttle from '../middleware/throttle'; -import rootReducer from '../rootReducer'; +import { rootReducer } from '../rootReducer'; export default function configureStore(preloadedState) { const composeEnhancers = diff --git a/x-pack/plugins/apm/public/store/config/configureStore.prod.js b/x-pack/plugins/apm/public/store/config/configureStore.prod.js index d52bc2ba45f53..ee3034156b927 100644 --- a/x-pack/plugins/apm/public/store/config/configureStore.prod.js +++ b/x-pack/plugins/apm/public/store/config/configureStore.prod.js @@ -6,7 +6,7 @@ import { createStore, applyMiddleware } from 'redux'; import thunk from 'redux-thunk'; -import rootReducer from '../rootReducer'; +import { rootReducer } from '../rootReducer'; export default function configureStore(preloadedState) { return createStore(rootReducer, preloadedState, applyMiddleware(thunk)); diff --git a/x-pack/plugins/apm/public/store/mockData/mockTraceList.json b/x-pack/plugins/apm/public/store/mockData/mockTraceList.json new file mode 100644 index 0000000000000..4e97a030a2621 --- /dev/null +++ b/x-pack/plugins/apm/public/store/mockData/mockTraceList.json @@ -0,0 +1,30 @@ +[ + { + "name": "log", + "serviceName": "flask-server", + "averageResponseTime": 1329, + "tracesPerMinute": 3201, + "impact": 70 + }, + { + "name": "products/item", + "serviceName": "client", + "averageResponseTime": 2301, + "tracesPerMinute": 5432, + "impact": 42 + }, + { + "name": "billing/payment", + "serviceName": "client", + "averageResponseTime": 789, + "tracesPerMinute": 1201, + "impact": 14 + }, + { + "name": "user/profile", + "serviceName": "client", + "averageResponseTime": 1212, + "tracesPerMinute": 904, + "impact": 92 + } +] diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/errorDistribution.js b/x-pack/plugins/apm/public/store/reactReduxRequest/errorDistribution.js index b01bee5f37d78..a800b31f9b3b5 100644 --- a/x-pack/plugins/apm/public/store/reactReduxRequest/errorDistribution.js +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/errorDistribution.js @@ -20,7 +20,7 @@ export function getErrorDistribution(state) { export function ErrorDistributionRequest({ urlParams, render }) { const { serviceName, start, end, errorGroupId, kuery } = urlParams; - if (!(serviceName, start, end, errorGroupId)) { + if (!(serviceName && start && end && errorGroupId)) { return null; } diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/spans.js b/x-pack/plugins/apm/public/store/reactReduxRequest/spans.js deleted file mode 100644 index eb35e32a311e0..0000000000000 --- a/x-pack/plugins/apm/public/store/reactReduxRequest/spans.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { createInitialDataSelector } from './helpers'; -import { Request } from 'react-redux-request'; -import { loadSpans } from '../../services/rest/apm'; - -const ID = 'spans'; -const INITIAL_DATA = {}; -const withInitialData = createInitialDataSelector(INITIAL_DATA); - -export function getSpans(state) { - return withInitialData(state.reactReduxRequest[ID]); -} - -export function SpansRequest({ urlParams, render }) { - const { serviceName, start, end, transactionId, kuery } = urlParams; - - if (!(serviceName && start && end && transactionId)) { - return null; - } - - return ( - - ); -} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/traceList.js b/x-pack/plugins/apm/public/store/reactReduxRequest/traceList.js new file mode 100644 index 0000000000000..804e404189861 --- /dev/null +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/traceList.js @@ -0,0 +1,48 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Request } from 'react-redux-request'; +import { createSelector } from 'reselect'; +import { loadTraceList } from '../../services/rest/apm'; +import { createInitialDataSelector } from './helpers'; + +const ID = 'traceList'; +const INITIAL_DATA = []; +const withInitialData = createInitialDataSelector(INITIAL_DATA); + +const selectRRR = (state = {}) => state.reactReduxRequest; + +export const selectTraceList = createSelector( + [selectRRR], + reactReduxRequest => { + return withInitialData(reactReduxRequest[ID]); + } +); + +export function TraceListRequest({ urlParams = {}, render }) { + const { start, end, kuery } = urlParams; + + if (!start || !end) { + return null; + } + + return ( + + ); +} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDetails.js b/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDetails.js deleted file mode 100644 index bfc2c0fee99e0..0000000000000 --- a/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDetails.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { createInitialDataSelector } from './helpers'; -import { Request } from 'react-redux-request'; -import { loadTransaction } from '../../services/rest/apm'; - -const ID = 'transactionDetails'; -const INITIAL_DATA = {}; -const withInitialData = createInitialDataSelector(INITIAL_DATA); - -export function getTransactionDetails(state) { - return withInitialData(state.reactReduxRequest[ID]); -} - -export function TransactionDetailsRequest({ urlParams, render }) { - const { serviceName, start, end, transactionId, kuery } = urlParams; - - if (!(serviceName && start && end && transactionId)) { - return null; - } - - return ( - - ); -} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDetails.tsx b/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDetails.tsx new file mode 100644 index 0000000000000..0e1d5ece186db --- /dev/null +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDetails.tsx @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Request, RRRRender } from 'react-redux-request'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { loadTransaction } from '../../services/rest/apm'; +import { IReduxState } from '../rootReducer'; +import { IUrlParams } from '../urlParams'; +// @ts-ignore +import { createInitialDataSelector } from './helpers'; + +const ID = 'transactionDetails'; +export function getTransactionDetails(state: IReduxState) { + return state.reactReduxRequest[ID]; +} + +export function TransactionDetailsRequest({ + urlParams, + render +}: { + urlParams: IUrlParams; + render: RRRRender; +}) { + const { serviceName, start, end, transactionId, traceId, kuery } = urlParams; + + if (!(serviceName && start && end && transactionId)) { + return null; + } + + return ( + + ); +} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDistribution.js b/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDistribution.js deleted file mode 100644 index ffc2d27614695..0000000000000 --- a/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDistribution.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { createInitialDataSelector } from './helpers'; -import { Request } from 'react-redux-request'; -import { loadTransactionDistribution } from '../../services/rest/apm'; - -const ID = 'transactionDistribution'; -const INITIAL_DATA = { buckets: [], totalHits: 0 }; -const withInitialData = createInitialDataSelector(INITIAL_DATA); - -export function getTransactionDistribution(state) { - return withInitialData(state.reactReduxRequest[ID]); -} - -export function getDefaultTransactionId(state) { - const distribution = getTransactionDistribution(state); - return distribution.data.defaultTransactionId; -} - -export function TransactionDistributionRequest({ urlParams, render }) { - const { serviceName, start, end, transactionName, kuery } = urlParams; - - if (!(serviceName && start && end && transactionName)) { - return null; - } - - return ( - - ); -} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDistribution.tsx b/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDistribution.tsx new file mode 100644 index 0000000000000..b52644d6881d5 --- /dev/null +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/transactionDistribution.tsx @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Request, RRRRender, RRRRenderResponse } from 'react-redux-request'; +import { IDistributionResponse } from '../../../server/lib/transactions/distribution/get_distribution'; +import { loadTransactionDistribution } from '../../services/rest/apm'; +import { IReduxState } from '../rootReducer'; +import { IUrlParams } from '../urlParams'; +// @ts-ignore +import { createInitialDataSelector } from './helpers'; + +const ID = 'transactionDistribution'; +const INITIAL_DATA = { buckets: [], totalHits: 0 }; +const withInitialData = createInitialDataSelector(INITIAL_DATA); + +export function getTransactionDistribution( + state: IReduxState +): RRRRenderResponse { + return withInitialData(state.reactReduxRequest[ID]); +} + +export function getDefaultDistributionSample(state: IReduxState) { + const distribution = getTransactionDistribution(state); + const { defaultSample = {} } = distribution.data; + return { + traceId: defaultSample.traceId, + transactionId: defaultSample.transactionId + }; +} + +export function TransactionDistributionRequest({ + urlParams, + render +}: { + urlParams: IUrlParams; + render: RRRRender; +}) { + const { serviceName, start, end, transactionName, kuery } = urlParams; + + if (!(serviceName && start && end && transactionName)) { + return null; + } + + return ( + + ); +} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/waterfall.tsx b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfall.tsx new file mode 100644 index 0000000000000..13038fdea15d7 --- /dev/null +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfall.tsx @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { RRRRender } from 'react-redux-request'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { IWaterfall } from '../../components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers'; +import { IUrlParams } from '../urlParams'; +import { WaterfallV1Request } from './waterfallV1'; +import { WaterfallV2Request } from './waterfallV2'; + +interface Props { + urlParams: IUrlParams; + transaction: Transaction; + render: RRRRender; +} + +export function WaterfallRequest({ urlParams, transaction, render }: Props) { + const hasTrace = transaction.hasOwnProperty('trace'); + if (hasTrace) { + return ( + + ); + } else { + return ( + + ); + } +} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/waterfallV1.tsx b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfallV1.tsx new file mode 100644 index 0000000000000..f04f37c5f60df --- /dev/null +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfallV1.tsx @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { get } from 'lodash'; +import React from 'react'; +import { Request, RRRRender } from 'react-redux-request'; +import { + SERVICE_NAME, + TRANSACTION_ID +} from 'x-pack/plugins/apm/common/constants'; +import { Span } from 'x-pack/plugins/apm/typings/Span'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { + getWaterfall, + IWaterfall +} from '../../components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers'; +import { loadSpans } from '../../services/rest/apm'; +import { IUrlParams } from '../urlParams'; +// @ts-ignore +import { createInitialDataSelector } from './helpers'; + +export const ID = 'waterfallV1'; + +interface Props { + urlParams: IUrlParams; + transaction: Transaction; + render: RRRRender; +} + +export function WaterfallV1Request({ urlParams, transaction, render }: Props) { + const { start, end } = urlParams; + const transactionId: string = get(transaction, TRANSACTION_ID); + const serviceName: string = get(transaction, SERVICE_NAME); + + if (!(serviceName && transactionId && start && end)) { + return null; + } + + return ( + + id={ID} + fn={loadSpans} + args={[{ serviceName, start, end, transactionId }]} + render={({ status, data = [], args }) => { + const waterfall = getWaterfall([transaction, ...data], transaction); + return render({ status, data: waterfall, args }); + }} + /> + ); +} diff --git a/x-pack/plugins/apm/public/store/reactReduxRequest/waterfallV2.tsx b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfallV2.tsx new file mode 100644 index 0000000000000..43e4f65c91d4b --- /dev/null +++ b/x-pack/plugins/apm/public/store/reactReduxRequest/waterfallV2.tsx @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { get } from 'lodash'; +import React from 'react'; +import { Request, RRRRender } from 'react-redux-request'; +import { TRACE_ID } from 'x-pack/plugins/apm/common/constants'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { WaterfallResponse } from 'x-pack/plugins/apm/typings/waterfall'; +import { + getWaterfall, + IWaterfall +} from '../../components/app/TransactionDetails/Transaction/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers'; +import { loadTrace } from '../../services/rest/apm'; +import { IUrlParams } from '../urlParams'; +// @ts-ignore +import { createInitialDataSelector } from './helpers'; + +export const ID = 'waterfallV2'; + +interface Props { + urlParams: IUrlParams; + transaction: Transaction; + render: RRRRender; +} + +export function WaterfallV2Request({ urlParams, transaction, render }: Props) { + const { start, end } = urlParams; + const traceId: string = get(transaction, TRACE_ID); + + if (!(traceId && start && end)) { + return null; + } + + return ( + + id={ID} + fn={loadTrace} + args={[{ traceId, start, end }]} + render={({ args, data = [], status }) => { + const waterfall = getWaterfall(data, transaction); + return render({ args, data: waterfall, status }); + }} + /> + ); +} diff --git a/x-pack/plugins/apm/public/store/rootReducer.js b/x-pack/plugins/apm/public/store/rootReducer.js deleted file mode 100644 index 8c2b6635ec56b..0000000000000 --- a/x-pack/plugins/apm/public/store/rootReducer.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { combineReducers } from 'redux'; -import location from './location'; -import urlParams from './urlParams'; -import { reducer } from 'react-redux-request'; - -const rootReducer = combineReducers({ - location, - urlParams, - reactReduxRequest: reducer -}); - -export default rootReducer; diff --git a/x-pack/plugins/apm/public/store/rootReducer.ts b/x-pack/plugins/apm/public/store/rootReducer.ts new file mode 100644 index 0000000000000..3efab71b998b9 --- /dev/null +++ b/x-pack/plugins/apm/public/store/rootReducer.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { reducer } from 'react-redux-request'; +import { combineReducers } from 'redux'; +import { StringMap } from '../../typings/common'; +// @ts-ignore +import location from './location'; +import { IUrlParams, urlParamsReducer } from './urlParams'; + +export interface IReduxState { + location: any; + urlParams: IUrlParams; + reactReduxRequest: StringMap; +} + +export const rootReducer = combineReducers({ + location, + urlParams: urlParamsReducer, + reactReduxRequest: reducer +}); diff --git a/x-pack/plugins/apm/public/store/selectors/chartSelectors.js b/x-pack/plugins/apm/public/store/selectors/chartSelectors.js index cc898d6b66779..534da52262d16 100644 --- a/x-pack/plugins/apm/public/store/selectors/chartSelectors.js +++ b/x-pack/plugins/apm/public/store/selectors/chartSelectors.js @@ -7,11 +7,7 @@ import d3 from 'd3'; import { last, zipObject, difference, memoize, get, isEmpty } from 'lodash'; import { colors } from '../../style/variables'; -import { - asMillisWithDefault, - asDecimal, - tpmUnit -} from '../../utils/formatters'; +import { asMillis, asDecimal, tpmUnit } from '../../utils/formatters'; import { rgba } from 'polished'; export const getEmptySerie = memoize( @@ -59,7 +55,7 @@ export function getResponseTimeSeries(chartsData) { { title: 'Avg.', data: getChartValues(dates, avg), - legendValue: `${asMillisWithDefault(overallAvgDuration)}`, + legendValue: asMillis(overallAvgDuration), type: 'line', color: colors.apmBlue }, diff --git a/x-pack/plugins/apm/public/store/urlParams.js b/x-pack/plugins/apm/public/store/urlParams.js deleted file mode 100644 index 23a8313f6b90f..0000000000000 --- a/x-pack/plugins/apm/public/store/urlParams.js +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import _ from 'lodash'; -import { createSelector } from 'reselect'; -import { LOCATION_UPDATE } from './location'; -import { toQuery, legacyDecodeURIComponent } from '../utils/url'; -import { getDefaultTransactionId } from './reactReduxRequest/transactionDistribution'; -import { getDefaultTransactionType } from './reactReduxRequest/serviceDetails'; - -// ACTION TYPES -export const TIMEPICKER_UPDATE = 'TIMEPICKER_UPDATE'; - -// "urlParams" contains path and query parameters from the url, that can be easily consumed from -// any (container) component with access to the store - -// Example: -// url: /opbeans-backend/Brewing%20Bot?transactionId=1321 -// serviceName: opbeans-backend (path param) -// transactionType: Brewing%20Bot (path param) -// transactionId: 1321 (query param) -function urlParams(state = {}, action) { - switch (action.type) { - case LOCATION_UPDATE: { - const { - processorEvent, - serviceName, - transactionType, - transactionName, - errorGroupId - } = getPathParams(action.location.pathname); - - const { - transactionId, - detailTab, - spanId, - page, - sortDirection, - sortField, - kuery - } = toQuery(action.location.search); - - return { - ...state, - - // query params - sortDirection, - sortField, - page: toNumber(page) || 0, - transactionId, - detailTab, - spanId: toNumber(spanId), - kuery: legacyDecodeURIComponent(kuery), - - // path params - processorEvent, - serviceName, - transactionType: legacyDecodeURIComponent(transactionType), - transactionName: legacyDecodeURIComponent(transactionName), - errorGroupId - }; - } - - case TIMEPICKER_UPDATE: - return { ...state, start: action.time.min, end: action.time.max }; - - default: - return state; - } -} - -function toNumber(value) { - if (value != null) { - return parseInt(value, 10); - } -} - -function getPathAsArray(pathname) { - return _.compact(pathname.split('/')); -} - -function getPathParams(pathname) { - const paths = getPathAsArray(pathname); - const pageName = paths[1]; - - switch (pageName) { - case 'transactions': - return { - processorEvent: 'transaction', - serviceName: paths[0], - transactionType: paths[2], - transactionName: paths[3] - }; - case 'errors': - return { - processorEvent: 'error', - serviceName: paths[0], - errorGroupId: paths[2] - }; - default: - return {}; - } -} - -// ACTION CREATORS -export function updateTimePicker(time) { - return { type: TIMEPICKER_UPDATE, time }; -} - -// Selectors -export const getUrlParams = createSelector( - state => state.urlParams, - getDefaultTransactionType, - getDefaultTransactionId, - (urlParams, transactionType, transactionId) => { - return _.defaults({}, urlParams, { - transactionType, - transactionId - }); - } -); - -export default urlParams; diff --git a/x-pack/plugins/apm/public/store/urlParams.ts b/x-pack/plugins/apm/public/store/urlParams.ts new file mode 100644 index 0000000000000..cedcbfe337fee --- /dev/null +++ b/x-pack/plugins/apm/public/store/urlParams.ts @@ -0,0 +1,172 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import _ from 'lodash'; +import { AnyAction } from 'redux'; +import { createSelector } from 'reselect'; +// @ts-ignore +import { legacyDecodeURIComponent, toQuery } from '../utils/url'; +// @ts-ignore +import { LOCATION_UPDATE } from './location'; +// @ts-ignore +import { getDefaultTransactionType } from './reactReduxRequest/serviceDetails'; +import { getDefaultDistributionSample } from './reactReduxRequest/transactionDistribution'; +import { IReduxState } from './rootReducer'; + +// ACTION TYPES +export const TIMEPICKER_UPDATE = 'TIMEPICKER_UPDATE'; + +// "urlParams" contains path and query parameters from the url, that can be easily consumed from +// any (container) component with access to the store + +// Example: +// url: /opbeans-backend/Brewing%20Bot?transactionId=1321 +// serviceName: opbeans-backend (path param) +// transactionType: Brewing%20Bot (path param) +// transactionId: 1321 (query param) +export function urlParamsReducer(state = {}, action: AnyAction) { + switch (action.type) { + case LOCATION_UPDATE: { + const { + processorEvent, + serviceName, + transactionType, + transactionName, + errorGroupId + } = getPathParams(action.location.pathname); + + const { + traceId, + transactionId, + detailTab, + flyoutDetailTab, + waterfallItemId, + spanId, + page, + sortDirection, + sortField, + kuery + } = toQuery(action.location.search); + + return removeUndefinedProps({ + ...state, + + // query params + sortDirection, + sortField, + page: toNumber(page) || 0, + transactionId: toString(transactionId), + traceId: toString(traceId), + waterfallItemId: toString(waterfallItemId), + detailTab: toString(detailTab), + flyoutDetailTab: toString(flyoutDetailTab), + spanId: toNumber(spanId), + kuery: legacyDecodeURIComponent(kuery as string | undefined), + + // path params + processorEvent, + serviceName, + transactionType: legacyDecodeURIComponent(transactionType), + transactionName: legacyDecodeURIComponent(transactionName), + errorGroupId + }); + } + + case TIMEPICKER_UPDATE: + return { ...state, start: action.time.min, end: action.time.max }; + + default: + return state; + } +} + +function toNumber(value?: string | string[]) { + if (value !== undefined && !Array.isArray(value)) { + return parseInt(value, 10); + } +} + +function toString(str?: string | string[]) { + if ( + str === '' || + str === 'null' || + str === 'undefined' || + Array.isArray(str) + ) { + return; + } + return str; +} + +function getPathAsArray(pathname: string) { + return _.compact(pathname.split('/')); +} + +function removeUndefinedProps(obj: T): Partial { + return _.pick(obj, value => value !== undefined); +} + +function getPathParams(pathname: string) { + const paths = getPathAsArray(pathname); + const pageName = paths[1]; + + switch (pageName) { + case 'transactions': + return { + processorEvent: 'transaction', + serviceName: paths[0], + transactionType: paths[2], + transactionName: paths[3] + }; + case 'errors': + return { + processorEvent: 'error', + serviceName: paths[0], + errorGroupId: paths[2] + }; + default: + return {}; + } +} + +// ACTION CREATORS +export function updateTimePicker(time: string) { + return { type: TIMEPICKER_UPDATE, time }; +} + +// Selectors +export const getUrlParams = createSelector( + (state: IReduxState) => state.urlParams, + getDefaultTransactionType, + getDefaultDistributionSample, + ( + urlParams, + transactionType: string, + { traceId, transactionId } + ): IUrlParams => { + return { + transactionType, + transactionId, + traceId, + ...urlParams + }; + } +); + +export interface IUrlParams { + end?: string; + errorGroupId?: string; + flyoutDetailTab?: string; + detailTab?: string; + kuery?: string; + serviceName?: string; + start?: string; + traceId?: string; + transactionId?: string; + transactionName?: string; + transactionType?: string; + waterfallItemId?: string; +} diff --git a/x-pack/plugins/apm/public/style/global_overrides.css b/x-pack/plugins/apm/public/style/global_overrides.css index 7b032a40914de..a4d51186ab759 100644 --- a/x-pack/plugins/apm/public/style/global_overrides.css +++ b/x-pack/plugins/apm/public/style/global_overrides.css @@ -31,4 +31,11 @@ Hide default dashed gridlines in EUI chart component for all APM graphs .rv-xy-plot__grid-lines__line { stroke-opacity: 1; stroke-dasharray: 1; -} \ No newline at end of file +} + +/* +Override tab size since K6 theme makes "s" and "m" tabs both 14px +*/ +.k6Tab--large .euiTab { + font-size: 16px; +} diff --git a/x-pack/plugins/apm/public/utils/__test__/__snapshots__/url.test.js.snap b/x-pack/plugins/apm/public/utils/__test__/__snapshots__/url.test.js.snap deleted file mode 100644 index 6430ae0cc5804..0000000000000 --- a/x-pack/plugins/apm/public/utils/__test__/__snapshots__/url.test.js.snap +++ /dev/null @@ -1,41 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`KibanaLinkComponent should render correct markup 1`] = ` - - Go to Discover - -`; - -exports[`RelativeLinkComponent should render correct markup 1`] = ` - - Go to Discover - -`; - -exports[`ViewMLJob should render component 1`] = ` - - View Job - -`; diff --git a/x-pack/plugins/apm/public/utils/__test__/__snapshots__/url.test.tsx.snap b/x-pack/plugins/apm/public/utils/__test__/__snapshots__/url.test.tsx.snap new file mode 100644 index 0000000000000..afb2f6c7926d5 --- /dev/null +++ b/x-pack/plugins/apm/public/utils/__test__/__snapshots__/url.test.tsx.snap @@ -0,0 +1,46 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`RelativeLinkComponent should render correct markup 1`] = ` + + Go to Discover + +`; + +exports[`UnconnectedKibanaLink should render correct markup 1`] = ` + + Go to Discover + +`; + +exports[`ViewMLJob should render component 1`] = ` + + View Job + +`; diff --git a/x-pack/plugins/apm/public/utils/__test__/formatters.test.js b/x-pack/plugins/apm/public/utils/__test__/formatters.test.js deleted file mode 100644 index 1bd7a4a4e493a..0000000000000 --- a/x-pack/plugins/apm/public/utils/__test__/formatters.test.js +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { asTime } from '../formatters'; - -describe('formatters', () => { - it('asTime', () => { - expect(asTime(1000)).toBe('1 ms'); - expect(asTime(1000 * 1000)).toBe('1,000 ms'); - expect(asTime(1000 * 1000 * 10)).toBe('10,000 ms'); - expect(asTime(1000 * 1000 * 20)).toBe('20.0 s'); - }); -}); diff --git a/x-pack/plugins/apm/public/utils/__test__/formatters.test.ts b/x-pack/plugins/apm/public/utils/__test__/formatters.test.ts new file mode 100644 index 0000000000000..46909496e80a8 --- /dev/null +++ b/x-pack/plugins/apm/public/utils/__test__/formatters.test.ts @@ -0,0 +1,46 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { asPercent, asTime } from '../formatters'; + +describe('formatters', () => { + describe('asTime', () => { + it('formats correctly with defaults', () => { + expect(asTime(null)).toBe('N/A'); + expect(asTime(undefined)).toBe('N/A'); + expect(asTime(0)).toBe('0 μs'); + expect(asTime(1)).toBe('1 μs'); + expect(asTime(1000)).toBe('1,000 μs'); + expect(asTime(1000 * 1000)).toBe('1,000 ms'); + expect(asTime(1000 * 1000 * 10)).toBe('10,000 ms'); + expect(asTime(1000 * 1000 * 20)).toBe('20.0 s'); + }); + + it('formats without unit', () => { + expect(asTime(1000, { withUnit: false })).toBe('1,000'); + }); + + it('falls back to default value', () => { + expect(asTime(undefined, { defaultValue: 'nope' })).toBe('nope'); + }); + }); + + describe('asPercent', () => { + it('should format item as percent', () => { + expect(asPercent(3725, 10000, 'n/a')).toBe('37.25%'); + }); + + it('should return fallback when denominator is 0 ', () => { + expect(asPercent(3725, 0, 'n/a')).toBe('n/a'); + expect(asPercent(3725, 0)).toBe(''); + }); + + it('should return fallback when denominator is undefined ', () => { + expect(asPercent(3725, undefined, 'n/a')).toBe('n/a'); + expect(asPercent(3725)).toBe(''); + }); + }); +}); diff --git a/x-pack/plugins/apm/public/utils/__test__/url.test.js b/x-pack/plugins/apm/public/utils/__test__/url.test.js deleted file mode 100644 index 6980d2c3b1620..0000000000000 --- a/x-pack/plugins/apm/public/utils/__test__/url.test.js +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { Router } from 'react-router-dom'; -import { mount, shallow } from 'enzyme'; -import createHistory from 'history/createMemoryHistory'; -import { - toQuery, - fromQuery, - KibanaLinkComponent, - RelativeLinkComponent, - encodeKibanaSearchParams, - decodeKibanaSearchParams, - ViewMLJob -} from '../url'; -import { toJson } from '../testHelpers'; - -jest.mock('ui/chrome', () => ({ - addBasePath: path => `myBasePath${path}` -})); - -describe('encodeKibanaSearchParams and decodeKibanaSearchParams should return the original string', () => { - it('should convert string to object', () => { - const search = `?_g=(ml:(jobIds:!(opbeans-node-request-high_mean_response_time)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2018-06-06T08:20:45.437Z',mode:absolute,to:'2018-06-14T21:56:58.505Z'))&_a=(filters:!(),mlSelectInterval:(interval:(display:Auto,val:auto)),mlSelectSeverity:(threshold:(display:warning,val:0)),mlTimeSeriesExplorer:(),query:(query_string:(analyze_wildcard:!t,query:'*')))`; - const nextSearch = encodeKibanaSearchParams( - decodeKibanaSearchParams(search) - ); - expect(search).toBe(`?${nextSearch}`); - }); -}); - -describe('decodeKibanaSearchParams', () => { - it('when both _a and _g are defined', () => { - const search = `?_g=(ml:(jobIds:!(opbeans-node-request-high_mean_response_time)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2018-06-06T08:20:45.437Z',mode:absolute,to:'2018-06-14T21:56:58.505Z'))&_a=(filters:!(),mlSelectInterval:(interval:(display:Auto,val:auto)),mlSelectSeverity:(threshold:(display:warning,val:0)),mlTimeSeriesExplorer:(),query:(query_string:(analyze_wildcard:!t,query:'*')))`; - const query = decodeKibanaSearchParams(search); - expect(query).toEqual({ - _a: { - filters: [], - mlSelectInterval: { interval: { display: 'Auto', val: 'auto' } }, - mlSelectSeverity: { threshold: { display: 'warning', val: 0 } }, - mlTimeSeriesExplorer: {}, - query: { query_string: { analyze_wildcard: true, query: '*' } } - }, - _g: { - ml: { jobIds: ['opbeans-node-request-high_mean_response_time'] }, - refreshInterval: { display: 'Off', pause: false, value: 0 }, - time: { - from: '2018-06-06T08:20:45.437Z', - mode: 'absolute', - to: '2018-06-14T21:56:58.505Z' - } - } - }); - }); - - it('when only _g is defined', () => { - const search = `?_g=(ml:(jobIds:!(opbeans-node-request-high_mean_response_time)))`; - const query = decodeKibanaSearchParams(search); - expect(query).toEqual({ - _a: null, - _g: { - ml: { jobIds: ['opbeans-node-request-high_mean_response_time'] } - } - }); - }); -}); - -describe('encodeKibanaSearchParams', () => { - it('should convert object to string', () => { - const query = { - _a: { - filters: [], - mlSelectInterval: { interval: { display: 'Auto', val: 'auto' } }, - mlSelectSeverity: { threshold: { display: 'warning', val: 0 } }, - mlTimeSeriesExplorer: {}, - query: { query_string: { analyze_wildcard: true, query: '*' } } - }, - _g: { - ml: { jobIds: ['opbeans-node-request-high_mean_response_time'] }, - refreshInterval: { display: 'Off', pause: false, value: 0 }, - time: { - from: '2018-06-06T08:20:45.437Z', - mode: 'absolute', - to: '2018-06-14T21:56:58.505Z' - } - } - }; - const search = encodeKibanaSearchParams(query); - expect(search).toBe( - `_g=(ml:(jobIds:!(opbeans-node-request-high_mean_response_time)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2018-06-06T08:20:45.437Z',mode:absolute,to:'2018-06-14T21:56:58.505Z'))&_a=(filters:!(),mlSelectInterval:(interval:(display:Auto,val:auto)),mlSelectSeverity:(threshold:(display:warning,val:0)),mlTimeSeriesExplorer:(),query:(query_string:(analyze_wildcard:!t,query:'*')))` - ); - }); -}); - -describe('toQuery', () => { - it('should parse string to object', () => { - expect(toQuery('?foo=bar&name=john%20doe')).toEqual({ - foo: 'bar', - name: 'john doe' - }); - }); -}); - -describe('fromQuery', () => { - it('should parse object to string', () => { - expect( - fromQuery({ - foo: 'bar', - name: 'john doe' - }) - ).toEqual('foo=bar&name=john%20doe'); - }); - - it('should not encode _a and _g', () => { - expect( - fromQuery({ - g: 'john doe:', - _g: 'john doe:', - a: 'john doe:', - _a: 'john doe:' - }) - ).toEqual('g=john%20doe%3A&_g=john%20doe:&a=john%20doe%3A&_a=john%20doe:'); - }); -}); - -describe('RelativeLinkComponent', () => { - let history; - let wrapper; - - beforeEach(() => { - history = createHistory(); - history.location = { - ...history.location, - pathname: '/opbeans-node/transactions', - search: '?foo=bar' - }; - - wrapper = mount( - - - Go to Discover - - - ); - }); - - it('should have correct url', () => { - expect(wrapper.find('a').prop('href')).toBe( - '/opbeans-node/errors?foo=bar&foo2=bar2' - ); - }); - - it('should render correct markup', () => { - expect(toJson(wrapper)).toMatchSnapshot(); - }); - - it('should have initial location', () => { - expect(history.location).toEqual( - expect.objectContaining({ - pathname: '/opbeans-node/transactions', - search: '?foo=bar' - }) - ); - }); - - it('should update location on click', () => { - wrapper.simulate('click', { button: 0 }); - expect(history.location).toEqual( - expect.objectContaining({ - pathname: '/opbeans-node/errors', - search: '?foo=bar&foo2=bar2' - }) - ); - }); -}); - -describe('KibanaLinkComponent', () => { - let wrapper; - - beforeEach(() => { - const discoverQuery = { - _a: { - interval: 'auto', - query: { - language: 'lucene', - query: `context.service.name:myServiceName AND error.grouping_key:myGroupId` - }, - sort: { '@timestamp': 'desc' } - } - }; - - wrapper = mount( - - Go to Discover - - ); - }); - - it('should have correct url', () => { - expect(wrapper.find('a').prop('href')).toBe( - "myBasePath/app/kibana#/discover?_g=&_a=(interval:auto,query:(language:lucene,query:'context.service.name:myServiceName AND error.grouping_key:myGroupId'),sort:('@timestamp':desc))" - ); - }); - - it('should render correct markup', () => { - expect(toJson(wrapper)).toMatchSnapshot(); - }); -}); - -describe('ViewMLJob', () => { - it('should render component', () => { - const location = { search: '' }; - const wrapper = shallow( - - ); - - expect(toJson(wrapper)).toMatchSnapshot(); - }); - - it('should have correct path props', () => { - const location = { search: '' }; - const wrapper = shallow( - - ); - - expect(wrapper.prop('pathname')).toBe('/app/ml'); - expect(wrapper.prop('hash')).toBe('/timeseriesexplorer'); - expect(wrapper.prop('query')).toEqual({ - _a: null, - _g: { - ml: { - jobIds: ['myServiceName-myTransactionType-high_mean_response_time'] - } - } - }); - }); -}); diff --git a/x-pack/plugins/apm/public/utils/__test__/url.test.tsx b/x-pack/plugins/apm/public/utils/__test__/url.test.tsx new file mode 100644 index 0000000000000..a21f3b7a526b5 --- /dev/null +++ b/x-pack/plugins/apm/public/utils/__test__/url.test.tsx @@ -0,0 +1,249 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { mount, ReactWrapper, shallow } from 'enzyme'; +import createHistory, { MemoryHistory } from 'history/createMemoryHistory'; +import React from 'react'; +import { Router } from 'react-router-dom'; +import url from 'url'; +// @ts-ignore +import { toJson } from '../testHelpers'; +import { + fromQuery, + RelativeLinkComponent, + toQuery, + UnconnectedKibanaLink, + ViewMLJob +} from '../url'; + +describe('toQuery', () => { + it('should parse string to object', () => { + expect(toQuery('?foo=bar&name=john%20doe')).toEqual({ + foo: 'bar', + name: 'john doe' + }); + }); +}); + +describe('fromQuery', () => { + it('should parse object to string', () => { + expect( + fromQuery({ + foo: 'bar', + name: 'john doe' + }) + ).toEqual('foo=bar&name=john%20doe'); + }); + + it('should not encode _a and _g', () => { + expect( + fromQuery({ + g: 'john doe:', + _g: 'john doe:', + a: 'john doe:', + _a: 'john doe:' + }) + ).toEqual('g=john%20doe%3A&_g=john%20doe:&a=john%20doe%3A&_a=john%20doe:'); + }); +}); + +describe('RelativeLinkComponent', () => { + let history: MemoryHistory; + let wrapper: ReactWrapper; + + beforeEach(() => { + history = createHistory(); + history.location = { + ...history.location, + pathname: '/opbeans-node/transactions', + search: '?foo=bar' + }; + + wrapper = mount( + + + Go to Discover + + + ); + }); + + it('should have correct url', () => { + expect(wrapper.find('a').prop('href')).toBe( + '/opbeans-node/errors?foo=bar&foo2=bar2' + ); + }); + + it('should render correct markup', () => { + expect(toJson(wrapper)).toMatchSnapshot(); + }); + + it('should have initial location', () => { + expect(history.location).toEqual( + expect.objectContaining({ + pathname: '/opbeans-node/transactions', + search: '?foo=bar' + }) + ); + }); + + it('should update location on click', () => { + wrapper.simulate('click', { button: 0 }); + expect(history.location).toEqual( + expect.objectContaining({ + pathname: '/opbeans-node/errors', + search: '?foo=bar&foo2=bar2' + }) + ); + }); +}); + +function getUnconnectedKibanLink() { + const discoverQuery = { + _a: { + interval: 'auto', + query: { + language: 'lucene', + query: `context.service.name:"myServiceName" AND error.grouping_key:"myGroupId"` + }, + sort: { '@timestamp': 'desc' } + } + }; + + return shallow( + + Go to Discover + + ); +} + +describe('UnconnectedKibanaLink', () => { + it('should have correct url', () => { + const wrapper = getUnconnectedKibanLink(); + const href = wrapper.find('EuiLink').prop('href') || ''; + const { _g, _a } = getUrlQuery(href); + const { pathname } = url.parse(href); + + expect(pathname).toBe('/app/kibana'); + expect(_a).toBe( + '(interval:auto,query:(language:lucene,query:\'context.service.name:"myServiceName" AND error.grouping_key:"myGroupId"\'),sort:(\'@timestamp\':desc))' + ); + expect(_g).toBe('(time:(from:now-24h,mode:quick,to:now))'); + }); + + it('should render correct markup', () => { + const wrapper = getUnconnectedKibanLink(); + expect(wrapper).toMatchSnapshot(); + }); + + it('should include existing _g values in link href', () => { + const wrapper = getUnconnectedKibanLink(); + wrapper.setProps({ + location: { + search: + '?_g=(refreshInterval:(pause:!t,value:0),time:(from:now-7d,mode:relative,to:now-1d))' + } + }); + const href = wrapper.find('EuiLink').prop('href'); + const { _g } = getUrlQuery(href); + + expect(_g).toBe( + '(refreshInterval:(pause:!t,value:0),time:(from:now-7d,mode:relative,to:now-1d))' + ); + }); + + it('should not throw due to hashed args', () => { + const wrapper = getUnconnectedKibanLink(); + expect(() => { + wrapper.setProps({ location: { search: '?_g=H@whatever' } }); + }).not.toThrow(); + }); + + it('should use default time range when _g is empty', () => { + const wrapper = getUnconnectedKibanLink(); + wrapper.setProps({ location: { search: '?_g=()' } }); + const href = wrapper.find('EuiLink').prop('href') as string; + const { _g } = getUrlQuery(href); + expect(_g).toBe('(time:(from:now-24h,mode:quick,to:now))'); + }); + + it('should merge in _g query values', () => { + const discoverQuery = { + _g: { + ml: { + jobIds: [1337] + } + } + }; + + const wrapper = shallow( + + Go to Discover + + ); + + const href = wrapper.find('EuiLink').prop('href') as string; + const { _g } = getUrlQuery(href); + expect(_g).toBe( + '(ml:(jobIds:!(1337)),time:(from:now-24h,mode:quick,to:now))' + ); + }); +}); + +function getUrlQuery(href?: string) { + const hash = url.parse(href!).hash!.slice(1); + return url.parse(hash, true).query; +} + +describe('ViewMLJob', () => { + it('should render component', () => { + const location = { search: '' }; + const wrapper = shallow( + + ); + + expect(wrapper).toMatchSnapshot(); + }); + + it('should have correct path props', () => { + const location = { search: '' }; + const wrapper = shallow( + + ); + + expect(wrapper.prop('pathname')).toBe('/app/ml'); + expect(wrapper.prop('hash')).toBe('/timeseriesexplorer'); + expect(wrapper.prop('query')).toEqual({ + _g: { + ml: { + jobIds: ['myServiceName-myTransactionType-high_mean_response_time'] + } + } + }); + }); +}); diff --git a/x-pack/plugins/apm/public/utils/documentation.ts b/x-pack/plugins/apm/public/utils/documentation.ts deleted file mode 100644 index 0ad3ce722d819..0000000000000 --- a/x-pack/plugins/apm/public/utils/documentation.ts +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { get } from 'lodash'; -// @ts-ignore -import { metadata } from 'ui/metadata'; - -const STACK_VERSION = metadata.branch; -const DOCS_ROOT = 'https://www.elastic.co/guide/en/apm'; - -// -// General APM -// -export const APM_DOCS = { - 'get-started': { - url: `${DOCS_ROOT}/get-started/${STACK_VERSION}/index.html` - } -}; - -// -// APM Server docs -// -export const APM_SERVER_DOCS = { - download: { - url: 'https://www.elastic.co/downloads/apm/apm-server' - }, - configuring: { - url: `${DOCS_ROOT}/server/${STACK_VERSION}/configuring.html` - }, - 'running-on-docker': { - url: `${DOCS_ROOT}/server/${STACK_VERSION}/running-on-docker.html#running-on-docker` - }, - frontend: { - url: `${DOCS_ROOT}/server/${STACK_VERSION}/frontend.html` - } -}; - -// -// APM Agents docs -// -const featureContextUserText = - 'You can configure your agent to add contextual information about your users.'; -const featureContextTagsText = - 'You can configure your agent to add filterable tags on transactions.'; -const featureContextCustomText = - 'You can configure your agent to add custom contextual information on transactions.'; - -export const APM_AGENT_DOCS = { - home: { - nodejs: { - url: `${DOCS_ROOT}/agent/nodejs/1.x/index.html` - }, - python: { - url: `${DOCS_ROOT}/agent/python/2.x/index.html` - }, - ruby: { - url: `${DOCS_ROOT}/agent/ruby/1.x/index.html` - }, - javascript: { - url: `${DOCS_ROOT}/agent/js-base/0.x/index.html` - } - }, - 'get-started': { - python: { - url: `${DOCS_ROOT}/agent/python/2.x/getting-started.html` - }, - javascript: { - url: `${DOCS_ROOT}/agent/js-base/0.x/getting-started.html` - } - }, - 'nodejs-only': { - 'babel-es-modules': { - url: `${DOCS_ROOT}/agent/nodejs/1.x/advanced-setup.html#es-modules` - } - }, - 'python-only': { - django: { url: `${DOCS_ROOT}/agent/python/2.x/django-support.html` }, - flask: { url: `${DOCS_ROOT}/agent/python/2.x/flask-support.html` } - }, - 'context-user': { - nodejs: { - text: featureContextUserText, - url: `${DOCS_ROOT}/agent/nodejs/1.x/agent-api.html#apm-set-user-context` - }, - python: { - text: featureContextUserText, - url: `${DOCS_ROOT}/agent/python/2.x/api.html#api-set-user-context` - }, - ruby: { - text: featureContextUserText, - url: `${DOCS_ROOT}/agent/ruby/1.x/advanced.html#_providing_info_about_the_user` - }, - javascript: { - text: featureContextUserText, - url: `${DOCS_ROOT}/agent/js-base/0.x/api.html#apm-set-user-context` - } - }, - 'context-tags': { - nodejs: { - text: featureContextTagsText, - url: `${DOCS_ROOT}/agent/nodejs/1.x/agent-api.html#apm-set-tag` - }, - python: { - text: featureContextTagsText, - url: `${DOCS_ROOT}/agent/python/2.x/api.html#api-tag` - }, - ruby: { - text: featureContextTagsText, - url: `${DOCS_ROOT}/agent/ruby/1.x/advanced.html#_adding_tags` - }, - javascript: { - text: `${DOCS_ROOT}/agent/js-base/0.x/api.html#apm-set-tags` - } - }, - 'context-custom': { - nodejs: { - text: featureContextCustomText, - url: `${DOCS_ROOT}/agent/nodejs/1.x/agent-api.html#apm-set-custom-context` - }, - python: { - text: featureContextCustomText, - url: `${DOCS_ROOT}/agent/python/2.x/api.html#api-set-custom-context` - }, - ruby: { - text: featureContextCustomText, - url: `${DOCS_ROOT}/agent/ruby/1.x/advanced.html#_adding_custom_context` - }, - javascript: { - text: featureContextCustomText, - url: `${DOCS_ROOT}/agent/js-base/0.x/api.html#apm-set-custom-context` - } - }, - 'dropped-spans': { - nodejs: { - url: `${DOCS_ROOT}/agent/nodejs/1.x/agent-api.html#transaction-max-spans` - }, - python: { - url: `${DOCS_ROOT}/agent/python/2.x/configuration.html#config-transaction-max-spans` - } - } -}; - -// -// Elastic docs -// -export const ELASTIC_DOCS = { - 'x-pack-emails': { - url: `https://www.elastic.co/guide/en/x-pack/${STACK_VERSION}/actions-email.html#configuring-email` - }, - 'watcher-get-started': { - url: `https://www.elastic.co/guide/en/x-pack/${STACK_VERSION}/watcher-getting-started.html` - } -}; - -// -// Helper methods -// -function translateAgentName(agentName: string): string { - switch (agentName) { - case 'js-react': - case 'js-base': - return 'javascript'; - - default: - return agentName; - } -} - -export function getFeatureDocs( - featureName: string, - agentName: string -): { - url: string; - text?: string; -} { - const translatedAgentName = translateAgentName(agentName); - return get(APM_AGENT_DOCS, `${featureName}.${translatedAgentName}`); -} diff --git a/x-pack/plugins/apm/public/utils/documentation/agents.ts b/x-pack/plugins/apm/public/utils/documentation/agents.ts new file mode 100644 index 0000000000000..f0f1f1f2b8d0d --- /dev/null +++ b/x-pack/plugins/apm/public/utils/documentation/agents.ts @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +const AGENT_URL_ROOT = 'https://www.elastic.co/guide/en/apm/agent'; + +interface AgentNamedValues { + [agentName: string]: string; +} + +export const APM_AGENT_DROPPED_SPANS_DOCS: AgentNamedValues = { + nodejs: `${AGENT_URL_ROOT}/nodejs/1.x/agent-api.html#transaction-max-spans`, + python: `${AGENT_URL_ROOT}/python/2.x/configuration.html#config-transaction-max-spans` +}; + +const APM_AGENT_FEATURE_DOCS: { + [featureName: string]: AgentNamedValues; +} = { + user: { + java: `${AGENT_URL_ROOT}/java/0.7/public-api.html#api-transaction-set-user`, + nodejs: `${AGENT_URL_ROOT}/nodejs/1.x/agent-api.html#apm-set-user-context`, + python: `${AGENT_URL_ROOT}/python/2.x/api.html#api-set-user-context`, + ruby: `${AGENT_URL_ROOT}/ruby/1.x/advanced.html#_providing_info_about_the_user`, + 'js-react': `${AGENT_URL_ROOT}/js-base/0.x/api.html#apm-set-user-context`, + 'js-base': `${AGENT_URL_ROOT}/js-base/0.x/api.html#apm-set-user-context` + }, + tags: { + java: `${AGENT_URL_ROOT}/java/0.7/public-api.html#api-transaction-add-tag`, + nodejs: `${AGENT_URL_ROOT}/nodejs/1.x/agent-api.html#apm-set-tag`, + python: `${AGENT_URL_ROOT}/python/2.x/api.html#api-tag`, + ruby: `${AGENT_URL_ROOT}/ruby/1.x/advanced.html#_adding_tags`, + 'js-react': `${AGENT_URL_ROOT}/js-base/0.x/api.html#apm-set-tags`, + 'js-base': `${AGENT_URL_ROOT}/js-base/0.x/api.html#apm-set-tags` + }, + custom: { + nodejs: `${AGENT_URL_ROOT}/nodejs/1.x/agent-api.html#apm-set-custom-context`, + python: `${AGENT_URL_ROOT}/python/2.x/api.html#api-set-custom-context`, + ruby: `${AGENT_URL_ROOT}/ruby/1.x/advanced.html#_adding_custom_context`, + 'js-react': `${AGENT_URL_ROOT}/js-base/0.x/api.html#apm-set-custom-context`, + 'js-base': `${AGENT_URL_ROOT}/js-base/0.x/api.html#apm-set-custom-context` + } +}; + +export function getAgentFeatureDocsUrl( + featureName: string, + agentName?: string +) { + if (APM_AGENT_FEATURE_DOCS[featureName] && agentName) { + return APM_AGENT_FEATURE_DOCS[featureName][agentName]; + } +} diff --git a/x-pack/plugins/apm/public/utils/documentation/xpack.ts b/x-pack/plugins/apm/public/utils/documentation/xpack.ts new file mode 100644 index 0000000000000..11741fb3ea803 --- /dev/null +++ b/x-pack/plugins/apm/public/utils/documentation/xpack.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { metadata } from 'ui/metadata'; +const STACK_VERSION = metadata.branch; + +const XPACK_URL_ROOT = `https://www.elastic.co/guide/en/x-pack/${STACK_VERSION}`; + +export const XPACK_DOCS = { + xpackEmails: `${XPACK_URL_ROOT}/actions-email.html#configuring-email`, + xpackWatcher: `${XPACK_URL_ROOT}/watcher-getting-started.html` +}; diff --git a/x-pack/plugins/apm/public/utils/formatters.js b/x-pack/plugins/apm/public/utils/formatters.js deleted file mode 100644 index 36b867c4606e4..0000000000000 --- a/x-pack/plugins/apm/public/utils/formatters.js +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { memoize } from 'lodash'; -import numeral from '@elastic/numeral'; - -const UNIT_CUT_OFF = 10 * 1000000; // 10 seconds in microseconds - -export function asSeconds(value, withUnit = true) { - const formatted = asDecimal(value / 1000000); - return `${formatted}${withUnit ? ' s' : ''}`; -} - -export function asMillis(value, withUnit = true) { - const formatted = asInteger(value / 1000); - return `${formatted}${withUnit ? ' ms' : ''}`; -} - -export function asMillisWithDefault(value) { - if (value == null) { - return `N/A`; - } - return asMillis(value); -} - -export const getTimeFormatter = memoize( - max => (max > UNIT_CUT_OFF ? asSeconds : asMillis) -); - -export function timeUnit(max) { - return max > UNIT_CUT_OFF ? 's' : 'ms'; -} - -/* - * value: time in microseconds - */ -export function asTime(value) { - return getTimeFormatter(value)(value); -} - -export function asDecimal(value) { - return numeral(value).format('0,0.0'); -} - -export function asInteger(value) { - return numeral(value).format('0,0'); -} - -export function tpmUnit(type) { - return type === 'request' ? 'rpm' : 'tpm'; -} diff --git a/x-pack/plugins/apm/public/utils/formatters.ts b/x-pack/plugins/apm/public/utils/formatters.ts new file mode 100644 index 0000000000000..08551aa43b7ac --- /dev/null +++ b/x-pack/plugins/apm/public/utils/formatters.ts @@ -0,0 +1,120 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import numeral from '@elastic/numeral'; +import { memoize } from 'lodash'; + +const SECONDS_CUT_OFF = 10 * 1000000; // 10 seconds (in microseconds) +const MILLISECONDS_CUT_OFF = 10 * 1000; // 10 milliseconds (in microseconds) + +/* + * value: time in microseconds + * withUnit: add unit suffix + * defaultValue: value to use if the specified is null/undefined + */ +type FormatterValue = number | undefined | null; +interface FormatterOptions { + withUnit?: boolean; + defaultValue?: string; +} + +export function asSeconds( + value: FormatterValue, + { withUnit = true, defaultValue = 'N/A' }: FormatterOptions = {} +) { + if (value == null) { + return defaultValue; + } + const formatted = asDecimal(value / 1000000); + return `${formatted}${withUnit ? ' s' : ''}`; +} + +export function asMillis( + value: FormatterValue, + { withUnit = true, defaultValue = 'N/A' }: FormatterOptions = {} +) { + if (value == null) { + return defaultValue; + } + + const formatted = asInteger(value / 1000); + return `${formatted}${withUnit ? ' ms' : ''}`; +} + +export function asMicros( + value: FormatterValue, + { withUnit = true, defaultValue = 'N/A' }: FormatterOptions = {} +) { + if (value == null) { + return defaultValue; + } + + const formatted = asInteger(value); + return `${formatted}${withUnit ? ' μs' : ''}`; +} + +type TimeFormatter = ( + max: number +) => ( + value: FormatterValue, + { withUnit, defaultValue }: FormatterOptions +) => string; + +export const getTimeFormatter: TimeFormatter = memoize((max: number) => { + const unit = timeUnit(max); + switch (unit) { + case 's': + return asSeconds; + case 'ms': + return asMillis; + case 'us': + return asMicros; + } +}); + +export function timeUnit(max: number) { + if (max > SECONDS_CUT_OFF) { + return 's'; + } else if (max > MILLISECONDS_CUT_OFF) { + return 'ms'; + } else { + return 'us'; + } +} + +export function asTime( + value: FormatterValue, + { withUnit = true, defaultValue = 'N/A' }: FormatterOptions = {} +) { + if (value == null) { + return defaultValue; + } + const formatter = getTimeFormatter(value); + return formatter(value, { withUnit, defaultValue }); +} + +export function asDecimal(value: number) { + return numeral(value).format('0,0.0'); +} + +export function asInteger(value: number) { + return numeral(value).format('0,0'); +} + +export function tpmUnit(type: string) { + return type === 'request' ? 'rpm' : 'tpm'; +} + +export function asPercent( + numerator: number, + denominator = 0, + fallbackResult = '' +) { + if (denominator === 0) { + return fallbackResult; + } + return numeral(numerator / denominator).format('0.00%'); +} diff --git a/x-pack/plugins/apm/public/utils/url.js b/x-pack/plugins/apm/public/utils/url.js deleted file mode 100644 index 8b1ab93bffe60..0000000000000 --- a/x-pack/plugins/apm/public/utils/url.js +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import PropTypes from 'prop-types'; -import { connect } from 'react-redux'; -import qs from 'querystring'; -import url from 'url'; -import { Link } from 'react-router-dom'; -import _ from 'lodash'; -import rison from 'rison-node'; -import { EuiLink } from '@elastic/eui'; -import createHistory from 'history/createHashHistory'; -import chrome from 'ui/chrome'; - -export function ViewMLJob({ - serviceName, - transactionType, - location, - children = 'View Job' -}) { - const { _g, _a } = decodeKibanaSearchParams(location.search); - - const pathname = '/app/ml'; - const hash = '/timeseriesexplorer'; - const query = { - _g: { - ..._g, - ml: { - jobIds: [`${serviceName}-${transactionType}-high_mean_response_time`] - } - }, - _a - }; - - return ( - - ); -} - -export function toQuery(search) { - return qs.parse(search.slice(1)); -} - -export function fromQuery(query) { - const encodedQuery = encodeQuery(query, ['_g', '_a']); - return stringifyWithoutEncoding(encodedQuery); -} - -export function encodeQuery(query, exclude = []) { - return _.mapValues(query, (value, key) => { - if (exclude.includes(key)) { - return encodeURI(value); - } - return qs.escape(value); - }); -} - -function stringifyWithoutEncoding(query) { - return qs.stringify(query, null, null, { - encodeURIComponent: v => v - }); -} - -export function decodeKibanaSearchParams(search) { - const query = toQuery(search); - return { - _g: query._g ? rison.decode(query._g) : null, - _a: query._a ? rison.decode(query._a) : null - }; -} - -export function encodeKibanaSearchParams(query) { - return stringifyWithoutEncoding({ - _g: rison.encode(query._g), - _a: rison.encode(query._a) - }); -} - -export function RelativeLinkComponent({ - location, - path, - query, - disabled, - ...props -}) { - if (disabled) { - return ; - } - - // Shorthand for pathname - const pathname = path || _.get(props.to, 'pathname') || location.pathname; - - // Add support for querystring as object - const search = - query || _.get(props.to, 'query') - ? fromQuery({ - ...toQuery(location.search), - ...query, - ..._.get(props.to, 'query') - }) - : location.search; - - return ( - - ); -} - -export function KibanaLinkComponent({ - location, - pathname, - hash, - query = {}, - ...props -}) { - const currentQuery = toQuery(location.search); - const nextQuery = { - _g: query._g ? rison.encode(query._g) : currentQuery._g, - _a: query._a ? rison.encode(query._a) : '' - }; - - const search = stringifyWithoutEncoding(nextQuery); - const href = url.format({ - pathname: chrome.addBasePath(pathname), - hash: `${hash}?${search}` - }); - - return ; -} - -const withLocation = connect( - ({ location }) => ({ location }), - {} -); -export const RelativeLink = withLocation(RelativeLinkComponent); -export const KibanaLink = withLocation(KibanaLinkComponent); - -// This is downright horrible 😭 💔 -// Angular decodes encoded url tokens like "%2F" to "/" which causes the route to change. -// It was supposedly fixed in https://github.com/angular/angular.js/commit/1b779028fdd339febaa1fff5f3bd4cfcda46cc09 but still seeing the issue -export function legacyEncodeURIComponent(url) { - return url && encodeURIComponent(url).replace(/%/g, '~'); -} - -export function legacyDecodeURIComponent(url) { - return url && decodeURIComponent(url.replace(/~/g, '%')); -} - -export function ExternalLink(props) { - return ; -} - -ExternalLink.propTypes = { - href: PropTypes.string.isRequired -}; - -// Make history singleton available across APM project. -// This is not great. Other options are to use context or withRouter helper -// React Context API is unstable and will change soon-ish (probably 16.3) -// withRouter helper from react-router overrides several props (eg. `location`) which makes it less desireable -export const history = createHistory(); diff --git a/x-pack/plugins/apm/public/utils/url.tsx b/x-pack/plugins/apm/public/utils/url.tsx new file mode 100644 index 0000000000000..6ae3fcb643a6c --- /dev/null +++ b/x-pack/plugins/apm/public/utils/url.tsx @@ -0,0 +1,226 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui'; +import createHistory from 'history/createHashHistory'; +import { get, isPlainObject, mapValues } from 'lodash'; +import qs from 'querystring'; +import React from 'react'; +import { connect } from 'react-redux'; +import { Link } from 'react-router-dom'; +import rison from 'rison-node'; +import chrome from 'ui/chrome'; +import url from 'url'; +import { StringMap } from '../../typings/common'; + +// Kibana default set in: https://github.com/elastic/kibana/blob/e13e47fc4eb6112f2a5401408e9f765eae90f55d/x-pack/plugins/apm/public/utils/timepicker/index.js#L31-L35 +// TODO: store this in config or a shared constant? +const DEFAULT_KIBANA_TIME_RANGE = { + time: { + from: 'now-24h', + mode: 'quick', + to: 'now' + } +}; + +interface ViewMlJobArgs { + serviceName: string; + transactionType: string; + location: any; + children?: any; +} + +export function ViewMLJob({ + serviceName, + transactionType, + location, + children = 'View Job' +}: ViewMlJobArgs) { + const pathname = '/app/ml'; + const hash = '/timeseriesexplorer'; + const jobId = `${serviceName}-${transactionType}-high_mean_response_time`; + const query = { + _g: { + ml: { + jobIds: [jobId] + } + } + }; + + return ( + + ); +} + +export function toQuery(search?: string): StringMap { + return search ? qs.parse(search.slice(1)) : {}; +} + +export function fromQuery(query: StringMap) { + const encodedQuery = encodeQuery(query, ['_g', '_a']); + return stringifyWithoutEncoding(encodedQuery); +} + +export function encodeQuery(query: StringMap, exclude: string[] = []) { + return mapValues(query, (value: any, key: string) => { + if (exclude.includes(key)) { + return encodeURI(value); + } + return qs.escape(value); + }); +} + +function stringifyWithoutEncoding(query: StringMap) { + return qs.stringify(query, undefined, undefined, { + encodeURIComponent: (v: string) => v + }); +} + +function risonSafeDecode(value: string) { + try { + const decoded = rison.decode(value); + return isPlainObject(decoded) ? (decoded as StringMap) : {}; + } catch (e) { + return {}; + } +} + +function decodeAndMergeG(g: string, toBeMerged?: StringMap) { + const decoded = risonSafeDecode(g); + return { ...DEFAULT_KIBANA_TIME_RANGE, ...decoded, ...toBeMerged }; +} + +export interface RelativeLinkComponentArgs { + location: { + search?: string; + pathname?: string; + }; + path: string; + query?: StringMap; + disabled?: boolean; + to?: StringMap; + className?: string; +} +export function RelativeLinkComponent({ + location, + path, + query, + disabled, + ...props +}: RelativeLinkComponentArgs) { + if (disabled) { + return ; + } + + // Shorthand for pathname + const pathname = path || get(props.to, 'pathname') || location.pathname; + + // Add support for querystring as object + const search = + query || get(props.to, 'query') + ? fromQuery({ + ...toQuery(location.search), + ...query, + ...get(props.to, 'query') + }) + : location.search; + + return ( + + ); +} + +// TODO: +// Both KibanaLink and RelativeLink does similar things, are too magic, and have different APIs. +// The initial idea with KibanaLink was to automatically preserve the timestamp (_g) when making links. RelativeLink went a bit overboard and preserves all query args +// The two components have different APIs: `path` vs `pathname` and one uses EuiLink the other react-router's Link (which behaves differently) +// Suggestion: Deprecate RelativeLink, and clean up KibanaLink + +export interface QueryWithG extends StringMap { + _g?: StringMap; +} + +export interface KibanaLinkArgs { + location: { + search?: string; + pathname?: string; + }; + pathname: string; + hash?: string; + query?: QueryWithG; + disabled?: boolean; + to?: StringMap; + className?: string; +} + +/** + * NOTE: Use this component directly if you have to use a link that is + * going to be rendered outside of React, e.g. in the Kibana global toast loader. + * + * You must remember to pass in location in that case. + */ +export const UnconnectedKibanaLink: React.SFC = ({ + location, + pathname, + hash, + query = {}, + ...props +}) => { + // Preserve current _g and _a + const currentQuery = toQuery(location.search); + const g = decodeAndMergeG(currentQuery._g, query._g); + const nextQuery = { + ...query, + _g: rison.encode(g), + _a: query._a ? rison.encode(query._a) : '' + }; + + const search = stringifyWithoutEncoding(nextQuery); + const href = url.format({ + pathname: chrome.addBasePath(pathname), + hash: `${hash}?${search}` + }); + + return ; +}; + +const withLocation = connect( + ({ location }: { location: any }) => ({ location }), + {} +); +export const RelativeLink = withLocation(RelativeLinkComponent); +export const KibanaLink = withLocation(UnconnectedKibanaLink); + +// This is downright horrible 😭 💔 +// Angular decodes encoded url tokens like "%2F" to "/" which causes the route to change. +// It was supposedly fixed in https://github.com/angular/angular.js/commit/1b779028fdd339febaa1fff5f3bd4cfcda46cc09 but still seeing the issue +export function legacyEncodeURIComponent(rawUrl?: string) { + return rawUrl && encodeURIComponent(rawUrl).replace(/%/g, '~'); +} + +export function legacyDecodeURIComponent(encodedUrl?: string) { + return encodedUrl && decodeURIComponent(encodedUrl.replace(/~/g, '%')); +} + +export function ExternalLink(props: EuiLinkAnchorProps) { + return ; +} + +// Make history singleton available across APM project. +// This is not great. Other options are to use context or withRouter helper +// React Context API is unstable and will change soon-ish (probably 16.3) +// withRouter helper from react-router overrides several props (eg. `location`) which makes it less desireable +export const history = createHistory(); diff --git a/x-pack/plugins/apm/server/lib/helpers/input_validation.js b/x-pack/plugins/apm/server/lib/helpers/input_validation.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/input_validation.js rename to x-pack/plugins/apm/server/lib/helpers/input_validation.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.js b/x-pack/plugins/apm/server/lib/helpers/setup_request.js deleted file mode 100644 index 0754816660769..0000000000000 --- a/x-pack/plugins/apm/server/lib/helpers/setup_request.js +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -/* eslint-disable no-console */ -import moment from 'moment'; - -function decodeEsQuery(esQuery) { - return esQuery ? JSON.parse(decodeURIComponent(esQuery)) : null; -} - -export function setupRequest(req, reply) { - const cluster = req.server.plugins.elasticsearch.getCluster('data'); - - const setup = { - start: moment.utc(req.query.start).valueOf(), - end: moment.utc(req.query.end).valueOf(), - esFilterQuery: decodeEsQuery(req.query.esFilterQuery), - client: (type, params) => { - if (req.query._debug) { - console.log(`DEBUG ES QUERY:`); - console.log( - `${req.method.toUpperCase()} ${req.url.pathname} ${JSON.stringify( - req.query - )}` - ); - console.log(`GET ${params.index}/_search`); - console.log(JSON.stringify(params.body, null, 4)); - } - return cluster.callWithRequest(req, type, params); - }, - config: req.server.config() - }; - - reply(setup); -} diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts new file mode 100644 index 0000000000000..70773755c2c78 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts @@ -0,0 +1,73 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/* tslint:disable no-console */ +import { SearchParams, SearchResponse } from 'elasticsearch'; +import { Request } from 'hapi'; +import moment from 'moment'; + +function decodeEsQuery(esQuery?: string): object { + return esQuery ? JSON.parse(decodeURIComponent(esQuery)) : null; +} + +interface KibanaConfig { + get: (key: string) => any; +} + +// Extend the defaults with the plugins and server methods we need. +declare module 'hapi' { + interface PluginProperties { + elasticsearch: any; + } + + interface Server { + config: () => KibanaConfig; + } +} + +type Client = (type: string, params: SearchParams) => SearchResponse; + +export interface Setup { + start: number; + end: number; + esFilterQuery: any; + client: Client; + config: KibanaConfig; +} + +interface APMRequestQuery { + _debug: string; + start: string; + end: string; + esFilterQuery: string; +} + +export function setupRequest(req: Request) { + const query = (req.query as unknown) as APMRequestQuery; + const cluster = req.server.plugins.elasticsearch.getCluster('data'); + + function client(type: string, params: SearchParams): SearchResponse { + if (query._debug) { + console.log(`DEBUG ES QUERY:`); + console.log( + `${req.method.toUpperCase()} ${req.url.pathname} ${JSON.stringify( + query + )}` + ); + console.log(`GET ${params.index}/_search`); + console.log(JSON.stringify(params.body, null, 4)); + } + return cluster.callWithRequest(req, type, params); + } + + return { + start: moment.utc(query.start).valueOf(), + end: moment.utc(query.end).valueOf(), + esFilterQuery: decodeEsQuery(query.esFilterQuery), + client, + config: req.server.config() + }; +} diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_group_query.ts b/x-pack/plugins/apm/server/lib/helpers/transaction_group_query.ts new file mode 100644 index 0000000000000..db7b65c646870 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/helpers/transaction_group_query.ts @@ -0,0 +1,95 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import moment from 'moment'; +import { + TRANSACTION_DURATION, + TRANSACTION_NAME +} from '../../../common/constants'; +import { Transaction } from '../../../typings/Transaction'; +import { ITransactionGroup } from '../../../typings/TransactionGroup'; + +export interface ITransactionGroupBucket { + key: string; + doc_count: number; + avg: { + value: number; + }; + p95: { + values: { + '95.0': number; + }; + }; + sample: { + hits: { + hits: Array<{ + _source: Transaction; + }>; + }; + }; +} + +export const TRANSACTION_GROUP_AGGREGATES = { + transactions: { + terms: { + field: `${TRANSACTION_NAME}.keyword`, + order: { avg: 'desc' }, + size: 100 + }, + aggs: { + sample: { + top_hits: { + size: 1, + sort: [{ '@timestamp': { order: 'desc' } }] + } + }, + avg: { avg: { field: TRANSACTION_DURATION } }, + p95: { percentiles: { field: TRANSACTION_DURATION, percents: [95] } } + } + } +}; + +function calculateRelativeImpacts(results: ITransactionGroup[]) { + const values = results.map(({ impact }) => impact); + const max = Math.max(...values); + const min = Math.min(...values); + + return results.map(bucket => ({ + ...bucket, + impact: ((bucket.impact - min) / (max - min)) * 100 + })); +} + +export function prepareTransactionGroups({ + buckets, + start, + end +}: { + buckets: ITransactionGroupBucket[]; + start: number; + end: number; +}) { + const duration = moment.duration(end - start); + const minutes = duration.asMinutes(); + + const results = buckets.map((bucket: ITransactionGroupBucket) => { + const averageResponseTime = bucket.avg.value; + const transactionsPerMinute = bucket.doc_count / minutes; + const impact = Math.round(averageResponseTime * transactionsPerMinute); + const sample = bucket.sample.hits.hits[0]._source; + + return { + name: bucket.key, + sample, + p95: bucket.p95.values['95.0'], + averageResponseTime, + transactionsPerMinute, + impact + }; + }); + + return calculateRelativeImpacts(results); +} diff --git a/x-pack/plugins/apm/server/lib/services/get_service.js b/x-pack/plugins/apm/server/lib/services/get_service.js deleted file mode 100644 index 416dfaf3746c4..0000000000000 --- a/x-pack/plugins/apm/server/lib/services/get_service.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { get } from 'lodash'; -import { - SERVICE_NAME, - TRANSACTION_TYPE, - SERVICE_AGENT_NAME -} from '../../../common/constants'; - -export async function getService({ serviceName, setup }) { - const { start, end, esFilterQuery, client, config } = setup; - - const params = { - index: [ - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') - ], - body: { - size: 0, - query: { - bool: { - filter: [ - { term: { [SERVICE_NAME]: serviceName } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - }, - aggs: { - types: { - terms: { field: TRANSACTION_TYPE, size: 100 } - }, - agents: { - terms: { field: SERVICE_AGENT_NAME, size: 1 } - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - - return { - service_name: serviceName, - types: resp.aggregations.types.buckets.map(bucket => bucket.key), - agent_name: get(resp, 'aggregations.agents.buckets[0].key') - }; -} diff --git a/x-pack/plugins/apm/server/lib/services/get_service.ts b/x-pack/plugins/apm/server/lib/services/get_service.ts new file mode 100644 index 0000000000000..2998f3487ecc6 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/services/get_service.ts @@ -0,0 +1,83 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { oc } from 'ts-optchain'; +import { TermsAggsBucket } from 'x-pack/plugins/apm/typings/elasticsearch'; +import { + SERVICE_AGENT_NAME, + SERVICE_NAME, + TRANSACTION_TYPE +} from '../../../common/constants'; +import { Setup } from '../helpers/setup_request'; + +export interface ServiceResponse { + service_name: string; + types: string[]; + agent_name?: string; +} + +export async function getService( + serviceName: string, + setup: Setup +): Promise { + const { start, end, esFilterQuery, client, config } = setup; + + const params = { + index: [ + config.get('apm_oss.errorIndices'), + config.get('apm_oss.transactionIndices') + ], + body: { + size: 0, + query: { + bool: { + filter: [ + { term: { [SERVICE_NAME]: serviceName } }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ] + } + }, + aggs: { + types: { + terms: { field: TRANSACTION_TYPE, size: 100 } + }, + agents: { + terms: { field: SERVICE_AGENT_NAME, size: 1 } + } + } + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + interface Aggs { + types: { + buckets: TermsAggsBucket[]; + }; + agents: { + buckets: TermsAggsBucket[]; + }; + } + + const resp = await client('search', params); + const aggs: Aggs = resp.aggregations; + + return { + service_name: serviceName, + types: aggs.types.buckets.map(bucket => bucket.key), + agent_name: oc(aggs).agents.buckets[0].key() + }; +} diff --git a/x-pack/plugins/apm/server/lib/services/get_services.js b/x-pack/plugins/apm/server/lib/services/get_services.js deleted file mode 100644 index 37da74123ffdd..0000000000000 --- a/x-pack/plugins/apm/server/lib/services/get_services.js +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { - SERVICE_NAME, - TRANSACTION_DURATION, - SERVICE_AGENT_NAME, - PROCESSOR_EVENT -} from '../../../common/constants'; -import { get } from 'lodash'; - -export async function getServices({ setup }) { - const { start, end, esFilterQuery, client, config } = setup; - - const params = { - index: [ - config.get('apm_oss.errorIndices'), - config.get('apm_oss.transactionIndices') - ], - body: { - size: 0, - query: { - bool: { - filter: [ - { - bool: { - should: [ - { term: { [PROCESSOR_EVENT]: 'transaction' } }, - { term: { [PROCESSOR_EVENT]: 'error' } } - ] - } - }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - }, - aggs: { - services: { - terms: { - field: SERVICE_NAME, - size: 500 - }, - aggs: { - avg: { - avg: { field: TRANSACTION_DURATION } - }, - agents: { - terms: { field: SERVICE_AGENT_NAME, size: 1 } - }, - events: { - terms: { field: PROCESSOR_EVENT, size: 2 } - } - } - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - - const buckets = get(resp.aggregations, 'services.buckets', []); - return buckets.map(bucket => { - const eventTypes = bucket.events.buckets; - - const transactions = eventTypes.find(e => e.key === 'transaction'); - const totalTransactions = get(transactions, 'doc_count', 0); - - const errors = eventTypes.find(e => e.key === 'error'); - const totalErrors = get(errors, 'doc_count', 0); - - const deltaAsMinutes = (end - start) / 1000 / 60; - - const transactionsPerMinute = totalTransactions / deltaAsMinutes; - const errorsPerMinute = totalErrors / deltaAsMinutes; - - return { - service_name: bucket.key, - agent_name: get(bucket, 'agents.buckets[0].key', null), - transactions_per_minute: transactionsPerMinute, - errors_per_minute: errorsPerMinute, - avg_response_time: bucket.avg.value - }; - }); -} diff --git a/x-pack/plugins/apm/server/lib/services/get_services.ts b/x-pack/plugins/apm/server/lib/services/get_services.ts new file mode 100644 index 0000000000000..eeb39c256e8a3 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/services/get_services.ts @@ -0,0 +1,128 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { oc } from 'ts-optchain'; +import { TermsAggsBucket } from 'x-pack/plugins/apm/typings/elasticsearch'; +import { + PROCESSOR_EVENT, + SERVICE_AGENT_NAME, + SERVICE_NAME, + TRANSACTION_DURATION +} from '../../../common/constants'; +import { Setup } from '../helpers/setup_request'; + +export interface ServiceListItemResponse { + service_name: string; + agent_name: string | undefined; + transactions_per_minute: number; + errors_per_minute: number; + avg_response_time: number; +} + +export async function getServices( + setup: Setup +): Promise { + const { start, end, esFilterQuery, client, config } = setup; + + const params = { + index: [ + config.get('apm_oss.errorIndices'), + config.get('apm_oss.transactionIndices') + ], + body: { + size: 0, + query: { + bool: { + filter: [ + { + bool: { + should: [ + { term: { [PROCESSOR_EVENT]: 'transaction' } }, + { term: { [PROCESSOR_EVENT]: 'error' } } + ] + } + }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ] + } + }, + aggs: { + services: { + terms: { + field: SERVICE_NAME, + size: 500 + }, + aggs: { + avg: { + avg: { field: TRANSACTION_DURATION } + }, + agents: { + terms: { field: SERVICE_AGENT_NAME, size: 1 } + }, + events: { + terms: { field: PROCESSOR_EVENT, size: 2 } + } + } + } + } + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + interface ServiceBucket extends TermsAggsBucket { + avg: { + value: number; + }; + agents: { + buckets: TermsAggsBucket[]; + }; + events: { + buckets: TermsAggsBucket[]; + }; + } + + interface Aggs extends TermsAggsBucket { + services: { + buckets: ServiceBucket[]; + }; + } + + const resp = await client('search', params); + const aggs: Aggs = resp.aggregations; + const serviceBuckets = oc(aggs).services.buckets([]); + + return serviceBuckets.map(bucket => { + const eventTypes = bucket.events.buckets; + const transactions = eventTypes.find(e => e.key === 'transaction'); + const totalTransactions = oc(transactions).doc_count(0); + + const errors = eventTypes.find(e => e.key === 'error'); + const totalErrors = oc(errors).doc_count(0); + + const deltaAsMinutes = (end - start) / 1000 / 60; + const transactionsPerMinute = totalTransactions / deltaAsMinutes; + const errorsPerMinute = totalErrors / deltaAsMinutes; + + return { + service_name: bucket.key, + agent_name: oc(bucket).agents.buckets[0].key(), + transactions_per_minute: transactionsPerMinute, + errors_per_minute: errorsPerMinute, + avg_response_time: bucket.avg.value + }; + }); +} diff --git a/x-pack/plugins/apm/server/lib/traces/get_top_traces.ts b/x-pack/plugins/apm/server/lib/traces/get_top_traces.ts new file mode 100644 index 0000000000000..990879690d9b7 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/traces/get_top_traces.ts @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchResponse } from 'elasticsearch'; +import { get } from 'lodash'; +import { + PARENT_ID, + PROCESSOR_EVENT, + TRACE_ID +} from '../../../common/constants'; +import { Transaction } from '../../../typings/Transaction'; +import { ITransactionGroup } from '../../../typings/TransactionGroup'; +import { Setup } from '../helpers/setup_request'; +import { + ITransactionGroupBucket, + prepareTransactionGroups, + TRANSACTION_GROUP_AGGREGATES +} from '../helpers/transaction_group_query'; + +export async function getTopTraces(setup: Setup): Promise { + const { start, end, esFilterQuery, client, config } = setup; + + const params = { + index: config.get('apm_oss.transactionIndices'), + body: { + size: 0, + query: { + bool: { + must: { + // this criterion safeguards against data that lacks a transaction + // parent ID but still is not a "trace" by way of not having a + // trace ID (e.g. old data before parent ID was implemented, etc) + exists: { + field: TRACE_ID + } + }, + must_not: { + // no parent ID alongside a trace ID means this transaction is a + // "root" transaction, i.e. a trace + exists: { + field: PARENT_ID + } + }, + filter: [ + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + }, + { term: { [PROCESSOR_EVENT]: 'transaction' } } + ] + } + }, + aggs: TRANSACTION_GROUP_AGGREGATES + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + const response: SearchResponse = await client('search', params); + const buckets: ITransactionGroupBucket[] = get( + response.aggregations, + 'transactions.buckets', + [] + ); + + return prepareTransactionGroups({ buckets, start, end }); +} diff --git a/x-pack/plugins/apm/server/lib/traces/get_trace.ts b/x-pack/plugins/apm/server/lib/traces/get_trace.ts new file mode 100644 index 0000000000000..b92e9e377e701 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/traces/get_trace.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchParams, SearchResponse } from 'elasticsearch'; +import { WaterfallResponse } from 'x-pack/plugins/apm/typings/waterfall'; +import { TRACE_ID } from '../../../common/constants'; +import { Span } from '../../../typings/Span'; +import { Transaction } from '../../../typings/Transaction'; +import { Setup } from '../helpers/setup_request'; + +export async function getTrace( + traceId: string, + setup: Setup +): Promise { + const { start, end, client, config } = setup; + + const params: SearchParams = { + index: config.get('apm_oss.transactionIndices'), + body: { + size: 1000, + query: { + bool: { + filter: [ + { term: { [TRACE_ID]: traceId } }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ] + } + } + } + }; + + const resp: SearchResponse = await client( + 'search', + params + ); + + return resp.hits.hits.map(hit => hit._source); +} diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/calculate_bucket_size.js b/x-pack/plugins/apm/server/lib/transactions/distribution/calculate_bucket_size.js deleted file mode 100644 index 1102211f0cc1b..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/calculate_bucket_size.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { - SERVICE_NAME, - TRANSACTION_NAME, - TRANSACTION_DURATION -} from '../../../../common/constants'; - -export async function calculateBucketSize({ - serviceName, - transactionName, - setup -}) { - const { start, end, esFilterQuery, client, config } = setup; - - const params = { - index: config.get('apm_oss.transactionIndices'), - body: { - size: 0, - query: { - bool: { - filter: [ - { term: { [SERVICE_NAME]: serviceName } }, - { term: { [`${TRANSACTION_NAME}.keyword`]: transactionName } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - }, - aggs: { - stats: { - extended_stats: { - field: TRANSACTION_DURATION - } - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - const minBucketSize = config.get('xpack.apm.minimumBucketSize'); - const bucketTargetCount = config.get('xpack.apm.bucketTargetCount'); - const { max } = resp.aggregations.stats; - const bucketSize = Math.floor(max / bucketTargetCount); - - return bucketSize > minBucketSize ? bucketSize : minBucketSize; -} diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/calculate_bucket_size.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/calculate_bucket_size.ts new file mode 100644 index 0000000000000..38025110730bf --- /dev/null +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/calculate_bucket_size.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchParams } from 'elasticsearch'; +import { + SERVICE_NAME, + TRANSACTION_DURATION, + TRANSACTION_NAME +} from '../../../../common/constants'; +import { Setup } from '../../helpers/setup_request'; + +export async function calculateBucketSize( + serviceName: string, + transactionName: string, + setup: Setup +) { + const { start, end, esFilterQuery, client, config } = setup; + + const params: SearchParams = { + index: config.get('apm_oss.transactionIndices'), + body: { + size: 0, + query: { + bool: { + filter: [ + { term: { [SERVICE_NAME]: serviceName } }, + { term: { [`${TRANSACTION_NAME}.keyword`]: transactionName } }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ] + } + }, + aggs: { + stats: { + extended_stats: { + field: TRANSACTION_DURATION + } + } + } + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + const resp = await client('search', params); + const minBucketSize: number = config.get('xpack.apm.minimumBucketSize'); + const bucketTargetCount: number = config.get('xpack.apm.bucketTargetCount'); + const max: number = resp.aggregations.stats.max; + const bucketSize = Math.floor(max / bucketTargetCount); + + return bucketSize > minBucketSize ? bucketSize : minBucketSize; +} diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets.js b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets.js deleted file mode 100644 index d5c0d4835a7bf..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets.js +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { get } from 'lodash'; -import { - SERVICE_NAME, - TRANSACTION_DURATION, - TRANSACTION_ID, - TRANSACTION_NAME, - TRANSACTION_SAMPLED -} from '../../../../common/constants'; - -export async function getBuckets({ - serviceName, - transactionName, - bucketSize = 100, - setup -}) { - const { start, end, esFilterQuery, client, config } = setup; - - const bucketTargetCount = config.get('xpack.apm.bucketTargetCount'); - - const params = { - index: config.get('apm_oss.transactionIndices'), - body: { - size: 0, - query: { - bool: { - filter: [ - { term: { [SERVICE_NAME]: serviceName } }, - { term: { [`${TRANSACTION_NAME}.keyword`]: transactionName } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ], - should: [{ term: { [TRANSACTION_SAMPLED]: true } }] - } - }, - aggs: { - distribution: { - histogram: { - field: TRANSACTION_DURATION, - interval: bucketSize, - min_doc_count: 0, - extended_bounds: { - min: 0, - max: bucketSize * bucketTargetCount - } - }, - aggs: { - transaction: { - top_hits: { - _source: [TRANSACTION_ID, TRANSACTION_SAMPLED], - size: 1 - } - } - } - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - - const buckets = resp.aggregations.distribution.buckets.map(bucket => { - const transaction = get(bucket.transaction.hits.hits[0], '_source'); - return { - key: bucket.key, - count: bucket.doc_count, - transaction_id: get(transaction, TRANSACTION_ID), - sampled: get(transaction, TRANSACTION_SAMPLED) - }; - }); - - return { - total_hits: resp.hits.total, - buckets - }; -} diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets.ts new file mode 100644 index 0000000000000..b552d7e3146e7 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets.ts @@ -0,0 +1,127 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchParams, SearchResponse } from 'elasticsearch'; +import { oc } from 'ts-optchain'; +import { + SERVICE_NAME, + TRACE_ID, + TRANSACTION_DURATION, + TRANSACTION_ID, + TRANSACTION_NAME, + TRANSACTION_SAMPLED +} from '../../../../common/constants'; +import { Transaction } from '../../../../typings/Transaction'; +import { Setup } from '../../helpers/setup_request'; + +export interface IBucket { + key: number; + count: number; + sample?: IBucketSample; +} + +interface IBucketSample { + traceId?: string; + transactionId?: string; +} + +interface IBucketsResponse { + totalHits: number; + buckets: IBucket[]; +} + +interface ESBucket { + key: number; + doc_count: number; + sample: SearchResponse<{ + transaction: Pick; + trace: { + id: string; + }; + }>; +} + +export async function getBuckets( + serviceName: string, + transactionName: string, + bucketSize: number, + setup: Setup +): Promise { + const { start, end, esFilterQuery, client, config } = setup; + const bucketTargetCount: number = config.get('xpack.apm.bucketTargetCount'); + const params: SearchParams = { + index: config.get('apm_oss.transactionIndices'), + body: { + size: 0, + query: { + bool: { + filter: [ + { term: { [SERVICE_NAME]: serviceName } }, + { term: { [`${TRANSACTION_NAME}.keyword`]: transactionName } }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ], + should: [{ term: { [TRANSACTION_SAMPLED]: true } }] + } + }, + aggs: { + distribution: { + histogram: { + field: TRANSACTION_DURATION, + interval: bucketSize, + min_doc_count: 0, + extended_bounds: { + min: 0, + max: bucketSize * bucketTargetCount + } + }, + aggs: { + sample: { + top_hits: { + _source: [TRANSACTION_ID, TRANSACTION_SAMPLED, TRACE_ID], + size: 1 + } + } + } + } + } + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + const resp = await client('search', params); + const buckets = (resp.aggregations.distribution.buckets as ESBucket[]).map( + bucket => { + const sampleSource = oc(bucket).sample.hits.hits[0]._source(); + const isSampled = oc(sampleSource).transaction.sampled(false); + const sample = { + traceId: oc(sampleSource).trace.id(), + transactionId: oc(sampleSource).transaction.id() + }; + + return { + key: bucket.key, + count: bucket.doc_count, + sample: isSampled ? sample : undefined + }; + } + ); + + return { + totalHits: resp.hits.total, + buckets + }; +} diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution.js b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution.js deleted file mode 100644 index c6902eab3a454..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution.js +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { get, isEmpty } from 'lodash'; -import { getBuckets } from './get_buckets'; -import { calculateBucketSize } from './calculate_bucket_size'; - -function getDefaultTransactionId(buckets) { - const filledBuckets = buckets.filter( - bucket => bucket.count && bucket.sampled - ); - - if (isEmpty(filledBuckets)) { - return; - } - - const middleIndex = Math.floor(filledBuckets.length / 2); - return get(filledBuckets, `[${middleIndex}].transaction_id`); -} - -export async function getDistribution({ serviceName, transactionName, setup }) { - const bucketSize = await calculateBucketSize({ - serviceName, - transactionName, - setup - }); - const { buckets, total_hits: totalHits } = await getBuckets({ - serviceName, - transactionName, - setup, - bucketSize - }); - - return { - total_hits: totalHits, - buckets, - bucket_size: bucketSize, - default_transaction_id: getDefaultTransactionId(buckets) - }; -} diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution.ts new file mode 100644 index 0000000000000..c3ba7d53c23e3 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_distribution.ts @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { isEmpty } from 'lodash'; +import { Setup } from '../../helpers/setup_request'; +import { calculateBucketSize } from './calculate_bucket_size'; +import { getBuckets, IBucket } from './get_buckets'; + +export interface IDistributionResponse { + totalHits: number; + buckets: IBucket[]; + bucketSize: number; + defaultSample?: IBucket['sample']; +} + +function getDefaultSample(buckets: IBucket[]) { + const samples = buckets + .filter(bucket => bucket.count > 0 && bucket.sample) + .map(bucket => bucket.sample); + + if (isEmpty(samples)) { + return; + } + + const middleIndex = Math.floor(samples.length / 2); + return samples[middleIndex]; +} + +export async function getDistribution( + serviceName: string, + transactionName: string, + setup: Setup +): Promise { + const bucketSize = await calculateBucketSize( + serviceName, + transactionName, + setup + ); + const { buckets, totalHits } = await getBuckets( + serviceName, + transactionName, + bucketSize, + setup + ); + + return { + totalHits, + buckets, + bucketSize, + defaultSample: getDefaultSample(buckets) + }; +} diff --git a/x-pack/plugins/apm/server/lib/transactions/get_top_transactions.js b/x-pack/plugins/apm/server/lib/transactions/get_top_transactions.js deleted file mode 100644 index e9e607f277f1a..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/get_top_transactions.js +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import moment from 'moment'; -import { - SERVICE_NAME, - TRANSACTION_TYPE, - TRANSACTION_NAME, - TRANSACTION_ID, - TRANSACTION_DURATION -} from '../../../common/constants'; -import { get, sortBy } from 'lodash'; - -export async function getTopTransactions({ - transactionType, - serviceName, - setup -}) { - const { start, end, esFilterQuery, client, config } = setup; - - const duration = moment.duration(end - start); - const minutes = duration.asMinutes(); - - const params = { - index: config.get('apm_oss.transactionIndices'), - body: { - size: 0, - query: { - bool: { - filter: [ - { term: { [SERVICE_NAME]: serviceName } }, - { term: { [TRANSACTION_TYPE]: transactionType } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - }, - aggs: { - transactions: { - terms: { - field: `${TRANSACTION_NAME}.keyword`, - order: { avg: 'desc' }, - size: 100 - }, - aggs: { - sample: { - top_hits: { - _source: [TRANSACTION_ID], - size: 1, - sort: [{ '@timestamp': { order: 'desc' } }] - } - }, - avg: { - avg: { field: TRANSACTION_DURATION } - }, - p95: { - percentiles: { - field: TRANSACTION_DURATION, - percents: [95] - } - } - } - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - const buckets = get(resp, 'aggregations.transactions.buckets', []); - const results = buckets.map(bucket => { - const avg = bucket.avg.value; - const tpm = bucket.doc_count / minutes; - const impact = Math.round(avg * tpm); - return { - name: bucket.key, - id: get(bucket, `sample.hits.hits[0]._source.${TRANSACTION_ID}`), - p95: bucket.p95.values['95.0'], - avg, - tpm, - impact, - transaction_type: transactionType - }; - }); - - // Sort results by impact - needs to be desc, hence the reverse() - return sortBy(results, o => o.impact).reverse(); -} diff --git a/x-pack/plugins/apm/server/lib/transactions/get_top_transactions.ts b/x-pack/plugins/apm/server/lib/transactions/get_top_transactions.ts new file mode 100644 index 0000000000000..059d3710b969a --- /dev/null +++ b/x-pack/plugins/apm/server/lib/transactions/get_top_transactions.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchParams, SearchResponse } from 'elasticsearch'; +import { get } from 'lodash'; +import { + PROCESSOR_EVENT, + SERVICE_NAME, + TRANSACTION_TYPE +} from '../../../common/constants'; +import { Transaction } from '../../../typings/Transaction'; +import { ITransactionGroup } from '../../../typings/TransactionGroup'; +import { Setup } from '../helpers/setup_request'; +import { + prepareTransactionGroups, + TRANSACTION_GROUP_AGGREGATES +} from '../helpers/transaction_group_query'; + +export async function getTopTransactions({ + setup, + transactionType, + serviceName +}: { + setup: Setup; + transactionType: string; + serviceName: string; +}): Promise { + const { start, end, esFilterQuery, client, config } = setup; + + const params: SearchParams = { + index: config.get('apm_oss.transactionIndices'), + body: { + size: 0, + query: { + bool: { + filter: [ + { term: { [SERVICE_NAME]: serviceName } }, + { term: { [TRANSACTION_TYPE]: transactionType } }, + { term: { [PROCESSOR_EVENT]: 'transaction' } }, + { + range: { + '@timestamp': { gte: start, lte: end, format: 'epoch_millis' } + } + } + ] + } + }, + aggs: TRANSACTION_GROUP_AGGREGATES + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + const response: SearchResponse = await client('search', params); + const buckets = get(response, 'aggregations.transactions.buckets', []); + + return prepareTransactionGroups({ buckets, start, end }); +} diff --git a/x-pack/plugins/apm/server/lib/transactions/get_transaction.js b/x-pack/plugins/apm/server/lib/transactions/get_transaction.js deleted file mode 100644 index 3319814a4ec90..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/get_transaction.js +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { TRANSACTION_ID, PROCESSOR_EVENT } from '../../../common/constants'; -import { get } from 'lodash'; - -async function getTransaction({ transactionId, setup }) { - const { start, end, esFilterQuery, client, config } = setup; - - const params = { - index: config.get('apm_oss.transactionIndices'), - body: { - size: 1, - query: { - bool: { - filter: [ - { term: { [PROCESSOR_EVENT]: 'transaction' } }, - { term: { [TRANSACTION_ID]: transactionId } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - return get(resp, 'hits.hits[0]._source', {}); -} - -export default getTransaction; diff --git a/x-pack/plugins/apm/server/lib/transactions/get_transaction.ts b/x-pack/plugins/apm/server/lib/transactions/get_transaction.ts new file mode 100644 index 0000000000000..301e54d1f2a03 --- /dev/null +++ b/x-pack/plugins/apm/server/lib/transactions/get_transaction.ts @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchParams, SearchResponse } from 'elasticsearch'; +import { oc } from 'ts-optchain'; +import { Transaction } from 'x-pack/plugins/apm/typings/Transaction'; +import { + PROCESSOR_EVENT, + TRACE_ID, + TRANSACTION_ID +} from '../../../common/constants'; +import { Setup } from '../helpers/setup_request'; + +export async function getTransaction( + transactionId: string, + traceId: string | undefined, + setup: Setup +) { + const { start, end, esFilterQuery, client, config } = setup; + + const params: SearchParams = { + index: config.get('apm_oss.transactionIndices'), + body: { + size: 1, + query: { + bool: { + filter: [ + { term: { [PROCESSOR_EVENT]: 'transaction' } }, + { term: { [TRANSACTION_ID]: transactionId } }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ] + } + } + } + }; + + if (esFilterQuery) { + params.body.query.bool.filter.push(esFilterQuery); + } + + if (traceId) { + params.body.query.bool.filter.push({ term: { [TRACE_ID]: traceId } }); + } + + const resp: SearchResponse = await client('search', params); + return oc(resp).hits.hits[0]._source() || null; +} diff --git a/x-pack/plugins/apm/server/lib/transactions/get_transaction_duration.js b/x-pack/plugins/apm/server/lib/transactions/get_transaction_duration.js deleted file mode 100644 index fb9620fe9659a..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/get_transaction_duration.js +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { get } from 'lodash'; -import { - TRANSACTION_ID, - TRANSACTION_DURATION, - PROCESSOR_EVENT -} from '../../../common/constants'; - -export async function getTransactionDuration({ transactionId, setup }) { - const { start, end, esFilterQuery, client, config } = setup; - - const params = { - index: config.get('apm_oss.transactionIndices'), - body: { - size: 1, - _source: TRANSACTION_DURATION, - query: { - bool: { - filter: [ - { term: { [PROCESSOR_EVENT]: 'transaction' } }, - { term: { [TRANSACTION_ID]: transactionId } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - } - } - }; - - if (esFilterQuery) { - params.body.query.bool.filter.push(esFilterQuery); - } - - const resp = await client('search', params); - return get(resp, `hits.hits[0]._source.${TRANSACTION_DURATION}`); -} diff --git a/x-pack/plugins/apm/server/lib/transactions/spans/get_spans.js b/x-pack/plugins/apm/server/lib/transactions/spans/get_spans.js deleted file mode 100644 index b7f3a9f3d96df..0000000000000 --- a/x-pack/plugins/apm/server/lib/transactions/spans/get_spans.js +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { - TRANSACTION_ID, - SPAN_START, - SPAN_TYPE, - PROCESSOR_EVENT -} from '../../../../common/constants'; - -async function getSpans({ transactionId, setup }) { - const { start, end, client, config } = setup; - - const params = { - index: config.get('apm_oss.spanIndices'), - body: { - size: 500, - query: { - bool: { - filter: [ - { term: { [TRANSACTION_ID]: transactionId } }, - { term: { [PROCESSOR_EVENT]: 'span' } }, - { - range: { - '@timestamp': { - gte: start, - lte: end, - format: 'epoch_millis' - } - } - } - ] - } - }, - sort: [{ [SPAN_START]: { order: 'asc' } }], - aggs: { - types: { - terms: { - field: SPAN_TYPE, - size: 100 - } - } - } - } - }; - - const resp = await client('search', params); - return { - span_types: resp.aggregations.types.buckets.map(bucket => ({ - type: bucket.key, - count: bucket.doc_count - })), - spans: resp.hits.hits.map((doc, i) => ({ - doc_id: doc._id, - id: i, - ...doc._source.span, - context: doc._source.context - })) - }; -} - -export default getSpans; diff --git a/x-pack/plugins/apm/server/lib/transactions/spans/get_spans.ts b/x-pack/plugins/apm/server/lib/transactions/spans/get_spans.ts new file mode 100644 index 0000000000000..dc587dfd2f49b --- /dev/null +++ b/x-pack/plugins/apm/server/lib/transactions/spans/get_spans.ts @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchResponse } from 'elasticsearch'; +import { Span } from 'x-pack/plugins/apm/typings/Span'; +import { + PROCESSOR_EVENT, + SPAN_START, + SPAN_TYPE, + TRANSACTION_ID +} from '../../../../common/constants'; +import { Setup } from '../../helpers/setup_request'; + +export async function getSpans(transactionId: string, setup: Setup) { + const { start, end, client, config } = setup; + + const params = { + index: config.get('apm_oss.spanIndices'), + body: { + size: 500, + query: { + bool: { + filter: [ + { term: { [TRANSACTION_ID]: transactionId } }, + { term: { [PROCESSOR_EVENT]: 'span' } }, + { + range: { + '@timestamp': { + gte: start, + lte: end, + format: 'epoch_millis' + } + } + } + ] + } + }, + sort: [{ [SPAN_START]: { order: 'asc' } }], + aggs: { + types: { + terms: { + field: SPAN_TYPE, + size: 100 + } + } + } + } + }; + + const resp: SearchResponse = await client('search', params); + return resp.hits.hits.map(hit => hit._source); +} diff --git a/x-pack/plugins/apm/server/routes/errors.js b/x-pack/plugins/apm/server/routes/errors.js index 8ff6abd41cc53..775664abc90b6 100644 --- a/x-pack/plugins/apm/server/routes/errors.js +++ b/x-pack/plugins/apm/server/routes/errors.js @@ -15,9 +15,9 @@ import { withDefaultValidators } from '../lib/helpers/input_validation'; const pre = [{ method: setupRequest, assign: 'setup' }]; const ROOT = '/api/apm/services/{serviceName}/errors'; -const defaultErrorHandler = reply => err => { +const defaultErrorHandler = err => { console.error(err.stack); - reply(Boom.wrap(err, 400)); + throw Boom.boomify(err, { statusCode: 400 }); }; export function initErrorsApi(server) { @@ -33,7 +33,7 @@ export function initErrorsApi(server) { }) } }, - handler: (req, reply) => { + handler: req => { const { setup } = req.pre; const { serviceName } = req.params; const { sortField, sortDirection } = req.query; @@ -43,9 +43,7 @@ export function initErrorsApi(server) { sortField, sortDirection, setup - }) - .then(reply) - .catch(defaultErrorHandler(reply)); + }).catch(defaultErrorHandler); } }); @@ -58,12 +56,12 @@ export function initErrorsApi(server) { query: withDefaultValidators() } }, - handler: (req, reply) => { + handler: req => { const { setup } = req.pre; const { serviceName, groupId } = req.params; - return getErrorGroup({ serviceName, groupId, setup }) - .then(reply) - .catch(defaultErrorHandler(reply)); + return getErrorGroup({ serviceName, groupId, setup }).catch( + defaultErrorHandler + ); } }); @@ -76,13 +74,13 @@ export function initErrorsApi(server) { query: withDefaultValidators() } }, - handler: (req, reply) => { + handler: req => { const { setup } = req.pre; const { serviceName, groupId } = req.params; - return getDistribution({ serviceName, groupId, setup }) - .then(reply) - .catch(defaultErrorHandler(reply)); + return getDistribution({ serviceName, groupId, setup }).catch( + defaultErrorHandler + ); } }); } diff --git a/x-pack/plugins/apm/server/routes/services.js b/x-pack/plugins/apm/server/routes/services.js deleted file mode 100644 index 90a3d923800ba..0000000000000 --- a/x-pack/plugins/apm/server/routes/services.js +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import Boom from 'boom'; -import { getServices } from '../lib/services/get_services'; -import { getService } from '../lib/services/get_service'; -import { setupRequest } from '../lib/helpers/setup_request'; -import { withDefaultValidators } from '../lib/helpers/input_validation'; - -const ROOT = '/api/apm/services'; -const pre = [{ method: setupRequest, assign: 'setup' }]; -const defaultErrorHandler = reply => err => { - console.error(err.stack); - reply(Boom.wrap(err, 400)); -}; - -export function initServicesApi(server) { - server.route({ - method: 'GET', - path: ROOT, - config: { - pre, - validate: { - query: withDefaultValidators() - } - }, - handler: (req, reply) => { - const { setup } = req.pre; - return getServices({ setup }) - .then(reply) - .catch(defaultErrorHandler(reply)); - } - }); - - server.route({ - method: 'GET', - path: `${ROOT}/{serviceName}`, - config: { - pre, - validate: { - query: withDefaultValidators() - } - }, - handler: (req, reply) => { - const { setup } = req.pre; - const { serviceName } = req.params; - return getService({ serviceName, setup }) - .then(reply) - .catch(defaultErrorHandler(reply)); - } - }); -} diff --git a/x-pack/plugins/apm/server/routes/services.ts b/x-pack/plugins/apm/server/routes/services.ts new file mode 100644 index 0000000000000..31cf772c5e5dc --- /dev/null +++ b/x-pack/plugins/apm/server/routes/services.ts @@ -0,0 +1,54 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Boom from 'boom'; +import { Server } from 'hapi'; +import { withDefaultValidators } from '../lib/helpers/input_validation'; +import { setupRequest } from '../lib/helpers/setup_request'; +import { getService } from '../lib/services/get_service'; +import { getServices } from '../lib/services/get_services'; + +const ROOT = '/api/apm/services'; +const pre = [{ method: setupRequest, assign: 'setup' }]; +const defaultErrorHandler = (err: Error) => { + // tslint:disable-next-line + console.error(err.stack); + // @ts-ignore + return Boom.boomify(err, { statusCode: 400 }); +}; + +export function initServicesApi(server: Server) { + server.route({ + method: 'GET', + path: ROOT, + options: { + pre, + validate: { + query: withDefaultValidators() + } + }, + handler: req => { + const { setup } = req.pre; + return getServices(setup).catch(defaultErrorHandler); + } + }); + + server.route({ + method: 'GET', + path: `${ROOT}/{serviceName}`, + options: { + pre, + validate: { + query: withDefaultValidators() + } + }, + handler: req => { + const { setup } = req.pre; + const { serviceName } = req.params; + return getService(serviceName, setup).catch(defaultErrorHandler); + } + }); +} diff --git a/x-pack/plugins/apm/server/routes/status_check.js b/x-pack/plugins/apm/server/routes/status_check.js index 700fb51fcf14c..8e78fdc4b7848 100644 --- a/x-pack/plugins/apm/server/routes/status_check.js +++ b/x-pack/plugins/apm/server/routes/status_check.js @@ -12,9 +12,9 @@ import { setupRequest } from '../lib/helpers/setup_request'; const ROOT = '/api/apm/status'; const pre = [{ method: setupRequest, assign: 'setup' }]; -const defaultErrorHandler = reply => err => { +const defaultErrorHandler = err => { console.error(err.stack); - reply(Boom.wrap(err, 400)); + throw Boom.boomify(err, { statusCode: 400 }); }; export function initStatusApi(server) { @@ -29,11 +29,9 @@ export function initStatusApi(server) { }) } }, - handler: (req, reply) => { + handler: req => { const { setup } = req.pre; - return getServerStatus({ setup }) - .then(reply) - .catch(defaultErrorHandler(reply)); + return getServerStatus({ setup }).catch(defaultErrorHandler); } }); @@ -48,11 +46,9 @@ export function initStatusApi(server) { }) } }, - handler: (req, reply) => { + handler: req => { const { setup } = req.pre; - return getAgentStatus({ setup }) - .then(reply) - .catch(defaultErrorHandler(reply)); + return getAgentStatus({ setup }).catch(defaultErrorHandler); } }); } diff --git a/x-pack/plugins/apm/server/routes/traces.ts b/x-pack/plugins/apm/server/routes/traces.ts new file mode 100644 index 0000000000000..56588130ba3dd --- /dev/null +++ b/x-pack/plugins/apm/server/routes/traces.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Boom from 'boom'; +import { Server } from 'hapi'; +import { withDefaultValidators } from '../lib/helpers/input_validation'; +import { setupRequest } from '../lib/helpers/setup_request'; +import { getTopTraces } from '../lib/traces/get_top_traces'; +import { getTrace } from '../lib/traces/get_trace'; + +const pre = [{ method: setupRequest, assign: 'setup' }]; +const ROOT = '/api/apm/traces'; +const defaultErrorHandler = (err: Error) => { + // tslint:disable-next-line + console.error(err.stack); + // @ts-ignore + return Boom.boomify(err, { statusCode: 400 }); +}; + +export function initTracesApi(server: Server) { + // Get trace list + server.route({ + method: 'GET', + path: ROOT, + options: { + pre, + validate: { + query: withDefaultValidators() + } + }, + handler: req => { + const { setup } = req.pre; + + return getTopTraces(setup).catch(defaultErrorHandler); + } + }); + + // Get individual trace + server.route({ + method: 'GET', + path: `${ROOT}/{traceId}`, + options: { + pre, + validate: { + query: withDefaultValidators() + } + }, + handler: req => { + const { traceId } = req.params; + const { setup } = req.pre; + return getTrace(traceId, setup).catch(defaultErrorHandler); + } + }); +} diff --git a/x-pack/plugins/apm/server/routes/transactions.js b/x-pack/plugins/apm/server/routes/transactions.js deleted file mode 100644 index 1bad37fece9c2..0000000000000 --- a/x-pack/plugins/apm/server/routes/transactions.js +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import Joi from 'joi'; -import Boom from 'boom'; - -import { getTimeseriesData } from '../lib/transactions/charts/get_timeseries_data'; -import getSpans from '../lib/transactions/spans/get_spans'; -import { getDistribution } from '../lib/transactions/distribution/get_distribution'; -import { getTransactionDuration } from '../lib/transactions/get_transaction_duration'; -import { getTopTransactions } from '../lib/transactions/get_top_transactions'; -import getTransaction from '../lib/transactions/get_transaction'; -import { setupRequest } from '../lib/helpers/setup_request'; -import { withDefaultValidators } from '../lib/helpers/input_validation'; - -const pre = [{ method: setupRequest, assign: 'setup' }]; -const ROOT = '/api/apm/services/{serviceName}/transactions'; -const defaultErrorHandler = reply => err => { - console.error(err.stack); - reply(Boom.wrap(err, 400)); -}; - -export function initTransactionsApi(server) { - server.route({ - method: 'GET', - path: ROOT, - config: { - pre, - validate: { - query: withDefaultValidators({ - transaction_type: Joi.string().default('request'), - query: Joi.string() - }) - } - }, - handler: (req, reply) => { - const { serviceName } = req.params; - const { transaction_type: transactionType } = req.query; - const { setup } = req.pre; - - return getTopTransactions({ - serviceName, - transactionType, - setup - }) - .then(reply) - .catch(defaultErrorHandler(reply)); - } - }); - - server.route({ - method: 'GET', - path: `${ROOT}/{transactionId}`, - config: { - pre, - validate: { - query: withDefaultValidators() - } - }, - handler: (req, reply) => { - const { transactionId } = req.params; - const { setup } = req.pre; - return getTransaction({ transactionId, setup }) - .then(res => reply(res)) - .catch(defaultErrorHandler(reply)); - } - }); - - server.route({ - method: 'GET', - path: `${ROOT}/{transactionId}/spans`, - config: { - pre, - validate: { - query: withDefaultValidators() - } - }, - handler: (req, reply) => { - const { transactionId } = req.params; - const { setup } = req.pre; - return Promise.all([ - getSpans({ transactionId, setup }), - getTransactionDuration({ transactionId, setup }) - ]) - .then(([spans, duration]) => reply({ ...spans, duration })) - .catch(defaultErrorHandler(reply)); - } - }); - - server.route({ - method: 'GET', - path: `${ROOT}/charts`, - config: { - pre, - validate: { - query: withDefaultValidators({ - transaction_type: Joi.string().default('request'), - transaction_name: Joi.string(), - query: Joi.string() - }) - } - }, - handler: (req, reply) => { - const { setup } = req.pre; - const { serviceName } = req.params; - const transactionType = req.query.transaction_type; - const transactionName = req.query.transaction_name; - - return getTimeseriesData({ - serviceName, - transactionType, - transactionName, - setup - }) - .then(reply) - .catch(defaultErrorHandler(reply)); - } - }); - - server.route({ - method: 'GET', - path: `${ROOT}/distribution`, - config: { - pre, - validate: { - query: withDefaultValidators({ - transaction_name: Joi.string().required() - }) - } - }, - handler: (req, reply) => { - const { setup } = req.pre; - const { serviceName } = req.params; - const { transaction_name: transactionName } = req.query; - return getDistribution({ - serviceName, - transactionName, - setup - }) - .then(reply) - .catch(defaultErrorHandler(reply)); - } - }); -} diff --git a/x-pack/plugins/apm/server/routes/transactions.ts b/x-pack/plugins/apm/server/routes/transactions.ts new file mode 100644 index 0000000000000..2774e090e1d57 --- /dev/null +++ b/x-pack/plugins/apm/server/routes/transactions.ts @@ -0,0 +1,147 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Boom from 'boom'; +import { Server } from 'hapi'; +import Joi from 'joi'; +import { withDefaultValidators } from '../lib/helpers/input_validation'; +import { setupRequest } from '../lib/helpers/setup_request'; +// @ts-ignore +import { getTimeseriesData } from '../lib/transactions/charts/get_timeseries_data'; +import { getDistribution } from '../lib/transactions/distribution/get_distribution'; +import { getTopTransactions } from '../lib/transactions/get_top_transactions'; +import { getTransaction } from '../lib/transactions/get_transaction'; +import { getSpans } from '../lib/transactions/spans/get_spans'; + +const pre = [{ method: setupRequest, assign: 'setup' }]; +const ROOT = '/api/apm/services/{serviceName}/transactions'; +const defaultErrorHandler = (err: Error) => { + // tslint:disable-next-line + console.error(err.stack); + // @ts-ignore + Boom.boomify(err, { statusCode: err.statusCode || 400 }); +}; + +export function initTransactionsApi(server: Server) { + server.route({ + method: 'GET', + path: ROOT, + options: { + pre, + validate: { + query: withDefaultValidators({ + transaction_type: Joi.string().default('request'), + query: Joi.string() + }) + } + }, + handler: req => { + const { serviceName } = req.params; + const { transaction_type: transactionType } = req.query as { + transaction_type: string; + }; + const { setup } = req.pre; + + return getTopTransactions({ + serviceName, + transactionType, + setup + }).catch(defaultErrorHandler); + } + }); + + server.route({ + method: 'GET', + path: `${ROOT}/{transactionId}`, + options: { + pre, + validate: { + query: withDefaultValidators({ + traceId: Joi.string().allow('') + }) + } + }, + handler: req => { + const { transactionId } = req.params; + const { traceId } = req.query as { traceId: string }; + const { setup } = req.pre; + return getTransaction(transactionId, traceId, setup).catch( + defaultErrorHandler + ); + } + }); + + server.route({ + method: 'GET', + path: `${ROOT}/{transactionId}/spans`, + options: { + pre, + validate: { + query: withDefaultValidators() + } + }, + handler: req => { + const { transactionId } = req.params; + const { setup } = req.pre; + return getSpans(transactionId, setup).catch(defaultErrorHandler); + } + }); + + server.route({ + method: 'GET', + path: `${ROOT}/charts`, + options: { + pre, + validate: { + query: withDefaultValidators({ + transaction_type: Joi.string().default('request'), + transaction_name: Joi.string(), + query: Joi.string() + }) + } + }, + handler: req => { + const { setup } = req.pre; + const { serviceName } = req.params; + const { transaction_type: transactionType } = req.query as { + transaction_type: string; + }; + const { transaction_name: transactionName } = req.query as { + transaction_name: string; + }; + + return getTimeseriesData({ + serviceName, + transactionType, + transactionName, + setup + }).catch(defaultErrorHandler); + } + }); + + server.route({ + method: 'GET', + path: `${ROOT}/distribution`, + options: { + pre, + validate: { + query: withDefaultValidators({ + transaction_name: Joi.string().required() + }) + } + }, + handler: req => { + const { setup } = req.pre; + const { serviceName } = req.params; + const { transaction_name: transactionName } = req.query as { + transaction_name: string; + }; + return getDistribution(serviceName, transactionName, setup).catch( + defaultErrorHandler + ); + } + }); +} diff --git a/x-pack/plugins/apm/types.d.ts b/x-pack/plugins/apm/types.d.ts deleted file mode 100644 index e538124ba47eb..0000000000000 --- a/x-pack/plugins/apm/types.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -// allow JSON files to be imported directly without TSLint errors -// see: https://github.com/palantir/tslint/issues/1264#issuecomment-228433367 -// and: https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#arbitrary-expressions-are-forbidden-in-export-assignments-in-ambient-contexts -declare module '*.json' { - const json: any; - export default json; -} - -interface StringMap { - [key: string]: T; -} diff --git a/x-pack/plugins/apm/typings/APMDoc.ts b/x-pack/plugins/apm/typings/APMDoc.ts new file mode 100644 index 0000000000000..dc8fffad9bc30 --- /dev/null +++ b/x-pack/plugins/apm/typings/APMDoc.ts @@ -0,0 +1,81 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface APMDocV1 { + '@timestamp': string; + beat: { + hostname: string; + name: string; + version: string; + }; + host: { + name: string; + }; +} + +export interface APMDocV2 extends APMDocV1 { + timestamp: { + us: number; + }; + parent?: { + id: string; // parent ID is not available on the root transaction + }; + trace: { + id: string; + }; +} + +export interface ContextService { + name: string; + agent: { + name: string; + version: string; + }; + framework?: { + name: string; + version: string; + }; + runtime?: { + name: string; + version: string; + }; + language?: { + name: string; + version?: string; + }; +} + +export interface Stackframe { + filename: string; + line: { + number: number; + column?: number; + context?: string; + }; + abs_path?: string; + colno?: number; + context_line?: string; + function?: string; + library_frame?: boolean; + exclude_from_grouping?: boolean; + module?: string; + context?: { + post?: string[]; + pre?: string[]; + }; + sourcemap?: { + updated?: boolean; + error?: string; + }; + vars?: any; + orig?: { + filename?: string; + abs_path?: string; + function?: string; + lineno?: number; + colno?: number; + }; +} diff --git a/x-pack/plugins/apm/typings/Error.ts b/x-pack/plugins/apm/typings/Error.ts new file mode 100644 index 0000000000000..a4bacfeff62ce --- /dev/null +++ b/x-pack/plugins/apm/typings/Error.ts @@ -0,0 +1,46 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { APMDocV1, ContextService, Stackframe } from './APMDoc'; + +export interface Error extends APMDocV1 { + processor: { + name: 'error'; + event: 'error'; + }; + context: { + process?: { + pid: number; + }; + service: ContextService; + }; + transaction?: { + id: string; // transaction ID is not required in v1 + }; + error: { + id?: string; // ID is not required in v1 + timestamp: string; + culprit: string; + grouping_key: string; + // either exception or log are given + exception?: { + message?: string; // either message or type are given + type?: string; + code?: string; + module?: string; + attributes?: any; + handled?: boolean; + stacktrace?: Stackframe[]; + }; + log?: { + message: string; + param_message?: string; + logger_name?: string; + level?: string; + stacktrace?: Stackframe[]; + }; + }; +} diff --git a/x-pack/plugins/apm/typings/Span.ts b/x-pack/plugins/apm/typings/Span.ts new file mode 100644 index 0000000000000..b14a328a85988 --- /dev/null +++ b/x-pack/plugins/apm/typings/Span.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { APMDocV1, APMDocV2, ContextService, Stackframe } from './APMDoc'; + +export interface DbContext { + instance?: string; + statement?: string; + type?: string; + user?: string; +} + +interface Processor { + name: 'transaction'; + event: 'span'; +} + +interface Context { + db?: DbContext; + service: ContextService; + [key: string]: any; +} + +export interface SpanV1 extends APMDocV1 { + version: 'v1'; + processor: Processor; + context: Context; + span: { + duration: { + us: number; + }; + start: { + us: number; // only v1 + }; + name: string; + type: string; + id: number; // we are manually adding span.id + parent?: string; // only v1 + stacktrace?: Stackframe[]; + }; + transaction: { + id: string; + }; +} + +export interface SpanV2 extends APMDocV2 { + version: 'v2'; + processor: Processor; + context: Context; + span: { + duration: { + us: number; + }; + name: string; + type: string; + id: number; // id will be derived from hex encoded 64 bit hex_id string in v2 + hex_id: string; // only v2 + stacktrace?: Stackframe[]; + }; + transaction: { + id: string; + }; +} + +export type Span = SpanV1 | SpanV2; diff --git a/x-pack/plugins/apm/typings/Transaction.ts b/x-pack/plugins/apm/typings/Transaction.ts new file mode 100644 index 0000000000000..21422f0c3f0ae --- /dev/null +++ b/x-pack/plugins/apm/typings/Transaction.ts @@ -0,0 +1,91 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { APMDocV1, APMDocV2, ContextService } from './APMDoc'; + +interface Processor { + name: 'transaction'; + event: 'transaction'; +} + +interface ContextSystem { + architecture?: string; + hostname?: string; + ip?: string; + platform?: string; +} + +interface Context { + process?: { + pid: number; + }; + service: ContextService; + system?: ContextSystem; + request: { + url: { + full: string; + }; + method: string; + }; + user?: { + id: string; + }; + [key: string]: any; +} + +interface Marks { + agent: { + [name: string]: number; + }; +} + +export interface TransactionV1 extends APMDocV1 { + version: 'v1'; + processor: Processor; + context: Context; + transaction: { + duration: { + us: number; + }; + id: string; + marks?: Marks; + name: string; // name could be missing in ES but the UI will always only aggregate on transactions with a name + result?: string; + sampled: boolean; + span_count?: { + dropped?: { + total?: number; + }; + }; + type: string; + }; +} + +export interface TransactionV2 extends APMDocV2 { + version: 'v2'; + processor: Processor; + context: Context; + transaction: { + duration: { + us: number; + }; + id: string; + marks?: Marks; + name: string; // name could be missing in ES but the UI will always only aggregate on transactions with a name + result?: string; + sampled: boolean; + + span_count?: { + started?: number; // only v2 + dropped?: { + total?: number; + }; + }; + type: string; + }; +} + +export type Transaction = TransactionV1 | TransactionV2; diff --git a/x-pack/plugins/apm/typings/TransactionGroup.ts b/x-pack/plugins/apm/typings/TransactionGroup.ts new file mode 100644 index 0000000000000..3967d4d94d5cf --- /dev/null +++ b/x-pack/plugins/apm/typings/TransactionGroup.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Transaction } from './Transaction'; + +export interface ITransactionGroup { + name: string; + sample: Transaction; + p95: number; + averageResponseTime: number; + transactionsPerMinute: number; + impact: number; +} diff --git a/x-pack/plugins/apm/typings/common.ts b/x-pack/plugins/apm/typings/common.ts new file mode 100644 index 0000000000000..c69188724f8ed --- /dev/null +++ b/x-pack/plugins/apm/typings/common.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface StringMap { + [key: string]: T; +} diff --git a/x-pack/plugins/apm/typings/elasticsearch.ts b/x-pack/plugins/apm/typings/elasticsearch.ts new file mode 100644 index 0000000000000..f3a536e8993ff --- /dev/null +++ b/x-pack/plugins/apm/typings/elasticsearch.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface TermsAggsBucket { + key: string; + doc_count: number; +} diff --git a/x-pack/plugins/apm/typings/global_types.d.ts b/x-pack/plugins/apm/typings/global_types.d.ts new file mode 100644 index 0000000000000..ba1e9e998727f --- /dev/null +++ b/x-pack/plugins/apm/typings/global_types.d.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// allow JSON files to be imported directly without TSLint errors +// see: https://github.com/palantir/tslint/issues/1264#issuecomment-228433367 +// and: https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#arbitrary-expressions-are-forbidden-in-export-assignments-in-ambient-contexts +declare module '*.json' { + const json: any; + export default json; +} diff --git a/x-pack/plugins/apm/typings/numeral.d.ts b/x-pack/plugins/apm/typings/numeral.d.ts new file mode 100644 index 0000000000000..d21595041f14d --- /dev/null +++ b/x-pack/plugins/apm/typings/numeral.d.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +interface Numeral { + (value?: any): Numeral; + format: (pattern: string) => string; +} + +declare var numeral: Numeral; + +declare module '@elastic/numeral' { + export = numeral; +} diff --git a/x-pack/plugins/apm/typings/react-redux-request.d.ts b/x-pack/plugins/apm/typings/react-redux-request.d.ts new file mode 100644 index 0000000000000..23a3b7578772c --- /dev/null +++ b/x-pack/plugins/apm/typings/react-redux-request.d.ts @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// Everything in here should be moved to http://github.com/sqren/react-redux-request + +declare module 'react-redux-request' { + import React from 'react'; + + export interface RRRRenderResponse { + status: 'SUCCESS' | 'LOADING' | 'FAILURE'; + data: T; + args: P; + } + + export type RRRRender = ( + res: RRRRenderResponse + ) => JSX.Element | null; + + export interface RequestProps { + id: string; + fn: (args: any) => Promise; + selector?: (state: any) => any; + args?: any[]; + render?: RRRRender; + } + + export function reducer(state: any): any; + + export class Request extends React.Component< + RequestProps + > {} +} diff --git a/x-pack/plugins/apm/typings/waterfall.ts b/x-pack/plugins/apm/typings/waterfall.ts new file mode 100644 index 0000000000000..d33cdcda65cc3 --- /dev/null +++ b/x-pack/plugins/apm/typings/waterfall.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Span } from './Span'; +import { Transaction } from './Transaction'; + +export type WaterfallResponse = Array; diff --git a/x-pack/plugins/beats_management/common/constants/configuration_blocks.ts b/x-pack/plugins/beats_management/common/constants/configuration_blocks.ts new file mode 100644 index 0000000000000..e89e53e25b89d --- /dev/null +++ b/x-pack/plugins/beats_management/common/constants/configuration_blocks.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export enum ConfigurationBlockTypes { + FilebeatInputs = 'filebeat.inputs', + FilebeatModules = 'filebeat.modules', + MetricbeatModules = 'metricbeat.modules', + Output = 'output', + Processors = 'processors', +} + +export const UNIQUENESS_ENFORCING_TYPES = [ConfigurationBlockTypes.Output]; diff --git a/x-pack/plugins/beats_management/common/constants/index.ts b/x-pack/plugins/beats_management/common/constants/index.ts new file mode 100644 index 0000000000000..50851dcef947e --- /dev/null +++ b/x-pack/plugins/beats_management/common/constants/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { PLUGIN } from './plugin'; +export { INDEX_NAMES } from './index_names'; +export { UNIQUENESS_ENFORCING_TYPES, ConfigurationBlockTypes } from './configuration_blocks'; +export const BASE_PATH = '/management/beats_management/'; +export { TABLE_CONFIG } from './table'; diff --git a/x-pack/plugins/beats_management/common/constants/index_names.ts b/x-pack/plugins/beats_management/common/constants/index_names.ts new file mode 100644 index 0000000000000..f8d20fb79c360 --- /dev/null +++ b/x-pack/plugins/beats_management/common/constants/index_names.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const INDEX_NAMES = { + BEATS: '.management-beats', +}; diff --git a/x-pack/plugins/beats_management/common/constants/plugin.ts b/x-pack/plugins/beats_management/common/constants/plugin.ts new file mode 100644 index 0000000000000..dc7cd85300341 --- /dev/null +++ b/x-pack/plugins/beats_management/common/constants/plugin.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const PLUGIN = { + ID: 'beats_management', +}; diff --git a/x-pack/plugins/beats_management/common/constants/table.ts b/x-pack/plugins/beats_management/common/constants/table.ts new file mode 100644 index 0000000000000..119b4f3da4596 --- /dev/null +++ b/x-pack/plugins/beats_management/common/constants/table.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const TABLE_CONFIG = { + INITIAL_ROW_SIZE: 5, + PAGE_SIZE_OPTIONS: [3, 5, 10, 20], + TRUNCATE_TAG_LENGTH: 33, + TRUNCATE_TAG_LENGTH_SMALL: 20, +}; diff --git a/x-pack/plugins/beats_management/common/domain_types.ts b/x-pack/plugins/beats_management/common/domain_types.ts new file mode 100644 index 0000000000000..30c179c7060e9 --- /dev/null +++ b/x-pack/plugins/beats_management/common/domain_types.ts @@ -0,0 +1,88 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { ConfigurationBlockTypes } from './constants'; + +export enum FilebeatModuleName { + system = 'system', + apache2 = 'apache2', + nginx = 'nginx', + mongodb = 'mongodb', + elasticsearch = 'elasticsearch', +} + +export enum MetricbeatModuleName { + system = 'system', + apache2 = 'apache2', + nginx = 'nginx', + mongodb = 'mongodb', + elasticsearch = 'elasticsearch', +} + +export enum OutputType { + elasticsearch = 'elasticsearch', + logstash = 'logstash', + kafka = 'kafka', + console = 'console', +} + +export interface FilebeatInputsConfig { + paths: string[]; + other: string; +} +export interface FilebeatModuleConfig { + module: FilebeatModuleName; + other: string; +} +export interface MetricbeatModuleConfig { + module: MetricbeatModuleName; + hosts?: string[]; + period: string; + other: string; +} + +export type ConfigContent = FilebeatInputsConfig | FilebeatModuleConfig | MetricbeatModuleConfig; +export interface ConfigurationBlock { + type: ConfigurationBlockTypes; + description: string; + configs: ConfigContent[]; +} + +export interface ReturnedConfigurationBlock + extends Pick> { + config: ConfigContent; +} + +export interface CMBeat { + id: string; + config_status: 'OK' | 'UNKNOWN' | 'ERROR'; + enrollment_token: string; + active: boolean; + access_token: string; + verified_on?: string; + type: string; + version?: string; + host_ip: string; + host_name: string; + ephemeral_id?: string; + last_checkin?: Date; + event_rate?: string; + local_configuration_yml?: string; + tags?: string[]; + central_configuration_yml?: string; + metadata?: {}; + name?: string; +} + +export interface CMPopulatedBeat extends CMBeat { + full_tags: BeatTag[]; +} + +export interface BeatTag { + id: string; + configuration_blocks: ConfigurationBlock[]; + color?: string; + last_updated: Date; +} diff --git a/x-pack/plugins/beats_management/index.ts b/x-pack/plugins/beats_management/index.ts new file mode 100644 index 0000000000000..a415395de5262 --- /dev/null +++ b/x-pack/plugins/beats_management/index.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import Joi from 'joi'; +import { resolve } from 'path'; +import { PLUGIN } from './common/constants'; +import { initServerWithKibana } from './server/kibana.index'; + +const DEFAULT_ENROLLMENT_TOKENS_TTL_S = 10 * 60; // 10 minutes + +export const config = Joi.object({ + enabled: Joi.boolean().default(true), + encryptionKey: Joi.string(), + defaultUserRoles: Joi.array() + .items(Joi.string()) + .default(['superuser']), + enrollmentTokensTtlInSeconds: Joi.number() + .integer() + .min(1) + .max(10 * 60 * 14) // No more then 2 weeks for security reasons + .default(DEFAULT_ENROLLMENT_TOKENS_TTL_S), +}).default(); +export const configPrefix = 'xpack.beats'; + +export function beats(kibana: any) { + return new kibana.Plugin({ + id: PLUGIN.ID, + require: ['kibana', 'elasticsearch', 'xpack_main'], + publicDir: resolve(__dirname, 'public'), + uiExports: { + managementSections: ['plugins/beats_management'], + }, + config: () => config, + configPrefix, + init(server: any) { + initServerWithKibana(server); + }, + }); +} diff --git a/x-pack/plugins/beats_management/public/app.d.ts b/x-pack/plugins/beats_management/public/app.d.ts new file mode 100644 index 0000000000000..4e806e12d3843 --- /dev/null +++ b/x-pack/plugins/beats_management/public/app.d.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export type FlatObject = { [Key in keyof T]: string }; + +export interface AppURLState { + beatsKBar?: string; + tagsKBar?: string; + enrollmentToken?: string; + createdTag?: string; +} diff --git a/x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx b/x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx new file mode 100644 index 0000000000000..7ff5296ef4d92 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/autocomplete_field/index.tsx @@ -0,0 +1,290 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiFieldSearch, + EuiFieldSearchProps, + EuiOutsideClickDetector, + EuiPanel, +} from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; + +// @ts-ignore +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; + +import { composeStateUpdaters } from '../../utils/typed_react'; +import { SuggestionItem } from './suggestion_item'; + +interface AutocompleteFieldProps { + isLoadingSuggestions: boolean; + isValid: boolean; + loadSuggestions: (value: string, cursorPosition: number, maxCount?: number) => void; + onSubmit?: (value: string) => void; + onChange?: (value: string) => void; + placeholder?: string; + suggestions: AutocompleteSuggestion[]; + value: string; +} + +interface AutocompleteFieldState { + areSuggestionsVisible: boolean; + selectedIndex: number | null; +} + +export class AutocompleteField extends React.Component< + AutocompleteFieldProps, + AutocompleteFieldState +> { + public readonly state: AutocompleteFieldState = { + areSuggestionsVisible: false, + selectedIndex: null, + }; + + private inputElement: HTMLInputElement | null = null; + + public render() { + const { suggestions, isLoadingSuggestions, isValid, placeholder, value } = this.props; + const { areSuggestionsVisible, selectedIndex } = this.state; + + return ( + + + + {areSuggestionsVisible && !isLoadingSuggestions && suggestions.length > 0 ? ( + + {suggestions.map((suggestion, suggestionIndex) => ( + + ))} + + ) : null} + + + ); + } + + public componentDidUpdate(prevProps: AutocompleteFieldProps, prevState: AutocompleteFieldState) { + const hasNewSuggestions = prevProps.suggestions !== this.props.suggestions; + const hasNewValue = prevProps.value !== this.props.value; + + if (hasNewValue) { + this.updateSuggestions(); + } + + if (hasNewSuggestions) { + this.showSuggestions(); + } + } + + private handleChangeInputRef = (element: HTMLInputElement | null) => { + this.inputElement = element; + }; + + private handleChange = (evt: React.ChangeEvent) => { + this.changeValue(evt.currentTarget.value); + }; + + private handleKeyDown = (evt: React.KeyboardEvent) => { + const { suggestions } = this.props; + + switch (evt.key) { + case 'ArrowUp': + evt.preventDefault(); + if (suggestions.length > 0) { + this.setState( + composeStateUpdaters(withSuggestionsVisible, withPreviousSuggestionSelected) + ); + } + break; + case 'ArrowDown': + evt.preventDefault(); + if (suggestions.length > 0) { + this.setState(composeStateUpdaters(withSuggestionsVisible, withNextSuggestionSelected)); + } else { + this.updateSuggestions(); + } + break; + case 'Enter': + evt.preventDefault(); + if (this.state.selectedIndex !== null) { + this.applySelectedSuggestion(); + } else { + this.submit(); + } + break; + case 'Escape': + evt.preventDefault(); + this.setState(withSuggestionsHidden); + break; + } + }; + + private handleKeyUp = (evt: React.KeyboardEvent) => { + switch (evt.key) { + case 'ArrowLeft': + case 'ArrowRight': + case 'Home': + case 'End': + this.updateSuggestions(); + break; + } + }; + + private selectSuggestionAt = (index: number) => () => { + this.setState(withSuggestionAtIndexSelected(index)); + }; + + private applySelectedSuggestion = () => { + if (this.state.selectedIndex !== null) { + this.applySuggestionAt(this.state.selectedIndex)(); + } + }; + + private applySuggestionAt = (index: number) => () => { + const { value, suggestions } = this.props; + const selectedSuggestion = suggestions[index]; + + if (!selectedSuggestion) { + return; + } + + const newValue = + value.substr(0, selectedSuggestion.start) + + selectedSuggestion.text + + value.substr(selectedSuggestion.end); + + this.setState(withSuggestionsHidden); + this.changeValue(newValue); + this.focusInputElement(); + }; + + private changeValue = (value: string) => { + const { onChange } = this.props; + if (onChange) { + onChange(value); + } + }; + + private focusInputElement = () => { + if (this.inputElement) { + this.inputElement.focus(); + } + }; + + private showSuggestions = () => { + this.setState(withSuggestionsVisible); + }; + + private hideSuggestions = () => { + this.setState(withSuggestionsHidden); + }; + + private submit = () => { + const { isValid, onSubmit, value } = this.props; + + if (isValid && onSubmit) { + onSubmit(value); + } + + this.setState(withSuggestionsHidden); + }; + + private updateSuggestions = (value?: string) => { + const inputCursorPosition = this.inputElement ? this.inputElement.selectionStart || 0 : 0; + this.props.loadSuggestions(value || this.props.value, inputCursorPosition, 10); + }; +} + +const withPreviousSuggestionSelected = ( + state: AutocompleteFieldState, + props: AutocompleteFieldProps +): AutocompleteFieldState => ({ + ...state, + selectedIndex: + props.suggestions.length === 0 + ? null + : state.selectedIndex !== null + ? (state.selectedIndex + props.suggestions.length - 1) % props.suggestions.length + : Math.max(props.suggestions.length - 1, 0), +}); + +const withNextSuggestionSelected = ( + state: AutocompleteFieldState, + props: AutocompleteFieldProps +): AutocompleteFieldState => ({ + ...state, + selectedIndex: + props.suggestions.length === 0 + ? null + : state.selectedIndex !== null + ? (state.selectedIndex + 1) % props.suggestions.length + : 0, +}); + +const withSuggestionAtIndexSelected = (suggestionIndex: number) => ( + state: AutocompleteFieldState, + props: AutocompleteFieldProps +): AutocompleteFieldState => ({ + ...state, + selectedIndex: + props.suggestions.length === 0 + ? null + : suggestionIndex >= 0 && suggestionIndex < props.suggestions.length + ? suggestionIndex + : 0, +}); + +const withSuggestionsVisible = (state: AutocompleteFieldState) => ({ + ...state, + areSuggestionsVisible: true, +}); + +const withSuggestionsHidden = (state: AutocompleteFieldState) => ({ + ...state, + areSuggestionsVisible: false, + selectedIndex: null, +}); + +const FixedEuiFieldSearch: React.SFC< + React.InputHTMLAttributes & + EuiFieldSearchProps & { + inputRef?: (element: HTMLInputElement | null) => void; + onSearch: (value: string) => void; + } +> = EuiFieldSearch as any; + +const AutocompleteContainer = styled.div` + position: relative; +`; + +const SuggestionsPanel = styled(EuiPanel).attrs({ + paddingSize: 'none', + hasShadow: true, +})` + position: absolute; + width: 100%; + margin-top: 2px; + overflow: hidden; + z-index: 1000; +`; diff --git a/x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx new file mode 100644 index 0000000000000..c9dc832cf37b7 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/autocomplete_field/suggestion_item.tsx @@ -0,0 +1,123 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiIcon } from '@elastic/eui'; +import { tint } from 'polished'; +import React from 'react'; +import styled from 'styled-components'; + +// @ts-ignore +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; + +interface SuggestionItemProps { + isSelected?: boolean; + onClick?: React.MouseEventHandler; + onMouseEnter?: React.MouseEventHandler; + suggestion: AutocompleteSuggestion; +} + +export class SuggestionItem extends React.Component { + public static defaultProps: Partial = { + isSelected: false, + }; + + public render() { + const { isSelected, onClick, onMouseEnter, suggestion } = this.props; + + return ( + + + + + {suggestion.text} + + + ); + } +} + +const SuggestionItemContainer = styled.div<{ + isSelected?: boolean; +}>` + display: flex; + flex-direction: row; + font-size: ${props => props.theme.eui.euiFontSizeS}; + height: ${props => props.theme.eui.euiSizeXl}; + white-space: nowrap; + background-color: ${props => + props.isSelected ? props.theme.eui.euiColorLightestShade : 'transparent'}; +`; + +const SuggestionItemField = styled.div` + align-items: center; + cursor: pointer; + display: flex; + flex-direction: row; + height: ${props => props.theme.eui.euiSizeXl}; + padding: ${props => props.theme.eui.euiSizeXs}; +`; + +const SuggestionItemIconField = SuggestionItemField.extend<{ suggestionType: string }>` + background-color: ${props => tint(0.1, getEuiIconColor(props.theme, props.suggestionType))}; + color: ${props => getEuiIconColor(props.theme, props.suggestionType)}; + flex: 0 0 auto; + justify-content: center; + width: ${props => props.theme.eui.euiSizeXl}; +`; + +const SuggestionItemTextField = SuggestionItemField.extend` + flex: 2 0 0; + font-family: ${props => props.theme.eui.euiCodeFontFamily}; +`; + +const SuggestionItemDescriptionField = SuggestionItemField.extend` + flex: 3 0 0; + p { + display: inline; + span { + font-family: ${props => props.theme.eui.euiCodeFontFamily}; + } + } +`; + +const getEuiIconType = (suggestionType: string) => { + switch (suggestionType) { + case 'field': + return 'kqlField'; + case 'value': + return 'kqlValue'; + case 'recentSearch': + return 'search'; + case 'conjunction': + return 'kqlSelector'; + case 'operator': + return 'kqlOperand'; + default: + return 'empty'; + } +}; + +const getEuiIconColor = (theme: any, suggestionType: string): string => { + switch (suggestionType) { + case 'field': + return theme.eui.euiColorVis7; + case 'value': + return theme.eui.euiColorVis0; + case 'operator': + return theme.eui.euiColorVis1; + case 'conjunction': + return theme.eui.euiColorVis2; + case 'recentSearch': + default: + return theme.eui.euiColorMediumShade; + } +}; diff --git a/x-pack/plugins/beats_management/public/components/config_list.tsx b/x-pack/plugins/beats_management/public/components/config_list.tsx new file mode 100644 index 0000000000000..b04163a183264 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/config_list.tsx @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { EuiBasicTable, EuiLink } from '@elastic/eui'; +import React from 'react'; +import { ConfigurationBlock } from '../../common/domain_types'; +import { supportedConfigs } from '../config_schemas'; + +interface ComponentProps { + configs: ConfigurationBlock[]; + onConfigClick: (action: 'edit' | 'delete', config: ConfigurationBlock) => any; +} + +export const ConfigList: React.SFC = props => ( + { + const type = supportedConfigs.find((sc: any) => sc.value === config.type); + + return ( + props.onConfigClick('edit', config)}> + {type ? type.text : config.type} + + ); + }, + }, + { + field: 'module', + name: 'Module', + truncateText: false, + render: (value: string) => { + return value || 'N/A'; + }, + }, + { + field: 'description', + name: 'Description', + }, + { + name: 'Actions', + actions: [ + { + name: 'Remove', + description: 'Remove this config from tag', + type: 'icon', + icon: 'trash', + onClick: (item: ConfigurationBlock) => props.onConfigClick('delete', item), + }, + ], + }, + ]} + /> +); diff --git a/x-pack/plugins/beats_management/public/components/connected_link.tsx b/x-pack/plugins/beats_management/public/components/connected_link.tsx new file mode 100644 index 0000000000000..b2c0e8ad607af --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/connected_link.tsx @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import React from 'react'; + +import { EuiLink } from '@elastic/eui'; +import { Link, withRouter } from 'react-router-dom'; + +export function ConnectedLinkComponent({ + location, + path, + query, + disabled, + ...props +}: { + location: any; + path: string; + disabled: boolean; + query: any; + [key: string]: any; +}) { + if (disabled) { + return ; + } + + // Shorthand for pathname + const pathname = path || _.get(props.to, 'pathname') || location.pathname; + + return ( + + ); +} + +export const ConnectedLink = withRouter(ConnectedLinkComponent); diff --git a/x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx b/x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx new file mode 100644 index 0000000000000..508649d6ad22d --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/inputs/code_editor.tsx @@ -0,0 +1,113 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +// @ts-ignore +import { CommonProps, EuiCodeEditor, EuiCodeEditorProps, EuiFormRow } from '@elastic/eui'; +// @ts-ignore +import { FormsyInputProps, withFormsy } from 'formsy-react'; +import React, { Component, InputHTMLAttributes } from 'react'; + +interface ComponentProps extends FormsyInputProps, CommonProps, EuiCodeEditorProps { + instantValidation: boolean; + label: string; + isReadOnly: boolean; + mode: 'javascript' | 'yaml'; + errorText: string; + fullWidth: boolean; + helpText: React.ReactElement; + compressed: boolean; + onChange(value: string): void; + onBlur(): void; +} + +interface ComponentState { + allowError: boolean; +} + +class CodeEditor extends Component< + InputHTMLAttributes & ComponentProps, + ComponentState +> { + public static defaultProps = { + passRequiredToField: true, + }; + + public state = { allowError: false }; + + public componentDidMount() { + const { defaultValue, setValue } = this.props; + setValue(defaultValue || ''); + } + + public componentWillReceiveProps(nextProps: ComponentProps) { + if (nextProps.isFormSubmitted()) { + this.showError(); + } + } + + public handleChange = (value: string) => { + this.props.setValue(value); + if (this.props.onChange) { + this.props.onChange(value); + } + if (this.props.instantValidation) { + this.showError(); + } + }; + + public handleBlur = () => { + this.showError(); + if (this.props.onBlur) { + this.props.onBlur(); + } + }; + + public showError = () => this.setState({ allowError: true }); + + public render() { + const { + id, + label, + isReadOnly, + isValid, + getValue, + isPristine, + getErrorMessage, + mode, + fullWidth, + className, + helpText, + } = this.props; + + const { allowError } = this.state; + const error = !isPristine() && !isValid() && allowError; + + return ( + + + + ); + } +} + +export const FormsyEuiCodeEditor = withFormsy(CodeEditor); diff --git a/x-pack/plugins/beats_management/public/components/inputs/index.ts b/x-pack/plugins/beats_management/public/components/inputs/index.ts new file mode 100644 index 0000000000000..50a5674f6fd7c --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/inputs/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { FormsyEuiCodeEditor } from './code_editor'; +export { FormsyEuiFieldText } from './input'; +export { FormsyEuiPasswordText } from './password_input'; +export { FormsyEuiMultiFieldText } from './multi_input'; +export { FormsyEuiSelect } from './select'; diff --git a/x-pack/plugins/beats_management/public/components/inputs/input.tsx b/x-pack/plugins/beats_management/public/components/inputs/input.tsx new file mode 100644 index 0000000000000..1f778e35cdc21 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/inputs/input.tsx @@ -0,0 +1,113 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { CommonProps, EuiFieldText, EuiFieldTextProps, EuiFormRow } from '@elastic/eui'; +import { FormsyInputProps, withFormsy } from 'formsy-react'; +import React, { Component, InputHTMLAttributes } from 'react'; + +interface ComponentProps extends FormsyInputProps, CommonProps, EuiFieldTextProps { + instantValidation?: boolean; + label: string; + errorText: string; + fullWidth: boolean; + helpText: React.ReactElement; + compressed: boolean; + onChange?(e: React.ChangeEvent, value: any): void; + onBlur?(e: React.ChangeEvent, value: any): void; +} + +interface ComponentState { + allowError: boolean; +} + +class FieldText extends Component< + InputHTMLAttributes & ComponentProps, + ComponentState +> { + public static defaultProps = { + passRequiredToField: true, + }; + + public state = { allowError: false }; + + public componentDidMount() { + const { defaultValue, setValue } = this.props; + if (defaultValue) { + setValue(defaultValue); + } + } + + public componentWillReceiveProps(nextProps: ComponentProps) { + if (nextProps.isFormSubmitted()) { + this.showError(); + } + } + + public handleChange = (e: React.ChangeEvent) => { + const { value } = e.currentTarget; + this.props.setValue(value); + if (this.props.onChange) { + this.props.onChange(e, e.currentTarget.value); + } + if (this.props.instantValidation) { + this.showError(); + } + }; + + public handleBlur = (e: React.ChangeEvent) => { + this.showError(); + if (this.props.onBlur) { + this.props.onBlur(e, e.currentTarget.value); + } + }; + + public showError = () => this.setState({ allowError: true }); + + public render() { + const { + id, + required, + label, + getValue, + isValid, + isPristine, + getErrorMessage, + fullWidth, + className, + disabled, + helpText, + placeholder, + } = this.props; + + const { allowError } = this.state; + const error = !isPristine() && !isValid() && allowError; + + return ( + + + + ); + } +} + +export const FormsyEuiFieldText = withFormsy(FieldText); diff --git a/x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx b/x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx new file mode 100644 index 0000000000000..ba7b2e6265610 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/inputs/multi_input.tsx @@ -0,0 +1,115 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { CommonProps, EuiFormRow, EuiTextArea, EuiTextAreaProps } from '@elastic/eui'; +// @ts-ignore +import { FormsyInputProps, withFormsy } from 'formsy-react'; +import React, { Component, InputHTMLAttributes } from 'react'; + +interface ComponentProps extends FormsyInputProps, CommonProps, EuiTextAreaProps { + instantValidation: boolean; + label: string; + errorText: string; + fullWidth: boolean; + helpText: React.ReactElement; + compressed: boolean; + onChange(e: React.ChangeEvent, value: any): void; + onBlur(e: React.ChangeEvent, value: any): void; +} + +interface ComponentState { + allowError: boolean; +} + +class MultiFieldText extends Component< + InputHTMLAttributes & ComponentProps, + ComponentState +> { + public static defaultProps = { + passRequiredToField: true, + }; + + public state = { allowError: false }; + + public componentDidMount() { + const { defaultValue, setValue } = this.props; + + if (defaultValue) { + setValue(defaultValue); + } + } + + public componentWillReceiveProps(nextProps: ComponentProps) { + if (nextProps.isFormSubmitted()) { + this.showError(); + } + } + + public handleChange = (e: React.ChangeEvent) => { + const value = e.currentTarget.value.split('\n'); + this.props.setValue(value); + if (this.props.onChange) { + this.props.onChange(e, value); + } + if (this.props.instantValidation) { + this.showError(); + } + }; + + public handleBlur = (e: React.ChangeEvent) => { + this.showError(); + if (this.props.onBlur) { + this.props.onBlur(e, e.currentTarget.value); + } + }; + + public showError = () => this.setState({ allowError: true }); + + public render() { + const { + id, + required, + label, + getValue, + isValid, + isPristine, + getErrorMessage, + fullWidth, + className, + disabled, + helpText, + placeholder, + } = this.props; + + const { allowError } = this.state; + const error = !isPristine() && !isValid() && allowError; + + return ( + + + + ); + } +} + +export const FormsyEuiMultiFieldText = withFormsy(MultiFieldText); diff --git a/x-pack/plugins/beats_management/public/components/inputs/password_input.tsx b/x-pack/plugins/beats_management/public/components/inputs/password_input.tsx new file mode 100644 index 0000000000000..30318f76bb90f --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/inputs/password_input.tsx @@ -0,0 +1,110 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore currently no definition for EuiFieldPassword +import { CommonProps, EuiFieldPassword, EuiFieldPasswordProps, EuiFormRow } from '@elastic/eui'; +import { FormsyInputProps, withFormsy } from 'formsy-react'; +import React, { Component, InputHTMLAttributes } from 'react'; + +interface ComponentProps extends FormsyInputProps, CommonProps, EuiFieldPasswordProps { + instantValidation?: boolean; + label: string; + errorText: string; + fullWidth: boolean; + helpText: React.ReactElement; + compressed: boolean; + onChange?(e: React.ChangeEvent, value: any): void; + onBlur?(e: React.ChangeEvent, value: any): void; +} + +interface ComponentState { + allowError: boolean; +} + +class FieldPassword extends Component< + InputHTMLAttributes & ComponentProps, + ComponentState +> { + constructor(props: any) { + super(props); + + this.state = { + allowError: false, + }; + } + + public componentDidMount() { + const { defaultValue, setValue } = this.props; + if (defaultValue) { + setValue(defaultValue); + } + } + + public handleChange = (e: React.ChangeEvent) => { + const { value } = e.currentTarget; + this.props.setValue(value); + if (this.props.onChange) { + this.props.onChange(e, value); + } + if (this.props.instantValidation) { + this.showError(); + } + }; + + public handleBlur = (e: React.ChangeEvent) => { + this.showError(); + if (this.props.onBlur) { + this.props.onBlur(e, e.currentTarget.value); + } + }; + + public showError = () => this.setState({ allowError: true }); + + public render() { + const { + id, + required, + label, + getValue, + isValid, + isPristine, + getErrorMessage, + fullWidth, + className, + disabled, + helpText, + onBlur, + } = this.props; + + const { allowError } = this.state; + const error = !isPristine() && !isValid() && allowError; + + return ( + + + + ); + } +} + +export const FormsyEuiPasswordText = withFormsy(FieldPassword); diff --git a/x-pack/plugins/beats_management/public/components/inputs/select.tsx b/x-pack/plugins/beats_management/public/components/inputs/select.tsx new file mode 100644 index 0000000000000..8fa192090a99a --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/inputs/select.tsx @@ -0,0 +1,124 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + CommonProps, + EuiFormRow, + // @ts-ignore + EuiSelect, +} from '@elastic/eui'; +// @ts-ignore +import { FormsyInputProps, withFormsy } from 'formsy-react'; +import React, { Component, InputHTMLAttributes } from 'react'; + +const FixedSelect = EuiSelect as React.SFC; + +interface ComponentProps extends FormsyInputProps, CommonProps { + instantValidation: boolean; + options: Array<{ value: string; text: string }>; + label: string; + errorText: string; + fullWidth: boolean; + helpText: React.ReactElement; + compressed: boolean; + onChange(e: React.ChangeEvent, value: any): void; + onBlur(e: React.ChangeEvent, value: any): void; +} + +interface ComponentState { + allowError: boolean; +} + +class FieldSelect extends Component< + InputHTMLAttributes & ComponentProps, + ComponentState +> { + public static defaultProps = { + passRequiredToField: true, + }; + + public state = { allowError: false }; + + public componentDidMount() { + const { defaultValue, setValue } = this.props; + if (defaultValue) { + setValue(defaultValue); + } + } + + public componentWillReceiveProps(nextProps: ComponentProps) { + if (nextProps.isFormSubmitted()) { + this.showError(); + } + } + + public handleChange = (e: React.ChangeEvent) => { + const { value } = e.currentTarget; + + this.props.setValue(value); + if (this.props.onChange) { + this.props.onChange(e, e.currentTarget.value); + } + if (this.props.instantValidation) { + this.showError(); + } + }; + + public handleBlur = (e: React.ChangeEvent) => { + this.showError(); + if (this.props.onBlur) { + this.props.onBlur(e, e.currentTarget.value); + } + }; + + public showError = () => this.setState({ allowError: true }); + + public render() { + const { + id, + required, + label, + options, + getValue, + isValid, + isPristine, + getErrorMessage, + fullWidth, + className, + disabled, + helpText, + } = this.props; + + const { allowError } = this.state; + const error = !isPristine() && !isValid() && allowError; + + return ( + + + + ); + } +} + +export const FormsyEuiSelect = withFormsy(FieldSelect); diff --git a/x-pack/plugins/beats_management/public/components/layouts/header.tsx b/x-pack/plugins/beats_management/public/components/layouts/header.tsx new file mode 100644 index 0000000000000..4ad567b73fc77 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/layouts/header.tsx @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiBreadcrumbDefinition, + EuiHeader, + EuiHeaderBreadcrumbs, + EuiHeaderSection, +} from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; + +interface HeaderProps { + breadcrumbs?: EuiBreadcrumbDefinition[]; +} + +export class Header extends React.PureComponent { + public render() { + const { breadcrumbs = [] } = this.props; + + return ( + + + + + + ); + } +} + +const HeaderWrapper = styled(EuiHeader)` + height: 29px; +`; diff --git a/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx b/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx new file mode 100644 index 0000000000000..8f31b90ff507e --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/layouts/no_data.tsx @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { withRouter } from 'react-router-dom'; + +import { + EuiEmptyPrompt, + EuiFlexGroup, + EuiFlexItem, + EuiModal, + EuiOverlayMask, + EuiPage, + EuiPageBody, + EuiPageContent, +} from '@elastic/eui'; + +interface LayoutProps { + title: string; + actionSection?: React.ReactNode; + modalRender?: () => React.ReactNode; + modalClosePath?: string; +} + +export const NoDataLayout: React.SFC = withRouter( + ({ actionSection, title, modalRender, modalClosePath, children, history }) => { + const modalContent = modalRender && modalRender(); + return ( + + + + + + {title}

      } + body={children} + actions={actionSection} + /> + + + + + {modalContent && ( + + { + history.push(modalClosePath); + }} + style={{ width: '640px' }} + > + {modalContent} + + + )} + + ); + } +) as any; diff --git a/x-pack/plugins/beats_management/public/components/layouts/primary.tsx b/x-pack/plugins/beats_management/public/components/layouts/primary.tsx new file mode 100644 index 0000000000000..516ad648eac8b --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/layouts/primary.tsx @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { withRouter } from 'react-router-dom'; + +import { + EuiModal, + EuiOverlayMask, + EuiPage, + EuiPageBody, + EuiPageContent, + EuiPageContentBody, + EuiPageHeader, + EuiPageHeaderSection, + EuiTitle, +} from '@elastic/eui'; + +interface PrimaryLayoutProps { + title: string; + actionSection?: React.ReactNode; + modalRender?: () => React.ReactNode; + modalClosePath?: string; +} + +export const PrimaryLayout: React.SFC = withRouter( + ({ actionSection, title, modalRender, modalClosePath, children, history }) => { + const modalContent = modalRender && modalRender(); + return ( + + + + + +

      {title}

      +
      +
      + {actionSection} +
      + + {children} + +
      + {modalContent && ( + + { + history.push(modalClosePath); + }} + style={{ width: '640px' }} + > + {modalContent} + + + )} +
      + ); + } +) as any; diff --git a/x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx b/x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx new file mode 100644 index 0000000000000..32cfd4cb43316 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/layouts/walkthrough.tsx @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { + EuiPage, + EuiPageBody, + EuiPageContent, + EuiPageContentBody, + // @ts-ignore + EuiStepsHorizontal, + EuiTitle, +} from '@elastic/eui'; + +interface LayoutProps { + title: string; + goTo: (path: string) => any; + walkthroughSteps: Array<{ + id: string; + name: string; + disabled: boolean; + }>; + activePath: string; +} + +export const WalkthroughLayout: React.SFC = ({ + walkthroughSteps, + title, + activePath, + goTo, + children, +}) => { + const indexOfCurrent = walkthroughSteps.findIndex(step => activePath === step.id); + return ( + + + + +

      {title}

      +
      +
      +
      + ({ + title: step.name, + isComplete: i <= indexOfCurrent, + onClick: () => goTo(step.id), + }))} + /> +
      +
      + {children} +
      +
      +
      + ); +}; diff --git a/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/consumer.tsx b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/consumer.tsx new file mode 100644 index 0000000000000..dc46f827dd4ca --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/consumer.tsx @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { Consumer as BreadcrumbConsumer } from './context'; diff --git a/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/context.tsx b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/context.tsx new file mode 100644 index 0000000000000..1c1452d34d248 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/context.tsx @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import React from 'react'; + +import { Breadcrumb, BreadcrumbContext } from './types'; + +/* istanbul ignore next */ +const defaultContext: BreadcrumbContext = { + breadcrumbs: [], + addCrumb: (crumb: Breadcrumb) => null, + removeCrumb: (crumb: Breadcrumb) => null, +}; + +export const { Provider, Consumer } = React.createContext(defaultContext); diff --git a/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/index.ts b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/index.ts new file mode 100644 index 0000000000000..56192af8bdc0d --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/index.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { BreadcrumbProvider } from './provider'; +export { BreadcrumbConsumer } from './consumer'; +export { RouteWithBreadcrumb } from './route_with_breadcrumb'; diff --git a/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/provider.tsx b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/provider.tsx new file mode 100644 index 0000000000000..5b82d7c9ebcfc --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/provider.tsx @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import React, { Component, ReactElement } from 'react'; +import { Provider } from './context'; +import { Breadcrumb } from './types'; + +interface ComponentProps { + children: ReactElement | Array>; +} + +interface ComponentState { + breadcrumbs: Array<{ + href: string; + breadcrumb: Breadcrumb; + parents?: Breadcrumb[]; + }>; +} + +export class BreadcrumbProvider extends Component { + public state = { + breadcrumbs: [] as ComponentState['breadcrumbs'], + }; + + public addCrumb = (breadcrumb: Breadcrumb, parents?: Breadcrumb[]) => { + this.setState(({ breadcrumbs: prevCrumbs }) => ({ + breadcrumbs: [ + ...prevCrumbs, + { + href: breadcrumb.href, + breadcrumb, + parents, + }, + ], + })); + }; + + public removeCrumb = (crumbToRemove: Breadcrumb) => { + this.setState(({ breadcrumbs: prevCrumbs }) => { + const breadcrumbs = prevCrumbs.filter(prevCrumb => { + const { href } = prevCrumb; + return !(crumbToRemove.href === href); + }); + return { breadcrumbs }; + }); + }; + + public render() { + const { breadcrumbs } = this.state; + + const context = { + breadcrumbs: breadcrumbs.reduce( + (crumbs, crumbStorageItem) => { + if (crumbStorageItem.parents) { + crumbs = crumbs.concat(crumbStorageItem.parents); + } + crumbs.push(crumbStorageItem.breadcrumb); + return crumbs; + }, + [] as Breadcrumb[] + ), + addCrumb: this.addCrumb, + removeCrumb: this.removeCrumb, + }; + return {this.props.children}; + } +} diff --git a/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/route_with_breadcrumb.tsx b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/route_with_breadcrumb.tsx new file mode 100644 index 0000000000000..f0b5e93838b08 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/route_with_breadcrumb.tsx @@ -0,0 +1,88 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import React, { Component } from 'react'; + +import { RouteProps } from 'react-router'; +import { Route } from 'react-router-dom'; +import { BreadcrumbConsumer } from './consumer'; +import { Breadcrumb, BreadcrumbContext } from './types'; + +interface WrappedRouteWithBreadcrumbProps extends RouteProps { + text: string; + href: string; + parents?: Breadcrumb[]; + context: BreadcrumbContext; +} + +class WrappedRouteWithBreadcrumb extends Component< + WrappedRouteWithBreadcrumbProps, + {}, + BreadcrumbContext +> { + public componentWillUnmount() { + const { text, href, context } = this.props; + + context.removeCrumb({ + text, + href, + }); + } + + public componentDidMount() { + const { text, href, parents, context } = this.props; + context.addCrumb( + { + text, + href, + }, + parents + ); + } + + public render() { + return this.props.children; + } +} + +type titleCallback = ( + urlParams: { + [key: string]: string; + } +) => string; +interface RouteWithBreadcrumbProps extends RouteProps { + title: string | titleCallback; + path: string; + parentBreadcrumbs?: Breadcrumb[]; +} + +export const RouteWithBreadcrumb: React.SFC = ({ + title, + render, + component: RouteComponent, + parentBreadcrumbs, + ...props +}) => ( + { + return ( + + {context => ( + + {render && render(renderProps)} + {RouteComponent && } + + )} + + ); + }} + /> +); diff --git a/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/types.d.ts b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/types.d.ts new file mode 100644 index 0000000000000..9b9e8e3230d99 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/route_with_breadcrumb/types.d.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface BreadcrumbContext { + breadcrumbs: Breadcrumb[]; + addCrumb: (crumb: Breadcrumb, parents?: Breadcrumb[]) => void; + removeCrumb: (crumb: Breadcrumb) => void; +} +export interface Breadcrumb { + text: string; + href: string; +} diff --git a/x-pack/plugins/beats_management/public/components/table/action_button.tsx b/x-pack/plugins/beats_management/public/components/table/action_button.tsx new file mode 100644 index 0000000000000..1ef99a78be699 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/action_button.tsx @@ -0,0 +1,54 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton, EuiContextMenu, EuiPopover } from '@elastic/eui'; +import React from 'react'; +import { ActionDefinition } from './table_type_configs'; + +interface ActionButtonProps { + itemName: 'Beats' | 'Tags'; + actions: ActionDefinition[]; + isPopoverVisible: boolean; + actionHandler(action: string, payload?: any): void; + hidePopover(): void; + showPopover(): void; +} + +export function ActionButton(props: ActionButtonProps) { + const { actions, actionHandler, hidePopover, isPopoverVisible, showPopover } = props; + if (actions.length === 0) { + return null; + } + return ( + + Bulk Action + + } + closePopover={hidePopover} + id="contextMenu" + isOpen={isPopoverVisible} + panelPaddingSize="none" + withTitle + > + ({ + ...action, + onClick: () => actionHandler(action.action), + })), + }, + ]} + /> + + ); +} diff --git a/x-pack/plugins/beats_management/public/components/table/assignment_schema.ts b/x-pack/plugins/beats_management/public/components/table/assignment_schema.ts new file mode 100644 index 0000000000000..d1a324e191cb9 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/assignment_schema.ts @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { AssignmentActionType } from './table'; + +export interface AssignmentControlSchema { + id?: number; + name: string; + danger?: boolean; + action?: AssignmentActionType; + showWarning?: boolean; + warningHeading?: string; + warningMessage?: string; + lazyLoad?: boolean; + panel?: AssignmentControlSchema; + grow?: boolean; +} + +export const beatsListAssignmentOptions: AssignmentControlSchema[] = [ + { + grow: false, + name: 'Unenroll selected', + showWarning: true, + warningHeading: 'Unenroll selected beats?', + warningMessage: 'The selected Beats will no longer use central management', + action: AssignmentActionType.Delete, + danger: true, + }, + { + name: 'Set tags', + grow: false, + lazyLoad: true, + panel: { + id: 1, + name: 'Assign tags', + }, + }, +]; + +export const tagListAssignmentOptions: AssignmentControlSchema[] = [ + { + danger: true, + grow: false, + name: 'Remove tag(s)', + showWarning: true, + warningHeading: 'Remove tag(s)', + warningMessage: 'Remove the tag?', + action: AssignmentActionType.Delete, + }, +]; + +export const tagConfigAssignmentOptions: AssignmentControlSchema[] = [ + { + danger: true, + grow: false, + name: 'Remove tag(s)', + showWarning: true, + warningHeading: 'Remove tag(s)', + warningMessage: 'Remove the tag from the selected beat(s)?', + action: AssignmentActionType.Delete, + }, +]; diff --git a/x-pack/plugins/beats_management/public/components/table/controls.tsx b/x-pack/plugins/beats_management/public/components/table/controls.tsx new file mode 100644 index 0000000000000..894b907f0351e --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/controls.tsx @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import React from 'react'; +import { AutocompleteField } from '../autocomplete_field/index'; +import { OptionControl } from '../table_controls'; +import { AssignmentOptions as AssignmentOptionsType, KueryBarProps } from './table'; + +interface ControlBarProps { + itemType: string; + assignmentOptions: AssignmentOptionsType; + kueryBarProps?: KueryBarProps; + selectionCount: number; +} + +export function ControlBar(props: ControlBarProps) { + const { + assignmentOptions: { actionHandler, items, schema, type }, + kueryBarProps, + selectionCount, + } = props; + + if (type === 'none') { + return null; + } + + return ( + + + + + {kueryBarProps && ( + + + + )} + + ); +} diff --git a/x-pack/plugins/beats_management/public/components/table/index.ts b/x-pack/plugins/beats_management/public/components/table/index.ts new file mode 100644 index 0000000000000..9d806de7cf024 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/index.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { AssignmentActionType, AssignmentOptions, KueryBarProps, Table } from './table'; +export { + AssignmentControlSchema, + beatsListAssignmentOptions, + tagConfigAssignmentOptions, +} from './assignment_schema'; +export { ControlBar } from './controls'; +export { + ActionDefinition, + BeatDetailTagsTable, + BeatsTableType, + FilterDefinition, + TagsTableType, +} from './table_type_configs'; diff --git a/x-pack/plugins/beats_management/public/components/table/table.tsx b/x-pack/plugins/beats_management/public/components/table/table.tsx new file mode 100644 index 0000000000000..c3cfb3ae398d0 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/table.tsx @@ -0,0 +1,123 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + // @ts-ignore no typings for EuiInMemoryTable in EUI + EuiInMemoryTable, + EuiSpacer, +} from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; +import { TABLE_CONFIG } from '../../../common/constants'; +import { AssignmentControlSchema } from './assignment_schema'; +import { ControlBar } from './controls'; +import { TableType } from './table_type_configs'; + +export enum AssignmentActionType { + Add, + Assign, + Delete, + Edit, + Reload, + Search, +} + +export interface AssignmentOptions { + schema: AssignmentControlSchema[]; + items: any[]; + type?: 'none' | 'primary' | 'assignment'; + actionHandler(action: AssignmentActionType, payload?: any): void; +} + +export interface KueryBarProps { + filterQueryDraft: string; + isLoadingSuggestions: boolean; + isValid: boolean; + loadSuggestions: (value: string, cursorPosition: number, maxCount?: number) => void; + onChange?: (value: string) => void; + onSubmit?: (value: string) => void; + suggestions: AutocompleteSuggestion[]; + value: string; +} + +interface TableProps { + assignmentOptions?: AssignmentOptions; + hideTableControls?: boolean; + kueryBarProps?: KueryBarProps; + items: any[]; + type: TableType; +} + +interface TableState { + selection: any[]; +} + +const TableContainer = styled.div` + padding: 16px; +`; + +export class Table extends React.Component { + constructor(props: any) { + super(props); + + this.state = { + selection: [], + }; + } + + public resetSelection = () => { + this.setSelection([]); + }; + + public setSelection = (selection: any[]) => { + this.setState({ + selection, + }); + }; + + public render() { + const { assignmentOptions, hideTableControls, items, kueryBarProps, type } = this.props; + + const pagination = { + initialPageSize: TABLE_CONFIG.INITIAL_ROW_SIZE, + pageSizeOptions: TABLE_CONFIG.PAGE_SIZE_OPTIONS, + }; + + const selectionOptions = hideTableControls + ? null + : { + onSelectionChange: this.setSelection, + selectable: () => true, + selectableMessage: () => 'Select this beat', + selection: this.state.selection, + }; + + return ( + + {!hideTableControls && + assignmentOptions && ( + + )} + + + + ); + } +} diff --git a/x-pack/plugins/beats_management/public/components/table/table_search_control.tsx b/x-pack/plugins/beats_management/public/components/table/table_search_control.tsx new file mode 100644 index 0000000000000..c3d79f5d1891b --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/table_search_control.tsx @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + // @ts-ignore typings for EuiSearchar not included in EUI + EuiSearchBar, +} from '@elastic/eui'; +import React from 'react'; +import { FilterDefinition } from '../table'; +import { AssignmentActionType } from './table'; + +interface TableSearchControlProps { + filters?: FilterDefinition[]; + actionHandler(action: AssignmentActionType, payload?: any): void; +} + +export const TableSearchControl = (props: TableSearchControlProps) => { + const { actionHandler, filters } = props; + return ( + actionHandler(AssignmentActionType.Search, query)} + /> + ); +}; diff --git a/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx b/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx new file mode 100644 index 0000000000000..fccbeae56fd29 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table/table_type_configs.tsx @@ -0,0 +1,241 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiToolTip, IconColor } from '@elastic/eui'; +import { first, sortBy, sortByOrder, uniq } from 'lodash'; +import moment from 'moment'; +import React from 'react'; +import { BeatTag, CMPopulatedBeat, ConfigurationBlock } from '../../../common/domain_types'; +import { ConnectedLink } from '../connected_link'; +import { TagBadge } from '../tag'; + +export interface ColumnDefinition { + align?: string; + field: string; + name: string; + sortable?: boolean; + width?: string; + render?(value: any, object?: any): any; +} + +export interface ActionDefinition { + action: string; + danger?: boolean; + icon?: any; + name: string; +} + +interface FilterOption { + value: string; +} + +export interface FilterDefinition { + field: string; + name: string; + options?: FilterOption[]; + type: string; +} + +export interface ControlDefinitions { + actions: ActionDefinition[]; + filters: FilterDefinition[]; + primaryActions?: ActionDefinition[]; +} + +export interface TableType { + itemType: 'Beats' | 'Tags'; + columnDefinitions: ColumnDefinition[]; + controlDefinitions(items: any[]): ControlDefinitions; +} + +export const BeatsTableType: TableType = { + itemType: 'Beats', + columnDefinitions: [ + { + field: 'name', + name: 'Beat name', + render: (name: string, beat: CMPopulatedBeat) => ( + {name} + ), + sortable: true, + }, + { + field: 'type', + name: 'Type', + sortable: true, + }, + { + field: 'full_tags', + name: 'Tags', + render: (value: string, beat: CMPopulatedBeat) => ( + + {(sortBy(beat.full_tags, 'id') || []).map(tag => ( + + + + + + ))} + + ), + sortable: false, + }, + { + // TODO: update to use actual metadata field + field: 'config_status', + name: 'Config Status', + render: (value: string, beat: CMPopulatedBeat) => { + let color: IconColor = 'success'; + let statusText = 'OK'; + let tooltipText = 'Beat successfully applied latest config'; + + switch (beat.config_status) { + case 'UNKNOWN': + color = 'subdued'; + statusText = 'Offline'; + if (moment().diff(beat.last_checkin, 'minutes') >= 10) { + tooltipText = 'This Beat has not connected to kibana in over 10min'; + } else { + tooltipText = 'This Beat has not yet been started.'; + } + break; + case 'ERROR': + color = 'danger'; + statusText = 'Error'; + tooltipText = 'Please check the logs of this Beat for error details'; + break; + } + + return ( + + + {statusText} + + + ); + }, + sortable: false, + }, + { + field: 'full_tags', + name: 'Last config update', + render: (tags: BeatTag[]) => + tags.length ? ( + + {moment(first(sortByOrder(tags, ['last_updated'], ['desc'])).last_updated).fromNow()} + + ) : null, + sortable: true, + }, + ], + controlDefinitions: (data: any[]) => ({ + actions: [ + { + name: 'Disenroll Selected', + action: 'delete', + danger: true, + }, + ], + filters: [ + { + type: 'field_value_selection', + field: 'type', + name: 'Type', + options: uniq(data.map(({ type }: { type: any }) => ({ value: type })), 'value'), + }, + ], + }), +}; + +export const TagsTableType: TableType = { + itemType: 'Tags', + columnDefinitions: [ + { + field: 'id', + name: 'Tag name', + render: (id: string, tag: BeatTag) => ( + + + + ), + sortable: true, + width: '45%', + }, + { + align: 'right', + field: 'configuration_blocks', + name: 'Configurations', + render: (configurationBlocks: ConfigurationBlock[]) => ( +
      {configurationBlocks.length}
      + ), + sortable: false, + }, + { + align: 'right', + field: 'last_updated', + name: 'Last update', + render: (lastUpdate: Date) =>
      {moment(lastUpdate).fromNow()}
      , + sortable: true, + }, + ], + controlDefinitions: (data: any) => ({ + actions: [ + { + name: 'Remove Selected', + action: 'delete', + danger: true, + }, + ], + filters: [], + }), +}; + +export const BeatDetailTagsTable: TableType = { + itemType: 'Tags', + columnDefinitions: [ + { + field: 'id', + name: 'Tag name', + render: (id: string, tag: BeatTag) => ( + + + + ), + sortable: true, + width: '55%', + }, + { + align: 'right', + field: 'configuration_blocks', + name: 'Configurations', + render: (configurations: ConfigurationBlock[]) => {configurations.length}, + sortable: true, + }, + { + align: 'right', + field: 'last_updated', + name: 'Last update', + render: (lastUpdate: string) => {moment(lastUpdate).fromNow()}, + sortable: true, + }, + ], + controlDefinitions: (data: any) => ({ + actions: [], + filters: [], + primaryActions: [ + { + name: 'Add Tag', + action: 'add', + danger: false, + }, + { + name: 'Remove Selected', + action: 'remove', + danger: true, + }, + ], + }), +}; diff --git a/x-pack/plugins/beats_management/public/components/table_controls/action_control.tsx b/x-pack/plugins/beats_management/public/components/table_controls/action_control.tsx new file mode 100644 index 0000000000000..9b858f3277cd1 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table_controls/action_control.tsx @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + // @ts-ignore EuiConfirmModal typings not included in current EUI + EuiConfirmModal, + EuiOverlayMask, + EuiTextColor, +} from '@elastic/eui'; +import React from 'react'; +import { AssignmentActionType } from '../table'; + +interface ActionControlProps { + action: AssignmentActionType; + danger?: boolean; + name: string; + showWarning?: boolean; + warningHeading?: string; + warningMessage?: string; + actionHandler(action: AssignmentActionType, payload?: any): void; +} + +interface ActionControlState { + showModal: boolean; +} + +export class ActionControl extends React.PureComponent { + constructor(props: ActionControlProps) { + super(props); + + this.state = { + showModal: false, + }; + } + + public render() { + const { + action, + actionHandler, + danger, + name, + showWarning, + warningHeading, + warningMessage, + } = this.props; + return ( +
      + this.setState({ showModal: true }) : () => actionHandler(action) + } + > + {name} + + {this.state.showModal && ( + + { + actionHandler(action); + this.setState({ showModal: false }); + }} + onCancel={() => this.setState({ showModal: false })} + title={warningHeading ? warningHeading : 'Confirm'} + > + {warningMessage} + + + )} +
      + ); + } +} diff --git a/x-pack/plugins/beats_management/public/components/table_controls/index.ts b/x-pack/plugins/beats_management/public/components/table_controls/index.ts new file mode 100644 index 0000000000000..f97cd9e727d2a --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table_controls/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { OptionControl } from './option_control'; diff --git a/x-pack/plugins/beats_management/public/components/table_controls/option_control.tsx b/x-pack/plugins/beats_management/public/components/table_controls/option_control.tsx new file mode 100644 index 0000000000000..9c65c65440f64 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table_controls/option_control.tsx @@ -0,0 +1,166 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButton, + // @ts-ignore + EuiCard, + EuiContextMenu, + EuiPanel, + EuiPopover, + EuiTextColor, + EuiToolTip, + EuiToolTipProps, +} from '@elastic/eui'; +import { EuiIcon } from '@elastic/eui'; +import { isArray } from 'lodash'; +import React from 'react'; +import { AssignmentControlSchema } from '../table'; +import { AssignmentActionType } from '../table'; +import { ActionControl } from './action_control'; +import { TagBadgeList } from './tag_badge_list'; + +interface ComponentProps { + itemType: string; + items?: any[]; + schema: AssignmentControlSchema[]; + selectionCount: number; + actionHandler(action: AssignmentActionType, payload?: any): void; +} + +interface ComponentState { + showPopover: boolean; +} + +interface FixedEuiToolTipProps extends EuiToolTipProps { + delay: 'regular' | 'long'; +} +const FixedEuiToolTip = (EuiToolTip as any) as React.SFC; + +export class OptionControl extends React.PureComponent { + constructor(props: ComponentProps) { + super(props); + + this.state = { + showPopover: false, + }; + } + + public schemaToPanelTree( + schemaOrArray: AssignmentControlSchema | AssignmentControlSchema[], + panels: any = [] + ) { + const { items, actionHandler } = this.props; + + let schema: AssignmentControlSchema | null = null; + let schemaArray: AssignmentControlSchema[] | null = null; + + if (isArray(schemaOrArray)) { + schemaArray = schemaOrArray as AssignmentControlSchema[]; + } else { + schema = schemaOrArray as AssignmentControlSchema; + } + + const panel: any = { + title: schema ? schema.name : undefined, + id: panels.length, + }; + + if (schemaArray) { + panel.items = schemaArray.map(def => { + return { + onClick: def.lazyLoad ? () => actionHandler(AssignmentActionType.Reload) : undefined, + panel: def.panel ? def.panel.id : undefined, + name: def.action ? ( + + ) : ( + {def.name} + ), + }; + }); + } else { + if (items === undefined) { + panel.content = 'Unknown Error.'; + } else if (items.length === 0) { + panel.content = ( + + } + title="No tags found." + description="Please create a new configuration tag." + /> + + ); + } else { + panel.content = ; + } + } + + panels.push(panel); + + if (schemaArray !== null) { + schemaArray.forEach((item: AssignmentControlSchema) => { + if (item.panel) { + this.schemaToPanelTree(item.panel, panels); + } + }); + } + + return panels; + } + + public render() { + const { itemType, selectionCount, schema } = this.props; + + return ( + + { + this.setState({ + showPopover: true, + }); + }} + > + Manage {itemType} + + + } + closePopover={() => { + this.setState({ showPopover: false }); + }} + id="assignmentList" + isOpen={this.state.showPopover} + panelPaddingSize="none" + anchorPosition="downLeft" + withTitle + > + + + ); + } +} diff --git a/x-pack/plugins/beats_management/public/components/table_controls/tag_assignment.tsx b/x-pack/plugins/beats_management/public/components/table_controls/tag_assignment.tsx new file mode 100644 index 0000000000000..952636d9b9804 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table_controls/tag_assignment.tsx @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui'; +import React from 'react'; +import { TABLE_CONFIG } from '../../../common/constants'; +import { TagBadge } from '../tag/tag_badge'; + +interface TagAssignmentProps { + tag: any; + assignTag(id: string): void; +} + +interface TagAssignmentState { + isFetchingTags: boolean; +} + +export class TagAssignment extends React.PureComponent { + constructor(props: TagAssignmentProps) { + super(props); + + this.state = { + isFetchingTags: false, + }; + } + + public render() { + const { + assignTag, + tag, + tag: { id }, + } = this.props; + + return ( + + {this.state.isFetchingTags && ( + + + + )} + + assignTag(id)} + onClickAriaLabel={id} + tag={tag} + /> + + + ); + } +} diff --git a/x-pack/plugins/beats_management/public/components/table_controls/tag_badge_list.tsx b/x-pack/plugins/beats_management/public/components/table_controls/tag_badge_list.tsx new file mode 100644 index 0000000000000..f419c086a43fe --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/table_controls/tag_badge_list.tsx @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import React from 'react'; +import { AssignmentActionType } from '../table/table'; +import { TagAssignment } from './tag_assignment'; + +interface TagBadgeListProps { + items: any[]; + actionHandler(action: AssignmentActionType, payload?: any): void; +} + +export const TagBadgeList = (props: TagBadgeListProps) => ( + // @ts-ignore direction prop type "column" not defined in current EUI version + + {props.items.map((item: any) => ( + + props.actionHandler(AssignmentActionType.Assign, id)} + /> + + ))} + +); diff --git a/x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx b/x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx new file mode 100644 index 0000000000000..934e2d2645d94 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/tag/config_view/config_form.tsx @@ -0,0 +1,227 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +// @ts-ignore +import Formsy, { addValidationRule, FieldValue, FormData } from 'formsy-react'; +import yaml from 'js-yaml'; +import { get } from 'lodash'; +import React from 'react'; +import { ConfigurationBlock } from '../../../../common/domain_types'; +import { YamlConfigSchema } from '../../../lib/lib'; +import { + FormsyEuiCodeEditor, + FormsyEuiFieldText, + FormsyEuiMultiFieldText, + FormsyEuiPasswordText, + FormsyEuiSelect, +} from '../../inputs'; + +addValidationRule('isHosts', (form: FormData, values: FieldValue | string[]) => { + // TODO add more validation + return true; +}); + +addValidationRule('isString', (values: FormData, value: FieldValue) => { + return true; +}); + +addValidationRule('isPeriod', (values: FormData, value: FieldValue) => { + // TODO add more validation + return true; +}); + +addValidationRule('isPath', (values: FormData, value: FieldValue) => { + // TODO add more validation + return value && value.length > 0; +}); + +addValidationRule('isPaths', (values: FormData, value: FieldValue) => { + // TODO add more validation + return true; +}); + +addValidationRule('isYaml', (values: FormData, value: FieldValue) => { + try { + const stuff = yaml.safeLoad(value || ''); + if (typeof stuff === 'string') { + return false; + } + return true; + } catch (e) { + return false; + } +}); + +interface ComponentProps { + values: ConfigurationBlock; + schema: YamlConfigSchema[]; + id: string; + onSubmit?: (modal: any) => any; + canSubmit(canIt: boolean): any; +} + +export class ConfigForm extends React.Component { + private form = React.createRef(); + constructor(props: ComponentProps) { + super(props); + + this.state = { + canSubmit: false, + }; + } + + public enableButton = () => { + this.setState({ + canSubmit: true, + }); + this.props.canSubmit(true); + }; + public disableButton = () => { + this.setState({ + canSubmit: false, + }); + this.props.canSubmit(false); + }; + public submit = () => { + if (this.form.current && this.props.onSubmit) { + this.form.current.click(); + } + }; + public onValidSubmit = (model: ModelType) => { + if (!this.props.onSubmit) { + return; + } + + this.props.onSubmit(model); + }; + public render() { + return ( +
      +
      + + {this.props.schema.map(schema => { + switch (schema.ui.type) { + case 'input': + return ( + + ); + case 'password': + return ( + + ); + case 'multi-input': + return ( + + ); + case 'select': + return ( + + ); + case 'code': + return ( + + ); + } + })} + {this.props.onSubmit && ( +
      + ); + } +} diff --git a/x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx b/x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx new file mode 100644 index 0000000000000..b86b11d2b2d54 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/tag/config_view/index.tsx @@ -0,0 +1,158 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButton, + EuiButtonEmpty, + // @ts-ignore + EuiCodeEditor, + EuiFieldText, + EuiFlexGroup, + EuiFlexItem, + EuiFlyout, + EuiFlyoutBody, + EuiFlyoutFooter, + EuiFlyoutHeader, + EuiFormRow, + // @ts-ignore + EuiHorizontalRule, + // @ts-ignore + EuiSearchBar, + // @ts-ignore + EuiSelect, + // @ts-ignore + EuiTabbedContent, + EuiTitle, +} from '@elastic/eui'; +import React from 'react'; +import { ConfigurationBlock } from '../../../../common/domain_types'; +import { supportedConfigs } from '../../../config_schemas'; +import { ConfigForm } from './config_form'; + +interface ComponentProps { + configBlock?: ConfigurationBlock; + onClose(): any; + onSave?(config: ConfigurationBlock): any; +} + +export class ConfigView extends React.Component { + private form = React.createRef(); + private editMode: boolean; + constructor(props: any) { + super(props); + this.editMode = props.configBlock !== undefined; + + this.state = { + valid: false, + configBlock: props.configBlock || { + type: supportedConfigs[0].value, + }, + }; + } + public onValueChange = (field: string) => (e: any) => { + const value = e.currentTarget ? e.currentTarget.value : e; + this.setState((state: any) => ({ + configBlock: { + ...state.configBlock, + [field]: value, + }, + })); + }; + public render() { + return ( + + + +

      + {this.editMode + ? this.props.onSave + ? 'Edit configuration block' + : 'View configuration block' + : 'Add configuration block'} +

      +
      +
      + + + + + + + +

      + { + (supportedConfigs.find(config => this.state.configBlock.type === config.value) as any) + .text + } +  configuration +

      + + + { + if (this.props.onSave) { + this.props.onSave({ + ...this.state.configBlock, + configs: [data], + }); + } + this.props.onClose(); + } + : undefined + } + canSubmit={canIt => this.setState({ valid: canIt })} + ref={this.form} + values={this.state.configBlock} + id={ + (supportedConfigs.find(config => this.state.configBlock.type === config.value) as any) + .value + } + schema={ + (supportedConfigs.find(config => this.state.configBlock.type === config.value) as any) + .config + } + /> +
      + + + + + Close + + + {this.props.onSave && ( + + { + if (this.form.current) { + this.form.current.submit(); + } + }} + > + Save + + + )} + + +
      + ); + } +} diff --git a/x-pack/plugins/beats_management/public/components/tag/disabled_tag_badge.tsx b/x-pack/plugins/beats_management/public/components/tag/disabled_tag_badge.tsx new file mode 100644 index 0000000000000..23d1be68e0da8 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/tag/disabled_tag_badge.tsx @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiBadge } from '@elastic/eui'; +import React from 'react'; +import { TABLE_CONFIG } from '../../../common/constants'; + +interface TagBadgeProps { + maxIdRenderSize?: number; + id: string; +} + +export const DisabledTagBadge = (props: TagBadgeProps) => { + const { id, maxIdRenderSize } = props; + const idRenderSize = maxIdRenderSize || TABLE_CONFIG.TRUNCATE_TAG_LENGTH; + const idToRender = id.length > idRenderSize ? `${id.substring(0, idRenderSize)}...` : id; + return ( + + {idToRender} + + ); +}; diff --git a/x-pack/plugins/beats_management/public/components/tag/index.ts b/x-pack/plugins/beats_management/public/components/tag/index.ts new file mode 100644 index 0000000000000..24a1c3f6f8b1e --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/tag/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { TagBadge } from './tag_badge'; +export { TagEdit } from './tag_edit'; diff --git a/x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx b/x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx new file mode 100644 index 0000000000000..f81c16f59ee12 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/tag/tag_badge.tsx @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiBadge } from '@elastic/eui'; +import React from 'react'; +import { TABLE_CONFIG } from '../../../common/constants'; +import { DisabledTagBadge } from './disabled_tag_badge'; + +interface TagBadgeProps { + iconType?: any; + onClick?: () => void; + onClickAriaLabel?: string; + maxIdRenderSize?: number; + tag: { color?: string; disabled?: boolean; id: string }; +} + +export const TagBadge = (props: TagBadgeProps) => { + const { + iconType, + onClick, + onClickAriaLabel, + tag: { color, disabled, id }, + } = props; + + const maxIdRenderSize = props.maxIdRenderSize || TABLE_CONFIG.TRUNCATE_TAG_LENGTH; + const idToRender = id.length > maxIdRenderSize ? `${id.substring(0, maxIdRenderSize)}...` : id; + return disabled ? ( + + ) : ( + + {idToRender} + + ); +}; diff --git a/x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx b/x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx new file mode 100644 index 0000000000000..d2864104889a8 --- /dev/null +++ b/x-pack/plugins/beats_management/public/components/tag/tag_edit.tsx @@ -0,0 +1,221 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButton, + // @ts-ignore + EuiColorPicker, + EuiFieldText, + EuiFlexGroup, + EuiFlexItem, + // @ts-ignore + EuiForm, + EuiFormRow, + EuiHorizontalRule, + EuiSpacer, + EuiText, + EuiTitle, +} from '@elastic/eui'; +import 'brace/mode/yaml'; +import 'brace/theme/github'; +import { isEqual } from 'lodash'; +import React from 'react'; +import { BeatTag, CMBeat, ConfigurationBlock } from '../../../common/domain_types'; +import { ConfigList } from '../config_list'; +import { AssignmentActionType, Table } from '../table'; +import { BeatsTableType } from '../table'; +import { tagConfigAssignmentOptions } from '../table'; +import { ConfigView } from './config_view'; +import { TagBadge } from './tag_badge'; + +interface TagEditProps { + mode: 'edit' | 'create'; + tag: Pick>; + onDetachBeat: (beatIds: string[]) => void; + onTagChange: (field: keyof BeatTag, value: string) => any; + attachedBeats: CMBeat[] | null; +} + +interface TagEditState { + showFlyout: boolean; + tableRef: any; + selectedConfigIndex?: number; +} + +export class TagEdit extends React.PureComponent { + constructor(props: TagEditProps) { + super(props); + + this.state = { + showFlyout: false, + tableRef: React.createRef(), + }; + } + + public render() { + const { tag, attachedBeats } = this.props; + return ( +
      + + + +

      Tag details

      +
      + +

      + A tag is a group of configuration blocks that you can apply to one or more Beats. +

      +
      +
      + +
      +
      + + + + + + {this.props.mode === 'create' && ( + + + + )} + + +
      + + + + + + +

      Configuration blocks

      +
      + +

      + A tag can have configuration blocks for different types of Beats. For example, a tag + can have two Metricbeat configuration blocks and one Filebeat input configuration + block. +

      +
      +
      + +
      + { + const selectedIndex = tag.configuration_blocks.findIndex(c => { + return isEqual(config, c); + }); + if (action === 'delete') { + const configs = [...tag.configuration_blocks]; + configs.splice(selectedIndex, 1); + this.updateTag('configuration_blocks', configs); + } else { + this.setState({ + showFlyout: true, + selectedConfigIndex: selectedIndex, + }); + } + }} + /> +
      + { + this.setState({ showFlyout: true }); + }} + > + Add configuration block + +
      +
      +
      + + {attachedBeats && ( +
      + + + +

      Beats with this tag

      +
      + + + )} + + {this.state.showFlyout && ( + this.setState({ showFlyout: false, selectedConfigIndex: undefined })} + onSave={(config: any) => { + this.setState({ showFlyout: false, selectedConfigIndex: undefined }); + if (this.state.selectedConfigIndex !== undefined) { + const configs = [...tag.configuration_blocks]; + configs[this.state.selectedConfigIndex] = config; + this.updateTag('configuration_blocks', configs); + } else { + this.updateTag('configuration_blocks', [ + ...(tag.configuration_blocks || []), + config, + ]); + } + }} + /> + )} + + ); + } + + private getNameError = (name: string) => { + if (name && name !== '' && name.search(/^[a-zA-Z0-9-]+$/) === -1) { + return 'Tag name must consist of letters, numbers, and dashes only'; + } else { + return false; + } + }; + + private handleAssignmentActions = (action: AssignmentActionType) => { + switch (action) { + case AssignmentActionType.Delete: + const { selection } = this.state.tableRef.current.state; + this.props.onDetachBeat(selection.map((beat: any) => beat.id)); + } + }; + + // TODO this should disable save button on bad validations + private updateTag = (key: keyof BeatTag, value?: any) => + value !== undefined + ? this.props.onTagChange(key, value) + : (e: any) => this.props.onTagChange(key, e.target ? e.target.value : e); +} diff --git a/x-pack/plugins/beats_management/public/config_schemas.ts b/x-pack/plugins/beats_management/public/config_schemas.ts new file mode 100644 index 0000000000000..0a1427289c6fb --- /dev/null +++ b/x-pack/plugins/beats_management/public/config_schemas.ts @@ -0,0 +1,376 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { YamlConfigSchema } from './lib/lib'; + +const filebeatInputConfig: YamlConfigSchema[] = [ + { + id: 'paths', + ui: { + label: 'Paths', + type: 'multi-input', + helpText: 'Put each of the paths on a seperate line', + placeholder: `first/path/to/file.json second/path/to/otherfile.json`, + }, + validations: 'isPaths', + error: 'One file path per line', + required: true, + }, + { + id: 'other', + ui: { + label: 'Other Config', + type: 'code', + helpText: 'Use YAML format to specify other settings for the Filebeat Input', + }, + validations: 'isYaml', + error: 'Use valid YAML format', + }, +]; + +const filebeatModuleConfig: YamlConfigSchema[] = [ + { + id: 'module', + ui: { + label: 'Module', + type: 'select', + }, + options: [ + { + value: 'apache2', + text: 'apache2', + }, + { + value: 'auditd', + text: 'auditd', + }, + { + value: 'elasticsearch', + text: 'elasticsearch', + }, + { + value: 'haproxy', + text: 'haproxy', + }, + { + value: 'icinga', + text: 'icinga', + }, + { + value: 'iis', + text: 'iis', + }, + { + value: 'kafka', + text: 'kafka', + }, + { + value: 'kibana', + text: 'kibana', + }, + { + value: 'logstash', + text: 'logstash', + }, + { + value: 'mongodb', + text: 'mongodb', + }, + { + value: 'mysql', + text: 'mysql', + }, + { + value: 'nginx', + text: 'nginx', + }, + { + value: 'osquery', + text: 'osquery', + }, + { + value: 'postgresql', + text: 'postgresql', + }, + { + value: 'redis', + text: 'redis', + }, + { + value: 'system', + text: 'system', + }, + { + value: 'traefik', + text: 'traefik', + }, + ], + error: 'Please select a module', + required: true, + }, + { + id: 'other', + ui: { + label: 'Other Config', + type: 'code', + helpText: 'Use YAML format to specify other settings for the Filebeat Module', + }, + validations: 'isYaml', + error: 'Use valid YAML format', + }, +]; + +const metricbeatModuleConfig: YamlConfigSchema[] = [ + { + id: 'module', + ui: { + label: 'Module', + type: 'select', + }, + options: [ + { + value: 'aerospike', + text: 'aerospike', + }, + { + value: 'apache', + text: 'apache', + }, + { + value: 'ceph', + text: 'ceph', + }, + { + value: 'couchbase', + text: 'couchbase', + }, + { + value: 'docker', + text: 'docker', + }, + { + value: 'dropwizard', + text: 'dropwizard', + }, + { + value: 'elasticsearch', + text: 'elasticsearch', + }, + { + value: 'envoyproxy', + text: 'envoyproxy', + }, + { + value: 'etcd', + text: 'etcd', + }, + { + value: 'golang', + text: 'golang', + }, + { + value: 'graphite', + text: 'graphite', + }, + { + value: 'haproxy', + text: 'haproxy', + }, + { + value: 'http', + text: 'http', + }, + { + value: 'jolokia', + text: 'jolokia', + }, + { + value: 'kafka', + text: 'kafka', + }, + { + value: 'kibana', + text: 'kibana', + }, + { + value: 'kubernetes', + text: 'kubernetes', + }, + { + value: 'kvm', + text: 'kvm', + }, + { + value: 'logstash', + text: 'logstash', + }, + { + value: 'memcached', + text: 'memcached', + }, + { + value: 'mongodb', + text: 'mongodb', + }, + { + value: 'munin', + text: 'munin', + }, + { + value: 'mysql', + text: 'mysql', + }, + { + value: 'nginx', + text: 'nginx', + }, + { + value: 'php_fpm', + text: 'php_fpm', + }, + { + value: 'postgresql', + text: 'postgresql', + }, + { + value: 'prometheus', + text: 'prometheus', + }, + { + value: 'rabbitmq', + text: 'rabbitmq', + }, + { + value: 'redis', + text: 'redis', + }, + { + value: 'system', + text: 'system', + }, + { + value: 'traefik', + text: 'traefik', + }, + { + value: 'uwsgi', + text: 'uwsgi', + }, + { + value: 'vsphere', + text: 'vsphere', + }, + { + value: 'windows', + text: 'windows', + }, + { + value: 'zookeeper', + text: 'zookeeper', + }, + ], + error: 'Please select a module', + required: true, + }, + { + id: 'hosts', + ui: { + label: 'Hosts', + type: 'multi-input', + helpText: 'Put each of the paths on a seperate line', + placeholder: `somehost.local otherhost.local`, + }, + validations: 'isHosts', + error: 'One file host per line', + required: false, + }, + { + id: 'period', + ui: { + label: 'Period', + type: 'input', + }, + defaultValue: '10s', + validations: 'isPeriod', + error: 'Invalid Period, must be formatted as `10s` for 10 seconds', + required: true, + }, + { + id: 'other', + ui: { + label: 'Other Config', + type: 'code', + helpText: 'Use YAML format to specify other settings for the Metricbeat Module', + }, + validations: 'isYaml', + error: 'Use valid YAML format', + }, +]; + +const outputConfig: YamlConfigSchema[] = [ + { + id: 'output', + ui: { + label: 'Output Type', + type: 'select', + }, + options: [ + { + value: 'elasticsearch', + text: 'Elasticsearch', + }, + { + value: 'logstash', + text: 'Logstash', + }, + { + value: 'kafka', + text: 'Kafka', + }, + { + value: 'console', + text: 'Console', + }, + ], + error: 'Please select an output type', + required: true, + }, + { + id: '{{output}}.hosts', + ui: { + label: 'Hosts', + type: 'multi-input', + }, + validations: 'isHosts', + error: 'One file host per line', + parseValidResult: v => v.split('\n'), + }, + { + id: '{{output}}.username', + ui: { + label: 'Username', + type: 'input', + }, + validations: 'isString', + error: 'Unprocessable username', + }, + { + id: '{{output}}.password', + ui: { + label: 'Password', + type: 'password', + }, + validations: 'isString', + error: 'Unprocessable password', + }, +]; + +export const supportedConfigs = [ + { text: 'Filebeat Input', value: 'filebeat.inputs', config: filebeatInputConfig }, + { text: 'Filebeat Module', value: 'filebeat.modules', config: filebeatModuleConfig }, + { text: 'Metricbeat Module', value: 'metricbeat.modules', config: metricbeatModuleConfig }, + { text: 'Output', value: 'output', config: outputConfig }, +]; diff --git a/x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx b/x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx new file mode 100644 index 0000000000000..a0a2afb7e63f2 --- /dev/null +++ b/x-pack/plugins/beats_management/public/containers/with_kuery_autocompletion.tsx @@ -0,0 +1,89 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; + +import { FrontendLibs } from '../lib/lib'; +import { RendererFunction } from '../utils/typed_react'; + +interface WithKueryAutocompletionLifecycleProps { + libs: FrontendLibs; + fieldPrefix?: string; + children: RendererFunction<{ + isLoadingSuggestions: boolean; + loadSuggestions: (expression: string, cursorPosition: number, maxSuggestions?: number) => void; + suggestions: AutocompleteSuggestion[]; + }>; +} + +interface WithKueryAutocompletionLifecycleState { + // lacking cancellation support in the autocompletion api, + // this is used to keep older, slower requests from clobbering newer ones + currentRequest: { + expression: string; + cursorPosition: number; + } | null; + suggestions: AutocompleteSuggestion[]; +} + +export class WithKueryAutocompletion extends React.Component< + WithKueryAutocompletionLifecycleProps, + WithKueryAutocompletionLifecycleState +> { + public readonly state: WithKueryAutocompletionLifecycleState = { + currentRequest: null, + suggestions: [], + }; + + public render() { + const { currentRequest, suggestions } = this.state; + + return this.props.children({ + isLoadingSuggestions: currentRequest !== null, + loadSuggestions: this.loadSuggestions, + suggestions, + }); + } + + private loadSuggestions = async ( + expression: string, + cursorPosition: number, + maxSuggestions?: number + ) => { + this.setState({ + currentRequest: { + expression, + cursorPosition, + }, + suggestions: [], + }); + let suggestions: any[] = []; + try { + suggestions = await this.props.libs.elasticsearch.getSuggestions( + expression, + cursorPosition, + this.props.fieldPrefix + ); + } catch (e) { + suggestions = []; + } + + this.setState( + state => + state.currentRequest && + state.currentRequest.expression !== expression && + state.currentRequest.cursorPosition !== cursorPosition + ? state // ignore this result, since a newer request is in flight + : { + ...state, + currentRequest: null, + suggestions: maxSuggestions ? suggestions.slice(0, maxSuggestions) : suggestions, + } + ); + }; +} diff --git a/x-pack/plugins/beats_management/public/containers/with_url_state.tsx b/x-pack/plugins/beats_management/public/containers/with_url_state.tsx new file mode 100644 index 0000000000000..1630c2c20cda8 --- /dev/null +++ b/x-pack/plugins/beats_management/public/containers/with_url_state.tsx @@ -0,0 +1,99 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { parse, stringify } from 'querystring'; +import React from 'react'; +import { withRouter } from 'react-router-dom'; +import { FlatObject } from '../app'; +import { RendererFunction } from '../utils/typed_react'; + +type StateCallback = (previousState: T) => T; + +export interface URLStateProps { + goTo: (path: string) => void; + setUrlState: ( + newState: + | Partial> + | StateCallback + | Promise> + ) => void; + urlState: URLState; +} +interface ComponentProps { + history: any; + match: any; + children: RendererFunction>; +} + +export class WithURLStateComponent extends React.Component< + ComponentProps +> { + private get URLState(): URLState { + // slice because parse does not account for the initial ? in the search string + return parse(decodeURIComponent(this.props.history.location.search).substring(1)) as URLState; + } + + private historyListener: (() => void) | null = null; + + public componentWillUnmount() { + if (this.historyListener) { + this.historyListener(); + } + } + public render() { + return this.props.children({ + goTo: this.goTo, + setUrlState: this.setURLState, + urlState: this.URLState || {}, + }); + } + + private setURLState = async ( + state: + | Partial> + | StateCallback + | Promise> + ) => { + let newState; + const pastState = this.URLState; + if (typeof state === 'function') { + newState = await state(pastState); + } else { + newState = state; + } + + const search: string = stringify({ + ...(pastState as any), + ...(newState as any), + }); + + const newLocation = { + ...this.props.history.location, + search, + }; + + this.props.history.replace(newLocation); + this.forceUpdate(); + }; + + private goTo = (path: string) => { + this.props.history.push({ + pathname: path, + search: this.props.history.location.search, + }); + }; +} +export const WithURLState = withRouter(WithURLStateComponent); + +export function withUrlState(UnwrappedComponent: React.ComponentType): React.SFC { + return (origProps: OP) => { + return ( + + {(URLProps: URLStateProps) => } + + ); + }; +} diff --git a/x-pack/plugins/beats_management/public/index.tsx b/x-pack/plugins/beats_management/public/index.tsx new file mode 100644 index 0000000000000..749fd8cecf9c6 --- /dev/null +++ b/x-pack/plugins/beats_management/public/index.tsx @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as euiVars from '@elastic/eui/dist/eui_theme_k6_light.json'; +import React from 'react'; +import { ThemeProvider } from 'styled-components'; +import { BASE_PATH } from '../common/constants'; +import { BreadcrumbProvider } from './components/route_with_breadcrumb'; +import { compose } from './lib/compose/kibana'; +import { FrontendLibs } from './lib/lib'; +import { PageRouter } from './router'; + +function startApp(libs: FrontendLibs) { + libs.framework.registerManagementSection('beats', 'Central Management', BASE_PATH); + libs.framework.render( + + + + + + ); +} + +startApp(compose()); diff --git a/x-pack/plugins/beats_management/public/lib/__tests__/tags.test.ts b/x-pack/plugins/beats_management/public/lib/__tests__/tags.test.ts new file mode 100644 index 0000000000000..c57a451a0475c --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/__tests__/tags.test.ts @@ -0,0 +1,204 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { BeatTag } from '../../../common/domain_types'; +import { supportedConfigs } from '../../config_schemas'; +import { CMTagsAdapter } from '../adapters/tags/adapter_types'; +import { TagsLib } from '../tags'; + +describe('Tags Client Domain Lib', () => { + let tagsLib: TagsLib; + + beforeEach(async () => { + tagsLib = new TagsLib({} as CMTagsAdapter, supportedConfigs); + }); + + it('should use helper function to convert users yaml in tag to config object', async () => { + const convertedTag = tagsLib.userConfigsToJson([ + { + id: 'foo', + configuration_blocks: [ + { + type: 'filebeat.inputs', + description: 'string', + configs: [{ paths: ['adad/adasd'], other: "something: 'here'" }], + }, + ], + color: 'red', + last_updated: new Date(), + } as BeatTag, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).not.toHaveProperty('other'); + expect(convertedTag[0].configuration_blocks[0].configs[0]).toHaveProperty('something'); + expect((convertedTag[0].configuration_blocks[0].configs[0] as any).something).toBe('here'); + }); + + it('should use helper function to convert user config to json with undefined `other`', async () => { + const convertedTag = tagsLib.userConfigsToJson([ + { + id: 'fsdfsdfs', + color: '#DD0A73', + configuration_blocks: [ + { + type: 'filebeat.inputs', + description: 'sdfsdf', + configs: [{ paths: ['sdfsfsdf'], other: undefined }], + }, + ], + last_updated: '2018-09-04T15:52:08.983Z', + } as any, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).not.toHaveProperty('other'); + }); + + it('should use helper function to convert users yaml in tag to config object, where empty other leads to no other fields saved', async () => { + const convertedTag = tagsLib.userConfigsToJson([ + { + id: 'foo', + configuration_blocks: [ + { + type: 'filebeat.inputs', + description: 'string', + configs: [{ paths: ['adad/adasd'], other: '' }], + }, + ], + color: 'red', + last_updated: new Date(), + } as BeatTag, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).not.toHaveProperty('other'); + }); + + it('should convert tokenized fields to JSON', async () => { + const convertedTag = tagsLib.userConfigsToJson([ + { + id: 'dfgdfgdfgdfgdfg', + color: '#DD0A73', + configuration_blocks: [ + { + type: 'output', + description: 'something', + configs: [ + { + output: 'console', + '{{output}}': { hosts: ['esefsfsgg', 'drgdrgdgr'], username: '', password: '' }, + }, + ], + }, + ], + last_updated: '2018-10-22T23:59:59.016Z', + } as any, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).toHaveProperty('console'); + expect((convertedTag[0].configuration_blocks[0].configs[0] as any).console).toHaveProperty( + 'hosts' + ); + + expect((convertedTag[0].configuration_blocks[0].configs[0] as any).console.hosts.length).toBe( + 2 + ); + }); + + it('should convert JSON to tokenized fields', async () => { + const convertedTag = tagsLib.jsonConfigToUserYaml([ + { + id: 'dfgdfgdfgdfgdfg', + color: '#DD0A73', + configuration_blocks: [ + { + type: 'output', + description: 'something', + configs: [ + { + output: 'console', + console: { hosts: ['esefsfsgg', 'drgdrgdgr'], username: '', password: '' }, + }, + ], + }, + ], + last_updated: '2018-10-22T23:59:59.016Z', + } as any, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).toHaveProperty('{{output}}'); + expect( + (convertedTag[0].configuration_blocks[0].configs[0] as any)['{{output}}'] + ).toHaveProperty('hosts'); + + expect( + (convertedTag[0].configuration_blocks[0].configs[0] as any)['{{output}}'].hosts.length + ).toBe(2); + }); + + it('should use helper function to convert config object to users yaml', async () => { + const convertedTag = tagsLib.jsonConfigToUserYaml([ + { + id: 'fsdfsdfs', + color: '#DD0A73', + configuration_blocks: [ + { + type: 'filebeat.inputs', + description: 'sdfsdf', + configs: [{ paths: ['sdfsfsdf'], something: 'here' }], + }, + ], + last_updated: '2018-09-04T15:52:08.983Z', + } as any, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).not.toHaveProperty('something'); + expect(convertedTag[0].configuration_blocks[0].configs[0]).toHaveProperty('other'); + + expect(convertedTag[0].configuration_blocks[0].configs[0].other).toBe('something: here\n'); + }); + + it('should use helper function to convert config object to users yaml with empty `other`', async () => { + const convertedTag = tagsLib.jsonConfigToUserYaml([ + { + id: 'fsdfsdfs', + color: '#DD0A73', + configuration_blocks: [ + { + type: 'filebeat.inputs', + description: undefined, + configs: [{ paths: ['sdfsfsdf'] }], + }, + ], + last_updated: '2018-09-04T15:52:08.983Z', + } as any, + ]); + + expect(convertedTag.length).toBe(1); + expect(convertedTag[0].configuration_blocks.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs.length).toBe(1); + expect(convertedTag[0].configuration_blocks[0].configs[0]).not.toHaveProperty('something'); + expect(convertedTag[0].configuration_blocks[0].configs[0]).toHaveProperty('other'); + + expect(convertedTag[0].configuration_blocks[0].configs[0].other).toBe(''); + }); +}); diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts new file mode 100644 index 0000000000000..3808ec1d57422 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/beats/adapter_types.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMBeat } from '../../../../common/domain_types'; + +export interface CMBeatsAdapter { + get(id: string): Promise; + update(id: string, beatData: Partial): Promise; + getBeatsWithTag(tagId: string): Promise; + getAll(ESQuery?: any): Promise; + removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise; + assignTagsToBeats(assignments: BeatsTagAssignment[]): Promise; + getBeatWithToken(enrollmentToken: string): Promise; +} + +export interface BeatsTagAssignment { + beatId: string; + tag: string; + idxInRequest?: number; +} + +interface BeatsReturnedTagAssignment { + status: number | null; + result?: string; +} + +export interface CMAssignmentReturn { + assignments: BeatsReturnedTagAssignment[]; +} + +export interface BeatsRemovalReturn { + removals: BeatsReturnedTagAssignment[]; +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts new file mode 100644 index 0000000000000..e66e7e45b5c4f --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/beats/memory_beats_adapter.ts @@ -0,0 +1,105 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { omit } from 'lodash'; + +import { CMBeat } from '../../../../common/domain_types'; +import { + BeatsRemovalReturn, + BeatsTagAssignment, + CMAssignmentReturn, + CMBeatsAdapter, +} from './adapter_types'; + +export class MemoryBeatsAdapter implements CMBeatsAdapter { + private beatsDB: CMBeat[]; + + constructor(beatsDB: CMBeat[]) { + this.beatsDB = beatsDB; + } + + public async get(id: string) { + return this.beatsDB.find(beat => beat.id === id) || null; + } + + public async update(id: string, beatData: Partial): Promise { + const index = this.beatsDB.findIndex(beat => beat.id === id); + + if (index === -1) { + return false; + } + + this.beatsDB[index] = { ...this.beatsDB[index], ...beatData }; + return true; + } + + public async getAll() { + return this.beatsDB.map((beat: any) => omit(beat, ['access_token'])); + } + public async getBeatsWithTag(tagId: string): Promise { + return this.beatsDB.map((beat: any) => omit(beat, ['access_token'])); + } + + public async getBeatWithToken(enrollmentToken: string): Promise { + return this.beatsDB.map((beat: any) => omit(beat, ['access_token']))[0]; + } + public async removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise { + const beatIds = removals.map(r => r.beatId); + + const response = this.beatsDB.filter(beat => beatIds.includes(beat.id)).map(beat => { + const tagData = removals.find(r => r.beatId === beat.id); + if (tagData) { + if (beat.tags) { + beat.tags = beat.tags.filter(tag => tag !== tagData.tag); + } + } + const removalsForBeat = removals.filter(r => r.beatId === beat.id); + if (removalsForBeat.length) { + removalsForBeat.forEach((assignment: BeatsTagAssignment) => { + if (beat.tags) { + beat.tags = beat.tags.filter(tag => tag !== assignment.tag); + } + }); + } + return beat; + }); + + return response.map((item: CMBeat, resultIdx: number) => ({ + idxInRequest: removals[resultIdx].idxInRequest, + result: 'updated', + status: 200, + })); + } + + public async assignTagsToBeats(assignments: BeatsTagAssignment[]): Promise { + const beatIds = assignments.map(r => r.beatId); + + this.beatsDB.filter(beat => beatIds.includes(beat.id)).map(beat => { + // get tags that need to be assigned to this beat + const tags = assignments + .filter(a => a.beatId === beat.id) + .map((t: BeatsTagAssignment) => t.tag); + + if (tags.length > 0) { + if (!beat.tags) { + beat.tags = []; + } + const nonExistingTags = tags.filter((t: string) => beat.tags && !beat.tags.includes(t)); + + if (nonExistingTags.length > 0) { + beat.tags = beat.tags.concat(nonExistingTags); + } + } + return beat; + }); + + return assignments.map((item: BeatsTagAssignment, resultIdx: number) => ({ + idxInRequest: assignments[resultIdx].idxInRequest, + result: 'updated', + status: 200, + })); + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts new file mode 100644 index 0000000000000..8649bf9c37e0e --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/beats/rest_beats_adapter.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMBeat } from '../../../../common/domain_types'; +import { RestAPIAdapter } from '../rest_api/adapter_types'; +import { + BeatsRemovalReturn, + BeatsTagAssignment, + CMAssignmentReturn, + CMBeatsAdapter, +} from './adapter_types'; +export class RestBeatsAdapter implements CMBeatsAdapter { + constructor(private readonly REST: RestAPIAdapter) {} + + public async get(id: string): Promise { + return await this.REST.get(`/api/beats/agent/${id}`); + } + + public async getBeatWithToken(enrollmentToken: string): Promise { + const beat = await this.REST.get(`/api/beats/agent/unknown/${enrollmentToken}`); + return beat; + } + + public async getAll(ESQuery?: any): Promise { + return (await this.REST.get<{ beats: CMBeat[] }>('/api/beats/agents/all', { ESQuery })).beats; + } + + public async getBeatsWithTag(tagId: string): Promise { + return (await this.REST.get<{ beats: CMBeat[] }>(`/api/beats/agents/tag/${tagId}`)).beats; + } + + public async update(id: string, beatData: Partial): Promise { + await this.REST.put<{ success: true }>(`/api/beats/agent/${id}`, beatData); + return true; + } + + public async removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise { + return (await this.REST.post<{ removals: BeatsRemovalReturn[] }>( + `/api/beats/agents_tags/removals`, + { + removals, + } + )).removals; + } + + public async assignTagsToBeats(assignments: BeatsTagAssignment[]): Promise { + return (await this.REST.post<{ assignments: CMAssignmentReturn[] }>( + `/api/beats/agents_tags/assignments`, + { + assignments, + } + )).assignments; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts new file mode 100644 index 0000000000000..4940857493275 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/adapter_types.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; + +export interface ElasticsearchAdapter { + convertKueryToEsQuery: (kuery: string) => Promise; + getSuggestions: (kuery: string, selectionStart: any) => Promise; + isKueryValid(kuery: string): boolean; +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts new file mode 100644 index 0000000000000..1b918fb72c809 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/memory.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; +import { ElasticsearchAdapter } from './adapter_types'; + +export class MemoryElasticsearchAdapter implements ElasticsearchAdapter { + constructor( + private readonly mockIsKueryValid: (kuery: string) => boolean, + private readonly mockKueryToEsQuery: (kuery: string) => string, + private readonly suggestions: AutocompleteSuggestion[] + ) {} + + public isKueryValid(kuery: string): boolean { + return this.mockIsKueryValid(kuery); + } + public async convertKueryToEsQuery(kuery: string): Promise { + return this.mockKueryToEsQuery(kuery); + } + public async getSuggestions( + kuery: string, + selectionStart: any + ): Promise { + return this.suggestions; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts new file mode 100644 index 0000000000000..d987a18137116 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/elasticsearch/rest.ts @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { isEmpty } from 'lodash'; +import { AutocompleteSuggestion, getAutocompleteProvider } from 'ui/autocomplete_providers'; +// @ts-ignore TODO type this +import { fromKueryExpression, toElasticsearchQuery } from 'ui/kuery'; +import { RestAPIAdapter } from '../rest_api/adapter_types'; +import { ElasticsearchAdapter } from './adapter_types'; + +export class RestElasticsearchAdapter implements ElasticsearchAdapter { + private cachedIndexPattern: any = null; + constructor(private readonly api: RestAPIAdapter, private readonly indexPatternName: string) {} + + public isKueryValid(kuery: string): boolean { + try { + fromKueryExpression(kuery); + } catch (err) { + return false; + } + + return true; + } + public async convertKueryToEsQuery(kuery: string): Promise { + if (!this.isKueryValid(kuery)) { + return ''; + } + const ast = fromKueryExpression(kuery); + const indexPattern = await this.getIndexPattern(); + return JSON.stringify(toElasticsearchQuery(ast, indexPattern)); + } + public async getSuggestions( + kuery: string, + selectionStart: any + ): Promise { + const autocompleteProvider = getAutocompleteProvider('kuery'); + if (!autocompleteProvider) { + return []; + } + const config = { + get: () => true, + }; + const indexPattern = await this.getIndexPattern(); + + const getAutocompleteSuggestions = autocompleteProvider({ + config, + indexPatterns: [indexPattern], + boolFilter: null, + }); + const results = getAutocompleteSuggestions({ + query: kuery || '', + selectionStart, + selectionEnd: selectionStart, + }); + return results; + } + + private async getIndexPattern() { + if (this.cachedIndexPattern) { + return this.cachedIndexPattern; + } + const res = await this.api.get( + `/api/index_patterns/_fields_for_wildcard?pattern=${this.indexPatternName}` + ); + if (isEmpty(res.fields)) { + return; + } + this.cachedIndexPattern = { + fields: res.fields, + title: `${this.indexPatternName}`, + }; + return this.cachedIndexPattern; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts new file mode 100644 index 0000000000000..4e58725475171 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/framework/kibana_framework_adapter.ts @@ -0,0 +1,225 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { IModule, IScope } from 'angular'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; + +import { + BufferedKibanaServiceCall, + FrameworkAdapter, + KibanaAdapterServiceRefs, + KibanaUIConfig, +} from '../../lib'; + +export class KibanaFrameworkAdapter implements FrameworkAdapter { + public appState: object; + + private management: any; + private adapterService: KibanaAdapterServiceProvider; + private rootComponent: React.ReactElement | null = null; + private uiModule: IModule; + private routes: any; + private XPackInfoProvider: any; + private xpackInfo: null | any; + private chrome: any; + private shieldUser: any; + + constructor( + uiModule: IModule, + management: any, + routes: any, + chrome: any, + XPackInfoProvider: any + ) { + this.adapterService = new KibanaAdapterServiceProvider(); + this.management = management; + this.uiModule = uiModule; + this.routes = routes; + this.chrome = chrome; + this.XPackInfoProvider = XPackInfoProvider; + this.appState = {}; + } + + public get baseURLPath(): string { + return this.chrome.getBasePath(); + } + + public setUISettings = (key: string, value: any) => { + this.adapterService.callOrBuffer(({ config }) => { + config.set(key, value); + }); + }; + + public render = (component: React.ReactElement) => { + this.rootComponent = component; + }; + + public hasValidLicense() { + if (!this.xpackInfo) { + return false; + } + return this.xpackInfo.get('features.beats_management.licenseValid', false); + } + + public licenseExpired() { + if (!this.xpackInfo) { + return false; + } + return this.xpackInfo.get('features.beats_management.licenseExpired', false); + } + + public securityEnabled() { + if (!this.xpackInfo) { + return false; + } + + return this.xpackInfo.get('features.beats_management.securityEnabled', false); + } + + public getDefaultUserRoles() { + if (!this.xpackInfo) { + return []; + } + + return this.xpackInfo.get('features.beats_management.defaultUserRoles'); + } + + public getCurrentUser() { + try { + return this.shieldUser; + } catch (e) { + return null; + } + } + + public registerManagementSection(pluginId: string, displayName: string, basePath: string) { + this.register(this.uiModule); + + this.hookAngular(() => { + if (this.hasValidLicense()) { + const registerSection = () => + this.management.register(pluginId, { + display: 'Beats', // TODO these need to be config options not hard coded in the adapter + icon: 'logoBeats', + order: 30, + }); + const getSection = () => this.management.getSection(pluginId); + const section = this.management.hasItem(pluginId) ? getSection() : registerSection(); + + section.register(pluginId, { + visible: true, + display: displayName, + order: 30, + url: `#${basePath}`, + }); + } + }); + } + + private manageAngularLifecycle($scope: any, $route: any, elem: any) { + const lastRoute = $route.current; + const deregister = $scope.$on('$locationChangeSuccess', () => { + const currentRoute = $route.current; + // if templates are the same we are on the same route + if (lastRoute.$$route.template === currentRoute.$$route.template) { + // this prevents angular from destroying scope + $route.current = lastRoute; + } + }); + $scope.$on('$destroy', () => { + if (deregister) { + deregister(); + } + // manually unmount component when scope is destroyed + if (elem) { + ReactDOM.unmountComponentAtNode(elem); + } + }); + } + + private hookAngular(done: () => any) { + this.chrome.dangerouslyGetActiveInjector().then(async ($injector: any) => { + const Private = $injector.get('Private'); + const xpackInfo = Private(this.XPackInfoProvider); + + this.xpackInfo = xpackInfo; + if (this.securityEnabled()) { + try { + this.shieldUser = await $injector.get('ShieldUser').getCurrent().$promise; + } catch (e) { + // errors when security disabled, even though we check first because angular + } + } + + done(); + }); + } + + private register = (adapterModule: IModule) => { + const adapter = this; + this.routes.when(`/management/beats_management/:view?/:id?/:other?/:other2?`, { + template: + '
      ', + controllerAs: 'beatsManagement', + // tslint:disable-next-line: max-classes-per-file + controller: class BeatsManagementController { + constructor($scope: any, $route: any) { + $scope.$$postDigest(() => { + const elem = document.getElementById('beatsReactRoot'); + ReactDOM.render(adapter.rootComponent as React.ReactElement, elem); + adapter.manageAngularLifecycle($scope, $route, elem); + }); + $scope.$onInit = () => { + $scope.topNavMenu = []; + }; + } + }, + }); + }; +} + +// tslint:disable-next-line: max-classes-per-file +class KibanaAdapterServiceProvider { + public serviceRefs: KibanaAdapterServiceRefs | null = null; + public bufferedCalls: Array> = []; + + public $get($rootScope: IScope, config: KibanaUIConfig) { + this.serviceRefs = { + config, + rootScope: $rootScope, + }; + + this.applyBufferedCalls(this.bufferedCalls); + + return this; + } + + public callOrBuffer(serviceCall: (serviceRefs: KibanaAdapterServiceRefs) => void) { + if (this.serviceRefs !== null) { + this.applyBufferedCalls([serviceCall]); + } else { + this.bufferedCalls.push(serviceCall); + } + } + + public applyBufferedCalls( + bufferedCalls: Array> + ) { + if (!this.serviceRefs) { + return; + } + + this.serviceRefs.rootScope.$apply(() => { + bufferedCalls.forEach(serviceCall => { + if (!this.serviceRefs) { + return; + } + return serviceCall(this.serviceRefs); + }); + }); + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts new file mode 100644 index 0000000000000..e9d9bf551f739 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/adapter_types.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { FlatObject } from '../../../app'; + +export interface RestAPIAdapter { + get(url: string, query?: FlatObject): Promise; + post(url: string, body?: { [key: string]: any }): Promise; + delete(url: string): Promise; + put(url: string, body?: any): Promise; +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts new file mode 100644 index 0000000000000..690843bbb1cf8 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/rest_api/axios_rest_api_adapter.ts @@ -0,0 +1,78 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import axios, { AxiosInstance } from 'axios'; +import { FlatObject } from '../../../app'; +import { RestAPIAdapter } from './adapter_types'; +let globalAPI: AxiosInstance; + +export class AxiosRestAPIAdapter implements RestAPIAdapter { + constructor(private readonly xsrfToken: string, private readonly basePath: string) {} + + public async get(url: string, query?: FlatObject): Promise { + return await this.REST.get(url, query ? { params: query } : {}).then(resp => resp.data); + } + + public async post( + url: string, + body?: { [key: string]: any } + ): Promise { + return await this.REST.post(url, body).then(resp => resp.data); + } + + public async delete(url: string): Promise { + return await this.REST.delete(url).then(resp => resp.data); + } + + public async put(url: string, body?: any): Promise { + return await this.REST.put(url, body).then(resp => resp.data); + } + + private get REST() { + if (globalAPI) { + return globalAPI; + } + + globalAPI = axios.create({ + baseURL: this.basePath, + withCredentials: true, + responseType: 'json', + timeout: 30000, + headers: { + Accept: 'application/json', + credentials: 'same-origin', + 'Content-Type': 'application/json', + 'kbn-version': this.xsrfToken, + 'kbn-xsrf': this.xsrfToken, + }, + }); + // Add a request interceptor + globalAPI.interceptors.request.use( + config => { + // Do something before request is sent + return config; + }, + error => { + // Do something with request error + return Promise.reject(error); + } + ); + + // Add a response interceptor + globalAPI.interceptors.response.use( + response => { + // Do something with response data + return response; + }, + error => { + // Do something with response error + return Promise.reject(error); + } + ); + + return globalAPI; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts new file mode 100644 index 0000000000000..395c01f259dc3 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/tags/adapter_types.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { BeatTag } from '../../../../common/domain_types'; + +export interface CMTagsAdapter { + getTagsWithIds(tagIds: string[]): Promise; + delete(tagIds: string[]): Promise; + getAll(): Promise; + upsertTag(tag: BeatTag): Promise; +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts new file mode 100644 index 0000000000000..86daefb47c653 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/tags/memory_tags_adapter.ts @@ -0,0 +1,39 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { BeatTag } from '../../../../common/domain_types'; +import { CMTagsAdapter } from './adapter_types'; + +export class MemoryTagsAdapter implements CMTagsAdapter { + private tagsDB: BeatTag[] = []; + + constructor(tagsDB: BeatTag[]) { + this.tagsDB = tagsDB; + } + + public async getTagsWithIds(tagIds: string[]) { + return this.tagsDB.filter(tag => tagIds.includes(tag.id)); + } + + public async delete(tagIds: string[]) { + this.tagsDB = this.tagsDB.filter(tag => !tagIds.includes(tag.id)); + return true; + } + + public async getAll() { + return this.tagsDB; + } + + public async upsertTag(tag: BeatTag) { + const existingTagIndex = this.tagsDB.findIndex(t => t.id === tag.id); + if (existingTagIndex !== -1) { + this.tagsDB[existingTagIndex] = tag; + } else { + this.tagsDB.push(tag); + } + return tag; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts new file mode 100644 index 0000000000000..e49d4a9109984 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/tags/rest_tags_adapter.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { BeatTag } from '../../../../common/domain_types'; +import { RestAPIAdapter } from '../rest_api/adapter_types'; +import { CMTagsAdapter } from './adapter_types'; + +export class RestTagsAdapter implements CMTagsAdapter { + constructor(private readonly REST: RestAPIAdapter) {} + + public async getTagsWithIds(tagIds: string[]): Promise { + const tags = await this.REST.get(`/api/beats/tags/${tagIds.join(',')}`); + return tags; + } + + public async getAll(): Promise { + return await this.REST.get(`/api/beats/tags`); + } + + public async delete(tagIds: string[]): Promise { + return (await this.REST.delete<{ success: boolean }>(`/api/beats/tags/${tagIds.join(',')}`)) + .success; + } + + public async upsertTag(tag: BeatTag): Promise { + const response = await this.REST.put<{ success: boolean }>(`/api/beats/tag/${tag.id}`, { + color: tag.color, + configuration_blocks: tag.configuration_blocks, + }); + + return response.success ? tag : null; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts b/x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts new file mode 100644 index 0000000000000..55b7e6f94fe04 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/tokens/adapter_types.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface CMTokensAdapter { + createEnrollmentToken(): Promise; +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts new file mode 100644 index 0000000000000..f329e491c9ad0 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/tokens/memory_tokens_adapter.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMTokensAdapter } from './adapter_types'; + +export class MemoryTokensAdapter implements CMTokensAdapter { + public async createEnrollmentToken(): Promise { + return '2jnwkrhkwuehriauhweair'; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts b/x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts new file mode 100644 index 0000000000000..778bcbf5d8d5c --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/adapters/tokens/rest_tokens_adapter.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { RestAPIAdapter } from '../rest_api/adapter_types'; +import { CMTokensAdapter } from './adapter_types'; + +export class RestTokensAdapter implements CMTokensAdapter { + constructor(private readonly REST: RestAPIAdapter) {} + + public async createEnrollmentToken(): Promise { + const tokens = (await this.REST.post<{ tokens: string[] }>('/api/beats/enrollment_tokens')) + .tokens; + return tokens[0]; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/beats.ts b/x-pack/plugins/beats_management/public/lib/beats.ts new file mode 100644 index 0000000000000..f676f4611be63 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/beats.ts @@ -0,0 +1,70 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { flatten } from 'lodash'; +import { CMBeat, CMPopulatedBeat } from './../../common/domain_types'; +import { + BeatsRemovalReturn, + BeatsTagAssignment, + CMAssignmentReturn, + CMBeatsAdapter, +} from './adapters/beats/adapter_types'; +import { FrontendDomainLibs } from './lib'; + +export class BeatsLib { + constructor( + private readonly adapter: CMBeatsAdapter, + private readonly libs: { tags: FrontendDomainLibs['tags'] } + ) {} + + public async get(id: string): Promise { + const beat = await this.adapter.get(id); + return beat ? (await this.mergeInTags([beat]))[0] : null; + } + + public async getBeatWithToken(enrollmentToken: string): Promise { + const beat = await this.adapter.getBeatWithToken(enrollmentToken); + return beat; + } + + public async getBeatsWithTag(tagId: string): Promise { + const beats = await this.adapter.getBeatsWithTag(tagId); + return await this.mergeInTags(beats); + } + + public async getAll(ESQuery?: any): Promise { + const beats = await this.adapter.getAll(ESQuery); + return await this.mergeInTags(beats); + } + + public async update(id: string, beatData: Partial): Promise { + return await this.adapter.update(id, beatData); + } + + public async removeTagsFromBeats(removals: BeatsTagAssignment[]): Promise { + return await this.adapter.removeTagsFromBeats(removals); + } + + public async assignTagsToBeats(assignments: BeatsTagAssignment[]): Promise { + return await this.adapter.assignTagsToBeats(assignments); + } + + private async mergeInTags(beats: CMBeat[]): Promise { + const tagIds = flatten(beats.map(b => b.tags || [])); + const tags = await this.libs.tags.getTagsWithIds(tagIds); + + // TODO the filter should not be needed, if the data gets into a bad state, we should error + // and inform the user they need to delte the tag, or else we should auto delete it + const mergedBeats: CMPopulatedBeat[] = beats.map( + b => + ({ + ...b, + full_tags: (b.tags || []).map(tagId => tags.find(t => t.id === tagId)).filter(t => t), + } as CMPopulatedBeat) + ); + return mergedBeats; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/compose/kibana.ts b/x-pack/plugins/beats_management/public/lib/compose/kibana.ts new file mode 100644 index 0000000000000..659b3acf9dba7 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/compose/kibana.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import { XPackInfoProvider } from 'plugins/xpack_main/services/xpack_info'; +// @ts-ignore +import 'ui/autoload/all'; +// @ts-ignore: path dynamic for kibana +import chrome from 'ui/chrome'; +// @ts-ignore: path dynamic for kibana +import { management } from 'ui/management'; +// @ts-ignore: path dynamic for kibana +import { uiModules } from 'ui/modules'; +// @ts-ignore: path dynamic for kibana +import routes from 'ui/routes'; + +import { INDEX_NAMES } from '../../../common/constants/index_names'; +import { supportedConfigs } from '../../config_schemas'; +import { RestBeatsAdapter } from '../adapters/beats/rest_beats_adapter'; +import { RestElasticsearchAdapter } from '../adapters/elasticsearch/rest'; +import { KibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; +import { AxiosRestAPIAdapter } from '../adapters/rest_api/axios_rest_api_adapter'; +import { RestTagsAdapter } from '../adapters/tags/rest_tags_adapter'; +import { RestTokensAdapter } from '../adapters/tokens/rest_tokens_adapter'; +import { BeatsLib } from '../beats'; +import { ElasticsearchLib } from '../elasticsearch'; +import { FrontendDomainLibs, FrontendLibs } from '../lib'; +import { TagsLib } from '../tags'; + +export function compose(): FrontendLibs { + const api = new AxiosRestAPIAdapter(chrome.getXsrfToken(), chrome.getBasePath()); + const esAdapter = new RestElasticsearchAdapter(api, INDEX_NAMES.BEATS); + + const tags = new TagsLib(new RestTagsAdapter(api), supportedConfigs); + const tokens = new RestTokensAdapter(api); + const beats = new BeatsLib(new RestBeatsAdapter(api), { + tags, + }); + + const domainLibs: FrontendDomainLibs = { + tags, + tokens, + beats, + }; + const pluginUIModule = uiModules.get('app/beats_management'); + + const framework = new KibanaFrameworkAdapter( + pluginUIModule, + management, + routes, + chrome, + XPackInfoProvider + ); + + const libs: FrontendLibs = { + framework, + elasticsearch: new ElasticsearchLib(esAdapter), + ...domainLibs, + }; + return libs; +} diff --git a/x-pack/plugins/beats_management/public/lib/compose/memory.ts b/x-pack/plugins/beats_management/public/lib/compose/memory.ts new file mode 100644 index 0000000000000..fd56de9a77607 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/compose/memory.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import 'ui/autoload/all'; +// @ts-ignore: path dynamic for kibana +import { management } from 'ui/management'; +// @ts-ignore: path dynamic for kibana +import { uiModules } from 'ui/modules'; +// @ts-ignore: path dynamic for kibana +import routes from 'ui/routes'; +// @ts-ignore: path dynamic for kibana +import { MemoryBeatsAdapter } from '../adapters/beats/memory_beats_adapter'; +import { KibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; +import { MemoryTagsAdapter } from '../adapters/tags/memory_tags_adapter'; +import { MemoryTokensAdapter } from '../adapters/tokens/memory_tokens_adapter'; + +import { BeatsLib } from '../beats'; +import { FrontendDomainLibs, FrontendLibs } from '../lib'; + +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; +import { supportedConfigs } from '../../config_schemas'; +import { TagsLib } from '../tags'; +import { MemoryElasticsearchAdapter } from './../adapters/elasticsearch/memory'; +import { ElasticsearchLib } from './../elasticsearch'; + +export function compose( + mockIsKueryValid: (kuery: string) => boolean, + mockKueryToEsQuery: (kuery: string) => string, + suggestions: AutocompleteSuggestion[] +): FrontendLibs { + const esAdapter = new MemoryElasticsearchAdapter( + mockIsKueryValid, + mockKueryToEsQuery, + suggestions + ); + const tags = new TagsLib(new MemoryTagsAdapter([]), supportedConfigs); + const tokens = new MemoryTokensAdapter(); + const beats = new BeatsLib(new MemoryBeatsAdapter([]), { tags }); + + const domainLibs: FrontendDomainLibs = { + tags, + tokens, + beats, + }; + const pluginUIModule = uiModules.get('app/beats_management'); + + const framework = new KibanaFrameworkAdapter(pluginUIModule, management, routes, null, null); + const libs: FrontendLibs = { + ...domainLibs, + elasticsearch: new ElasticsearchLib(esAdapter), + framework, + }; + return libs; +} diff --git a/x-pack/plugins/beats_management/public/lib/elasticsearch.ts b/x-pack/plugins/beats_management/public/lib/elasticsearch.ts new file mode 100644 index 0000000000000..7ea32a2eb9467 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/elasticsearch.ts @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; +import { ElasticsearchAdapter } from './adapters/elasticsearch/adapter_types'; + +interface HiddenFields { + op: 'is' | 'startsWith' | 'withoutPrefix'; + value: string; +} + +export class ElasticsearchLib { + private readonly hiddenFields: HiddenFields[] = [ + { op: 'startsWith', value: 'enrollment_token' }, + { op: 'is', value: 'beat.active' }, + { op: 'is', value: 'beat.enrollment_token' }, + { op: 'is', value: 'beat.access_token' }, + { op: 'is', value: 'beat.ephemeral_id' }, + { op: 'is', value: 'beat.verified_on' }, + ]; + + constructor(private readonly adapter: ElasticsearchAdapter) {} + + public isKueryValid(kuery: string): boolean { + return this.adapter.isKueryValid(kuery); + } + public async convertKueryToEsQuery(kuery: string): Promise { + return await this.adapter.convertKueryToEsQuery(kuery); + } + + public async getSuggestions( + kuery: string, + selectionStart: any, + fieldPrefix?: string + ): Promise { + const suggestions = await this.adapter.getSuggestions(kuery, selectionStart); + + const filteredSuggestions = suggestions.filter(suggestion => { + const hiddenFieldsCheck = this.hiddenFields; + + if (fieldPrefix) { + hiddenFieldsCheck.push({ + op: 'withoutPrefix', + value: `${fieldPrefix}.`, + }); + } + + return hiddenFieldsCheck.reduce((isvalid, field) => { + if (!isvalid) { + return false; + } + + switch (field.op) { + case 'startsWith': + return !suggestion.text.startsWith(field.value); + case 'is': + return suggestion.text.trim() !== field.value; + case 'withoutPrefix': + return suggestion.text.startsWith(field.value); + } + }, true); + }); + + return filteredSuggestions; + } +} diff --git a/x-pack/plugins/beats_management/public/lib/lib.ts b/x-pack/plugins/beats_management/public/lib/lib.ts new file mode 100644 index 0000000000000..23e4da5c6336e --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/lib.ts @@ -0,0 +1,101 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { IModule, IScope } from 'angular'; +import { AxiosRequestConfig } from 'axios'; +import React from 'react'; +import { CMTokensAdapter } from './adapters/tokens/adapter_types'; +import { BeatsLib } from './beats'; +import { ElasticsearchLib } from './elasticsearch'; +import { TagsLib } from './tags'; + +export interface FrontendDomainLibs { + beats: BeatsLib; + tags: TagsLib; + tokens: CMTokensAdapter; +} + +export interface FrontendLibs extends FrontendDomainLibs { + elasticsearch: ElasticsearchLib; + framework: FrameworkAdapter; +} + +export interface YamlConfigSchema { + id: string; + ui: { + label: string; + type: 'input' | 'multi-input' | 'select' | 'code' | 'password'; + helpText?: string; + placeholder?: string; + }; + options?: Array<{ value: string; text: string }>; + validations?: 'isHosts' | 'isString' | 'isPeriod' | 'isPath' | 'isPaths' | 'isYaml'; + error: string; + defaultValue?: string; + required?: boolean; + parseValidResult?: (value: any) => any; +} + +export interface FrameworkAdapter { + // Instance vars + appState?: object; + kbnVersion?: string; + baseURLPath: string; + registerManagementSection(pluginId: string, displayName: string, basePath: string): void; + getDefaultUserRoles(): string[]; + // Methods + getCurrentUser(): { + email: string | null; + enabled: boolean; + full_name: string | null; + metadata: { _reserved: true }; + roles: string[]; + scope: string[]; + username: string; + }; + licenseExpired(): boolean; + securityEnabled(): boolean; + hasValidLicense(): boolean; + setUISettings(key: string, value: any): void; + render(component: React.ReactElement): void; +} + +export interface FramworkAdapterConstructable { + new (uiModule: IModule): FrameworkAdapter; +} + +// TODO: replace AxiosRequestConfig with something more defined +export type RequestConfig = AxiosRequestConfig; + +export interface ApiAdapter { + kbnVersion: string; + + get(url: string, config?: RequestConfig | undefined): Promise; + post(url: string, data?: any, config?: AxiosRequestConfig | undefined): Promise; + delete(url: string, config?: RequestConfig | undefined): Promise; + put(url: string, data?: any, config?: RequestConfig | undefined): Promise; +} + +export interface UiKibanaAdapterScope extends IScope { + breadcrumbs: any[]; + topNavMenu: any[]; +} + +export interface KibanaUIConfig { + get(key: string): any; + set(key: string, value: any): Promise; +} + +export interface KibanaAdapterServiceRefs { + config: KibanaUIConfig; + rootScope: IScope; +} + +export type BufferedKibanaServiceCall = (serviceRefs: ServiceRefs) => void; + +export interface Chrome { + setRootTemplate(template: string): void; +} diff --git a/x-pack/plugins/beats_management/public/lib/tags.ts b/x-pack/plugins/beats_management/public/lib/tags.ts new file mode 100644 index 0000000000000..86b21bca24310 --- /dev/null +++ b/x-pack/plugins/beats_management/public/lib/tags.ts @@ -0,0 +1,156 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import yaml from 'js-yaml'; +import { get } from 'lodash'; +import { omit, set } from 'lodash'; +import _ from 'lodash'; +import { BeatTag, ConfigurationBlock } from '../../common/domain_types'; +import { ConfigContent } from '../../common/domain_types'; +import { CMTagsAdapter } from './adapters/tags/adapter_types'; + +export class TagsLib { + constructor(private readonly adapter: CMTagsAdapter, private readonly tagConfigs: any) {} + + public async getTagsWithIds(tagIds: string[]): Promise { + return this.jsonConfigToUserYaml(await this.adapter.getTagsWithIds(tagIds)); + } + public async delete(tagIds: string[]): Promise { + return await this.adapter.delete(tagIds); + } + public async getAll(): Promise { + return this.jsonConfigToUserYaml(await this.adapter.getAll()); + } + public async upsertTag(tag: BeatTag): Promise { + tag.id = tag.id.replace(' ', '-'); + return await this.adapter.upsertTag(this.userConfigsToJson([tag])[0]); + } + + public jsonConfigToUserYaml(tags: BeatTag[]): BeatTag[] { + return tags.map(tag => { + const transformedTag: BeatTag = tag as any; + // configuration_blocks yaml, JS cant read YAML so we parse it into JS, + // because beats flattens all fields, and we need more structure. + // we take tagConfigs, grab the config that applies here, render what we can into + // an object, and the rest we assume to be the yaml string that goes + // into the yaml editor... + // NOTE: The perk of this, is that as we support more features via controls + // vs yaml editing, it should "just work", and things that were in YAML + // will now be in the UI forms... + transformedTag.configuration_blocks = (tag.configuration_blocks || []).map(block => { + const { type, description, configs } = block; + const activeConfig = configs[0]; + const thisConfig = this.tagConfigs.find((conf: any) => conf.value === type).config; + + const knownConfigIds = thisConfig.map((config: any) => config.id); + const hydratedIds = this.hydrateTokenArray(knownConfigIds, activeConfig); + const convertedConfig = knownConfigIds.reduce( + (blockObj: any, id: keyof ConfigContent, index: number) => { + const unhydratedKey = hydratedIds[index]; + set( + blockObj, + id, + id === 'other' + ? yaml.dump(omit(activeConfig, knownConfigIds)) + : get(activeConfig, unhydratedKey) + ); + + return blockObj; + }, + {} + ); + + // Workaround to empty object passed into dump resulting in this odd output + if (convertedConfig.other && convertedConfig.other === '{}\n') { + convertedConfig.other = ''; + } + + return { + type, + description, + configs: [convertedConfig], + } as ConfigurationBlock; + }); + return transformedTag; + }); + } + + public userConfigsToJson(tags: BeatTag[]): BeatTag[] { + return tags.map(tag => { + const transformedTag: BeatTag = tag as any; + // configurations is the JS representation of the config yaml, + // so here we take that JS and convert it into a YAML string. + // we do so while also flattening "other" into the flat yaml beats expect + transformedTag.configuration_blocks = (tag.configuration_blocks || []).map(block => { + const { type, description, configs } = block; + const activeConfig = configs[0]; + const thisConfig = this.tagConfigs.find((conf: any) => conf.value === type).config; + const knownConfigIds = thisConfig + .map((config: any) => config.id) + .filter((id: string) => id !== 'other'); + + const picked = this.pickDeep(activeConfig, knownConfigIds); + + const convertedConfig = { + ...yaml.safeLoad(activeConfig.other || '{}'), + ...picked, + }; + + return { + type, + description, + configs: [this.hydrateTokenizedObject(convertedConfig)], + } as ConfigurationBlock; + }); + + return transformedTag; + }); + } + + /** + * This function takes an object that contains keys in the pattern of {{keyname}}, and replaces the key with the value of a matching key. + * Example input: + * { foo: 'here', '{{foo}}': 'there' } + * Would return: + * { foo: 'here', here: 'there' } + */ + private hydrateTokenizedObject(model: any) { + return JSON.parse(JSON.stringify(model), (key, value) => { + return _.isObject(value) && !_.isArray(value) + ? _.mapKeys(value, (v, k: string) => { + return k.replace(/{{[^{}]+}}/g, (token: string) => { + return model[token.replace(/[{}]+/g, '')]; + }); + }) + : value; + }); + } + + /** + * This function takes an array of strings and object and replaces strings in the array patching the patten of {{key}} with the matching value from the object. + * Example input: + * [ '{{key}}', 'other' ], and { key: 'here', foo: 'there' } + * Would return: + * [ 'here', 'other' ] + */ + private hydrateTokenArray(keys: string[], data: any) { + return keys.map(key => { + return key.replace(/{{[^{}]+}}/g, (token: string) => { + return data[token.replace(/[{}]+/g, '')]; + }); + }); + } + + private pickDeep(obj: any, keys: string[]) { + const copy = {}; + _.forEach(keys, key => { + if (_.has(obj, key)) { + const val = _.get(obj, key); + _.set(copy, key, val); + } + }); + return copy; + } +} diff --git a/x-pack/plugins/beats_management/public/pages/404.tsx b/x-pack/plugins/beats_management/public/pages/404.tsx new file mode 100644 index 0000000000000..956bf90e84927 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/404.tsx @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +export class NotFoundPage extends React.PureComponent { + public render() { + return
      No content found
      ; + } +} diff --git a/x-pack/plugins/beats_management/public/pages/beat/action_section.tsx b/x-pack/plugins/beats_management/public/pages/beat/action_section.tsx new file mode 100644 index 0000000000000..0ab8181794628 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/beat/action_section.tsx @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui'; +import { first, sortByOrder } from 'lodash'; +import moment from 'moment'; +import React from 'react'; +import { CMPopulatedBeat } from '../../../common/domain_types'; + +interface BeatDetailsActionSectionProps { + beat: CMPopulatedBeat | undefined; +} + +export const BeatDetailsActionSection = ({ beat }: BeatDetailsActionSectionProps) => ( +
      + {beat ? ( + + + + Type:  + {beat.type}. + + + + + Version:  + {beat.version}. + + + {/* TODO: We need a populated field before we can run this code + + + Uptime: 12min. + + */} + {beat.full_tags && + beat.full_tags.length > 0 && ( + + + Last Config Update:{' '} + + {moment( + first(sortByOrder(beat.full_tags, 'last_updated')).last_updated + ).fromNow()} + + . + + + )} + + ) : ( +
      Beat not found
      + )} +
      +); diff --git a/x-pack/plugins/beats_management/public/pages/beat/activity.tsx b/x-pack/plugins/beats_management/public/pages/beat/activity.tsx new file mode 100644 index 0000000000000..b2d40ad00427f --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/beat/activity.tsx @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { FrontendLibs } from '../../lib/lib'; + +interface BeatActivityPageProps { + libs: FrontendLibs; +} + +export const BeatActivityPage = (props: BeatActivityPageProps) =>
      Beat Activity View
      ; diff --git a/x-pack/plugins/beats_management/public/pages/beat/detail.tsx b/x-pack/plugins/beats_management/public/pages/beat/detail.tsx new file mode 100644 index 0000000000000..6451f48b156dd --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/beat/detail.tsx @@ -0,0 +1,134 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiFlexGroup, + EuiFlexItem, + // @ts-ignore EuiInMemoryTable typings not yet available + EuiInMemoryTable, + EuiLink, + EuiText, + EuiTitle, +} from '@elastic/eui'; +import { flatten, get } from 'lodash'; +import React from 'react'; +import { TABLE_CONFIG } from '../../../common/constants'; +import { BeatTag, CMPopulatedBeat, ConfigurationBlock } from '../../../common/domain_types'; +import { ConnectedLink } from '../../components/connected_link'; +import { TagBadge } from '../../components/tag'; +import { ConfigView } from '../../components/tag/config_view/index'; +import { supportedConfigs } from '../../config_schemas'; + +interface PageProps { + beat: CMPopulatedBeat | undefined; +} + +interface PageState { + selectedConfig: ConfigurationBlock | null; +} + +export class BeatDetailPage extends React.PureComponent { + constructor(props: PageProps) { + super(props); + + this.state = { + selectedConfig: null, + }; + } + public render() { + const props = this.props; + const { beat } = props; + if (!beat) { + return
      Beat not found
      ; + } + const configurationBlocks = flatten( + beat.full_tags.map((tag: BeatTag) => { + return tag.configuration_blocks.map(configuration => ({ + // @ts-ignore one of the types on ConfigurationBlock doesn't define a "module" property + module: configuration.configs[0].module || null, + tagId: tag.id, + tagColor: tag.color, + ...beat, + ...configuration, + displayValue: get( + supportedConfigs.find(config => config.value === configuration.type), + 'text', + null + ), + })); + }) + ); + + const columns = [ + { + field: 'displayValue', + name: 'Type', + sortable: true, + render: (value: string | null, configuration: any) => ( + { + this.setState({ + selectedConfig: configuration, + }); + }} + > + {value || configuration.type} + + ), + }, + { + field: 'module', + name: 'Module', + sortable: true, + }, + { + field: 'description', + name: 'Description', + sortable: true, + }, + { + field: 'tagId', + name: 'Tag', + render: (id: string, block: any) => ( + + + + ), + sortable: true, + }, + ]; + return ( + + + + +

      Configurations

      +
      + +

      + You can have multiple configurations applied to an individual tag. These + configurations can repeat or mix types as necessary. For example, you may utilize + three metricbeat configurations alongside one input and filebeat configuration. +

      +
      +
      + + + +
      + {this.state.selectedConfig && ( + this.setState({ selectedConfig: null })} + /> + )} +
      + ); + } +} diff --git a/x-pack/plugins/beats_management/public/pages/beat/index.tsx b/x-pack/plugins/beats_management/public/pages/beat/index.tsx new file mode 100644 index 0000000000000..0b61d8da2fcce --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/beat/index.tsx @@ -0,0 +1,157 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiSpacer, + // @ts-ignore types for EuiTab not currently available + EuiTab, + // @ts-ignore types for EuiTabs not currently available + EuiTabs, +} from '@elastic/eui'; +import React from 'react'; +import { Route, Switch } from 'react-router-dom'; +import { CMPopulatedBeat } from '../../../common/domain_types'; +import { AppURLState } from '../../app'; +import { PrimaryLayout } from '../../components/layouts/primary'; +import { URLStateProps, withUrlState } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; +import { BeatDetailsActionSection } from './action_section'; +import { BeatActivityPage } from './activity'; +import { BeatDetailPage } from './detail'; +import { BeatTagsPage } from './tags'; + +interface Match { + params: any; +} + +interface BeatDetailsPageProps extends URLStateProps { + location: any; + history: any; + libs: FrontendLibs; + match: Match; +} + +interface BeatDetailsPageState { + beat: CMPopulatedBeat | undefined; + beatId: string; + isLoading: boolean; +} + +class BeatDetailsPageComponent extends React.PureComponent< + BeatDetailsPageProps, + BeatDetailsPageState +> { + constructor(props: BeatDetailsPageProps) { + super(props); + + this.state = { + beat: undefined, + beatId: this.props.match.params.beatId, + isLoading: true, + }; + this.loadBeat(); + } + + public onSelectedTabChanged = (id: string) => { + this.props.history.push({ + pathname: id, + search: this.props.location.search, + }); + }; + + public render() { + const { beat } = this.state; + let id; + let name; + + if (beat) { + id = beat.id; + name = beat.name; + } + const title = this.state.isLoading + ? 'Loading' + : `Beat: ${name || 'No name receved from beat'} (id: ${id})`; + + const tabs = [ + { + id: `/beat/${id}`, + name: 'Config', + disabled: false, + }, + // { + // id: `/beat/${id}/activity`, + // name: 'Beat Activity', + // disabled: false, + // }, + { + id: `/beat/${id}/tags`, + name: 'Configuration Tags', + disabled: false, + }, + ]; + + return ( + }> + + {tabs.map((tab, index) => ( + { + this.props.history.push({ + pathname: tab.id, + search: this.props.location.search, + }); + }} + > + {tab.name} + + ))} + + + + } + /> + ( + this.loadBeat()} + {...props} + /> + )} + /> + ( + + )} + /> + + + ); + } + + private async loadBeat() { + const { beatId } = this.props.match.params; + let beat; + try { + beat = await this.props.libs.beats.get(beatId); + if (!beat) { + throw new Error('beat not found'); + } + } catch (e) { + throw new Error(e); + } + this.setState({ beat, isLoading: false }); + } +} +export const BeatDetailsPage = withUrlState(BeatDetailsPageComponent); diff --git a/x-pack/plugins/beats_management/public/pages/beat/tags.tsx b/x-pack/plugins/beats_management/public/pages/beat/tags.tsx new file mode 100644 index 0000000000000..9d0a693e8efa7 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/beat/tags.tsx @@ -0,0 +1,67 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiGlobalToastList } from '@elastic/eui'; +import React from 'react'; +import { CMPopulatedBeat } from '../../../common/domain_types'; +import { BeatDetailTagsTable, Table } from '../../components/table'; +import { FrontendLibs } from '../../lib/lib'; + +interface BeatTagsPageProps { + beatId: string; + libs: FrontendLibs; + refreshBeat(): void; +} + +interface BeatTagsPageState { + beat: CMPopulatedBeat | null; + notifications: any[]; +} + +export class BeatTagsPage extends React.PureComponent { + private tableRef = React.createRef
      (); + constructor(props: BeatTagsPageProps) { + super(props); + + this.state = { + beat: null, + notifications: [], + }; + } + + public async componentWillMount() { + await this.getBeat(); + } + + public render() { + const { beat } = this.state; + return ( +
      +
      + + this.setState({ notifications: [] })} + toastLifeTimeMs={5000} + /> + + ); + } + + private getBeat = async () => { + try { + const beat = await this.props.libs.beats.get(this.props.beatId); + this.setState({ beat }); + } catch (e) { + throw new Error(e); + } + }; +} diff --git a/x-pack/plugins/beats_management/public/pages/enforce_security.tsx b/x-pack/plugins/beats_management/public/pages/enforce_security.tsx new file mode 100644 index 0000000000000..2b29c01663e11 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/enforce_security.tsx @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import * as React from 'react'; +import { NoDataLayout } from '../components/layouts/no_data'; + +export const EnforceSecurityPage: React.SFC = () => ( + +

      You must enable security in Kibana and Elasticsearch to use Beats central management.

      +
      +); diff --git a/x-pack/plugins/beats_management/public/pages/invalid_license.tsx b/x-pack/plugins/beats_management/public/pages/invalid_license.tsx new file mode 100644 index 0000000000000..c04f5a4acec15 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/invalid_license.tsx @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import * as React from 'react'; +import { NoDataLayout } from '../components/layouts/no_data'; + +export const InvalidLicensePage: React.SFC = () => ( + +

      + Your current license is expired. Enrolled Beats will continue to work, but you need a valid + license to access the Beats Management UI. +

      +
      +); diff --git a/x-pack/plugins/beats_management/public/pages/main/activity.tsx b/x-pack/plugins/beats_management/public/pages/main/activity.tsx new file mode 100644 index 0000000000000..5aa523e3a32f8 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/activity.tsx @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +export class ActivityPage extends React.PureComponent { + public render() { + return
      activity logs view
      ; + } +} diff --git a/x-pack/plugins/beats_management/public/pages/main/beats.tsx b/x-pack/plugins/beats_management/public/pages/main/beats.tsx new file mode 100644 index 0000000000000..568b1583012af --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/beats.tsx @@ -0,0 +1,313 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiButton, + EuiButtonEmpty, + EuiGlobalToastList, + EuiModal, + EuiModalBody, + EuiModalHeader, + EuiModalHeaderTitle, + EuiOverlayMask, +} from '@elastic/eui'; +import { flatten, intersection, sortBy } from 'lodash'; +import moment from 'moment'; +import React from 'react'; +import { RouteComponentProps } from 'react-router'; +import { UNIQUENESS_ENFORCING_TYPES } from 'x-pack/plugins/beats_management/common/constants'; +import { BeatTag, CMPopulatedBeat, ConfigurationBlock } from '../../../common/domain_types'; +import { BeatsTagAssignment } from '../../../server/lib/adapters/beats/adapter_types'; +import { AppURLState } from '../../app'; +import { BeatsTableType, Table } from '../../components/table'; +import { beatsListAssignmentOptions } from '../../components/table/assignment_schema'; +import { AssignmentActionType } from '../../components/table/table'; +import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion'; +import { URLStateProps } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; +import { EnrollBeatPage } from './enroll_fragment'; + +interface BeatsPageProps extends URLStateProps { + libs: FrontendLibs; + location: any; + beats: CMPopulatedBeat[]; + loadBeats: () => any; +} + +interface BeatsPageState { + notifications: any[]; + tableRef: any; + tags: any[] | null; +} + +interface ActionAreaProps extends URLStateProps, RouteComponentProps { + libs: FrontendLibs; +} + +export class BeatsPage extends React.PureComponent { + public static ActionArea = (props: ActionAreaProps) => ( + + { + // random, but specific number ensures new tab does not overwrite another _newtab in chrome + // and at the same time not truly random so that many clicks of the link open many tabs at this same URL + window.open( + 'https://www.elastic.co/guide/en/beats/libbeat/current/getting-started.html', + '_newtab35628937456' + ); + }} + > + Learn how to install beats + + { + props.goTo(`/overview/beats/enroll`); + }} + > + Enroll Beats + + + {props.location.pathname === '/overview/beats/enroll' && ( + + { + props.goTo(`/overview/beats`); + }} + style={{ width: '640px' }} + > + + Enroll a new Beat + + + + + + + )} + + ); + constructor(props: BeatsPageProps) { + super(props); + + this.state = { + notifications: [], + tableRef: React.createRef(), + tags: null, + }; + } + + public componentDidUpdate(prevProps: any) { + if (this.props.location !== prevProps.location) { + this.props.loadBeats(); + } + } + public render() { + return ( +
      + + {autocompleteProps => ( +
      this.props.setUrlState({ beatsKBar: value }), // todo + onSubmit: () => null, // todo + value: this.props.urlState.beatsKBar || '', + }} + assignmentOptions={{ + items: this.filterSelectedBeatTags(), + schema: beatsListAssignmentOptions, + type: 'assignment', + actionHandler: this.handleBeatsActions, + }} + items={sortBy(this.props.beats, 'id') || []} + ref={this.state.tableRef} + type={BeatsTableType} + /> + )} + + this.setState({ notifications: [] })} + toastLifeTimeMs={5000} + /> + + ); + } + + private handleBeatsActions = (action: AssignmentActionType, payload: any) => { + switch (action) { + case AssignmentActionType.Assign: + this.handleBeatTagAssignment(payload); + break; + case AssignmentActionType.Edit: + // TODO: navigate to edit page + break; + case AssignmentActionType.Delete: + this.deleteSelected(); + break; + case AssignmentActionType.Reload: + this.loadTags(); + break; + } + + this.props.loadBeats(); + }; + + private handleBeatTagAssignment = async (tagId: string) => { + const selected = this.getSelectedBeats(); + if (selected.some(beat => beat.full_tags.some(({ id }) => id === tagId))) { + await this.removeTagsFromBeats(selected, tagId); + } else { + await this.assignTagsToBeats(selected, tagId); + } + }; + + private deleteSelected = async () => { + const selected = this.getSelectedBeats(); + for (const beat of selected) { + await this.props.libs.beats.update(beat.id, { active: false }); + } + + this.notifyBeatDisenrolled(selected); + + // because the compile code above has a very minor race condition, we wait, + // the max race condition time is really 10ms but doing 100 to be safe + setTimeout(async () => { + await this.props.loadBeats(); + }, 100); + }; + + private loadTags = async () => { + const tags = await this.props.libs.tags.getAll(); + this.setState({ + tags, + }); + }; + + private createBeatTagAssignments = ( + beats: CMPopulatedBeat[], + tagId: string + ): BeatsTagAssignment[] => beats.map(({ id }) => ({ beatId: id, tag: tagId })); + + private removeTagsFromBeats = async (beats: CMPopulatedBeat[], tagId: string) => { + if (beats.length) { + const assignments = this.createBeatTagAssignments(beats, tagId); + await this.props.libs.beats.removeTagsFromBeats(assignments); + await this.refreshData(); + this.notifyUpdatedTagAssociation('remove', assignments, tagId); + } + }; + + private assignTagsToBeats = async (beats: CMPopulatedBeat[], tagId: string) => { + if (beats.length) { + const assignments = this.createBeatTagAssignments(beats, tagId); + await this.props.libs.beats.assignTagsToBeats(assignments); + await this.refreshData(); + this.notifyUpdatedTagAssociation('add', assignments, tagId); + } + }; + + private notifyBeatDisenrolled = async (beats: CMPopulatedBeat[]) => { + let title; + let text; + if (beats.length === 1) { + title = `"${beats[0].name || beats[0].id}" disenrolled`; + text = `Beat with ID "${beats[0].id}" was disenrolled.`; + } else { + title = `${beats.length} beats disenrolled`; + } + + this.setState({ + notifications: this.state.notifications.concat({ + color: 'warning', + id: `disenroll_${new Date()}`, + title, + text, + }), + }); + }; + + private notifyUpdatedTagAssociation = ( + action: 'add' | 'remove', + assignments: BeatsTagAssignment[], + tag: string + ) => { + const actionName = action === 'remove' ? 'Removed' : 'Added'; + const preposition = action === 'remove' ? 'from' : 'to'; + const beatMessage = + assignments.length && assignments.length === 1 + ? `beat "${this.getNameForBeatId(assignments[0].beatId)}"` + : `${assignments.length} beats`; + this.setState({ + notifications: this.state.notifications.concat({ + color: 'success', + id: `tag-${moment.now()}`, + text:

      {`${actionName} tag "${tag}" ${preposition} ${beatMessage}.`}

      , + title: `Tag ${actionName}`, + }), + }); + }; + + private getNameForBeatId = (beatId: string) => { + const beat = this.props.beats.find(b => b.id === beatId); + if (beat) { + return beat.name; + } + return null; + }; + + private refreshData = async () => { + await this.loadTags(); + await this.props.loadBeats(); + this.state.tableRef.current.setSelection(this.getSelectedBeats()); + }; + + private getSelectedBeats = (): CMPopulatedBeat[] => { + const selectedIds = this.state.tableRef.current.state.selection.map((beat: any) => beat.id); + const beats: CMPopulatedBeat[] = []; + selectedIds.forEach((id: any) => { + const beat: CMPopulatedBeat | undefined = this.props.beats.find(b => b.id === id); + if (beat) { + beats.push(beat); + } + }); + return beats; + }; + + private filterSelectedBeatTags = () => { + if (!this.state.tags) { + return []; + } + return this.selectedBeatConfigsRequireUniqueness() + ? this.state.tags.map(this.disableTagForUniquenessEnforcement) + : this.state.tags; + }; + + private configBlocksRequireUniqueness = (configurationBlocks: ConfigurationBlock[]) => + intersection(UNIQUENESS_ENFORCING_TYPES, configurationBlocks.map(block => block.type)) + .length !== 0; + + private disableTagForUniquenessEnforcement = (tag: BeatTag) => + this.configBlocksRequireUniqueness(tag.configuration_blocks) && + // if > 0 beats are associated with the tag, it will result in disassociation, so do not disable it + !this.getSelectedBeats().some(beat => beat.full_tags.some(({ id }) => id === tag.id)) + ? { ...tag, disabled: true } + : tag; + + private selectedBeatConfigsRequireUniqueness = () => + // union beat tags + flatten(this.getSelectedBeats().map(({ full_tags }) => full_tags)) + // map tag list to bool + .map(({ configuration_blocks }) => this.configBlocksRequireUniqueness(configuration_blocks)) + // reduce to result + .reduce((acc, cur) => acc || cur, false); +} diff --git a/x-pack/plugins/beats_management/public/pages/main/create_tag_fragment.tsx b/x-pack/plugins/beats_management/public/pages/main/create_tag_fragment.tsx new file mode 100644 index 0000000000000..8db80bd2ec9be --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/create_tag_fragment.tsx @@ -0,0 +1,110 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiSpacer } from '@elastic/eui'; +import 'brace/mode/yaml'; + +import 'brace/theme/github'; +import React from 'react'; +import { BeatTag } from '../../../common/domain_types'; +import { AppURLState } from '../../app'; +import { TagEdit } from '../../components/tag'; +import { URLStateProps, withUrlState } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; + +interface TagPageProps extends URLStateProps { + libs: FrontendLibs; + match: any; +} + +interface TagPageState { + showFlyout: boolean; + tag: BeatTag; +} + +export class CreateTagFragment extends React.PureComponent { + private mode: 'edit' | 'create' = 'create'; + constructor(props: TagPageProps) { + super(props); + this.state = { + showFlyout: false, + tag: { + id: props.urlState.createdTag ? props.urlState.createdTag : '', + color: '#DD0A73', + configuration_blocks: [], + last_updated: new Date(), + }, + }; + + if (props.urlState.createdTag) { + this.mode = 'edit'; + this.loadTag(); + } + } + + public render() { + return ( + + { + this.props.libs.beats.removeTagsFromBeats( + beatIds.map(id => { + return { beatId: id, tag: this.state.tag.id }; + }) + ); + }} + onTagChange={(field: string, value: string | number) => + this.setState(oldState => ({ + tag: { ...oldState.tag, [field]: value }, + })) + } + attachedBeats={null} + /> + + + + + + + Save & Continue + + + + + ); + } + + private loadTag = async () => { + const tags = await this.props.libs.tags.getTagsWithIds([this.state.tag.id]); + if (tags.length > 0) { + this.setState({ + tag: tags[0], + }); + } + }; + + private saveTag = async () => { + const newTag = await this.props.libs.tags.upsertTag(this.state.tag as BeatTag); + if (!newTag) { + return alert('error saving tag'); + } + this.props.setUrlState({ + createdTag: newTag.id, + }); + this.props.goTo(`/overview/initial/finish`); + }; +} +export const CreateTagPageFragment = withUrlState(CreateTagFragment); diff --git a/x-pack/plugins/beats_management/public/pages/main/enroll_fragment.tsx b/x-pack/plugins/beats_management/public/pages/main/enroll_fragment.tsx new file mode 100644 index 0000000000000..25c34c9720c06 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/enroll_fragment.tsx @@ -0,0 +1,279 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { + // @ts-ignore typings for EuiBasicTable not present in current version + EuiBasicTable, + EuiButton, + EuiFlexGroup, + EuiFlexItem, + EuiLoadingSpinner, + EuiModalBody, + // @ts-ignore + EuiSelect, + EuiTitle, +} from '@elastic/eui'; +import { capitalize } from 'lodash'; +import React from 'react'; +import { RouteComponentProps } from 'react-router'; +import { CMBeat } from '../../../common/domain_types'; +import { AppURLState } from '../../app'; +import { URLStateProps, withUrlState } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; + +interface BeatsProps extends URLStateProps, RouteComponentProps { + match: any; + libs: FrontendLibs; +} +export class EnrollBeat extends React.Component { + private pinging = false; + constructor(props: BeatsProps) { + super(props); + + this.state = { + enrolledBeat: null, + command: 'sudo filebeat', + beatType: 'filebeat', + }; + } + public pingForBeatWithToken = async ( + libs: FrontendLibs, + token: string + ): Promise => { + try { + const beats = await libs.beats.getBeatWithToken(token); + if (!beats) { + throw new Error('no beats'); + } + return beats; + } catch (err) { + if (this.pinging) { + const timeout = (ms: number) => new Promise(res => setTimeout(res, ms)); + await timeout(5000); + return await this.pingForBeatWithToken(libs, token); + } + } + }; + public async componentDidMount() { + if (!this.props.urlState.enrollmentToken) { + const enrollmentToken = await this.props.libs.tokens.createEnrollmentToken(); + this.props.setUrlState({ + enrollmentToken, + }); + } + } + public waitForToken = async (token: string) => { + if (this.pinging) { + return; + } + this.pinging = true; + const enrolledBeat = (await this.pingForBeatWithToken(this.props.libs, token)) as CMBeat; + + this.setState({ + enrolledBeat, + }); + this.pinging = false; + }; + public render() { + if (!this.props.urlState.enrollmentToken) { + return null; + } + if (this.props.urlState.enrollmentToken && !this.state.enrolledBeat) { + this.waitForToken(this.props.urlState.enrollmentToken); + } + const { goTo } = this.props; + + const actions = []; + + switch (this.props.location.pathname) { + case '/overview/initial/beats': + actions.push({ + goTo: '/overview/initial/tag', + name: 'Continue', + }); + break; + case '/overview/beats/enroll': + actions.push({ + goTo: '/overview/beats/enroll', + name: 'Enroll another Beat', + newToken: true, + }); + actions.push({ + goTo: '/overview/beats', + name: 'Done', + clearToken: true, + }); + break; + } + + return ( + + {!this.state.enrolledBeat && ( + + + + + + +

      Beat type:

      +
      +
      +
      + this.setState({ beatType: e.target.value })} + fullWidth={true} + /> +
      +
      + +
      +
      + + + + + +

      Platform:

      +
      +
      +
      + ${ + this.state.beatType + }.exe`, + text: 'Windows', + }, + { + value: `./${this.state.beatType}`, + text: 'MacOS', + }, + ]} + onChange={(e: any) => this.setState({ command: e.target.value })} + fullWidth={true} + /> +
      +
      +
      +
      + {this.state.command && ( + + + + + +

      + On the host where your {capitalize(this.state.beatType)} is installed, + run: +

      +
      +
      +
      +
      +
      + $ {this.state.command} enroll {window.location.protocol} + {`//`} + {window.location.host} + {this.props.libs.framework.baseURLPath + ? this.props.libs.framework.baseURLPath + : ''}{' '} + {this.props.urlState.enrollmentToken} +
      +
      +
      +
      + + + + + +

      Waiting for {capitalize(this.state.beatType)} to enroll...

      +
      +
      +
      +
      +
      +
      + +
      +
      + )} +
      + )} + {this.state.enrolledBeat && ( + + The Beat is now enrolled in central management: +
      +
      +
      + +
      +
      + {actions.map(action => ( + { + if (action.clearToken) { + this.props.setUrlState({ enrollmentToken: '' }); + } + + if (action.newToken) { + const enrollmentToken = await this.props.libs.tokens.createEnrollmentToken(); + + this.props.setUrlState({ enrollmentToken }); + return this.setState({ + enrolledBeat: null, + }); + } + goTo(action.goTo); + }} + > + {action.name} + + ))} +
      + )} +
      + ); + } +} + +export const EnrollBeatPage = withUrlState(EnrollBeat); diff --git a/x-pack/plugins/beats_management/public/pages/main/finish_walkthrough.tsx b/x-pack/plugins/beats_management/public/pages/main/finish_walkthrough.tsx new file mode 100644 index 0000000000000..13293f242e099 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/finish_walkthrough.tsx @@ -0,0 +1,101 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { EuiButton, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiPageContent } from '@elastic/eui'; +import React from 'react'; +import { RouteComponentProps } from 'react-router'; +import { BeatTag, CMBeat } from '../../../common/domain_types'; +import { BeatsTagAssignment } from '../../../server/lib/adapters/beats/adapter_types'; +import { AppURLState } from '../../app'; +import { URLStateProps, withUrlState } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; +interface PageProps extends URLStateProps, RouteComponentProps { + loadBeats: any; + libs: FrontendLibs; +} +export class FinishWalkthrough extends React.Component { + constructor(props: PageProps) { + super(props); + + this.state = { + assigned: false, + }; + } + + public componentDidMount() { + setTimeout(async () => { + await this.props.loadBeats(); + + const done = await this.assignTagToBeat(); + + if (done) { + this.setState({ + assigned: true, + }); + } + }, 300); + } + + public render() { + const { goTo } = this.props; + + return ( + + + + Your Beat is enrolled. What's next?} + body={ + +

      Start your Beat to check for configuration errors, then click Done.

      +
      + } + actions={ + { + goTo('/overview/beats'); + }} + > + Done + + } + /> +
      +
      +
      + ); + } + + private createBeatTagAssignments = (beats: CMBeat[], tag: BeatTag): BeatsTagAssignment[] => + beats.map(({ id }) => ({ beatId: id, tag: tag.id })); + + private assignTagToBeat = async () => { + if (!this.props.urlState.enrollmentToken) { + return alert('Invalid URL, no enrollmentToken found'); + } + if (!this.props.urlState.createdTag) { + return alert('Invalid URL, no createdTag found'); + } + + const beat = await this.props.libs.beats.getBeatWithToken(this.props.urlState.enrollmentToken); + if (!beat) { + return alert('Error: Beat not enrolled properly'); + } + const tags = await this.props.libs.tags.getTagsWithIds([this.props.urlState.createdTag]); + + const assignments = this.createBeatTagAssignments([beat], tags[0]); + await this.props.libs.beats.assignTagsToBeats(assignments); + this.props.setUrlState({ + createdTag: '', + enrollmentToken: '', + }); + return true; + }; +} + +export const FinishWalkthroughPage = withUrlState(FinishWalkthrough); diff --git a/x-pack/plugins/beats_management/public/pages/main/index.tsx b/x-pack/plugins/beats_management/public/pages/main/index.tsx new file mode 100644 index 0000000000000..e5334a622317d --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/index.tsx @@ -0,0 +1,254 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + // @ts-ignore + EuiTab, + // @ts-ignore + EuiTabs, +} from '@elastic/eui'; +import { EuiButton } from '@elastic/eui'; +import React from 'react'; +import { Redirect, Route, Switch } from 'react-router-dom'; +import { CMPopulatedBeat } from '../../../common/domain_types'; +import { AppURLState } from '../../app'; +import { ConnectedLink } from '../../components/connected_link'; +import { NoDataLayout } from '../../components/layouts/no_data'; +import { PrimaryLayout } from '../../components/layouts/primary'; +import { WalkthroughLayout } from '../../components/layouts/walkthrough'; +import { RouteWithBreadcrumb } from '../../components/route_with_breadcrumb'; +import { URLStateProps, withUrlState } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; +import { ActivityPage } from './activity'; +import { BeatsPage } from './beats'; +import { CreateTagPageFragment } from './create_tag_fragment'; +import { EnrollBeatPage } from './enroll_fragment'; +import { FinishWalkthroughPage } from './finish_walkthrough'; +import { TagsPage } from './tags'; + +interface MainPagesProps extends URLStateProps { + libs: FrontendLibs; + location: any; +} + +interface MainPagesState { + enrollBeat?: { + enrollmentToken: string; + } | null; + beats: CMPopulatedBeat[]; + unfilteredBeats: CMPopulatedBeat[]; + loadedBeatsAtLeastOnce: boolean; +} + +class MainPagesComponent extends React.PureComponent { + private mounted: boolean = false; + + constructor(props: MainPagesProps) { + super(props); + this.state = { + loadedBeatsAtLeastOnce: false, + beats: [], + unfilteredBeats: [], + }; + } + public onSelectedTabChanged = (id: string) => { + this.props.goTo(id); + }; + + public componentDidMount() { + this.mounted = true; + this.loadBeats(); + } + + public componentWillUnmount() { + this.mounted = false; + } + + public render() { + if ( + this.state.loadedBeatsAtLeastOnce && + this.state.unfilteredBeats.length === 0 && + !this.props.location.pathname.includes('/overview/initial') + ) { + return ; + } + const tabs = [ + { + id: '/overview/beats', + name: 'Enrolled Beats', + disabled: false, + }, + // { + // id: '/overview/activity', + // name: 'Beats Activity', + // disabled: false, + // }, + { + id: '/overview/tags', + name: 'Configuration tags', + disabled: false, + }, + ]; + + const walkthroughSteps = [ + { + id: '/overview/initial/beats', + name: 'Enroll Beat', + disabled: false, + page: EnrollBeatPage, + }, + { + id: '/overview/initial/tag', + name: 'Create tag', + disabled: false, + page: CreateTagPageFragment, + }, + { + id: '/overview/initial/finish', + name: 'finish', + disabled: false, + page: FinishWalkthroughPage, + }, + ]; + + if (this.props.location.pathname === '/overview/initial/help') { + return ( + + + Enroll Beat + + + } + > +

      Manage your configurations in a central location.

      +
      + ); + } + + if (this.props.location.pathname.includes('/overview/initial')) { + return ( + + + {walkthroughSteps.map(step => ( + ( + + )} + /> + ))} + + + ); + } + + const renderedTabs = tabs.map((tab, index) => ( + this.onSelectedTabChanged(tab.id)} + isSelected={tab.id === this.props.location.pathname} + disabled={tab.disabled} + key={index} + > + {tab.name} + + )); + + return ( + + ( + + )} + /> + ( + + )} + /> + + } + > + {renderedTabs} + + ( + + )} + /> + ( + + )} + /> + } + /> + + ); + } + + private loadBeats = async () => { + let query; + if (this.props.urlState.beatsKBar) { + query = await this.props.libs.elasticsearch.convertKueryToEsQuery( + this.props.urlState.beatsKBar + ); + } + + let beats: CMPopulatedBeat[]; + let unfilteredBeats: CMPopulatedBeat[]; + try { + [beats, unfilteredBeats] = await Promise.all([ + this.props.libs.beats.getAll(query), + this.props.libs.beats.getAll(), + ]); + } catch (e) { + beats = []; + unfilteredBeats = []; + } + if (this.mounted) { + this.setState({ + loadedBeatsAtLeastOnce: true, + beats, + unfilteredBeats, + }); + } + }; +} + +export const MainPages = withUrlState(MainPagesComponent); diff --git a/x-pack/plugins/beats_management/public/pages/main/tags.tsx b/x-pack/plugins/beats_management/public/pages/main/tags.tsx new file mode 100644 index 0000000000000..4d51880fbba08 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/main/tags.tsx @@ -0,0 +1,111 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton } from '@elastic/eui'; +import React from 'react'; +import { BeatTag } from '../../../common/domain_types'; +import { AppURLState } from '../../app'; +import { AssignmentActionType, Table, TagsTableType } from '../../components/table'; +import { tagListAssignmentOptions } from '../../components/table/assignment_schema'; +import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion'; +import { URLStateProps } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; + +interface TagsPageProps extends URLStateProps { + libs: FrontendLibs; +} + +interface TagsPageState { + tags: BeatTag[]; + tableRef: any; +} + +export class TagsPage extends React.PureComponent { + public static ActionArea = ({ goTo }: TagsPageProps) => ( + { + goTo('/tag/create'); + }} + > + Add Tag + + ); + + constructor(props: TagsPageProps) { + super(props); + + this.state = { + tags: [], + tableRef: React.createRef(), + }; + + this.loadTags(); + } + + public render() { + return ( + + {autocompleteProps => ( +
      this.props.setUrlState({ tagsKBar: value }), + onSubmit: () => null, // todo + value: this.props.urlState.tagsKBar || '', + }} + assignmentOptions={{ + schema: tagListAssignmentOptions, + type: 'primary', + items: [], + actionHandler: this.handleTagsAction, + }} + ref={this.state.tableRef} + items={this.state.tags} + type={TagsTableType} + /> + )} + + ); + } + + private handleTagsAction = async (action: AssignmentActionType, payload: any) => { + switch (action) { + case AssignmentActionType.Delete: + const tags = this.getSelectedTags().map((tag: BeatTag) => tag.id); + const success = await this.props.libs.tags.delete(tags); + if (!success) { + alert( + 'Some of these tags might be assigned to beats. Please ensure tags being removed are not activly assigned' + ); + } else { + this.loadTags(); + if (this.state.tableRef && this.state.tableRef.current) { + this.state.tableRef.current.resetSelection(); + } + } + break; + } + + this.loadTags(); + }; + + private getSelectedTags = () => { + return this.state.tableRef.current ? this.state.tableRef.current.state.selection : []; + }; + + private async loadTags() { + const tags = await this.props.libs.tags.getAll(); + this.setState({ + tags, + }); + } +} diff --git a/x-pack/plugins/beats_management/public/pages/no_access.tsx b/x-pack/plugins/beats_management/public/pages/no_access.tsx new file mode 100644 index 0000000000000..4e04e2c2fad70 --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/no_access.tsx @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import * as React from 'react'; +import { NoDataLayout } from '../components/layouts/no_data'; + +export const NoAccessPage: React.SFC = () => ( + +

      + You are not authorized to access Beats central management. To use Beats central management, + you need the privileges granted by the `beats_admin` role. +

      +
      +); diff --git a/x-pack/plugins/beats_management/public/pages/tag/index.tsx b/x-pack/plugins/beats_management/public/pages/tag/index.tsx new file mode 100644 index 0000000000000..9655efc64ddbf --- /dev/null +++ b/x-pack/plugins/beats_management/public/pages/tag/index.tsx @@ -0,0 +1,144 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import 'brace/mode/yaml'; +import 'brace/theme/github'; + +import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui'; +import * as euiVars from '@elastic/eui/dist/eui_theme_k6_light.json'; +import { sample } from 'lodash'; +import React from 'react'; +import { UNIQUENESS_ENFORCING_TYPES } from 'x-pack/plugins/beats_management/common/constants'; +import { BeatTag, CMPopulatedBeat } from '../../../common/domain_types'; +import { AppURLState } from '../../app'; +import { PrimaryLayout } from '../../components/layouts/primary'; +import { TagEdit } from '../../components/tag'; +import { URLStateProps, withUrlState } from '../../containers/with_url_state'; +import { FrontendLibs } from '../../lib/lib'; +interface TagPageProps extends URLStateProps { + libs: FrontendLibs; + match: any; +} + +interface TagPageState { + showFlyout: boolean; + attachedBeats: CMPopulatedBeat[] | null; + tag: BeatTag; +} +export class TagPageComponent extends React.PureComponent { + private mode: 'edit' | 'create' = 'create'; + constructor(props: TagPageProps) { + super(props); + const randomColor = sample( + Object.keys(euiVars) + .filter(key => key.startsWith('euiColorVis')) + .map(key => (euiVars as any)[key]) + ); + + this.state = { + showFlyout: false, + attachedBeats: null, + tag: { + id: props.match.params.action === 'create' ? '' : props.match.params.tagid, + color: this.rgb2hex(randomColor), + configuration_blocks: [], + last_updated: new Date(), + }, + }; + + if (props.match.params.action !== 'create') { + this.mode = 'edit'; + this.loadTag(); + this.loadAttachedBeats(); + } + } + public render() { + return ( + +
      + { + await this.props.libs.beats.removeTagsFromBeats( + beatIds.map(id => { + return { beatId: id, tag: this.state.tag.id }; + }) + ); + await this.loadAttachedBeats(); + }} + onTagChange={(field: string, value: string | number) => + this.setState(oldState => ({ + tag: { ...oldState.tag, [field]: value }, + })) + } + attachedBeats={this.state.attachedBeats} + /> + + + + 1 // || this.state.tag.configuration_blocks.length === 0 + } + onClick={this.saveTag} + > + Save + + + + this.props.goTo('/overview/tags')}> + Cancel + + + +
      +
      + ); + } + private rgb2hex(rgb: string) { + const matchedrgb = rgb.match( + /^rgba?[\s+]?\([\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?,[\s+]?(\d+)[\s+]?/i + ); + return matchedrgb && matchedrgb.length === 4 + ? '#' + + ('0' + parseInt(matchedrgb[1], 10).toString(16)).slice(-2) + + ('0' + parseInt(matchedrgb[2], 10).toString(16)).slice(-2) + + ('0' + parseInt(matchedrgb[3], 10).toString(16)).slice(-2) + : ''; + } + private loadTag = async () => { + const tags = await this.props.libs.tags.getTagsWithIds([this.props.match.params.tagid]); + if (tags.length === 0) { + // TODO do something to error + } + this.setState({ + tag: tags[0], + }); + }; + + private loadAttachedBeats = async () => { + const beats = await this.props.libs.beats.getBeatsWithTag(this.props.match.params.tagid); + + this.setState({ + attachedBeats: beats, + }); + }; + private saveTag = async () => { + await this.props.libs.tags.upsertTag(this.state.tag as BeatTag); + this.props.goTo(`/overview/tags`); + }; + private getNumExclusiveConfigurationBlocks = () => + this.state.tag.configuration_blocks + .map(({ type }) => UNIQUENESS_ENFORCING_TYPES.some(uniqueType => uniqueType === type)) + .reduce((acc, cur) => (cur ? acc + 1 : acc), 0); +} +export const TagPage = withUrlState(TagPageComponent); diff --git a/x-pack/plugins/beats_management/public/router.tsx b/x-pack/plugins/beats_management/public/router.tsx new file mode 100644 index 0000000000000..3117bf2d07bf7 --- /dev/null +++ b/x-pack/plugins/beats_management/public/router.tsx @@ -0,0 +1,89 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { HashRouter, Redirect, Route, Switch } from 'react-router-dom'; +import { Header } from './components/layouts/header'; +import { BreadcrumbConsumer, RouteWithBreadcrumb } from './components/route_with_breadcrumb'; +import { FrontendLibs } from './lib/lib'; +import { BeatDetailsPage } from './pages/beat'; +import { EnforceSecurityPage } from './pages/enforce_security'; +import { InvalidLicensePage } from './pages/invalid_license'; +import { MainPages } from './pages/main'; +import { NoAccessPage } from './pages/no_access'; +import { TagPage } from './pages/tag'; + +export const PageRouter: React.SFC<{ libs: FrontendLibs }> = ({ libs }) => { + return ( + +
      + + {({ breadcrumbs }) => ( +
      + )} + + + {libs.framework.licenseExpired() && } />} + {!libs.framework.securityEnabled() && } />} + {!libs.framework.getCurrentUser() || + (!libs.framework.getCurrentUser().roles.includes('beats_admin') && + !libs.framework + .getDefaultUserRoles() + .some(r => libs.framework.getCurrentUser().roles.includes(r)) && ( + } /> + ))} + } + /> + } /> + { + return `Beats: ${params.beatId}`; + }} + parentBreadcrumbs={[ + { + text: 'Beats List', + href: '#/management/beats_management/overview/beats', + }, + ]} + path="/beat/:beatId" + render={(props: any) => } + /> + { + if (params.action === 'create') { + return 'Create Tag'; + } + return `Tag: ${params.tagid}`; + }} + parentBreadcrumbs={[ + { + text: 'Tags List', + href: '#/management/beats_management/overview/tags', + }, + ]} + path="/tag/:action/:tagid?" + render={(props: any) => } + /> + +
      +
      + ); +}; diff --git a/x-pack/plugins/beats_management/public/utils/typed_react.ts b/x-pack/plugins/beats_management/public/utils/typed_react.ts new file mode 100644 index 0000000000000..5557befa9d7e5 --- /dev/null +++ b/x-pack/plugins/beats_management/public/utils/typed_react.ts @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { omit } from 'lodash'; +import React from 'react'; +import { InferableComponentEnhancerWithProps } from 'react-redux'; + +export type RendererResult = React.ReactElement | null; +export type RendererFunction = (args: RenderArgs) => Result; + +export type ChildFunctionRendererProps = { + children: RendererFunction; + initializeOnMount?: boolean; + resetOnUnmount?: boolean; +} & RenderArgs; + +interface ChildFunctionRendererOptions { + onInitialize?: (props: RenderArgs) => void; + onCleanup?: (props: RenderArgs) => void; +} + +export const asChildFunctionRenderer = ( + hoc: InferableComponentEnhancerWithProps, + { onInitialize, onCleanup }: ChildFunctionRendererOptions = {} +) => + hoc( + class ChildFunctionRenderer extends React.Component> { + public displayName = 'ChildFunctionRenderer'; + + public componentDidMount() { + if (this.props.initializeOnMount && onInitialize) { + onInitialize(this.getRendererArgs()); + } + } + + public componentWillUnmount() { + if (this.props.resetOnUnmount && onCleanup) { + onCleanup(this.getRendererArgs()); + } + } + + public render() { + return this.props.children(this.getRendererArgs()); + } + + private getRendererArgs = () => + omit(['children', 'initializeOnMount', 'resetOnUnmount'], this.props) as Pick< + ChildFunctionRendererProps, + keyof InjectedProps + >; + } + ); + +export type StateUpdater = ( + prevState: Readonly, + prevProps: Readonly +) => State | null; + +export function composeStateUpdaters(...updaters: Array>) { + return (state: State, props: Props) => + updaters.reduce((currentState, updater) => updater(currentState, props) || currentState, state); +} diff --git a/x-pack/plugins/beats_management/readme.md b/x-pack/plugins/beats_management/readme.md new file mode 100644 index 0000000000000..3a9717a58f9a5 --- /dev/null +++ b/x-pack/plugins/beats_management/readme.md @@ -0,0 +1,22 @@ +# Documentation for Beats CM in x-pack kibana + +Notes: +Falure to have auth enabled in Kibana will make for a broken UI. UI based errors not yet in place + +### Run tests + +``` +node scripts/jest.js plugins/beats --watch +``` + +and for functional... (from x-pack root) + +``` + node scripts/functional_tests --config test/api_integration/config +``` + +### Run command to fake an enrolling beat (from beats_management dir) + +``` +node scripts/enroll.js +``` diff --git a/x-pack/plugins/beats_management/scripts/enroll.js b/x-pack/plugins/beats_management/scripts/enroll.js new file mode 100644 index 0000000000000..e1639be281da4 --- /dev/null +++ b/x-pack/plugins/beats_management/scripts/enroll.js @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +const request = require('request'); +const Chance = require('chance'); // eslint-disable-line +const args = process.argv.slice(2); +const chance = new Chance(); + +const enroll = async token => { + const beatId = chance.word(); + + await request( + { + url: `http://localhost:5601/api/beats/agent/${beatId}`, + method: 'POST', + headers: { + 'kbn-xsrf': 'xxx', + 'kbn-beats-enrollment-token': token, + }, + body: JSON.stringify({ + type: 'filebeat', + host_name: `${chance.word()}.bar.com`, + name: chance.word(), + version: '6.3.0', + }), + }, + (error, response, body) => { + console.log(error, body); + } + ); +}; + +enroll(args[0]); diff --git a/x-pack/plugins/beats_management/server/kibana.index.ts b/x-pack/plugins/beats_management/server/kibana.index.ts new file mode 100644 index 0000000000000..dd7bc443bc603 --- /dev/null +++ b/x-pack/plugins/beats_management/server/kibana.index.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { compose } from './lib/compose/kibana'; +import { initManagementServer } from './management_server'; + +export const initServerWithKibana = (hapiServer: any) => { + const libs = compose(hapiServer); + initManagementServer(libs); +}; diff --git a/x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts new file mode 100644 index 0000000000000..74c778fbe5672 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/beats/adapter_types.ts @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMBeat } from '../../../../common/domain_types'; +import { FrameworkUser } from '../framework/adapter_types'; + +export interface CMBeatsAdapter { + insert(user: FrameworkUser, beat: CMBeat): Promise; + update(user: FrameworkUser, beat: CMBeat): Promise; + get(user: FrameworkUser, id: string): Promise; + getAll(user: FrameworkUser, ESQuery?: any): Promise; + getWithIds(user: FrameworkUser, beatIds: string[]): Promise; + getAllWithTags(user: FrameworkUser, tagIds: string[]): Promise; + getBeatWithToken(user: FrameworkUser, enrollmentToken: string): Promise; + removeTagsFromBeats( + user: FrameworkUser, + removals: BeatsTagAssignment[] + ): Promise; + assignTagsToBeats( + user: FrameworkUser, + assignments: BeatsTagAssignment[] + ): Promise; +} + +export interface BeatsTagAssignment { + beatId: string; + tag: string; + idxInRequest?: number; +} + +interface BeatsReturnedTagAssignment { + status: number | null; + result?: string; +} + +export interface CMAssignmentReturn { + assignments: BeatsReturnedTagAssignment[]; +} + +export interface BeatsRemovalReturn { + removals: BeatsReturnedTagAssignment[]; +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts new file mode 100644 index 0000000000000..e8307e09b6567 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/beats/elasticsearch_beats_adapter.ts @@ -0,0 +1,241 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { flatten, get as _get, omit } from 'lodash'; +import { INDEX_NAMES } from '../../../../common/constants'; +import { CMBeat } from '../../../../common/domain_types'; +import { DatabaseAdapter } from '../database/adapter_types'; + +import { FrameworkUser } from '../framework/adapter_types'; +import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types'; + +export class ElasticsearchBeatsAdapter implements CMBeatsAdapter { + private database: DatabaseAdapter; + + constructor(database: DatabaseAdapter) { + this.database = database; + } + + public async get(user: FrameworkUser, id: string) { + const params = { + id: `beat:${id}`, + ignore: [404], + index: INDEX_NAMES.BEATS, + type: '_doc', + }; + + const response = await this.database.get(user, params); + if (!response.found) { + return null; + } + + return _get(response, '_source.beat'); + } + + public async insert(user: FrameworkUser, beat: CMBeat) { + beat.config_status = 'UNKNOWN'; + const body = { + beat, + type: 'beat', + }; + + await this.database.index(user, { + body, + id: `beat:${beat.id}`, + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }); + } + + public async update(user: FrameworkUser, beat: CMBeat) { + const body = { + beat, + type: 'beat', + }; + + const params = { + body, + id: `beat:${beat.id}`, + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }; + await this.database.index(user, params); + } + + public async getWithIds(user: FrameworkUser, beatIds: string[]) { + const ids = beatIds.map(beatId => `beat:${beatId}`); + + const params = { + _sourceIncludes: ['beat.id', 'beat.verified_on'], + body: { + ids, + }, + index: INDEX_NAMES.BEATS, + type: '_doc', + }; + const response = await this.database.mget(user, params); + + return _get(response, 'docs', []) + .filter((b: any) => b.found) + .map((b: any) => b._source.beat); + } + + public async getAllWithTags(user: FrameworkUser, tagIds: string[]): Promise { + const params = { + ignore: [404], + index: INDEX_NAMES.BEATS, + type: '_doc', + body: { + query: { + terms: { 'beat.tags': tagIds }, + }, + }, + }; + + const response = await this.database.search(user, params); + + const beats = _get(response, 'hits.hits', []); + + if (beats.length === 0) { + return []; + } + return beats.map((beat: any) => omit(beat._source.beat, ['access_token'])); + } + + public async getBeatWithToken( + user: FrameworkUser, + enrollmentToken: string + ): Promise { + const params = { + ignore: [404], + index: INDEX_NAMES.BEATS, + type: '_doc', + body: { + query: { + match: { 'beat.enrollment_token': enrollmentToken }, + }, + }, + }; + + const response = await this.database.search(user, params); + + const beats = _get(response, 'hits.hits', []); + + if (beats.length === 0) { + return null; + } + return omit(_get(beats[0], '_source.beat'), ['access_token']); + } + + public async getAll(user: FrameworkUser, ESQuery?: any) { + const params = { + index: INDEX_NAMES.BEATS, + size: 10000, + type: '_doc', + body: { + query: { + bool: { + must: { + term: { + type: 'beat', + }, + }, + }, + }, + }, + }; + + if (ESQuery) { + params.body.query = { + ...params.body.query, + ...ESQuery, + }; + } + + let response; + try { + response = await this.database.search(user, params); + } catch (e) { + // TODO something + } + if (!response) { + return []; + } + const beats = _get(response, 'hits.hits', []); + + return beats.map((beat: any) => omit(beat._source.beat, ['access_token'])); + } + + public async removeTagsFromBeats( + user: FrameworkUser, + removals: BeatsTagAssignment[] + ): Promise { + const body = flatten( + removals.map(({ beatId, tag }) => { + const script = ` + def beat = ctx._source.beat; + if (beat.tags != null) { + beat.tags.removeAll([params.tag]); + }`; + + return [ + { update: { _id: `beat:${beatId}` } }, + { script: { source: script.replace(' ', ''), params: { tag } } }, + ]; + }) + ); + + const response = await this.database.bulk(user, { + body, + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }); + return _get(response, 'items', []).map((item: any, resultIdx: number) => ({ + idxInRequest: removals[resultIdx].idxInRequest, + result: item.update.result, + status: item.update.status, + })); + } + + public async assignTagsToBeats( + user: FrameworkUser, + assignments: BeatsTagAssignment[] + ): Promise { + const body = flatten( + assignments.map(({ beatId, tag }) => { + const script = ` + def beat = ctx._source.beat; + if (beat.tags == null) { + beat.tags = []; + } + if (!beat.tags.contains(params.tag)) { + beat.tags.add(params.tag); + }`; + + return [ + { update: { _id: `beat:${beatId}` } }, + { script: { source: script.replace(' ', ''), params: { tag } } }, + ]; + }) + ); + + const response = await this.database.bulk(user, { + body, + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }); + // console.log(response.items[0].update.error); + return _get(response, 'items', []).map((item: any, resultIdx: any) => ({ + idxInRequest: assignments[resultIdx].idxInRequest, + result: item.update.result, + status: item.update.status, + })); + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/beats/memory_beats_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/beats/memory_beats_adapter.ts new file mode 100644 index 0000000000000..6ae1c018a5490 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/beats/memory_beats_adapter.ts @@ -0,0 +1,114 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { intersection, omit } from 'lodash'; + +import { CMBeat } from '../../../../common/domain_types'; +import { FrameworkUser } from '../framework/adapter_types'; +import { BeatsTagAssignment, CMBeatsAdapter } from './adapter_types'; + +export class MemoryBeatsAdapter implements CMBeatsAdapter { + private beatsDB: CMBeat[]; + + constructor(beatsDB: CMBeat[]) { + this.beatsDB = beatsDB; + } + + public async get(user: FrameworkUser, id: string) { + return this.beatsDB.find(beat => beat.id === id) || null; + } + + public async insert(user: FrameworkUser, beat: CMBeat) { + this.beatsDB.push(beat); + } + + public async update(user: FrameworkUser, beat: CMBeat) { + const beatIndex = this.beatsDB.findIndex(b => b.id === beat.id); + + this.beatsDB[beatIndex] = { + ...this.beatsDB[beatIndex], + ...beat, + }; + } + + public async getWithIds(user: FrameworkUser, beatIds: string[]) { + return this.beatsDB.filter(beat => beatIds.includes(beat.id)); + } + + public async getAllWithTags(user: FrameworkUser, tagIds: string[]): Promise { + return this.beatsDB.filter(beat => intersection(tagIds, beat.tags || []).length !== 0); + } + + public async getBeatWithToken( + user: FrameworkUser, + enrollmentToken: string + ): Promise { + return this.beatsDB.find(beat => enrollmentToken === beat.enrollment_token) || null; + } + + public async getAll(user: FrameworkUser) { + return this.beatsDB.map((beat: any) => omit(beat, ['access_token'])); + } + + public async removeTagsFromBeats( + user: FrameworkUser, + removals: BeatsTagAssignment[] + ): Promise { + const beatIds = removals.map(r => r.beatId); + + const response = this.beatsDB.filter(beat => beatIds.includes(beat.id)).map(beat => { + const tagData = removals.find(r => r.beatId === beat.id); + if (tagData) { + if (beat.tags) { + beat.tags = beat.tags.filter(tag => tag !== tagData.tag); + } + } + return beat; + }); + + return response.map((item: CMBeat, resultIdx: number) => ({ + idxInRequest: removals[resultIdx].idxInRequest, + result: 'updated', + status: 200, + })); + } + + public async assignTagsToBeats( + user: FrameworkUser, + assignments: BeatsTagAssignment[] + ): Promise { + const beatIds = assignments.map(r => r.beatId); + + this.beatsDB.filter(beat => beatIds.includes(beat.id)).map(beat => { + // get tags that need to be assigned to this beat + const tags = assignments + .filter(a => a.beatId === beat.id) + .map((t: BeatsTagAssignment) => t.tag); + + if (tags.length > 0) { + if (!beat.tags) { + beat.tags = []; + } + const nonExistingTags = tags.filter((t: string) => beat.tags && !beat.tags.includes(t)); + + if (nonExistingTags.length > 0) { + beat.tags = beat.tags.concat(nonExistingTags); + } + } + return beat; + }); + + return assignments.map((item: BeatsTagAssignment, resultIdx: number) => ({ + idxInRequest: assignments[resultIdx].idxInRequest, + result: 'updated', + status: 200, + })); + } + + public setDB(beatsDB: CMBeat[]) { + this.beatsDB = beatsDB; + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/kibana.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/kibana.ts new file mode 100644 index 0000000000000..bcbb1e9a29b49 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/kibana.ts @@ -0,0 +1,39 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +// file.skip + +// @ts-ignore +import { createEsTestCluster } from '@kbn/test'; +import { Root } from 'src/core/server/root'; +// @ts-ignore +import * as kbnTestServer from '../../../../../../../../src/test_utils/kbn_server'; +import { DatabaseKbnESPlugin } from '../adapter_types'; +import { KibanaDatabaseAdapter } from '../kibana_database_adapter'; +import { contractTests } from './test_contract'; +const es = createEsTestCluster({}); + +let legacyServer: any; +let rootServer: Root; +contractTests('Kibana Database Adapter', { + before: async () => { + await es.start(); + + rootServer = kbnTestServer.createRootWithCorePlugins({ + server: { maxPayloadBytes: 100 }, + }); + + await rootServer.start(); + legacyServer = kbnTestServer.getKbnServer(rootServer); + return await legacyServer.plugins.elasticsearch.waitUntilReady(); + }, + after: async () => { + await rootServer.shutdown(); + return await es.cleanup(); + }, + adapterSetup: () => { + return new KibanaDatabaseAdapter(legacyServer.plugins.elasticsearch as DatabaseKbnESPlugin); + }, +}); diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/test_contract.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/test_contract.ts new file mode 100644 index 0000000000000..d62dea55bf95d --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/database/__tests__/test_contract.ts @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { beatsIndexTemplate } from '../../../../utils/index_templates'; +import { DatabaseAdapter } from '../adapter_types'; + +interface ContractConfig { + before?(): Promise; + after?(): Promise; + adapterSetup(): DatabaseAdapter; +} + +export const contractTests = (testName: string, config: ContractConfig) => { + describe.skip(testName, () => { + let database: DatabaseAdapter; + beforeAll(async () => { + jest.setTimeout(100000); // 1 second + + if (config.before) { + await config.before(); + } + }); + afterAll(async () => config.after && (await config.after())); + beforeEach(async () => { + database = config.adapterSetup(); + }); + + it('Should inject template into ES', async () => { + try { + await database.putTemplate( + { kind: 'internal' }, + { + name: '.management-beats', + body: beatsIndexTemplate, + } + ); + } catch (e) { + expect(e).toEqual(null); + } + }); + + it('Unauthorized users cant query', async () => { + const params = { + id: `beat:foo`, + ignore: [404], + index: '.management-beats', + type: '_doc', + }; + let ranWithoutError = false; + try { + await database.get({ kind: 'unauthenticated' }, params); + ranWithoutError = true; + } catch (e) { + expect(e).not.toEqual(null); + } + expect(ranWithoutError).toEqual(false); + }); + + it('Should query ES', async () => { + const params = { + id: `beat:foo`, + ignore: [404], + index: '.management-beats', + type: '_doc', + }; + const response = await database.get({ kind: 'internal' }, params); + + expect(response).not.toEqual(undefined); + // @ts-ignore + expect(response.found).toEqual(undefined); + }); + }); +}; diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts new file mode 100644 index 0000000000000..59a36dceac50f --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/database/adapter_types.ts @@ -0,0 +1,307 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { FrameworkRequest, FrameworkUser } from '../framework/adapter_types'; +export interface DatabaseAdapter { + putTemplate(user: FrameworkUser, params: DatabasePutTemplateParams): Promise; + get( + user: FrameworkUser, + params: DatabaseGetParams + ): Promise>; + create( + user: FrameworkUser, + params: DatabaseCreateDocumentParams + ): Promise; + index( + user: FrameworkUser, + params: DatabaseIndexDocumentParams + ): Promise; + delete( + user: FrameworkUser, + params: DatabaseDeleteDocumentParams + ): Promise; + mget(user: FrameworkUser, params: DatabaseMGetParams): Promise>; + bulk( + user: FrameworkUser, + params: DatabaseBulkIndexDocumentsParams + ): Promise; + search(user: FrameworkUser, params: DatabaseSearchParams): Promise>; +} + +export interface DatabaseKbnESCluster { + callWithInternalUser(esMethod: string, options: {}): Promise; + callWithRequest(req: FrameworkRequest, esMethod: string, options: {}): Promise; +} + +export interface DatabaseKbnESPlugin { + getCluster(clusterName: string): DatabaseKbnESCluster; +} + +export interface DatabaseSearchParams extends DatabaseGenericParams { + analyzer?: string; + analyzeWildcard?: boolean; + defaultOperator?: DefaultOperator; + df?: string; + explain?: boolean; + storedFields?: DatabaseNameList; + docvalueFields?: DatabaseNameList; + fielddataFields?: DatabaseNameList; + from?: number; + ignoreUnavailable?: boolean; + allowNoIndices?: boolean; + expandWildcards?: ExpandWildcards; + lenient?: boolean; + lowercaseExpandedTerms?: boolean; + preference?: string; + q?: string; + routing?: DatabaseNameList; + scroll?: string; + searchType?: 'query_then_fetch' | 'dfs_query_then_fetch'; + size?: number; + sort?: DatabaseNameList; + _source?: DatabaseNameList; + _sourceExcludes?: DatabaseNameList; + _sourceIncludes?: DatabaseNameList; + terminateAfter?: number; + stats?: DatabaseNameList; + suggestField?: string; + suggestMode?: 'missing' | 'popular' | 'always'; + suggestSize?: number; + suggestText?: string; + timeout?: string; + trackScores?: boolean; + version?: boolean; + requestCache?: boolean; + index?: DatabaseNameList; + type?: DatabaseNameList; +} + +export interface DatabaseSearchResponse { + took: number; + timed_out: boolean; + _scroll_id?: string; + _shards: DatabaseShardsResponse; + hits: { + total: number; + max_score: number; + hits: Array<{ + _index: string; + _type: string; + _id: string; + _score: number; + _source: T; + _version?: number; + _explanation?: DatabaseExplanation; + fields?: any; + highlight?: any; + inner_hits?: any; + sort?: string[]; + }>; + }; + aggregations?: any; +} + +export interface DatabaseExplanation { + value: number; + description: string; + details: DatabaseExplanation[]; +} + +export interface DatabaseShardsResponse { + total: number; + successful: number; + failed: number; + skipped: number; +} + +export interface DatabaseGetDocumentResponse { + _index: string; + _type: string; + _id: string; + _version: number; + found: boolean; + _source: Source; +} + +export interface DatabaseBulkResponse { + took: number; + errors: boolean; + items: Array< + DatabaseDeleteDocumentResponse | DatabaseIndexDocumentResponse | DatabaseUpdateDocumentResponse + >; +} + +export interface DatabaseBulkIndexDocumentsParams extends DatabaseGenericParams { + waitForActiveShards?: string; + refresh?: DatabaseRefresh; + routing?: string; + timeout?: string; + type?: string; + fields?: DatabaseNameList; + _source?: DatabaseNameList; + _sourceExcludes?: DatabaseNameList; + _sourceIncludes?: DatabaseNameList; + pipeline?: string; + index?: string; +} + +export interface DatabaseMGetParams extends DatabaseGenericParams { + storedFields?: DatabaseNameList; + preference?: string; + realtime?: boolean; + refresh?: boolean; + _source?: DatabaseNameList; + _sourceExcludes?: DatabaseNameList; + _sourceIncludes?: DatabaseNameList; + index: string; + type?: string; +} + +export interface DatabaseMGetResponse { + docs?: Array>; +} + +export interface DatabasePutTemplateParams extends DatabaseGenericParams { + name: string; + body: any; +} + +export interface DatabaseDeleteDocumentParams extends DatabaseGenericParams { + waitForActiveShards?: string; + parent?: string; + refresh?: DatabaseRefresh; + routing?: string; + timeout?: string; + version?: number; + versionType?: DatabaseVersionType; + index: string; + type: string; + id: string; +} + +export interface DatabaseIndexDocumentResponse { + found: boolean; + _index: string; + _type: string; + _id: string; + _version: number; + result: string; +} + +export interface DatabaseUpdateDocumentResponse { + found: boolean; + _index: string; + _type: string; + _id: string; + _version: number; + result: string; +} + +export interface DatabaseDeleteDocumentResponse { + found: boolean; + _index: string; + _type: string; + _id: string; + _version: number; + result: string; +} + +export interface DatabaseIndexDocumentParams extends DatabaseGenericParams { + waitForActiveShards?: string; + opType?: 'index' | 'create'; + parent?: string; + refresh?: string; + routing?: string; + timeout?: string; + timestamp?: Date | number; + ttl?: string; + version?: number; + versionType?: DatabaseVersionType; + pipeline?: string; + id?: string; + index: string; + type: string; + body: T; +} + +export interface DatabaseGetResponse { + found: boolean; + _source: T; +} +export interface DatabaseCreateDocumentParams extends DatabaseGenericParams { + waitForActiveShards?: string; + parent?: string; + refresh?: DatabaseRefresh; + routing?: string; + timeout?: string; + timestamp?: Date | number; + ttl?: string; + version?: number; + versionType?: DatabaseVersionType; + pipeline?: string; + id?: string; + index: string; + type: string; +} + +export interface DatabaseCreateDocumentResponse { + created: boolean; + result: string; +} + +export interface DatabaseDeleteDocumentParams extends DatabaseGenericParams { + waitForActiveShards?: string; + parent?: string; + refresh?: DatabaseRefresh; + routing?: string; + timeout?: string; + version?: number; + versionType?: DatabaseVersionType; + index: string; + type: string; + id: string; +} + +export interface DatabaseGetParams extends DatabaseGenericParams { + storedFields?: DatabaseNameList; + parent?: string; + preference?: string; + realtime?: boolean; + refresh?: boolean; + routing?: string; + _source?: DatabaseNameList; + _sourceExcludes?: DatabaseNameList; + _sourceIncludes?: DatabaseNameList; + version?: number; + versionType?: DatabaseVersionType; + id: string; + index: string; + type: string; +} + +export type DatabaseNameList = string | string[] | boolean; +export type DatabaseRefresh = boolean | 'true' | 'false' | 'wait_for' | ''; +export type DatabaseVersionType = 'internal' | 'external' | 'external_gte' | 'force'; +export type ExpandWildcards = 'open' | 'closed' | 'none' | 'all'; +export type DefaultOperator = 'AND' | 'OR'; +export type DatabaseConflicts = 'abort' | 'proceed'; + +export interface DatabaseGenericParams { + requestTimeout?: number; + maxRetries?: number; + method?: string; + body?: any; + ignore?: number | number[]; + filterPath?: string | string[]; +} + +export interface DatabaseDeleteDocumentResponse { + found: boolean; + _index: string; + _type: string; + _id: string; + _version: number; + result: string; +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts new file mode 100644 index 0000000000000..ba593a793e34b --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/database/kibana_database_adapter.ts @@ -0,0 +1,107 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { internalAuthData } from '../../../utils/wrap_request'; +import { FrameworkUser } from '../framework/adapter_types'; +import { + DatabaseAdapter, + DatabaseBulkIndexDocumentsParams, + DatabaseCreateDocumentParams, + DatabaseCreateDocumentResponse, + DatabaseDeleteDocumentParams, + DatabaseDeleteDocumentResponse, + DatabaseGetDocumentResponse, + DatabaseGetParams, + DatabaseIndexDocumentParams, + DatabaseKbnESCluster, + DatabaseKbnESPlugin, + DatabaseMGetParams, + DatabaseMGetResponse, + DatabasePutTemplateParams, + DatabaseSearchParams, + DatabaseSearchResponse, +} from './adapter_types'; + +export class KibanaDatabaseAdapter implements DatabaseAdapter { + private es: DatabaseKbnESCluster; + + constructor(kbnElasticSearch: DatabaseKbnESPlugin) { + this.es = kbnElasticSearch.getCluster('admin'); + } + public async putTemplate(user: FrameworkUser, params: DatabasePutTemplateParams): Promise { + const callES = this.getCallType(user); + const result = await callES('indices.putTemplate', params); + return result; + } + + public async get( + user: FrameworkUser, + params: DatabaseGetParams + ): Promise> { + const callES = this.getCallType(user); + const result = await callES('get', params); + return result; + // todo + } + + public async mget( + user: FrameworkUser, + params: DatabaseMGetParams + ): Promise> { + const callES = this.getCallType(user); + const result = await callES('mget', params); + return result; + // todo + } + + public async bulk(user: FrameworkUser, params: DatabaseBulkIndexDocumentsParams): Promise { + const callES = this.getCallType(user); + const result = await callES('bulk', params); + return result; + } + + public async create( + user: FrameworkUser, + params: DatabaseCreateDocumentParams + ): Promise { + const callES = this.getCallType(user); + const result = await callES('create', params); + return result; + } + public async index(user: FrameworkUser, params: DatabaseIndexDocumentParams): Promise { + const callES = this.getCallType(user); + const result = await callES('index', params); + return result; + } + public async delete( + user: FrameworkUser, + params: DatabaseDeleteDocumentParams + ): Promise { + const callES = this.getCallType(user); + const result = await callES('delete', params); + return result; + } + + public async search( + user: FrameworkUser, + params: DatabaseSearchParams + ): Promise> { + const callES = this.getCallType(user); + const result = await callES('search', params); + return result; + } + + private getCallType(user: FrameworkUser): any { + if (user.kind === 'authenticated') { + return this.es.callWithRequest.bind(null, { + headers: user[internalAuthData], + }); + } else if (user.kind === 'internal') { + return this.es.callWithInternalUser; + } else { + throw new Error('Invalid user type'); + } + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/database/memory_database_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/database/memory_database_adapter.ts new file mode 100644 index 0000000000000..9851027ce2218 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/database/memory_database_adapter.ts @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { FrameworkUser } from '../framework/adapter_types'; +import { + DatabaseAdapter, + DatabaseBulkIndexDocumentsParams, + DatabaseCreateDocumentParams, + DatabaseCreateDocumentResponse, + DatabaseDeleteDocumentParams, + DatabaseDeleteDocumentResponse, + DatabaseGetDocumentResponse, + DatabaseGetParams, + DatabaseIndexDocumentParams, + DatabaseMGetParams, + DatabaseMGetResponse, + DatabasePutTemplateParams, + DatabaseSearchParams, + DatabaseSearchResponse, +} from './adapter_types'; + +export class MemoryDatabaseAdapter implements DatabaseAdapter { + public async putTemplate(user: FrameworkUser, params: DatabasePutTemplateParams): Promise { + return null; + } + + public async get( + user: FrameworkUser, + params: DatabaseGetParams + ): Promise> { + throw new Error('get not implamented in memory'); + } + + public async mget( + user: FrameworkUser, + params: DatabaseMGetParams + ): Promise> { + throw new Error('mget not implamented in memory'); + } + + public async bulk(user: FrameworkUser, params: DatabaseBulkIndexDocumentsParams): Promise { + throw new Error('mget not implamented in memory'); + } + + public async create( + user: FrameworkUser, + params: DatabaseCreateDocumentParams + ): Promise { + throw new Error('create not implamented in memory'); + } + public async index(user: FrameworkUser, params: DatabaseIndexDocumentParams): Promise { + throw new Error('index not implamented in memory'); + } + public async delete( + user: FrameworkUser, + params: DatabaseDeleteDocumentParams + ): Promise { + throw new Error('delete not implamented in memory'); + } + + public async search( + user: FrameworkUser, + params: DatabaseSearchParams + ): Promise> { + throw new Error('search not implamented in memory'); + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/__tests__/kibana.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/__tests__/kibana.ts new file mode 100644 index 0000000000000..b483379d444c0 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/framework/__tests__/kibana.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +// file.skip + +// @ts-ignore +import { createEsTestCluster } from '@kbn/test'; +import { config as beatsPluginConfig, configPrefix } from '../../../../..'; +// @ts-ignore +import * as kbnTestServer from '../../../../../../../../src/test_utils/kbn_server'; +import { KibanaBackendFrameworkAdapter } from '../kibana_framework_adapter'; +import { contractTests } from './test_contract'; + +const kbnServer = kbnTestServer.createRootWithCorePlugins({ server: { maxPayloadBytes: 100 } }); +const legacyServer = kbnTestServer.getKbnServer(kbnServer); + +contractTests('Kibana Framework Adapter', { + before: async () => { + await kbnServer.start(); + + const config = legacyServer.server.config(); + config.extendSchema(beatsPluginConfig, {}, configPrefix); + + config.set('xpack.beats.encryptionKey', 'foo'); + }, + after: async () => { + await kbnServer.shutdown(); + }, + adapterSetup: () => { + return new KibanaBackendFrameworkAdapter(legacyServer.server); + }, +}); diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/__tests__/test_contract.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/__tests__/test_contract.ts new file mode 100644 index 0000000000000..5d870d1cadc4b --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/framework/__tests__/test_contract.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { BackendFrameworkAdapter } from '../adapter_types'; + +interface ContractConfig { + before?(): Promise; + after?(): Promise; + adapterSetup(): BackendFrameworkAdapter; +} + +export const contractTests = (testName: string, config: ContractConfig) => { + describe.skip(testName, () => { + // let frameworkAdapter: BackendFrameworkAdapter; + beforeAll(async () => { + jest.setTimeout(100000); // 1 second + + if (config.before) { + await config.before(); + } + }); + afterAll(async () => config.after && (await config.after())); + beforeEach(async () => { + // FIXME: one of these always should exist, type ContractConfig as such + // const frameworkAdapter = config.adapterSetup(); + }); + + it('Should have tests here', () => { + expect(true).toEqual(true); + }); + }); +}; diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts new file mode 100644 index 0000000000000..64dca03e68d56 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/framework/adapter_types.ts @@ -0,0 +1,90 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { Lifecycle, ResponseToolkit } from 'hapi'; +import { internalAuthData } from '../../../utils/wrap_request'; + +export interface BackendFrameworkAdapter { + internalUser: FrameworkInternalUser; + version: string; + getSetting(settingPath: string): any; + exposeStaticDir(urlPath: string, dir: string): void; + registerRoute< + RouteRequest extends FrameworkWrappableRequest, + RouteResponse extends FrameworkResponse + >( + route: FrameworkRouteOptions + ): void; +} + +export interface FrameworkAuthenticatedUser { + kind: 'authenticated'; + [internalAuthData]: AuthDataType; + username: string; + roles: string[]; + full_name: string | null; + email: string | null; + metadata: { + [key: string]: any; + }; + enabled: boolean; +} + +export interface FrameworkUnAuthenticatedUser { + kind: 'unauthenticated'; +} + +export interface FrameworkInternalUser { + kind: 'internal'; +} + +export type FrameworkUser = + | FrameworkAuthenticatedUser + | FrameworkUnAuthenticatedUser + | FrameworkInternalUser; +export interface FrameworkRequest< + InternalRequest extends FrameworkWrappableRequest = FrameworkWrappableRequest +> { + user: FrameworkUser; + headers: InternalRequest['headers']; + info: InternalRequest['info']; + payload: InternalRequest['payload']; + params: InternalRequest['params']; + query: InternalRequest['query']; +} + +export interface FrameworkRouteOptions< + RouteRequest extends FrameworkWrappableRequest, + RouteResponse extends FrameworkResponse +> { + path: string; + method: string | string[]; + vhost?: string; + licenseRequired?: boolean; + requiredRoles?: string[]; + handler: FrameworkRouteHandler; + config?: {}; +} + +export type FrameworkRouteHandler< + RouteRequest extends FrameworkWrappableRequest, + RouteResponse extends FrameworkResponse +> = (request: FrameworkRequest, h: ResponseToolkit) => void; + +export interface FrameworkWrappableRequest< + Payload = any, + Params = any, + Query = any, + Headers = any, + Info = any +> { + headers: Headers; + info: Info; + payload: Payload; + params: Params; + query: Query; +} + +export type FrameworkResponse = Lifecycle.ReturnValue; diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/hapi_framework_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/hapi_framework_adapter.ts new file mode 100644 index 0000000000000..62e8b0599097d --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/framework/hapi_framework_adapter.ts @@ -0,0 +1,90 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { wrapRequest } from '../../../utils/wrap_request'; +import { FrameworkInternalUser } from './adapter_types'; +import { + BackendFrameworkAdapter, + FrameworkResponse, + FrameworkRouteOptions, + FrameworkWrappableRequest, +} from './adapter_types'; + +interface TestSettings { + enrollmentTokensTtlInSeconds: number; + encryptionKey: string; +} + +export class HapiBackendFrameworkAdapter implements BackendFrameworkAdapter { + public readonly internalUser: FrameworkInternalUser = { + kind: 'internal', + }; + public version: string; + private settings: TestSettings; + private server: any; + + constructor( + settings: TestSettings = { + encryptionKey: 'something_who_cares', + enrollmentTokensTtlInSeconds: 10 * 60, // 10 minutes + }, + hapiServer?: any + ) { + this.server = hapiServer; + this.settings = settings; + this.version = 'testing'; + } + + public getSetting(settingPath: string) { + switch (settingPath) { + case 'xpack.beats.enrollmentTokensTtlInSeconds': + return this.settings.enrollmentTokensTtlInSeconds; + case 'xpack.beats.encryptionKey': + return this.settings.encryptionKey; + } + } + + public exposeStaticDir(urlPath: string, dir: string): void { + if (!this.server) { + throw new Error('Must pass a hapi server into the adapter to use exposeStaticDir'); + } + this.server.route({ + handler: { + directory: { + path: dir, + }, + }, + method: 'GET', + path: urlPath, + }); + } + + public registerRoute< + RouteRequest extends FrameworkWrappableRequest, + RouteResponse extends FrameworkResponse + >(route: FrameworkRouteOptions) { + if (!this.server) { + throw new Error('Must pass a hapi server into the adapter to use registerRoute'); + } + const wrappedHandler = (licenseRequired: boolean) => (request: any, h: any) => { + return route.handler(wrapRequest(request), h); + }; + + this.server.route({ + handler: wrappedHandler(route.licenseRequired || false), + method: route.method, + path: route.path, + config: { + ...route.config, + auth: false, + }, + }); + } + + public async injectRequstForTesting({ method, url, headers, payload }: any) { + return await this.server.inject({ method, url, headers, payload }); + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts new file mode 100644 index 0000000000000..2004bf723f007 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/framework/kibana_framework_adapter.ts @@ -0,0 +1,209 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import Boom from 'boom'; +import { difference } from 'lodash'; +// @ts-ignore +import { mirrorPluginStatus } from '../../../../../../server/lib/mirror_plugin_status'; +import { PLUGIN } from '../../../../common/constants/plugin'; +import { wrapRequest } from '../../../utils/wrap_request'; +import { FrameworkRequest } from './adapter_types'; +import { + BackendFrameworkAdapter, + FrameworkInternalUser, + FrameworkResponse, + FrameworkRouteOptions, + FrameworkWrappableRequest, +} from './adapter_types'; + +export class KibanaBackendFrameworkAdapter implements BackendFrameworkAdapter { + public readonly internalUser: FrameworkInternalUser = { + kind: 'internal', + }; + public version: string; + private server: any; + private cryptoHash: string | null; + + constructor(hapiServer: any) { + this.server = hapiServer; + if (hapiServer.plugins.kibana) { + this.version = hapiServer.plugins.kibana.status.plugin.version; + } else { + this.version = 'unknown'; + } + this.cryptoHash = null; + this.validateConfig(); + + const xpackMainPlugin = hapiServer.plugins.xpack_main; + const thisPlugin = hapiServer.plugins.beats_management; + + mirrorPluginStatus(xpackMainPlugin, thisPlugin); + xpackMainPlugin.status.once('green', () => { + // Register a function that is called whenever the xpack info changes, + // to re-compute the license check results for this plugin + xpackMainPlugin.info + .feature(PLUGIN.ID) + .registerLicenseCheckResultsGenerator((xPackInfo: any) => this.checkLicense(xPackInfo)); + }); + } + // TODO make base path a constructor level param + public getSetting(settingPath: string) { + // TODO type check server properly + if (settingPath === 'xpack.beats.encryptionKey') { + // @ts-ignore + return this.server.config().get(settingPath) || this.cryptoHash; + } + // @ts-ignore + return this.server.config().get(settingPath) || this.cryptoHash; + } + + public exposeStaticDir(urlPath: string, dir: string): void { + this.server.route({ + handler: { + directory: { + path: dir, + }, + }, + method: 'GET', + path: urlPath, + }); + } + + public registerRoute< + RouteRequest extends FrameworkWrappableRequest, + RouteResponse extends FrameworkResponse + >(route: FrameworkRouteOptions) { + const hasAny = (roles: string[], requiredRoles: string[]) => + requiredRoles.some(r => roles.includes(r)); + + const wrappedHandler = (licenseRequired: boolean, requiredRoles?: string[]) => async ( + request: any, + h: any + ) => { + const xpackMainPlugin = this.server.plugins.xpack_main; + const licenseCheckResults = xpackMainPlugin.info.feature(PLUGIN.ID).getLicenseCheckResults(); + if (licenseRequired && !licenseCheckResults.licenseValid) { + return Boom.forbidden(licenseCheckResults.message); + } + const wrappedRequest = wrapRequest(request); + if (requiredRoles) { + if (wrappedRequest.user.kind !== 'authenticated') { + return h.response().code(403); + } + wrappedRequest.user = { + ...wrappedRequest.user, + ...(await this.getUser(request)), + }; + + if ( + wrappedRequest.user.kind === 'authenticated' && + (!hasAny(wrappedRequest.user.roles, this.getSetting('xpack.beats.defaultUserRoles')) || + !wrappedRequest.user.roles) && + difference(requiredRoles, wrappedRequest.user.roles).length !== 0 + ) { + return h.response().code(403); + } + } + return route.handler(wrappedRequest, h); + }; + + this.server.route({ + handler: wrappedHandler(route.licenseRequired || false, route.requiredRoles), + method: route.method, + path: route.path, + config: route.config, + }); + } + + private async getUser(request: FrameworkRequest) { + try { + return await this.server.plugins.security.getUser(request); + } catch (e) { + return null; + } + } + + // TODO make key a param + private validateConfig() { + // @ts-ignore + const config = this.server.config(); + const encryptionKey = config.get('xpack.beats.encryptionKey'); + + if (!encryptionKey) { + this.server.log( + 'Using a default encryption key for xpack.beats.encryptionKey. It is recommended that you set xpack.beats.encryptionKey in kibana.yml with a unique token' + ); + this.cryptoHash = 'xpack_beats_default_encryptionKey'; + } + } + + // TODO this should NOT be in an adapter, break up and move validation to a lib + private checkLicense(xPackInfo: any) { + // If, for some reason, we cannot get the license information + // from Elasticsearch, assume worst case and disable the Logstash pipeline UI + if (!xPackInfo || !xPackInfo.isAvailable()) { + return { + securityEnabled: false, + licenseValid: false, + message: + 'You cannot manage Beats central management because license information is not available at this time.', + }; + } + + const VALID_LICENSE_MODES = ['trial', 'standard', 'gold', 'platinum']; + + const isLicenseValid = xPackInfo.license.isOneOf(VALID_LICENSE_MODES); + const isLicenseActive = xPackInfo.license.isActive(); + const licenseType = xPackInfo.license.getType(); + const isSecurityEnabled = xPackInfo.feature('security').isEnabled(); + + // License is not valid + if (!isLicenseValid) { + return { + defaultUserRoles: this.getSetting('xpack.beats.defaultUserRoles'), + securityEnabled: true, + licenseValid: false, + licenseExpired: false, + message: `Your ${licenseType} license does not support Beats central management features. Please upgrade your license.`, + }; + } + + // License is valid but not active, we go into a read-only mode. + if (!isLicenseActive) { + return { + defaultUserRoles: this.getSetting('xpack.beats.defaultUserRoles'), + securityEnabled: true, + licenseValid: true, + licenseExpired: true, + message: `You cannot edit, create, or delete your Beats central management configurations because your ${licenseType} license has expired.`, + }; + } + + // Security is not enabled in ES + if (!isSecurityEnabled) { + const message = + 'Security must be enabled in order to use Beats central management features.' + + ' Please set xpack.security.enabled: true in your elasticsearch.yml.'; + return { + defaultUserRoles: this.getSetting('xpack.beats.defaultUserRoles'), + securityEnabled: false, + licenseValid: true, + licenseExpired: false, + + message, + }; + } + + // License is valid and active + return { + defaultUserRoles: this.getSetting('xpack.beats.defaultUserRoles'), + securityEnabled: true, + licenseValid: true, + licenseExpired: false, + }; + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts new file mode 100644 index 0000000000000..f826115f9efd9 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/tags/adapter_types.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { BeatTag } from '../../../../common/domain_types'; +import { FrameworkUser } from '../framework/adapter_types'; + +export interface CMTagsAdapter { + getAll(user: FrameworkUser, ESQuery?: any): Promise; + delete(user: FrameworkUser, tagIds: string[]): Promise; + getTagsWithIds(user: FrameworkUser, tagIds: string[]): Promise; + upsertTag(user: FrameworkUser, tag: BeatTag): Promise<{}>; +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts new file mode 100644 index 0000000000000..e3afa544fa0e1 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/tags/elasticsearch_tags_adapter.ts @@ -0,0 +1,149 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { flatten, get } from 'lodash'; +import { INDEX_NAMES } from '../../../../common/constants'; +import { FrameworkUser } from '../framework/adapter_types'; + +import { BeatTag, CMBeat } from '../../../../common/domain_types'; +import { DatabaseAdapter } from '../database/adapter_types'; +import { CMTagsAdapter } from './adapter_types'; + +export class ElasticsearchTagsAdapter implements CMTagsAdapter { + private database: DatabaseAdapter; + + constructor(database: DatabaseAdapter) { + this.database = database; + } + + public async getAll(user: FrameworkUser, ESQuery?: any) { + const params = { + _source: true, + size: 10000, + index: INDEX_NAMES.BEATS, + type: '_doc', + body: { + query: { + bool: { + must: { + term: { + type: 'tag', + }, + }, + }, + }, + }, + }; + if (ESQuery) { + params.body.query = { + ...params.body.query, + ...ESQuery, + }; + } + const response = await this.database.search(user, params); + const tags = get(response, 'hits.hits', []); + + return tags.map((tag: any) => tag._source.tag); + } + + public async delete(user: FrameworkUser, tagIds: string[]) { + const ids = tagIds.map(tag => tag); + + const params = { + ignore: [404], + index: INDEX_NAMES.BEATS, + type: '_doc', + body: { + query: { + terms: { 'beat.tags': tagIds }, + }, + }, + }; + + const beatsResponse = await this.database.search(user, params); + + const beats = get(beatsResponse, 'hits.hits', []).map( + (beat: any) => beat._source.beat + ); + + const inactiveBeats = beats.filter(beat => beat.active === false); + const activeBeats = beats.filter(beat => beat.active === true); + if (activeBeats.length !== 0) { + return false; + } + const beatIds = inactiveBeats.map((beat: CMBeat) => beat.id); + + const bulkBeatsUpdates = flatten( + beatIds.map(beatId => { + const script = ` + def beat = ctx._source.beat; + if (beat.tags != null) { + beat.tags.removeAll([params.tag]); + }`; + + return flatten( + ids.map(tagId => [ + { update: { _id: `beat:${beatId}` } }, + { script: { source: script.replace(' ', ''), params: { tagId } } }, + ]) + ); + }) + ); + + const bulkTagsDelete = ids.map(tagId => ({ delete: { _id: `tag:${tagId}` } })); + + await this.database.bulk(user, { + body: flatten([...bulkBeatsUpdates, ...bulkTagsDelete]), + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }); + + return true; + } + + public async getTagsWithIds(user: FrameworkUser, tagIds: string[]) { + if (tagIds.length === 0) { + return []; + } + const ids = tagIds.map(tag => `tag:${tag}`); + + const params = { + _source: true, + body: { + ids, + }, + index: INDEX_NAMES.BEATS, + type: '_doc', + }; + const response = await this.database.mget(user, params); + + return get(response, 'docs', []) + .filter((b: any) => b.found) + .map((b: any) => ({ + ...b._source.tag, + id: b._id.replace('tag:', ''), + })); + } + + public async upsertTag(user: FrameworkUser, tag: BeatTag) { + const body = { + tag, + type: 'tag', + }; + + const params = { + body, + id: `tag:${tag.id}`, + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }; + const response = await this.database.index(user, params); + + return get(response, 'result'); + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tags/memory_tags_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/tags/memory_tags_adapter.ts new file mode 100644 index 0000000000000..a730f55db98ee --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/tags/memory_tags_adapter.ts @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { BeatTag } from '../../../../common/domain_types'; +import { FrameworkUser } from '../framework/adapter_types'; +import { CMTagsAdapter } from './adapter_types'; + +export class MemoryTagsAdapter implements CMTagsAdapter { + private tagsDB: BeatTag[] = []; + + constructor(tagsDB: BeatTag[]) { + this.tagsDB = tagsDB; + } + + public async getAll(user: FrameworkUser) { + return this.tagsDB; + } + public async delete(user: FrameworkUser, tagIds: string[]) { + this.tagsDB = this.tagsDB.filter(tag => !tagIds.includes(tag.id)); + + return true; + } + public async getTagsWithIds(user: FrameworkUser, tagIds: string[]) { + return this.tagsDB.filter(tag => tagIds.includes(tag.id)); + } + + public async upsertTag(user: FrameworkUser, tag: BeatTag) { + const existingTagIndex = this.tagsDB.findIndex(t => t.id === tag.id); + if (existingTagIndex !== -1) { + this.tagsDB[existingTagIndex] = tag; + } else { + this.tagsDB.push(tag); + } + return tag; + } + + public setDB(tagsDB: BeatTag[]) { + this.tagsDB = tagsDB; + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts b/x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts new file mode 100644 index 0000000000000..2fe8c811c396e --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/tokens/adapter_types.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { FrameworkUser } from '../framework/adapter_types'; + +export interface TokenEnrollmentData { + token: string | null; + expires_on: string; +} + +export interface CMTokensAdapter { + deleteEnrollmentToken(enrollmentToken: string): Promise; + getEnrollmentToken(enrollmentToken: string): Promise; + upsertTokens(user: FrameworkUser, tokens: TokenEnrollmentData[]): Promise; +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts new file mode 100644 index 0000000000000..6aa9ceff46629 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/tokens/elasticsearch_tokens_adapter.ts @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { flatten, get } from 'lodash'; +import { INDEX_NAMES } from '../../../../common/constants'; +import { DatabaseAdapter } from '../database/adapter_types'; +import { BackendFrameworkAdapter, FrameworkUser } from '../framework/adapter_types'; +import { CMTokensAdapter, TokenEnrollmentData } from './adapter_types'; + +export class ElasticsearchTokensAdapter implements CMTokensAdapter { + private database: DatabaseAdapter; + private framework: BackendFrameworkAdapter; + + constructor(database: DatabaseAdapter, framework: BackendFrameworkAdapter) { + this.database = database; + this.framework = framework; + } + + public async deleteEnrollmentToken(enrollmentToken: string) { + const params = { + id: `enrollment_token:${enrollmentToken}`, + index: INDEX_NAMES.BEATS, + type: '_doc', + }; + + await this.database.delete(this.framework.internalUser, params); + } + + public async getEnrollmentToken(tokenString: string): Promise { + const params = { + id: `enrollment_token:${tokenString}`, + ignore: [404], + index: INDEX_NAMES.BEATS, + type: '_doc', + }; + + const response = await this.database.get(this.framework.internalUser, params); + const tokenDetails = get(response, '_source.enrollment_token', { + expires_on: '0', + token: null, + }); + + // Elasticsearch might return fast if the token is not found. OR it might return fast + // if the token *is* found. Either way, an attacker could using a timing attack to figure + // out whether a token is valid or not. So we introduce a random delay in returning from + // this function to obscure the actual time it took for Elasticsearch to find the token. + const randomDelayInMs = 25 + Math.round(Math.random() * 200); // between 25 and 225 ms + return new Promise(resolve => + setTimeout(() => resolve(tokenDetails), randomDelayInMs) + ); + } + + public async upsertTokens(user: FrameworkUser, tokens: TokenEnrollmentData[]) { + const body = flatten( + tokens.map(token => [ + { index: { _id: `enrollment_token:${token.token}` } }, + { + enrollment_token: token, + type: 'enrollment_token', + }, + ]) + ); + + await this.database.bulk(user, { + body, + index: INDEX_NAMES.BEATS, + refresh: 'wait_for', + type: '_doc', + }); + return tokens; + } +} diff --git a/x-pack/plugins/beats_management/server/lib/adapters/tokens/memory_tokens_adapter.ts b/x-pack/plugins/beats_management/server/lib/adapters/tokens/memory_tokens_adapter.ts new file mode 100644 index 0000000000000..fabbafc040969 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/adapters/tokens/memory_tokens_adapter.ts @@ -0,0 +1,46 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { FrameworkAuthenticatedUser } from '../framework/adapter_types'; +import { CMTokensAdapter, TokenEnrollmentData } from './adapter_types'; + +export class MemoryTokensAdapter implements CMTokensAdapter { + private tokenDB: TokenEnrollmentData[]; + + constructor(tokenDB: TokenEnrollmentData[]) { + this.tokenDB = tokenDB; + } + + public async deleteEnrollmentToken(enrollmentToken: string) { + const index = this.tokenDB.findIndex(token => token.token === enrollmentToken); + + if (index > -1) { + this.tokenDB.splice(index, 1); + } + } + + public async getEnrollmentToken(tokenString: string): Promise { + return new Promise(resolve => { + return resolve(this.tokenDB.find(token => token.token === tokenString)); + }); + } + + public async upsertTokens(user: FrameworkAuthenticatedUser, tokens: TokenEnrollmentData[]) { + tokens.forEach(token => { + const existingIndex = this.tokenDB.findIndex(t => t.token === token.token); + if (existingIndex !== -1) { + this.tokenDB[existingIndex] = token; + } else { + this.tokenDB.push(token); + } + }); + return tokens; + } + + public setDB(tokenDB: TokenEnrollmentData[]) { + this.tokenDB = tokenDB; + } +} diff --git a/x-pack/plugins/beats_management/server/lib/compose/kibana.ts b/x-pack/plugins/beats_management/server/lib/compose/kibana.ts new file mode 100644 index 0000000000000..bc00278251610 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/compose/kibana.ts @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { ElasticsearchBeatsAdapter } from '../adapters/beats/elasticsearch_beats_adapter'; +import { KibanaDatabaseAdapter } from '../adapters/database/kibana_database_adapter'; +import { ElasticsearchTagsAdapter } from '../adapters/tags/elasticsearch_tags_adapter'; +import { ElasticsearchTokensAdapter } from '../adapters/tokens/elasticsearch_tokens_adapter'; + +import { KibanaBackendFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; + +import { CMBeatsDomain } from '../domains/beats'; +import { CMTagsDomain } from '../domains/tags'; +import { CMTokensDomain } from '../domains/tokens'; + +import { CMDomainLibs, CMServerLibs } from '../lib'; + +export function compose(server: any): CMServerLibs { + const framework = new KibanaBackendFrameworkAdapter(server); + const database = new KibanaDatabaseAdapter(server.plugins.elasticsearch); + + const tags = new CMTagsDomain(new ElasticsearchTagsAdapter(database)); + const tokens = new CMTokensDomain(new ElasticsearchTokensAdapter(database, framework), { + framework, + }); + const beats = new CMBeatsDomain(new ElasticsearchBeatsAdapter(database), { + tags, + tokens, + framework, + }); + + const domainLibs: CMDomainLibs = { + beats, + tags, + tokens, + }; + + const libs: CMServerLibs = { + framework, + database, + ...domainLibs, + }; + + return libs; +} diff --git a/x-pack/plugins/beats_management/server/lib/compose/testing.ts b/x-pack/plugins/beats_management/server/lib/compose/testing.ts new file mode 100644 index 0000000000000..41fc18b80aeef --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/compose/testing.ts @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { MemoryBeatsAdapter } from '../adapters/beats/memory_beats_adapter'; +import { MemoryTagsAdapter } from '../adapters/tags/memory_tags_adapter'; +import { MemoryTokensAdapter } from '../adapters/tokens/memory_tokens_adapter'; + +import { HapiBackendFrameworkAdapter } from '../adapters/framework/hapi_framework_adapter'; + +import { CMBeatsDomain } from '../domains/beats'; +import { CMTagsDomain } from '../domains/tags'; +import { CMTokensDomain } from '../domains/tokens'; + +import { CMDomainLibs, CMServerLibs } from '../lib'; + +export function compose(server: any): CMServerLibs { + const framework = new HapiBackendFrameworkAdapter(undefined, server); + + const tags = new CMTagsDomain(new MemoryTagsAdapter(server.tagsDB || [])); + const tokens = new CMTokensDomain(new MemoryTokensAdapter(server.tokensDB || []), { + framework, + }); + const beats = new CMBeatsDomain(new MemoryBeatsAdapter(server.beatsDB || []), { + tags, + tokens, + framework, + }); + + const domainLibs: CMDomainLibs = { + beats, + tags, + tokens, + }; + + const libs: CMServerLibs = { + framework, + ...domainLibs, + }; + + return libs; +} diff --git a/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/assign_tags.test.ts b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/assign_tags.test.ts new file mode 100644 index 0000000000000..96ff86013762f --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/assign_tags.test.ts @@ -0,0 +1,237 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { FrameworkInternalUser } from '../../../adapters/framework/adapter_types'; + +import { MemoryBeatsAdapter } from '../../../adapters/beats/memory_beats_adapter'; +import { HapiBackendFrameworkAdapter } from '../../../adapters/framework/hapi_framework_adapter'; +import { MemoryTagsAdapter } from '../../../adapters/tags/memory_tags_adapter'; +import { MemoryTokensAdapter } from '../../../adapters/tokens/memory_tokens_adapter'; + +import { BeatTag, CMBeat } from '../../../../../common/domain_types'; + +import { CMBeatsDomain } from '../../beats'; +import { CMTagsDomain } from '../../tags'; +import { CMTokensDomain } from '../../tokens'; + +import Chance from 'chance'; + +const seed = Date.now(); +const chance = new Chance(seed); + +const internalUser: FrameworkInternalUser = { kind: 'internal' }; + +const settings = { + encryptionKey: 'something_who_cares', + enrollmentTokensTtlInSeconds: 10 * 60, // 10 minutes +}; + +describe('Beats Domain Lib', () => { + let beatsLib: CMBeatsDomain; + let beatsDB: CMBeat[] = []; + let tagsDB: BeatTag[] = []; + + describe('assign_tags_to_beats', () => { + beforeEach(async () => { + beatsDB = [ + { + access_token: '9a6c99ae0fd84b068819701169cd8a4b', + config_status: 'OK', + active: true, + enrollment_token: '23423423423', + host_ip: '1.2.3.4', + host_name: 'foo.bar.com', + id: 'qux', + type: 'filebeat', + }, + { + access_token: '188255eb560a4448b72656c5e99cae6f', + active: true, + config_status: 'OK', + enrollment_token: 'reertrte', + host_ip: '22.33.11.44', + host_name: 'baz.bar.com', + id: 'baz', + type: 'metricbeat', + }, + { + access_token: '93c4a4dd08564c189a7ec4e4f046b975', + active: true, + enrollment_token: '23s423423423', + config_status: 'OK', + host_ip: '1.2.3.4', + host_name: 'foo.bar.com', + id: 'foo', + tags: ['production', 'qa'], + type: 'metricbeat', + verified_on: '2018-05-15T16:25:38.924Z', + }, + { + access_token: '3c4a4dd08564c189a7ec4e4f046b9759', + enrollment_token: 'gdfsgdf', + active: true, + config_status: 'OK', + host_ip: '11.22.33.44', + host_name: 'foo.com', + id: 'bar', + type: 'filebeat', + }, + ]; + tagsDB = [ + { + configuration_blocks: [], + id: 'production', + last_updated: new Date(), + }, + { + configuration_blocks: [], + id: 'development', + last_updated: new Date(), + }, + { + configuration_blocks: [], + id: 'qa', + last_updated: new Date(), + }, + ]; + const framework = new HapiBackendFrameworkAdapter(settings); + + const tokensLib = new CMTokensDomain(new MemoryTokensAdapter([]), { + framework, + }); + + const tagsLib = new CMTagsDomain(new MemoryTagsAdapter(tagsDB)); + + beatsLib = new CMBeatsDomain(new MemoryBeatsAdapter(beatsDB), { + tags: tagsLib, + tokens: tokensLib, + framework, + }); + }); + + it('should add a single tag to a single beat', async () => { + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: 'bar', tag: 'production' }, + ]); + + expect(apiResponse.assignments).toEqual([{ status: 200, result: 'updated' }]); + }); + + it('should not re-add an existing tag to a beat', async () => { + const tags = ['production']; + + let beat = beatsDB.find(b => b.id === 'foo') as any; + expect(beat.tags).toEqual([...tags, 'qa']); + + // Adding the existing tag + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: 'foo', tag: 'production' }, + ]); + + expect(apiResponse.assignments).toEqual([{ status: 200, result: 'updated' }]); + + beat = beatsDB.find(b => b.id === 'foo') as any; + expect(beat.tags).toEqual([...tags, 'qa']); + }); + + it('should add a single tag to a multiple beats', async () => { + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: 'foo', tag: 'development' }, + { beatId: 'bar', tag: 'development' }, + ]); + + expect(apiResponse.assignments).toEqual([ + { status: 200, result: 'updated' }, + { status: 200, result: 'updated' }, + ]); + + let beat = beatsDB.find(b => b.id === 'foo') as any; + expect(beat.tags).toEqual(['production', 'qa', 'development']); // as beat 'foo' already had 'production' and 'qa' tags attached to it + + beat = beatsDB.find(b => b.id === 'bar') as any; + expect(beat.tags).toEqual(['development']); + }); + + it('should add multiple tags to a single beat', async () => { + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: 'bar', tag: 'development' }, + { beatId: 'bar', tag: 'production' }, + ]); + + expect(apiResponse.assignments).toEqual([ + { status: 200, result: 'updated' }, + { status: 200, result: 'updated' }, + ]); + + const beat = beatsDB.find(b => b.id === 'bar') as any; + expect(beat.tags).toEqual(['development', 'production']); + }); + + it('should add multiple tags to a multiple beats', async () => { + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: 'foo', tag: 'development' }, + { beatId: 'bar', tag: 'production' }, + ]); + + expect(apiResponse.assignments).toEqual([ + { status: 200, result: 'updated' }, + { status: 200, result: 'updated' }, + ]); + + let beat = beatsDB.find(b => b.id === 'foo') as any; + expect(beat.tags).toEqual(['production', 'qa', 'development']); // as beat 'foo' already had 'production' and 'qa' tags attached to it + + beat = beatsDB.find(b => b.id === 'bar') as any; + expect(beat.tags).toEqual(['production']); + }); + + it('should return errors for non-existent beats', async () => { + const nonExistentBeatId = chance.word(); + + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: nonExistentBeatId, tag: 'production' }, + ]); + + expect(apiResponse.assignments).toEqual([ + { status: 404, result: `Beat ${nonExistentBeatId} not found` }, + ]); + }); + + it('should return errors for non-existent tags', async () => { + const nonExistentTag = chance.word(); + + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: 'bar', tag: nonExistentTag }, + ]); + + expect(apiResponse.assignments).toEqual([ + { status: 404, result: `Tag ${nonExistentTag} not found` }, + ]); + + const beat = beatsDB.find(b => b.id === 'bar') as any; + expect(beat).not.toHaveProperty('tags'); + }); + + it('should return errors for non-existent beats and tags', async () => { + const nonExistentBeatId = chance.word(); + const nonExistentTag = chance.word(); + + const apiResponse = await beatsLib.assignTagsToBeats(internalUser, [ + { beatId: nonExistentBeatId, tag: nonExistentTag }, + ]); + + expect(apiResponse.assignments).toEqual([ + { + result: `Beat ${nonExistentBeatId} and tag ${nonExistentTag} not found`, + status: 404, + }, + ]); + + const beat = beatsDB.find(b => b.id === 'bar') as any; + expect(beat).not.toHaveProperty('tags'); + }); + }); +}); diff --git a/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/enroll.test.ts b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/enroll.test.ts new file mode 100644 index 0000000000000..d115c49244c65 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/enroll.test.ts @@ -0,0 +1,137 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { MemoryBeatsAdapter } from '../../../adapters/beats/memory_beats_adapter'; +import { HapiBackendFrameworkAdapter } from '../../../adapters/framework/hapi_framework_adapter'; +import { MemoryTagsAdapter } from '../../../adapters/tags/memory_tags_adapter'; +import { MemoryTokensAdapter } from '../../../adapters/tokens/memory_tokens_adapter'; +import { BeatEnrollmentStatus } from '../../../lib'; + +import { BeatTag, CMBeat } from '../../../../../common/domain_types'; +import { TokenEnrollmentData } from '../../../adapters/tokens/adapter_types'; + +import { CMBeatsDomain } from '../../beats'; +import { CMTagsDomain } from '../../tags'; +import { CMTokensDomain } from '../../tokens'; + +import Chance from 'chance'; +import { sign as signToken } from 'jsonwebtoken'; +import { omit } from 'lodash'; +import moment from 'moment'; + +const seed = Date.now(); +const chance = new Chance(seed); + +const settings = { + encryptionKey: 'something_who_cares', + enrollmentTokensTtlInSeconds: 10 * 60, // 10 minutes +}; + +describe('Beats Domain Lib', () => { + let beatsLib: CMBeatsDomain; + let tokensLib: CMTokensDomain; + + let beatsDB: CMBeat[] = []; + let tagsDB: BeatTag[] = []; + let tokensDB: TokenEnrollmentData[] = []; + let validEnrollmentToken: string; + let beatId: string; + let beat: Partial; + + describe('enroll_beat', () => { + beforeEach(async () => { + validEnrollmentToken = chance.word(); + beatId = chance.word(); + + beatsDB = []; + tagsDB = []; + tokensDB = [ + { + expires_on: moment() + .add(4, 'hours') + .toJSON(), + token: validEnrollmentToken, + }, + ]; + + const version = + chance.integer({ min: 1, max: 10 }) + + '.' + + chance.integer({ min: 1, max: 10 }) + + '.' + + chance.integer({ min: 1, max: 10 }); + + beat = { + host_name: 'foo.bar.com', + type: 'filebeat', + version, + }; + + const framework = new HapiBackendFrameworkAdapter(settings); + + tokensLib = new CMTokensDomain(new MemoryTokensAdapter(tokensDB), { + framework, + }); + + const tagsLib = new CMTagsDomain(new MemoryTagsAdapter(tagsDB)); + + beatsLib = new CMBeatsDomain(new MemoryBeatsAdapter(beatsDB), { + tags: tagsLib, + tokens: tokensLib, + framework, + }); + }); + + it('should enroll beat, returning an access token', async () => { + const { token } = await tokensLib.getEnrollmentToken(validEnrollmentToken); + + expect(token).toEqual(validEnrollmentToken); + const { accessToken, status } = await beatsLib.enrollBeat( + validEnrollmentToken, + beatId, + '192.168.1.1', + omit(beat, 'enrollment_token') + ); + expect(status).toEqual(BeatEnrollmentStatus.Success); + + expect(beatsDB.length).toEqual(1); + expect(beatsDB[0]).toHaveProperty('host_ip'); + expect(beatsDB[0]).toHaveProperty('verified_on'); + + expect(accessToken).toEqual(beatsDB[0].access_token); + + await tokensLib.deleteEnrollmentToken(validEnrollmentToken); + + expect(tokensDB.length).toEqual(0); + }); + + it('should reject an invalid enrollment token', async () => { + const { token } = await tokensLib.getEnrollmentToken(chance.word()); + + expect(token).toEqual(null); + }); + + it('should reject an expired enrollment token', async () => { + const { token } = await tokensLib.getEnrollmentToken( + signToken({}, settings.encryptionKey, { + expiresIn: '-1min', + }) + ); + + expect(token).toEqual(null); + }); + + it('should delete the given enrollment token so it may not be reused', async () => { + expect(tokensDB[0].token).toEqual(validEnrollmentToken); + await tokensLib.deleteEnrollmentToken(validEnrollmentToken); + expect(tokensDB.length).toEqual(0); + + const { token } = await tokensLib.getEnrollmentToken(validEnrollmentToken); + + expect(token).toEqual(null); + }); + }); +}); diff --git a/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/remove_tags.test.ts b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/remove_tags.test.ts new file mode 100644 index 0000000000000..63a98f5c054df --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/remove_tags.test.ts @@ -0,0 +1,112 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { BeatTag, CMBeat } from '../../../../../common/domain_types'; +import { FrameworkInternalUser } from '../../../adapters/framework/adapter_types'; +import { compose } from '../../../compose/testing'; +import { CMServerLibs } from '../../../lib'; + +const internalUser: FrameworkInternalUser = { kind: 'internal' }; + +describe('Beats Domain Lib', () => { + let libs: CMServerLibs; + let beatsDB: Array> = []; + let tagsDB: BeatTag[] = []; + + describe('remove_tags_from_beats', () => { + beforeEach(async () => { + beatsDB = [ + { + access_token: '9a6c99ae0fd84b068819701169cd8a4b', + active: true, + enrollment_token: '123kuil;4', + host_ip: '1.2.3.4', + host_name: 'foo.bar.com', + id: 'qux', + type: 'filebeat', + }, + { + access_token: '188255eb560a4448b72656c5e99cae6f', + active: true, + enrollment_token: '12fghjyu34', + host_ip: '22.33.11.44', + host_name: 'baz.bar.com', + id: 'baz', + type: 'metricbeat', + }, + { + access_token: '93c4a4dd08564c189a7ec4e4f046b975', + active: true, + enrollment_token: '12nfhgj34', + host_ip: '1.2.3.4', + host_name: 'foo.bar.com', + id: 'foo', + tags: ['production', 'qa'], + type: 'metricbeat', + verified_on: '2018-05-15T16:25:38.924Z', + }, + { + access_token: '3c4a4dd08564c189a7ec4e4f046b9759', + active: true, + + enrollment_token: '123sfd4', + host_ip: '11.22.33.44', + host_name: 'foo.com', + id: 'bar', + type: 'filebeat', + }, + ]; + tagsDB = [ + { + configuration_blocks: [], + id: 'production', + last_updated: new Date(), + }, + { + configuration_blocks: [], + id: 'development', + last_updated: new Date(), + }, + { + configuration_blocks: [], + id: 'qa', + last_updated: new Date(), + }, + ]; + + libs = compose({ + tagsDB, + beatsDB, + }); + }); + + it('should remove a single tag from a single beat', async () => { + const apiResponse = await libs.beats.removeTagsFromBeats(internalUser, [ + { beatId: 'foo', tag: 'production' }, + ]); + + expect(apiResponse.removals).toEqual([{ status: 200, result: 'updated' }]); + // @ts-ignore + expect(beatsDB.find(b => b.id === 'foo').tags).toEqual(['qa']); + }); + + it('should remove a single tag from a multiple beats', async () => { + const apiResponse = await libs.beats.removeTagsFromBeats(internalUser, [ + { beatId: 'foo', tag: 'development' }, + { beatId: 'bar', tag: 'development' }, + ]); + + expect(apiResponse.removals).toEqual([ + { status: 200, result: 'updated' }, + { status: 200, result: 'updated' }, + ]); + + // @ts-ignore + expect(beatsDB.find(b => b.id === 'foo').tags).toEqual(['production', 'qa']); + expect(beatsDB.find(b => b.id === 'bar')).not.toHaveProperty('tags'); + }); + }); +}); diff --git a/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/update.test.ts b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/update.test.ts new file mode 100644 index 0000000000000..74f747374e755 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/__tests__/beats/update.test.ts @@ -0,0 +1,118 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Chance from 'chance'; +import { BeatTag, CMBeat } from '../../../../../common/domain_types'; +import { MemoryBeatsAdapter } from '../../../adapters/beats/memory_beats_adapter'; +import { HapiBackendFrameworkAdapter } from '../../../adapters/framework/hapi_framework_adapter'; +import { MemoryTagsAdapter } from '../../../adapters/tags/memory_tags_adapter'; +import { TokenEnrollmentData } from '../../../adapters/tokens/adapter_types'; +import { MemoryTokensAdapter } from '../../../adapters/tokens/memory_tokens_adapter'; +import { CMBeatsDomain } from '../../beats'; +import { CMTagsDomain } from '../../tags'; +import { CMTokensDomain } from '../../tokens'; + +const seed = Date.now(); +const chance = new Chance(seed); + +const settings = { + encryptionKey: `it's_a_secret`, + enrollmentTokensTtlInSeconds: 10 * 60, // 10 minutes +}; + +describe('Beats Domain lib', () => { + describe('update_beat', () => { + let beatsLib: CMBeatsDomain; + let tokensLib: CMTokensDomain; + let token: TokenEnrollmentData; + let beatsDB: CMBeat[] = []; + let tagsDB: BeatTag[] = []; + let tokensDB: TokenEnrollmentData[]; + let beatId: string; + let beat: Partial; + + const getBeatsLib = async () => { + const framework = new HapiBackendFrameworkAdapter(settings); + + tokensLib = new CMTokensDomain(new MemoryTokensAdapter(tokensDB), { framework }); + const tagsLib = new CMTagsDomain(new MemoryTagsAdapter(tagsDB)); + + beatsLib = new CMBeatsDomain(new MemoryBeatsAdapter(beatsDB), { + framework, + tags: tagsLib, + tokens: tokensLib, + }); + + await tokensLib.createEnrollmentTokens(framework.internalUser, 1); + token = tokensDB[0]; + }; + + beforeEach(async () => { + beatId = chance.word(); + beat = { + host_name: 'foo.bar.com', + type: 'filebeat', + version: '6.4.0', + }; + beatsDB = []; + tagsDB = []; + tokensDB = []; + + getBeatsLib(); + }); + + it('should return a not-found message if beat does not exist', async () => { + const tokenString = token.token || ''; + const result = await beatsLib.update(tokenString, beatId, beat); + + expect(result).toBe('beat-not-found'); + }); + + it('should return an invalid message if token validation fails', async () => { + const beatToFind: CMBeat = { + id: beatId, + config_status: 'OK', + enrollment_token: '', + active: true, + access_token: token.token || '', + type: 'filebeat', + host_ip: 'localhost', + host_name: 'foo.bar.com', + }; + beatsDB = [beatToFind]; + + getBeatsLib(); + + const result = await beatsLib.update('something_invalid', beatId, beat); + + expect(result).toBe('invalid-access-token'); + }); + + it('should update the beat when a valid token is provided', async () => { + const beatToFind: CMBeat = { + id: beatId, + config_status: 'OK', + enrollment_token: '', + active: true, + access_token: token.token || '', + type: 'metricbeat', + host_ip: 'localhost', + host_name: 'bar.foo.com', + version: '6.3.5', + }; + beatsDB = [beatToFind]; + getBeatsLib(); + // @ts-ignore + await beatsLib.update(token, beatId, beat); + expect(beatsDB).toHaveLength(1); + const updatedBeat = beatsDB[0]; + expect(updatedBeat.id).toBe(beatId); + expect(updatedBeat.host_name).toBe('foo.bar.com'); + expect(updatedBeat.version).toBe('6.4.0'); + expect(updatedBeat.type).toBe('filebeat'); + }); + }); +}); diff --git a/x-pack/plugins/beats_management/server/lib/domains/__tests__/tokens.test.ts b/x-pack/plugins/beats_management/server/lib/domains/__tests__/tokens.test.ts new file mode 100644 index 0000000000000..91c504cd9f503 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/__tests__/tokens.test.ts @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { HapiBackendFrameworkAdapter } from '../../adapters/framework/hapi_framework_adapter'; +import { TokenEnrollmentData } from '../../adapters/tokens/adapter_types'; +import { MemoryTokensAdapter } from '../../adapters/tokens/memory_tokens_adapter'; +import { CMTokensDomain } from '../tokens'; + +import Chance from 'chance'; +import moment from 'moment'; +import { BackendFrameworkAdapter } from '../../adapters/framework/adapter_types'; + +const seed = Date.now(); +const chance = new Chance(seed); + +const settings = { + encryptionKey: 'something_who_cares', + enrollmentTokensTtlInSeconds: 10 * 60, // 10 minutes +}; + +describe('Token Domain Lib', () => { + let tokensLib: CMTokensDomain; + let tokensDB: TokenEnrollmentData[] = []; + let framework: BackendFrameworkAdapter; + + beforeEach(async () => { + tokensDB = []; + framework = new HapiBackendFrameworkAdapter(settings); + + tokensLib = new CMTokensDomain(new MemoryTokensAdapter(tokensDB), { + framework, + }); + }); + + it('should generate webtokens with a qty of 1', async () => { + const tokens = await tokensLib.createEnrollmentTokens(framework.internalUser, 1); + + expect(tokens.length).toBe(1); + + expect(typeof tokens[0]).toBe('string'); + }); + + it('should create the specified number of tokens', async () => { + const numTokens = chance.integer({ min: 1, max: 20 }); + const tokensFromApi = await tokensLib.createEnrollmentTokens(framework.internalUser, numTokens); + + expect(tokensFromApi.length).toEqual(numTokens); + expect(tokensFromApi).toEqual(tokensDB.map((t: TokenEnrollmentData) => t.token)); + }); + + it('should set token expiration to 10 minutes from now by default', async () => { + await tokensLib.createEnrollmentTokens(framework.internalUser, 1); + + const token = tokensDB[0]; + + // We do a fuzzy check to see if the token expires between 9 and 10 minutes + // from now because a bit of time has elapsed been the creation of the + // tokens and this check. + const tokenExpiresOn = moment(token.expires_on).valueOf(); + + // Because sometimes the test runs so fast it it equal, and we dont use expect.js version that has toBeLessThanOrEqualTo + const tenMinutesFromNow = moment() + .add('10', 'minutes') + .add('1', 'seconds') + .valueOf(); + + const almostTenMinutesFromNow = moment(tenMinutesFromNow) + .subtract('2', 'seconds') + .valueOf(); + expect(tokenExpiresOn).toBeLessThan(tenMinutesFromNow); + expect(tokenExpiresOn).toBeGreaterThan(almostTenMinutesFromNow); + }); +}); diff --git a/x-pack/plugins/beats_management/server/lib/domains/beats.ts b/x-pack/plugins/beats_management/server/lib/domains/beats.ts new file mode 100644 index 0000000000000..a1b890119fc3e --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/beats.ts @@ -0,0 +1,246 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { uniq } from 'lodash'; +import moment from 'moment'; +import { findNonExistentItems } from '../../utils/find_non_existent_items'; + +import { CMBeat } from '../../../common/domain_types'; +import { BeatsTagAssignment, CMBeatsAdapter } from '../adapters/beats/adapter_types'; +import { FrameworkUser } from '../adapters/framework/adapter_types'; + +import { CMAssignmentReturn } from '../adapters/beats/adapter_types'; +import { BeatsRemovalReturn } from '../adapters/beats/adapter_types'; +import { BeatEnrollmentStatus, CMDomainLibs, CMServerLibs, UserOrToken } from '../lib'; + +export class CMBeatsDomain { + private tags: CMDomainLibs['tags']; + private tokens: CMDomainLibs['tokens']; + private framework: CMServerLibs['framework']; + + constructor( + private readonly adapter: CMBeatsAdapter, + libs: { + tags: CMDomainLibs['tags']; + tokens: CMDomainLibs['tokens']; + framework: CMServerLibs['framework']; + } + ) { + this.adapter = adapter; + this.tags = libs.tags; + this.tokens = libs.tokens; + this.framework = libs.framework; + } + + public async getById(user: FrameworkUser, beatId: string): Promise { + const beat = await this.adapter.get(user, beatId); + return beat && beat.active ? beat : null; + } + + public async getAll(user: FrameworkUser, ESQuery?: any) { + return (await this.adapter.getAll(user, ESQuery)).filter( + (beat: CMBeat) => beat.active === true + ); + } + + public async getAllWithTag(user: FrameworkUser, tagId: string) { + return (await this.adapter.getAllWithTags(user, [tagId])).filter( + (beat: CMBeat) => beat.active === true + ); + } + + public async getByEnrollmentToken(user: FrameworkUser, enrollmentToken: string) { + const beat = await this.adapter.getBeatWithToken(user, enrollmentToken); + return beat && beat.active ? beat : null; + } + + public async update(userOrToken: UserOrToken, beatId: string, beatData: Partial) { + const beat = await this.adapter.get(this.framework.internalUser, beatId); + + // TODO make return type enum + if (beat === null) { + return 'beat-not-found'; + } + + if (typeof userOrToken === 'string') { + const { verified: isAccessTokenValid } = this.tokens.verifyToken( + beat ? beat.access_token : '', + userOrToken + ); + if (!isAccessTokenValid) { + return 'invalid-access-token'; + } + } + + const user = typeof userOrToken === 'string' ? this.framework.internalUser : userOrToken; + + await this.adapter.update(user, { + ...beat, + ...beatData, + }); + } + + // TODO more strongly type this + public async enrollBeat( + enrollmentToken: string, + beatId: string, + remoteAddress: string, + beat: Partial + ): Promise<{ status: string; accessToken?: string }> { + const { token, expires_on } = await this.tokens.getEnrollmentToken(enrollmentToken); + + if (expires_on && moment(expires_on).isBefore(moment())) { + return { status: BeatEnrollmentStatus.ExpiredEnrollmentToken }; + } + if (!token) { + return { status: BeatEnrollmentStatus.InvalidEnrollmentToken }; + } + + const existingBeat = await this.getById(this.framework.internalUser, beatId); + if (existingBeat) { + return { status: BeatEnrollmentStatus.Success }; + } + + const accessToken = this.tokens.generateAccessToken(); + const verifiedOn = moment().toJSON(); + + await this.adapter.insert(this.framework.internalUser, { + ...beat, + active: true, + enrollment_token: enrollmentToken, + verified_on: verifiedOn, + access_token: accessToken, + host_ip: remoteAddress, + id: beatId, + } as CMBeat); + + await this.tokens.deleteEnrollmentToken(enrollmentToken); + + return { status: BeatEnrollmentStatus.Success, accessToken }; + } + + public async removeTagsFromBeats( + user: FrameworkUser, + removals: BeatsTagAssignment[] + ): Promise { + const beatIds = uniq(removals.map(removal => removal.beatId)); + const tagIds = uniq(removals.map(removal => removal.tag)); + + const response = { + removals: removals.map(() => ({ status: null })), + }; + + const beats = await this.adapter.getWithIds(user, beatIds); + const tags = await this.tags.getTagsWithIds(user, tagIds); + + // Handle assignments containing non-existing beat IDs or tags + const nonExistentBeatIds = findNonExistentItems(beats, beatIds); + const nonExistentTags = await findNonExistentItems(tags, tagIds); + + addNonExistentItemToResponse( + response, + removals, + nonExistentBeatIds, + nonExistentTags, + 'removals' + ); + + // TODO abstract this + const validRemovals = removals + .map((removal, idxInRequest) => ({ + beatId: removal.beatId, + idxInRequest, // so we can add the result of this removal to the correct place in the response + tag: removal.tag, + })) + .filter((removal, idx) => response.removals[idx].status === null); + + if (validRemovals.length > 0) { + const removalResults = await this.adapter.removeTagsFromBeats(user, validRemovals); + return addToResultsToResponse('removals', response, removalResults); + } + return response; + } + + public async assignTagsToBeats( + user: FrameworkUser, + assignments: BeatsTagAssignment[] + ): Promise { + const beatIds = uniq(assignments.map(assignment => assignment.beatId)); + const tagIds = uniq(assignments.map(assignment => assignment.tag)); + + const response = { + assignments: assignments.map(() => ({ status: null })), + }; + const beats = await this.adapter.getWithIds(user, beatIds); + const tags = await this.tags.getTagsWithIds(user, tagIds); + // Handle assignments containing non-existing beat IDs or tags + const nonExistentBeatIds = findNonExistentItems(beats, beatIds); + const nonExistentTags = findNonExistentItems(tags, tagIds); + + // TODO break out back into route / function response + // TODO causes function to error if a beat or tag does not exist + addNonExistentItemToResponse( + response, + assignments, + nonExistentBeatIds, + nonExistentTags, + 'assignments' + ); + + // TODO abstract this + const validAssignments = assignments + .map((assignment, idxInRequest) => ({ + beatId: assignment.beatId, + idxInRequest, // so we can add the result of this assignment to the correct place in the response + tag: assignment.tag, + })) + .filter((assignment, idx) => response.assignments[idx].status === null); + + if (validAssignments.length > 0) { + const assignmentResults = await this.adapter.assignTagsToBeats(user, validAssignments); + + // TODO This should prob not mutate + return addToResultsToResponse('assignments', response, assignmentResults); + } + return response; + } +} + +// TODO abstract to the route, also the key arg is a temp fix +function addNonExistentItemToResponse( + response: any, + assignments: any, + nonExistentBeatIds: any, + nonExistentTags: any, + key: string +) { + assignments.forEach(({ beatId, tag }: BeatsTagAssignment, idx: any) => { + const isBeatNonExistent = nonExistentBeatIds.includes(beatId); + + const isTagNonExistent = nonExistentTags.includes(tag); + + if (isBeatNonExistent && isTagNonExistent) { + response[key][idx].status = 404; + response[key][idx].result = `Beat ${beatId} and tag ${tag} not found`; + } else if (isBeatNonExistent) { + response[key][idx].status = 404; + response[key][idx].result = `Beat ${beatId} not found`; + } else if (isTagNonExistent) { + response[key][idx].status = 404; + response[key][idx].result = `Tag ${tag} not found`; + } + }); +} + +// TODO dont mutate response +function addToResultsToResponse(key: string, response: any, assignmentResults: any) { + assignmentResults.forEach((assignmentResult: any) => { + const { idxInRequest, status, result } = assignmentResult; + response[key][idxInRequest].status = status; + response[key][idxInRequest].result = result; + }); + return response; +} diff --git a/x-pack/plugins/beats_management/server/lib/domains/tags.ts b/x-pack/plugins/beats_management/server/lib/domains/tags.ts new file mode 100644 index 0000000000000..79ff2007d1160 --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/tags.ts @@ -0,0 +1,96 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { intersection, uniq, values } from 'lodash'; +import { UNIQUENESS_ENFORCING_TYPES } from '../../../common/constants'; +import { ConfigurationBlock } from '../../../common/domain_types'; +import { FrameworkUser } from '../adapters/framework/adapter_types'; + +import { entries } from '../../utils/polyfills'; +import { CMTagsAdapter } from '../adapters/tags/adapter_types'; + +export class CMTagsDomain { + constructor(private readonly adapter: CMTagsAdapter) {} + + public async getAll(user: FrameworkUser, ESQuery?: any) { + return await this.adapter.getAll(user, ESQuery); + } + + public async getTagsWithIds(user: FrameworkUser, tagIds: string[]) { + return await this.adapter.getTagsWithIds(user, tagIds); + } + + public async delete(user: FrameworkUser, tagIds: string[]) { + return await this.adapter.delete(user, tagIds); + } + + public async saveTag( + user: FrameworkUser, + tagId: string, + config: { color: string; configuration_blocks: ConfigurationBlock[] } + ) { + const { isValid, message } = await this.validateConfigurationBlocks( + config.configuration_blocks + ); + if (!isValid) { + return { isValid, result: message }; + } + + const tag = { + ...config, + id: tagId, + last_updated: new Date(), + }; + return { + isValid: true, + result: await this.adapter.upsertTag(user, tag), + }; + } + + private validateConfigurationBlocks(configurationBlocks: any) { + const types = uniq(configurationBlocks.map((block: any) => block.type)); + + // If none of the types in the given configuration blocks are uniqueness-enforcing, + // we don't need to perform any further validation checks. + const uniquenessEnforcingTypes = intersection(types, UNIQUENESS_ENFORCING_TYPES); + if (uniquenessEnforcingTypes.length === 0) { + return { isValid: true }; + } + + // Count the number of uniqueness-enforcing types in the given configuration blocks + const typeCountMap = configurationBlocks.reduce((map: any, block: any) => { + const { type } = block; + if (!uniquenessEnforcingTypes.includes(type)) { + return map; + } + + const count = map[type] || 0; + return { + ...map, + [type]: count + 1, + }; + }, {}); + + // If there is no more than one of any uniqueness-enforcing types in the given + // configuration blocks, we don't need to perform any further validation checks. + if (values(typeCountMap).filter(count => count > 1).length === 0) { + return { isValid: true }; + } + + const message = entries(typeCountMap) + .filter(([, count]) => count > 1) + .map( + ([type, count]) => + `Expected only one configuration block of type '${type}' but found ${count}` + ) + .join(' '); + + return { + isValid: false, + message, + }; + } +} diff --git a/x-pack/plugins/beats_management/server/lib/domains/tokens.ts b/x-pack/plugins/beats_management/server/lib/domains/tokens.ts new file mode 100644 index 0000000000000..529a526bea75d --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/domains/tokens.ts @@ -0,0 +1,137 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { timingSafeEqual } from 'crypto'; +import { sign as signToken, verify as verifyToken } from 'jsonwebtoken'; +import moment from 'moment'; +import uuid from 'uuid'; +import { BackendFrameworkAdapter } from '../adapters/framework/adapter_types'; +import { FrameworkUser } from '../adapters/framework/adapter_types'; +import { CMTokensAdapter } from '../adapters/tokens/adapter_types'; + +const RANDOM_TOKEN_1 = 'b48c4bda384a40cb91c6eb9b8849e77f'; +const RANDOM_TOKEN_2 = '80a3819e3cd64f4399f1d4886be7a08b'; + +export class CMTokensDomain { + private adapter: CMTokensAdapter; + private framework: BackendFrameworkAdapter; + + constructor(adapter: CMTokensAdapter, libs: { framework: BackendFrameworkAdapter }) { + this.adapter = adapter; + this.framework = libs.framework; + } + + public async getEnrollmentToken(enrollmentToken: string) { + const fullToken = await this.adapter.getEnrollmentToken(enrollmentToken); + + if (!fullToken) { + return { + token: null, + expired: true, + expires_on: null, + }; + } + + const { verified, expired } = this.verifyToken(enrollmentToken, fullToken.token || '', false); + + if (!verified) { + return { + expired, + token: null, + expires_on: null, + }; + } + + return { ...fullToken, expired }; + } + + public async deleteEnrollmentToken(enrollmentToken: string) { + return await this.adapter.deleteEnrollmentToken(enrollmentToken); + } + + public verifyToken(recivedToken: string, token2: string, decode = true) { + let tokenDecoded = true; + let expired = false; + + if (decode) { + const enrollmentTokenSecret = this.framework.getSetting('xpack.beats.encryptionKey'); + + try { + verifyToken(recivedToken, enrollmentTokenSecret); + tokenDecoded = true; + } catch (err) { + if (err.name === 'TokenExpiredError') { + expired = true; + } + tokenDecoded = false; + } + } + + if ( + typeof recivedToken !== 'string' || + typeof token2 !== 'string' || + recivedToken.length !== token2.length + ) { + // This prevents a more subtle timing attack where we know already the tokens aren't going to + // match but still we don't return fast. Instead we compare two pre-generated random tokens using + // the same comparison algorithm that we would use to compare two equal-length tokens. + return { + expired, + verified: + timingSafeEqual( + Buffer.from(RANDOM_TOKEN_1, 'utf8'), + Buffer.from(RANDOM_TOKEN_2, 'utf8') + ) && tokenDecoded, + }; + } + + return { + expired, + verified: + timingSafeEqual(Buffer.from(recivedToken, 'utf8'), Buffer.from(token2, 'utf8')) && + tokenDecoded, + }; + } + + public generateAccessToken() { + const enrollmentTokenSecret = this.framework.getSetting('xpack.beats.encryptionKey'); + + const tokenData = { + created: moment().toJSON(), + randomHash: this.createRandomHash(), + }; + + return signToken(tokenData, enrollmentTokenSecret); + } + + public async createEnrollmentTokens( + user: FrameworkUser, + numTokens: number = 1 + ): Promise { + const tokens = []; + const enrollmentTokensTtlInSeconds = this.framework.getSetting( + 'xpack.beats.enrollmentTokensTtlInSeconds' + ); + + const enrollmentTokenExpiration = moment() + .add(enrollmentTokensTtlInSeconds, 'seconds') + .toJSON(); + + while (tokens.length < numTokens) { + tokens.push({ + expires_on: enrollmentTokenExpiration, + token: this.createRandomHash(), + }); + } + + await this.adapter.upsertTokens(user, tokens); + + return tokens.map(token => token.token); + } + + private createRandomHash() { + return uuid.v4().replace(/-/g, ''); + } +} diff --git a/x-pack/plugins/beats_management/server/lib/lib.ts b/x-pack/plugins/beats_management/server/lib/lib.ts new file mode 100644 index 0000000000000..b8d51374741fe --- /dev/null +++ b/x-pack/plugins/beats_management/server/lib/lib.ts @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { DatabaseAdapter } from './adapters/database/adapter_types'; +import { BackendFrameworkAdapter, FrameworkUser } from './adapters/framework/adapter_types'; + +import { CMBeatsDomain } from './domains/beats'; +import { CMTagsDomain } from './domains/tags'; +import { CMTokensDomain } from './domains/tokens'; + +export type UserOrToken = FrameworkUser | string; + +export interface CMDomainLibs { + beats: CMBeatsDomain; + tags: CMTagsDomain; + tokens: CMTokensDomain; +} + +export interface CMServerLibs extends CMDomainLibs { + framework: BackendFrameworkAdapter; + database?: DatabaseAdapter; +} + +export enum BeatEnrollmentStatus { + Success = 'Success', + ExpiredEnrollmentToken = 'Expired enrollment token', + InvalidEnrollmentToken = 'Invalid enrollment token', +} diff --git a/x-pack/plugins/beats_management/server/management_server.ts b/x-pack/plugins/beats_management/server/management_server.ts new file mode 100644 index 0000000000000..e278e6ff735c1 --- /dev/null +++ b/x-pack/plugins/beats_management/server/management_server.ts @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMServerLibs } from './lib/lib'; +import { createGetBeatConfigurationRoute } from './rest_api/beats/configuration'; +import { createBeatEnrollmentRoute } from './rest_api/beats/enroll'; +import { createGetBeatRoute } from './rest_api/beats/get'; +import { createListAgentsRoute } from './rest_api/beats/list'; +import { createTagAssignmentsRoute } from './rest_api/beats/tag_assignment'; +import { createTagRemovalsRoute } from './rest_api/beats/tag_removal'; +import { createBeatUpdateRoute } from './rest_api/beats/update'; +import { createDeleteTagsWithIdsRoute } from './rest_api/tags/delete'; +import { createGetTagsWithIdsRoute } from './rest_api/tags/get'; +import { createListTagsRoute } from './rest_api/tags/list'; +import { createSetTagRoute } from './rest_api/tags/set'; +import { createTokensRoute } from './rest_api/tokens/create'; +import { beatsIndexTemplate } from './utils/index_templates'; + +export const initManagementServer = (libs: CMServerLibs) => { + if (libs.database) { + libs.database.putTemplate(libs.framework.internalUser, { + name: '.management-beats', + body: beatsIndexTemplate, + }); + } + + libs.framework.registerRoute(createGetBeatRoute(libs)); + libs.framework.registerRoute(createGetTagsWithIdsRoute(libs)); + libs.framework.registerRoute(createListTagsRoute(libs)); + libs.framework.registerRoute(createDeleteTagsWithIdsRoute(libs)); + libs.framework.registerRoute(createGetBeatConfigurationRoute(libs)); + libs.framework.registerRoute(createTagAssignmentsRoute(libs)); + libs.framework.registerRoute(createListAgentsRoute(libs)); + libs.framework.registerRoute(createTagRemovalsRoute(libs)); + libs.framework.registerRoute(createBeatEnrollmentRoute(libs)); + libs.framework.registerRoute(createSetTagRoute(libs)); + libs.framework.registerRoute(createTokensRoute(libs)); + libs.framework.registerRoute(createBeatUpdateRoute(libs)); +}; diff --git a/x-pack/plugins/beats_management/server/rest_api/__tests__/beats_assignments.test.ts b/x-pack/plugins/beats_management/server/rest_api/__tests__/beats_assignments.test.ts new file mode 100644 index 0000000000000..331403e8145c3 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/__tests__/beats_assignments.test.ts @@ -0,0 +1,253 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMServerLibs } from '../../lib/lib'; +import { HapiBackendFrameworkAdapter } from './../../lib/adapters/framework/hapi_framework_adapter'; +import { testHarnes } from './test_harnes'; + +describe('assign_tags_to_beats', () => { + let serverLibs: CMServerLibs; + + beforeAll(async () => { + jest.setTimeout(100000); // 1 second + + serverLibs = await testHarnes.getServerLibs(); + }); + beforeEach(async () => await testHarnes.loadData()); + + it('should add a single tag to a single beat', async () => { + const { + result, + statusCode, + } = await (serverLibs.framework as HapiBackendFrameworkAdapter).injectRequstForTesting({ + method: 'POST', + url: '/api/beats/agents_tags/assignments', + headers: { + 'kbn-xsrf': 'xxx', + authorization: 'loggedin', + }, + payload: { + assignments: [{ beatId: 'bar', tag: 'production' }], + }, + }); + + expect(statusCode).toEqual(200); + expect(result.assignments).toEqual([{ status: 200, result: 'updated' }]); + }); + + it('should not re-add an existing tag to a beat', async () => { + const { + result, + statusCode, + } = await (serverLibs.framework as HapiBackendFrameworkAdapter).injectRequstForTesting({ + method: 'POST', + url: '/api/beats/agents_tags/assignments', + headers: { + 'kbn-xsrf': 'xxx', + authorization: 'loggedin', + }, + payload: { + assignments: [{ beatId: 'foo', tag: 'production' }], + }, + }); + + expect(statusCode).toEqual(200); + + expect(result.assignments).toEqual([{ status: 200, result: 'updated' }]); + + let beat; + + beat = await serverLibs.beats.getById( + { + kind: 'internal', + }, + 'foo' + ); + expect(beat!.tags).toEqual(['production', 'qa']); // as + }); + + it('should add a single tag to a multiple beats', async () => { + const { + result, + statusCode, + } = await (serverLibs.framework as HapiBackendFrameworkAdapter).injectRequstForTesting({ + method: 'POST', + url: '/api/beats/agents_tags/assignments', + headers: { + 'kbn-xsrf': 'xxx', + authorization: 'loggedin', + }, + payload: { + assignments: [{ beatId: 'foo', tag: 'development' }, { beatId: 'bar', tag: 'development' }], + }, + }); + + expect(statusCode).toEqual(200); + + expect(result.assignments).toEqual([ + { status: 200, result: 'updated' }, + { status: 200, result: 'updated' }, + ]); + + let beat; + + beat = await serverLibs.beats.getById( + { + kind: 'internal', + }, + 'foo' + ); + expect(beat!.tags).toEqual(['production', 'qa', 'development']); // as beat 'foo' already had 'production' and 'qa' tags attached to it + + // Beat bar + beat = await serverLibs.beats.getById( + { + kind: 'internal', + }, + 'bar' + ); + + expect(beat!.tags).toEqual(['development']); + }); + + it('should add multiple tags to a single beat', async () => { + const { + result, + statusCode, + } = await (serverLibs.framework as HapiBackendFrameworkAdapter).injectRequstForTesting({ + method: 'POST', + url: '/api/beats/agents_tags/assignments', + headers: { + 'kbn-xsrf': 'xxx', + authorization: 'loggedin', + }, + payload: { + assignments: [{ beatId: 'bar', tag: 'development' }, { beatId: 'bar', tag: 'production' }], + }, + }); + + expect(statusCode).toEqual(200); + + expect(result.assignments).toEqual([ + { status: 200, result: 'updated' }, + { status: 200, result: 'updated' }, + ]); + + const beat = await serverLibs.beats.getById( + { + kind: 'internal', + }, + 'bar' + ); + + expect(beat!.tags).toEqual(['development', 'production']); + }); + + // it('should add multiple tags to a multiple beats', async () => { + // const { body: apiResponse } = await supertest + // .post('/api/beats/agents_tags/assignments') + // .set('kbn-xsrf', 'xxx') + // .send({ + // assignments: [{ beatId: 'foo', tag: 'development' }, { beatId: 'bar', tag: 'production' }], + // }) + // .expect(200); + + // expect(apiResponse.assignments).to.eql([ + // { status: 200, result: 'updated' }, + // { status: 200, result: 'updated' }, + // ]); + + // let esResponse; + // let beat; + + // // Beat foo + // esResponse = await es.get({ + // index: ES_INDEX_NAME, + // type: ES_TYPE_NAME, + // id: `beat:foo`, + // }); + + // beat = esResponse._source.beat; + // expect(beat.tags).to.eql(['production', 'qa', 'development']); // as beat 'foo' already had 'production' and 'qa' tags attached to it + + // // Beat bar + // esResponse = await es.get({ + // index: ES_INDEX_NAME, + // type: ES_TYPE_NAME, + // id: `beat:bar`, + // }); + + // beat = esResponse._source.beat; + // expect(beat.tags).to.eql(['production']); + // }); + + // it('should return errors for non-existent beats', async () => { + // const nonExistentBeatId = chance.word(); + + // const { body: apiResponse } = await supertest + // .post('/api/beats/agents_tags/assignments') + // .set('kbn-xsrf', 'xxx') + // .send({ + // assignments: [{ beatId: nonExistentBeatId, tag: 'production' }], + // }) + // .expect(200); + + // expect(apiResponse.assignments).to.eql([ + // { status: 404, result: `Beat ${nonExistentBeatId} not found` }, + // ]); + // }); + + // it('should return errors for non-existent tags', async () => { + // const nonExistentTag = chance.word(); + + // const { body: apiResponse } = await supertest + // .post('/api/beats/agents_tags/assignments') + // .set('kbn-xsrf', 'xxx') + // .send({ + // assignments: [{ beatId: 'bar', tag: nonExistentTag }], + // }) + // .expect(200); + + // expect(apiResponse.assignments).to.eql([ + // { status: 404, result: `Tag ${nonExistentTag} not found` }, + // ]); + + // const esResponse = await es.get({ + // index: ES_INDEX_NAME, + // type: ES_TYPE_NAME, + // id: `beat:bar`, + // }); + + // const beat = esResponse._source.beat; + // expect(beat).to.not.have.property('tags'); + // }); + + // it('should return errors for non-existent beats and tags', async () => { + // const nonExistentBeatId = chance.word(); + // const nonExistentTag = chance.word(); + + // const { body: apiResponse } = await supertest + // .post('/api/beats/agents_tags/assignments') + // .set('kbn-xsrf', 'xxx') + // .send({ + // assignments: [{ beatID: nonExistentBeatId, tag: nonExistentTag }], + // }) + // .expect(200); + + // expect(apiResponse.assignments).to.eql([ + // { status: 404, result: `Beat ${nonExistentBeatId} and tag ${nonExistentTag} not found` }, + // ]); + + // const esResponse = await es.get({ + // index: ES_INDEX_NAME, + // type: ES_TYPE_NAME, + // id: `beat:bar`, + // }); + + // const beat = esResponse._source.beat; + // expect(beat).to.not.have.property('tags'); + // }); +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/__tests__/data.json b/x-pack/plugins/beats_management/server/rest_api/__tests__/data.json new file mode 100644 index 0000000000000..f263eff1a5bd4 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/__tests__/data.json @@ -0,0 +1,158 @@ +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "beat:qux", + "source": { + "type": "beat", + "beat": { + "type": "filebeat", + "active": true, + "host_ip": "1.2.3.4", + "host_name": "foo.bar.com", + "id": "qux", + "name": "qux_filebeat", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI" + } + } + } +} + +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "beat:baz", + "source": { + "type": "beat", + "beat": { + "type": "metricbeat", + "active": true, + "host_ip": "22.33.11.44", + "host_name": "baz.bar.com", + "id": "baz", + "name": "baz_metricbeat", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI" + } + } + } +} + +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "beat:foo", + "source": { + "type": "beat", + "beat": { + "type": "metricbeat", + "active": true, + "host_ip": "1.2.3.4", + "host_name": "foo.bar.com", + "id": "foo", + "name": "foo_metricbeat", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI", + "verified_on": "2018-05-15T16:25:38.924Z", + "tags": [ + "production", + "qa" + ] + } + } + } +} + +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "beat:bar", + "source": { + "type": "beat", + "beat": { + "type": "filebeat", + "active": true, + "host_ip": "11.22.33.44", + "host_name": "foo.com", + "id": "bar", + "name": "bar_filebeat", + "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjcmVhdGVkIjoiMjAxOC0wNi0zMFQwMzo0MjoxNS4yMzBaIiwiaWF0IjoxNTMwMzMwMTM1fQ.SSsX2Byyo1B1bGxV8C3G4QldhE5iH87EY_1r21-bwbI" + } + } + } +} + +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "tag:production", + "source": { + "type": "tag", + "tag": { + "configuration_blocks": [ + { + "type": "output", + "description": "some description", + "configs": [{ + "hosts": ["localhost:9200"], + "username": "some-username" + }] + }, + { + "type": "metricbeat.modules", + "configs": [{ + "module": "memcached", + "hosts": ["localhost:11211"] + }] + } + ] + } + } + } +} + +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "tag:development", + "source": { + "type": "tag", + "tag": { + "configuration_blocks": [] + } + } + } +} + +{ + "type": "doc", + "value": { + "index": ".management-beats", + "type": "_doc", + "id": "tag:qa", + "source": { + "type": "tag", + "tag": { + "configuration_blocks": [ + { + "type": "metricbeat.modules", + "configs": [{ + "module": "memcached", + "node.namespace": "node", + "hosts": ["localhost:4949"] + }] + } + ] + } + } + } +} \ No newline at end of file diff --git a/x-pack/plugins/beats_management/server/rest_api/__tests__/test_harnes.ts b/x-pack/plugins/beats_management/server/rest_api/__tests__/test_harnes.ts new file mode 100644 index 0000000000000..ed93ffbe36e1e --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/__tests__/test_harnes.ts @@ -0,0 +1,102 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { badRequest } from 'boom'; +import { readFile } from 'fs'; +// @ts-ignore +import Hapi from 'hapi'; +import { resolve } from 'path'; +import { promisify } from 'util'; +import { BeatTag, CMBeat } from '../../../common/domain_types'; +import { TokenEnrollmentData } from '../../lib/adapters/tokens/adapter_types'; +import { compose } from '../../lib/compose/testing'; +import { CMServerLibs } from '../../lib/lib'; +import { initManagementServer } from './../../management_server'; + +const readFileAsync = promisify(readFile); +let serverLibs: CMServerLibs; + +export const testHarnes = { + description: 'API Development Tests', + loadData: async () => { + if (!serverLibs) { + throw new Error('Server libs not composed yet...'); + } + const contents = await readFileAsync(resolve(__dirname, './data.json'), 'utf8'); + const database = contents.split(/\n\n/); + + // @ts-ignore the private access + serverLibs.beats.adapter.setDB( + database.reduce((inserts: CMBeat[], source) => { + const type = 'beat'; + const data = JSON.parse(source); + + if (data.value.source.type === type) { + inserts.push({ + id: data.value.id.substring(data.value.id.indexOf(':') + 1), + ...data.value.source[type], + }); + } + return inserts; + }, []) + ); + + // @ts-ignore the private access + serverLibs.tags.adapter.setDB( + database.reduce((inserts: BeatTag[], source) => { + const type = 'tag'; + const data = JSON.parse(source); + + if (data.value.source.type === type) { + inserts.push({ + id: data.value.id.substring(data.value.id.indexOf(':') + 1), + ...data.value.source[type], + }); + } + return inserts; + }, []) + ); + + // @ts-ignore the private access + serverLibs.tokens.adapter.setDB( + database.reduce((inserts: TokenEnrollmentData[], source) => { + const type = 'token'; + const data = JSON.parse(source); + + if (data.value.source.type === type) { + inserts.push({ + id: data.value.id.substring(data.value.id.indexOf(':') + 1), + ...data.value.source[type], + }); + } + return inserts; + }, []) + ); + }, + getServerLibs: async () => { + if (!serverLibs) { + const server = new Hapi.Server({ port: 111111 }); + const versionHeader = 'kbn-version'; + const xsrfHeader = 'kbn-xsrf'; + + server.ext('onPostAuth', (req: any, h: any) => { + const isSafeMethod = req.method === 'get' || req.method === 'head'; + const hasVersionHeader = versionHeader in req.headers; + const hasXsrfHeader = xsrfHeader in req.headers; + + if (!isSafeMethod && !hasVersionHeader && !hasXsrfHeader) { + throw badRequest(`Request must contain a ${xsrfHeader} header.`); + } + + return h.continue; + }); + + serverLibs = compose(server); + initManagementServer(serverLibs); + } + return serverLibs; + }, +}; diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/configuration.ts b/x-pack/plugins/beats_management/server/rest_api/beats/configuration.ts new file mode 100644 index 0000000000000..a24d6dee05132 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/configuration.ts @@ -0,0 +1,82 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import Joi from 'joi'; +import { omit } from 'lodash'; +import { BeatTag, CMBeat, ConfigurationBlock } from '../../../common/domain_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; +import { ReturnedConfigurationBlock } from './../../../common/domain_types'; + +export const createGetBeatConfigurationRoute = (libs: CMServerLibs) => ({ + method: 'GET', + path: '/api/beats/agent/{beatId}/configuration', + config: { + validate: { + headers: Joi.object({ + 'kbn-beats-access-token': Joi.string().required(), + }).options({ allowUnknown: true }), + query: Joi.object({ + validSetting: Joi.boolean().default(true), + }), + }, + auth: false, + }, + handler: async (request: any, h: any) => { + const beatId = request.params.beatId; + const accessToken = request.headers['kbn-beats-access-token']; + + let beat; + let tags; + try { + beat = await libs.beats.getById(libs.framework.internalUser, beatId); + if (beat === null) { + return h.response({ message: `Beat "${beatId}" not found` }).code(404); + } + + const isAccessTokenValid = beat.access_token === accessToken; + if (!isAccessTokenValid) { + return h.response({ message: 'Invalid access token' }).code(401); + } + + let newStatus: CMBeat['config_status'] = 'OK'; + if (!request.query.validSetting) { + newStatus = 'ERROR'; + } + + await libs.beats.update(libs.framework.internalUser, beat.id, { + config_status: newStatus, + last_checkin: new Date(), + }); + + tags = await libs.tags.getTagsWithIds(libs.framework.internalUser, beat.tags || []); + } catch (err) { + return wrapEsError(err); + } + + const configurationBlocks = tags.reduce( + (blocks: ReturnedConfigurationBlock[], tag: BeatTag) => { + blocks = blocks.concat( + tag.configuration_blocks.reduce( + (acc: ReturnedConfigurationBlock[], block: ConfigurationBlock) => { + acc.push({ + ...omit(block, ['configs']), + config: block.configs[0], + }); + return acc; + }, + [] + ) + ); + return blocks; + }, + [] + ); + + return { + configuration_blocks: configurationBlocks, + }; + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/enroll.ts b/x-pack/plugins/beats_management/server/rest_api/beats/enroll.ts new file mode 100644 index 0000000000000..266e3baa3829f --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/enroll.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import Joi from 'joi'; +import { omit } from 'lodash'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; +import { CMServerLibs } from '../../lib/lib'; +import { BeatEnrollmentStatus } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +// TODO: write to Kibana audit log file +export const createBeatEnrollmentRoute = (libs: CMServerLibs) => ({ + method: 'POST', + path: '/api/beats/agent/{beatId}', + licenseRequired: true, + config: { + auth: false, + validate: { + headers: Joi.object({ + 'kbn-beats-enrollment-token': Joi.string().required(), + }).options({ + allowUnknown: true, + }), + payload: Joi.object({ + host_name: Joi.string().required(), + name: Joi.string().required(), + type: Joi.string().required(), + version: Joi.string().required(), + }).required(), + }, + }, + handler: async (request: FrameworkRequest, h: any) => { + const { beatId } = request.params; + const enrollmentToken = request.headers['kbn-beats-enrollment-token']; + + try { + const { status, accessToken } = await libs.beats.enrollBeat( + enrollmentToken, + beatId, + request.info.remoteAddress, + omit(request.payload, 'enrollment_token') + ); + + switch (status) { + case BeatEnrollmentStatus.ExpiredEnrollmentToken: + return h + .response({ + message: BeatEnrollmentStatus.ExpiredEnrollmentToken, + }) + .code(400); + case BeatEnrollmentStatus.InvalidEnrollmentToken: + return h + .response({ + message: BeatEnrollmentStatus.InvalidEnrollmentToken, + }) + .code(400); + case BeatEnrollmentStatus.Success: + default: + return h.response({ access_token: accessToken }).code(201); + } + } catch (err) { + // TODO move this to kibana route thing in adapter + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/get.ts b/x-pack/plugins/beats_management/server/rest_api/beats/get.ts new file mode 100644 index 0000000000000..49fac5e9f009c --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/get.ts @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMBeat } from '../../../common/domain_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +export const createGetBeatRoute = (libs: CMServerLibs) => ({ + method: 'GET', + path: '/api/beats/agent/{beatId}/{token?}', + requiredRoles: ['beats_admin'], + handler: async (request: any, h: any) => { + const beatId = request.params.beatId; + + let beat: CMBeat | null; + if (beatId === 'unknown') { + try { + beat = await libs.beats.getByEnrollmentToken(request.user, request.params.token); + if (beat === null) { + return h.response().code(200); + } + } catch (err) { + return wrapEsError(err); + } + } else { + try { + beat = await libs.beats.getById(request.user, beatId); + if (beat === null) { + return h.response({ message: 'Beat not found' }).code(404); + } + } catch (err) { + return wrapEsError(err); + } + } + + delete beat.access_token; + + return beat; + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/list.ts b/x-pack/plugins/beats_management/server/rest_api/beats/list.ts new file mode 100644 index 0000000000000..6dfec291f602b --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/list.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as Joi from 'joi'; +import { CMBeat } from '../../../common/domain_types'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +export const createListAgentsRoute = (libs: CMServerLibs) => ({ + method: 'GET', + path: '/api/beats/agents/{listByAndValue*}', + requiredRoles: ['beats_admin'], + validate: { + headers: Joi.object({ + 'kbn-beats-enrollment-token': Joi.string().required(), + }).options({ + allowUnknown: true, + }), + query: Joi.object({ + ESQuery: Joi.string(), + }), + }, + licenseRequired: true, + handler: async (request: FrameworkRequest) => { + const listByAndValueParts = request.params.listByAndValue + ? request.params.listByAndValue.split('/') + : []; + let listBy: 'tag' | null = null; + let listByValue: string | null = null; + + if (listByAndValueParts.length === 2) { + listBy = listByAndValueParts[0]; + listByValue = listByAndValueParts[1]; + } + + try { + let beats: CMBeat[]; + + switch (listBy) { + case 'tag': + beats = await libs.beats.getAllWithTag(request.user, listByValue || ''); + break; + + default: + beats = await libs.beats.getAll( + request.user, + request.query && request.query.ESQuery ? JSON.parse(request.query.ESQuery) : undefined + ); + + break; + } + + return { beats }; + } catch (err) { + // TODO move this to kibana route thing in adapter + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/tag_assignment.ts b/x-pack/plugins/beats_management/server/rest_api/beats/tag_assignment.ts new file mode 100644 index 0000000000000..91cda6e9524f9 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/tag_assignment.ts @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Joi from 'joi'; +import { BeatsTagAssignment } from '../../../public/lib/adapters/beats/adapter_types'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; + +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +// TODO: write to Kibana audit log file +export const createTagAssignmentsRoute = (libs: CMServerLibs) => ({ + method: 'POST', + path: '/api/beats/agents_tags/assignments', + licenseRequired: true, + requiredRoles: ['beats_admin'], + config: { + validate: { + payload: Joi.object({ + assignments: Joi.array().items( + Joi.object({ + beatId: Joi.string().required(), + tag: Joi.string().required(), + }) + ), + }).required(), + }, + }, + handler: async (request: FrameworkRequest) => { + const { assignments }: { assignments: BeatsTagAssignment[] } = request.payload; + + try { + const response = await libs.beats.assignTagsToBeats(request.user, assignments); + return response; + } catch (err) { + // TODO move this to kibana route thing in adapter + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/tag_removal.ts b/x-pack/plugins/beats_management/server/rest_api/beats/tag_removal.ts new file mode 100644 index 0000000000000..d1912d96fdcdb --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/tag_removal.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Joi from 'joi'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +// TODO: write to Kibana audit log file +export const createTagRemovalsRoute = (libs: CMServerLibs) => ({ + method: 'POST', + path: '/api/beats/agents_tags/removals', + licenseRequired: true, + requiredRoles: ['beats_admin'], + config: { + validate: { + payload: Joi.object({ + removals: Joi.array().items( + Joi.object({ + beatId: Joi.string().required(), + tag: Joi.string().required(), + }) + ), + }).required(), + }, + }, + handler: async (request: FrameworkRequest) => { + const { removals } = request.payload; + + try { + const response = await libs.beats.removeTagsFromBeats(request.user, removals); + return response; + } catch (err) { + // TODO move this to kibana route thing in adapter + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/beats/update.ts b/x-pack/plugins/beats_management/server/rest_api/beats/update.ts new file mode 100644 index 0000000000000..64e08330734d0 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/beats/update.ts @@ -0,0 +1,70 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Joi from 'joi'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +// TODO: write to Kibana audit log file (include who did the verification as well) +export const createBeatUpdateRoute = (libs: CMServerLibs) => ({ + method: 'PUT', + path: '/api/beats/agent/{beatId}', + licenseRequired: true, + requiredRoles: ['beats_admin'], + config: { + validate: { + headers: Joi.object({ + 'kbn-beats-access-token': Joi.string(), + }).options({ + allowUnknown: true, + }), + params: Joi.object({ + beatId: Joi.string(), + }), + payload: Joi.object({ + active: Joi.bool(), + ephemeral_id: Joi.string(), + host_name: Joi.string(), + local_configuration_yml: Joi.string(), + metadata: Joi.object(), + name: Joi.string(), + type: Joi.string(), + version: Joi.string(), + }), + }, + }, + handler: async (request: FrameworkRequest, h: any) => { + const { beatId } = request.params; + const accessToken = request.headers['kbn-beats-access-token']; + const remoteAddress = request.info.remoteAddress; + const userOrToken = accessToken || request.user; + + if (request.user.kind === 'unauthenticated' && request.payload.active !== undefined) { + return h + .response({ message: 'access-token is not a valid auth type to change beat status' }) + .code(401); + } + + try { + const status = await libs.beats.update(userOrToken, beatId, { + ...request.payload, + host_ip: remoteAddress, + }); + + switch (status) { + case 'beat-not-found': + return h.response({ message: 'Beat not found', success: false }).code(404); + case 'invalid-access-token': + return h.response({ message: 'Invalid access token', success: false }).code(401); + } + + return h.response({ success: true }).code(204); + } catch (err) { + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/tags/delete.ts b/x-pack/plugins/beats_management/server/rest_api/tags/delete.ts new file mode 100644 index 0000000000000..0f138ecf04a14 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/tags/delete.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +export const createDeleteTagsWithIdsRoute = (libs: CMServerLibs) => ({ + method: 'DELETE', + path: '/api/beats/tags/{tagIds}', + requiredRoles: ['beats_admin'], + licenseRequired: true, + handler: async (request: any) => { + const tagIdString: string = request.params.tagIds; + const tagIds = tagIdString.split(',').filter((id: string) => id.length > 0); + + let success: boolean; + try { + success = await libs.tags.delete(request.user, tagIds); + } catch (err) { + return wrapEsError(err); + } + + return { success }; + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/tags/get.ts b/x-pack/plugins/beats_management/server/rest_api/tags/get.ts new file mode 100644 index 0000000000000..36d00208066c2 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/tags/get.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { BeatTag } from '../../../common/domain_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +export const createGetTagsWithIdsRoute = (libs: CMServerLibs) => ({ + method: 'GET', + path: '/api/beats/tags/{tagIds}', + requiredRoles: ['beats_admin'], + licenseRequired: true, + handler: async (request: any) => { + const tagIdString: string = request.params.tagIds; + const tagIds = tagIdString.split(',').filter((id: string) => id.length > 0); + + let tags: BeatTag[]; + try { + tags = await libs.tags.getTagsWithIds(request.user, tagIds); + } catch (err) { + return wrapEsError(err); + } + + return tags; + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/tags/list.ts b/x-pack/plugins/beats_management/server/rest_api/tags/list.ts new file mode 100644 index 0000000000000..f255a627220d3 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/tags/list.ts @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as Joi from 'joi'; +import { BeatTag } from '../../../common/domain_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +export const createListTagsRoute = (libs: CMServerLibs) => ({ + method: 'GET', + path: '/api/beats/tags', + requiredRoles: ['beats_admin'], + validate: { + headers: Joi.object({ + 'kbn-beats-enrollment-token': Joi.string().required(), + }).options({ + allowUnknown: true, + }), + query: Joi.object({ + ESQuery: Joi.string(), + }), + }, + licenseRequired: true, + handler: async (request: any) => { + let tags: BeatTag[]; + try { + tags = await libs.tags.getAll( + request.user + // request.query ? JSON.parse(request.query.ESQuery) : undefined + ); + } catch (err) { + return wrapEsError(err); + } + + return tags; + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/tags/set.ts b/x-pack/plugins/beats_management/server/rest_api/tags/set.ts new file mode 100644 index 0000000000000..600eef42d90af --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/tags/set.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Joi from 'joi'; +import { get, values } from 'lodash'; +import { ConfigurationBlockTypes } from '../../../common/constants'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +// TODO: write to Kibana audit log file +export const createSetTagRoute = (libs: CMServerLibs) => ({ + method: 'PUT', + path: '/api/beats/tag/{tag}', + licenseRequired: true, + requiredRoles: ['beats_admin'], + config: { + validate: { + params: Joi.object({ + tag: Joi.string(), + }), + payload: Joi.object({ + color: Joi.string(), + configuration_blocks: Joi.array().items( + Joi.object({ + configs: Joi.array() + .items(Joi.object()) + .required(), + description: Joi.string().allow(''), + type: Joi.string() + .only(values(ConfigurationBlockTypes)) + .required(), + }) + ), + }).allow(null), + }, + }, + handler: async (request: FrameworkRequest, h: any) => { + const defaultConfig = { configuration_blocks: [], color: '#DD0A73' }; + const config = get(request, 'payload', defaultConfig) || defaultConfig; + + try { + const { isValid, result } = await libs.tags.saveTag(request.user, request.params.tag, config); + if (!isValid) { + return h.response({ result, success: false }).code(400); + } + + return h.response({ success: true }).code(result === 'created' ? 201 : 200); + } catch (err) { + // TODO move this to kibana route thing in adapter + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/rest_api/tokens/create.ts b/x-pack/plugins/beats_management/server/rest_api/tokens/create.ts new file mode 100644 index 0000000000000..42604ced8a972 --- /dev/null +++ b/x-pack/plugins/beats_management/server/rest_api/tokens/create.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Joi from 'joi'; +import { get } from 'lodash'; +import { FrameworkRequest } from '../../lib/adapters/framework/adapter_types'; +import { CMServerLibs } from '../../lib/lib'; +import { wrapEsError } from '../../utils/error_wrappers'; + +// TODO: write to Kibana audit log file +const DEFAULT_NUM_TOKENS = 1; +export const createTokensRoute = (libs: CMServerLibs) => ({ + method: 'POST', + path: '/api/beats/enrollment_tokens', + licenseRequired: true, + requiredRoles: ['beats_admin'], + config: { + validate: { + payload: Joi.object({ + num_tokens: Joi.number() + .optional() + .default(DEFAULT_NUM_TOKENS) + .min(1), + }).allow(null), + }, + }, + handler: async (request: FrameworkRequest) => { + const numTokens = get(request, 'payload.num_tokens', DEFAULT_NUM_TOKENS); + + try { + const tokens = await libs.tokens.createEnrollmentTokens(request.user, numTokens); + return { tokens }; + } catch (err) { + // TODO move this to kibana route thing in adapter + return wrapEsError(err); + } + }, +}); diff --git a/x-pack/plugins/beats_management/server/utils/README.md b/x-pack/plugins/beats_management/server/utils/README.md new file mode 100644 index 0000000000000..8a6a27aa29867 --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/README.md @@ -0,0 +1 @@ +Utils should be data processing functions and other tools.... all in all utils is basicly everything that is not an adaptor, or presenter and yet too much to put in a lib. \ No newline at end of file diff --git a/x-pack/plugins/beats_management/server/utils/error_wrappers/index.ts b/x-pack/plugins/beats_management/server/utils/error_wrappers/index.ts new file mode 100644 index 0000000000000..3756b0c74fb10 --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/error_wrappers/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { wrapEsError } from './wrap_es_error'; diff --git a/x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.test.ts b/x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.test.ts new file mode 100644 index 0000000000000..e7fb1c2adda21 --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.test.ts @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { wrapEsError } from './wrap_es_error'; + +describe('wrap_es_error', () => { + describe('#wrapEsError', () => { + let originalError: any; + beforeEach(() => { + originalError = new Error('I am an error'); + originalError.statusCode = 404; + }); + + it('should return a Boom object', () => { + const wrappedError = wrapEsError(originalError); + + expect(wrappedError.isBoom).toEqual(true); + }); + + it('should return the correct Boom object', () => { + const wrappedError = wrapEsError(originalError); + + expect(wrappedError.output.statusCode).toEqual(originalError.statusCode); + expect(wrappedError.output.payload.message).toEqual(originalError.message); + }); + + it('should return invalid permissions message for 403 errors', () => { + const securityError = new Error('I am an error'); + // @ts-ignore + securityError.statusCode = 403; + const wrappedError = wrapEsError(securityError); + + expect(wrappedError.isBoom).toEqual(true); + expect(wrappedError.message).toEqual( + 'Insufficient user permissions for managing Beats configuration' + ); + }); + }); +}); diff --git a/x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.ts b/x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.ts new file mode 100644 index 0000000000000..16c35fad7d63b --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/error_wrappers/wrap_es_error.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// @ts-ignore +import Boom from 'boom'; + +/** + * Wraps ES errors into a Boom error response and returns it + * This also handles the permissions issue gracefully + * + * @param err Object ES error + * @return Object Boom error response + */ +export function wrapEsError(err: any) { + const statusCode = err.statusCode; + if (statusCode === 403) { + return Boom.forbidden('Insufficient user permissions for managing Beats configuration'); + } + + return Boom.boomify(err, { statusCode: err.statusCode }); +} diff --git a/x-pack/plugins/beats_management/server/utils/find_non_existent_items.ts b/x-pack/plugins/beats_management/server/utils/find_non_existent_items.ts new file mode 100644 index 0000000000000..0e9b4f0b6fa5e --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/find_non_existent_items.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +interface RandomItem { + id: string; + [key: string]: any; +} + +export function findNonExistentItems(items: RandomItem[], requestedItems: any) { + return requestedItems.reduce((nonExistentItems: string[], requestedItem: string, idx: number) => { + if (items.findIndex((item: RandomItem) => item && item.id === requestedItem) === -1) { + nonExistentItems.push(requestedItems[idx]); + } + return nonExistentItems; + }, []); +} diff --git a/x-pack/plugins/beats_management/server/utils/index_templates/beats_template.json b/x-pack/plugins/beats_management/server/utils/index_templates/beats_template.json new file mode 100644 index 0000000000000..2640c25c1d307 --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/index_templates/beats_template.json @@ -0,0 +1,109 @@ +{ + "index_patterns": [".management-beats"], + "version": 65000, + "settings": { + "index": { + "number_of_shards": 1, + "auto_expand_replicas": "0-1", + "codec": "best_compression" + } + }, + "mappings": { + "_doc": { + "dynamic": "strict", + "properties": { + "type": { + "type": "keyword" + }, + "enrollment_token": { + "properties": { + "token": { + "type": "keyword" + }, + "expires_on": { + "type": "date" + } + } + }, + "tag": { + "properties": { + "id": { + "type": "keyword" + }, + "color": { + "type": "keyword" + }, + "last_updated": { + "type": "date" + }, + "configuration_blocks": { + "type": "nested", + "properties": { + "type": { + "type": "keyword" + }, + "description": { + "type": "text" + }, + "configs": { + "type": "nested", + "dynamic": true + } + } + } + } + }, + "beat": { + "properties": { + "id": { + "type": "keyword" + }, + "config_status": { + "type": "keyword" + }, + "active": { + "type": "boolean" + }, + "last_checkin": { + "type": "date" + }, + "enrollment_token": { + "type": "keyword" + }, + "access_token": { + "type": "keyword" + }, + "verified_on": { + "type": "date" + }, + "type": { + "type": "keyword" + }, + "version": { + "type": "keyword" + }, + "host_ip": { + "type": "ip" + }, + "host_name": { + "type": "keyword" + }, + "ephemeral_id": { + "type": "keyword" + }, + "tags": { + "type": "keyword" + }, + "metadata": { + "dynamic": "true", + "type": "object" + }, + "name": { + "type": "keyword" + } + } + } + } + } + } +} diff --git a/x-pack/plugins/beats_management/server/utils/index_templates/index.ts b/x-pack/plugins/beats_management/server/utils/index_templates/index.ts new file mode 100644 index 0000000000000..eeaef7a68d49f --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/index_templates/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import beatsIndexTemplate from './beats_template.json'; +export { beatsIndexTemplate }; diff --git a/x-pack/plugins/beats_management/server/utils/polyfills.ts b/x-pack/plugins/beats_management/server/utils/polyfills.ts new file mode 100644 index 0000000000000..5291e2c72be7d --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/polyfills.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const entries = (obj: any) => { + const ownProps = Object.keys(obj); + let i = ownProps.length; + const resArray = new Array(i); // preallocate the Array + + while (i--) { + resArray[i] = [ownProps[i], obj[ownProps[i]]]; + } + + return resArray; +}; diff --git a/x-pack/plugins/beats_management/server/utils/wrap_request.ts b/x-pack/plugins/beats_management/server/utils/wrap_request.ts new file mode 100644 index 0000000000000..83838eb12b335 --- /dev/null +++ b/x-pack/plugins/beats_management/server/utils/wrap_request.ts @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + FrameworkRequest, + FrameworkWrappableRequest, +} from '../lib/adapters/framework/adapter_types'; + +export const internalAuthData = Symbol('internalAuthData'); + +export function wrapRequest( + req: InternalRequest +): FrameworkRequest { + const { params, payload, query, headers, info } = req; + + const isAuthenticated = headers.authorization != null; + + return { + // @ts-ignore -- partial applucation, adapter adds other user data + user: isAuthenticated + ? { + kind: 'authenticated', + [internalAuthData]: headers, + } + : { + kind: 'unauthenticated', + }, + headers, + info, + params, + payload, + query, + }; +} diff --git a/x-pack/plugins/beats_management/tsconfig.json b/x-pack/plugins/beats_management/tsconfig.json new file mode 100644 index 0000000000000..67fefc7286ca4 --- /dev/null +++ b/x-pack/plugins/beats_management/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.json", + "exclude": ["**/node_modules/**"], + "paths": { + "react": ["../../../node_modules/@types/react"] + } +} diff --git a/x-pack/plugins/beats_management/types/eui.d.ts b/x-pack/plugins/beats_management/types/eui.d.ts new file mode 100644 index 0000000000000..1b5ad7aa0a374 --- /dev/null +++ b/x-pack/plugins/beats_management/types/eui.d.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/** + * /!\ These type definitions are temporary until the upstream @elastic/eui + * package includes them. + */ + +import * as eui from '@elastic/eui'; +import { Moment } from 'moment'; +import { ChangeEventHandler, MouseEventHandler, ReactType, Ref, SFC } from 'react'; + +declare module '@elastic/eui' { + +} diff --git a/x-pack/plugins/beats_management/types/formsy.d.ts b/x-pack/plugins/beats_management/types/formsy.d.ts new file mode 100644 index 0000000000000..f153e80d13e53 --- /dev/null +++ b/x-pack/plugins/beats_management/types/formsy.d.ts @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +declare module 'formsy-react' { + import React, { SFC } from 'react'; + let Formsy: SFC; + export interface FormsyInputProps { + getErrorMessage(): any; + getValue(): any; + hasValue(): boolean; + isFormDisabled(): boolean; + isFormSubmitted(): boolean; + isPristine(): boolean; + isRequired(): boolean; + isValid(): boolean; + isValidValue(): boolean; + resetValue(): void; + setValidations(validations: any, required: boolean): void; + setValue(value: any): void; + showError(): boolean; + showRequired(): boolean; + } + + export default Formsy; + export type FormData = { [fieldName in keyof FormShape]: string }; + export type FieldValue = string | null | undefined; + + type ValidationMethod = ( + values: FormData, + value: string | null | undefined + ) => void; + + export function addValidationRule( + validationName: string, + validationMethod: ValidationMethod + ): void; + export function withFormsy(component: any): any; + + // function withFormsy( + // component: + // | React.Component + // | SFC + // ): React.Component; +} diff --git a/x-pack/plugins/beats_management/types/kibana.d.ts b/x-pack/plugins/beats_management/types/kibana.d.ts new file mode 100644 index 0000000000000..e95dc0df93bea --- /dev/null +++ b/x-pack/plugins/beats_management/types/kibana.d.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +declare module 'ui/index_patterns' { + export type IndexPattern = any; + + export interface StaticIndexPatternField { + name: string; + type: string; + aggregatable: boolean; + searchable: boolean; + } + + export interface StaticIndexPattern { + fields: StaticIndexPatternField[]; + title: string; + } +} + +declare module 'ui/autocomplete_providers' { + import { StaticIndexPattern } from 'ui/index_patterns'; + + export type AutocompleteProvider = ( + args: { + config: { + get(configKey: string): any; + }; + indexPatterns: StaticIndexPattern[]; + boolFilter: any; + } + ) => GetSuggestions; + + export type GetSuggestions = ( + args: { + query: string; + selectionStart: number; + selectionEnd: number; + } + ) => Promise; + + export type AutocompleteSuggestionType = 'field' | 'value' | 'operator' | 'conjunction'; + + export interface AutocompleteSuggestion { + description: string; + end: number; + start: number; + text: string; + type: AutocompleteSuggestionType; + } + + export function addAutocompleteProvider(language: string, provider: AutocompleteProvider): void; + + export function getAutocompleteProvider(language: string): AutocompleteProvider | undefined; +} diff --git a/x-pack/plugins/beats_management/wallaby.js b/x-pack/plugins/beats_management/wallaby.js new file mode 100644 index 0000000000000..bb57d22afafb3 --- /dev/null +++ b/x-pack/plugins/beats_management/wallaby.js @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +const path = require('path'); +process.env.NODE_PATH = path.join(__dirname, '..', '..', 'node_modules'); + +module.exports = function (wallaby) { + return { + debug: true, + files: [ + './tsconfig.json', + //'plugins/beats/public/**/*.+(js|jsx|ts|tsx|json|snap|css|less|sass|scss|jpg|jpeg|gif|png|svg)', + 'server/**/*.+(js|jsx|ts|tsx|json|snap|css|less|sass|scss|jpg|jpeg|gif|png|svg)', + 'common/**/*.+(js|jsx|ts|tsx|json|snap|css|less|sass|scss|jpg|jpeg|gif|png|svg)', + 'public/**/*.+(js|jsx|ts|tsx|json|snap|css|less|sass|scss|jpg|jpeg|gif|png|svg)', + '!**/*.test.ts', + ], + + tests: ['**/*.test.ts', '**/*.test.tsx'], + env: { + type: 'node', + runner: 'node', + }, + testFramework: 'jest', + compilers: { + '**/*.ts?(x)': wallaby.compilers.typeScript({ + typescript: require('typescript'), // eslint-disable-line + }), + '**/*.js': wallaby.compilers.babel({ + babelrc: false, + presets: [require.resolve('@kbn/babel-preset/node_preset')], + }), + }, + + setup: wallaby => { + const path = require('path'); + + const kibanaDirectory = path.resolve(wallaby.localProjectDir, '..', '..', '..'); + + wallaby.testFramework.configure({ + rootDir: wallaby.localProjectDir, + moduleNameMapper: { + '^ui/(.*)': `${kibanaDirectory}/src/ui/public/$1`, + // eslint-disable-next-line + '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': `${kibanaDirectory}/src/dev/jest/mocks/file_mock.js`, + '\\.(css|less|scss)$': `${kibanaDirectory}/src/dev/jest/mocks/style_mock.js`, + }, + testURL: 'http://localhost', + setupFiles: [`${kibanaDirectory}/x-pack/dev-tools/jest/setup/enzyme.js`], + snapshotSerializers: [`${kibanaDirectory}/node_modules/enzyme-to-json/serializer`], + transform: { + '^.+\\.js$': `${kibanaDirectory}/src/dev/jest/babel_transform.js`, + //"^.+\\.tsx?$": `${kibanaDirectory}/src/dev/jest/ts_transform.js`, + }, + }); + }, + }; +}; diff --git a/x-pack/plugins/canvas/.babelrc b/x-pack/plugins/canvas/.babelrc deleted file mode 100644 index 511759632645b..0000000000000 --- a/x-pack/plugins/canvas/.babelrc +++ /dev/null @@ -1,18 +0,0 @@ -{ - "plugins": [ - "transform-object-rest-spread", - "transform-async-to-generator", - "transform-class-properties" - ], - "presets": [ - "react", - [ - "env", - { - "targets": { - "node": "current" - } - } - ] - ] -} diff --git a/x-pack/plugins/canvas/README.md b/x-pack/plugins/canvas/README.md index 9d31dd9768657..5451ffd8a08cd 100644 --- a/x-pack/plugins/canvas/README.md +++ b/x-pack/plugins/canvas/README.md @@ -6,17 +6,17 @@ Canvas is included with X-Pack and requires a Basic license or better to use. -To run Canvas from dev mode, you'll need to build the Canvas plugins at least once. To do so, use the following command: +Canvas has its own build pipeline that gets triggered as part of `node scripts/kbn bootstrap`. However, should you ever need to run the build manually, like if you updated one of the plugins, you can do so with the following command: ```bash -yarn kbn run build:plugins --include canvas +yarn kbn run build --include x-pack ``` ### Developing in Canvas -Canvas has its plugin build process, so if you are planning to work on any of the plugin code, you'll need to use the plugin build process. +As mentioned above, Canvas has its plugin build process, so if you are planning to work on any of the plugin code, you'll need to use the plugin build process. -**If you are not working on Canvas plugins, you can just start Kibana like normal, as long as you ran the build command above at least once**. +**If you are not working on Canvas plugins, you can just start Kibana like normal, as long as you've used `yarn kbn bootstrap`**. The easiest way to do develop on Canvas and have the plugins built automatically is to cd into the canvas plugin path and start the process from there: @@ -28,10 +28,10 @@ yarn start There are several other scripts available once you are in that path as well. -- `yarn build:plugins` - local alias to build Canvas plugins, an alternative to use `kbn`. -- `yarn lint` - local linter setup, can also be used with the `--fix` flag for automatic fixes. -- `yarn test` - local test runner, does not require a real Kibana instance. Runs all the same unit tests the normal runner does, just limited to Canvas, and *waaaaaay* faster. -- `yarn test:dev` - Same as above, but watches for changes and only runs tests for the given scope (browser, server, or common). +- `node scripts/build_plugins` - local alias to build Canvas plugins, an alternative to using `kbn`. +- `node scripts/lint` - local linter setup, can also be used with the `--fix` flag for automatic fixes. +- `node scripts/test` - local test runner, does not require a real Kibana instance. Runs all the same unit tests the normal runner does, just limited to Canvas, and *waaaaaay* faster (currently 12 seconds or less). +- `node scripts/test_dev` - Same as above, but watches for changes and only runs tests for the given scope (browser, server, or common). ## Feature Questions diff --git a/x-pack/plugins/canvas/__tests__/fixtures/function_specs.js b/x-pack/plugins/canvas/__tests__/fixtures/function_specs.js new file mode 100644 index 0000000000000..433b5ec64b753 --- /dev/null +++ b/x-pack/plugins/canvas/__tests__/fixtures/function_specs.js @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Fn } from '../../common/lib/fn'; +import { functions as browserFns } from '../../canvas_plugin_src/functions/browser'; +import { functions as commonFns } from '../../canvas_plugin_src/functions/common'; +import { functions as serverFns } from '../../canvas_plugin_src/functions/server/src'; + +export const functionSpecs = [...browserFns, ...commonFns, ...serverFns].map(fn => new Fn(fn())); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/header.png new file mode 100644 index 0000000000000..f28ad4a3ce4be Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.js new file mode 100644 index 0000000000000..c1e5386c86de7 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const horizontalProgressBar = () => ({ + name: 'horizontalProgressBar', + displayName: 'Horizontal progress bar', + help: 'Displays progress as a portion of a horizontal bar', + width: 400, + height: 30, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="horizontalBar" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/header.png new file mode 100644 index 0000000000000..2eaeb2e976a78 Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.js new file mode 100644 index 0000000000000..9e6590b68d72b --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const horizontalProgressPill = () => ({ + name: 'horizontalProgressPill', + displayName: 'Horizontal progress pill', + help: 'Displays progress as a portion of a horizontal pill', + width: 400, + height: 30, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="horizontalPill" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js index e4345d8cffa7b..6c6b8ca9f3e64 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js @@ -9,8 +9,8 @@ import header from './header.png'; export const image = () => ({ name: 'image', displayName: 'Image', - help: 'A static image.', + help: 'A static image', image: header, - expression: `image mode="contain" + expression: `image dataurl=null mode="contain" | render`, }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/index.js index 15d98394e0475..3fb0f2940be94 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/index.js @@ -11,11 +11,16 @@ import { donut } from './donut'; import { dropdownFilter } from './dropdown_filter'; import { image } from './image'; import { horizontalBarChart } from './horiz_bar_chart'; +import { horizontalProgressBar } from './horizontal_progress_bar'; +import { horizontalProgressPill } from './horizontal_progress_pill'; import { lineChart } from './line_chart'; import { markdown } from './markdown'; import { metric } from './metric'; import { pie } from './pie'; import { plot } from './plot'; +import { progressGauge } from './progress_gauge'; +import { progressSemicircle } from './progress_semicircle'; +import { progressWheel } from './progress_wheel'; import { repeatImage } from './repeatImage'; import { revealImage } from './revealImage'; import { shape } from './shape'; @@ -23,6 +28,8 @@ import { table } from './table'; import { tiltedPie } from './tilted_pie'; import { timeFilter } from './time_filter'; import { verticalBarChart } from './vert_bar_chart'; +import { verticalProgressBar } from './vertical_progress_bar'; +import { verticalProgressPill } from './vertical_progress_pill'; export const elementSpecs = [ areaChart, @@ -32,11 +39,16 @@ export const elementSpecs = [ dropdownFilter, image, horizontalBarChart, + horizontalProgressBar, + horizontalProgressPill, lineChart, markdown, metric, pie, plot, + progressGauge, + progressSemicircle, + progressWheel, repeatImage, revealImage, shape, @@ -44,4 +56,6 @@ export const elementSpecs = [ tiltedPie, timeFilter, verticalBarChart, + verticalProgressBar, + verticalProgressPill, ]; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js index 48a161d8d20fc..89c7b1203e8f3 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js @@ -13,18 +13,18 @@ export const markdown = () => ({ image: header, expression: `filters | demodata -| markdown "### Welcome to the Markdown Element. +| markdown "### Welcome to the Markdown element Good news! You're already connected to some demo data! -The datatable contains +The data table contains **{{rows.length}} rows**, each containing the following columns: {{#each columns}} **{{name}}** {{/each}} -You can use standard Markdown in here, but you can also access your piped-in data using Handlebars. If you want to know more, check out the [Handlebars Documentation](http://handlebarsjs.com/expressions.html) +You can use standard Markdown in here, but you can also access your piped-in data using Handlebars. If you want to know more, check out the [Handlebars documentation](http://handlebarsjs.com/expressions.html). #### Enjoy!" | render`, }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/header.png new file mode 100644 index 0000000000000..8340c8a53b6ce Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.js new file mode 100644 index 0000000000000..cb2151cc9643b --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const progressGauge = () => ({ + name: 'progressGauge', + displayName: 'Progress gauge', + help: 'Displays progress as a portion of a gauge', + width: 200, + height: 200, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="gauge" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/header.png new file mode 100644 index 0000000000000..b5b708529edd4 Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.js new file mode 100644 index 0000000000000..b0b79c452c18f --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const progressSemicircle = () => ({ + name: 'progressSemicircle', + displayName: 'Progress semicircle', + help: 'Displays progress as a portion of a semicircle', + width: 200, + height: 100, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="semicircle" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/header.png new file mode 100644 index 0000000000000..71e5d7e29444e Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.js new file mode 100644 index 0000000000000..1e68bb406f978 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const progressWheel = () => ({ + name: 'progressWheel', + displayName: 'Progress wheel', + help: 'Displays progress as a portion of a wheel', + width: 200, + height: 200, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="wheel" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/register.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/register.js index 535bc6ee6edfe..cee9760d2d4cf 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { elementSpecs } from './index'; elementSpecs.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/revealImage/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/revealImage/index.js index cd6a820e7610a..e064ffba32848 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/elements/revealImage/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/revealImage/index.js @@ -13,7 +13,7 @@ export const revealImage = () => ({ image: header, expression: `filters | demodata -| math "sum(min(cost) / max(cost))" +| math "mean(percent_uptime)" | revealImage origin=bottom image=null | render`, }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/header.png new file mode 100644 index 0000000000000..b9ff963e92c31 Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.js new file mode 100644 index 0000000000000..559da533b13fc --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const verticalProgressBar = () => ({ + name: 'verticalProgressBar', + displayName: 'Vertical progress bar', + help: 'Displays progress as a portion of a vertical bar', + width: 80, + height: 400, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="verticalBar" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/header.png b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/header.png new file mode 100644 index 0000000000000..a4ac6b57da236 Binary files /dev/null and b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/header.png differ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.js b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.js new file mode 100644 index 0000000000000..1096fb4cdf2df --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import header from './header.png'; + +export const verticalProgressPill = () => ({ + name: 'verticalProgressPill', + displayName: 'Vertical progress pill', + help: 'Displays progress as a portion of a vertical pill', + width: 80, + height: 400, + image: header, + expression: `filters +| demodata +| math "mean(percent_uptime)" +| progress shape="verticalPill" label={formatnumber 0%} font={font size=24 family="${ + openSans.value + }" color="#000000" align=center} +| render`, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js index 8f35a1eb74951..7e6a78832508e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.js @@ -25,7 +25,7 @@ export const markdown = () => ({ }, font: { types: ['style'], - help: 'Font settings. Technically you can stick other styles in here too!', + help: 'Font settings. Technically, you can add other styles in here as well', default: '{font}', }, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/register.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/register.js index f4e7fa4b467b5..c92bebac5d192 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { functions } from './index'; functions.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/font.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/font.js index 7816283c370b3..b05945c500e11 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/font.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/font.js @@ -160,9 +160,9 @@ describe('font', () => { expect(result.spec).to.have.property('textAlign', 'right'); expect(result.css).to.contain('text-align:right'); - result = fn(null, { align: 'justified' }); - expect(result.spec).to.have.property('textAlign', 'justified'); - expect(result.css).to.contain('text-align:justified'); + result = fn(null, { align: 'justify' }); + expect(result.spec).to.have.property('textAlign', 'justify'); + expect(result.css).to.contain('text-align:justify'); }); it(`defaults to 'left'`, () => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js new file mode 100644 index 0000000000000..5b16b80ddd744 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js @@ -0,0 +1,173 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from 'expect.js'; +import { progress } from '../progress'; +import { functionWrapper } from '../../../../__tests__/helpers/function_wrapper'; +import { fontStyle } from './fixtures/test_styles'; + +describe('progress', () => { + const fn = functionWrapper(progress); + const value = 0.33; + + it('returns a render as progress', () => { + const result = fn(0.2); + expect(result) + .to.have.property('type', 'render') + .and.to.have.property('as', 'progress'); + }); + + it('sets the progress to context', () => { + const result = fn(0.58); + expect(result.value).to.have.property('value', 0.58); + }); + + it(`throws when context is outside of the valid range`, () => { + expect(fn) + .withArgs(3) + .to.throwException(e => { + expect(e.message).to.be('Context must be between 0 and 1'); + }); + }); + + describe('args', () => { + describe('shape', () => { + it('sets the progress element shape', () => { + const result = fn(value, { + shape: 'wheel', + }); + expect(result.value).to.have.property('shape', 'wheel'); + }); + + it(`defaults to 'gauge'`, () => { + const result = fn(value); + expect(result.value).to.have.property('shape', 'gauge'); + }); + }); + + describe('max', () => { + it('sets the maximum value', () => { + const result = fn(value, { + max: 2, + }); + expect(result.value).to.have.property('max', 2); + }); + + it('defaults to 1', () => { + const result = fn(value); + expect(result.value).to.have.property('max', 1); + }); + + it('throws if max <= 0', () => { + expect(fn) + .withArgs(value, { max: -0.5 }) + .to.throwException(e => { + expect(e.message).to.be(`'max' must be greater than 0`); + }); + }); + }); + + describe('valueColor', () => { + it('sets the color of the progress bar', () => { + const result = fn(value, { + valueColor: '#000000', + }); + expect(result.value).to.have.property('valueColor', '#000000'); + }); + + it(`defaults to '#1785b0'`, () => { + const result = fn(value); + expect(result.value).to.have.property('valueColor', '#1785b0'); + }); + }); + + describe('barColor', () => { + it('sets the color of the background bar', () => { + const result = fn(value, { + barColor: '#FFFFFF', + }); + expect(result.value).to.have.property('barColor', '#FFFFFF'); + }); + + it(`defaults to '#f0f0f0'`, () => { + const result = fn(value); + expect(result.value).to.have.property('barColor', '#f0f0f0'); + }); + }); + + describe('valueWeight', () => { + it('sets the thickness of the bars', () => { + const result = fn(value, { + valuWeight: 100, + }); + + expect(result.value).to.have.property('valuWeight', 100); + }); + + it(`defaults to 20`, () => { + const result = fn(value); + expect(result.value).to.have.property('barWeight', 20); + }); + }); + + describe('barWeight', () => { + it('sets the thickness of the bars', () => { + const result = fn(value, { + barWeight: 50, + }); + + expect(result.value).to.have.property('barWeight', 50); + }); + + it(`defaults to 20`, () => { + const result = fn(value); + expect(result.value).to.have.property('barWeight', 20); + }); + }); + + describe('label', () => { + it('sets the label of the progress', () => { + const result = fn(value, { label: 'foo' }); + + expect(result.value).to.have.property('label', 'foo'); + }); + + it('hides the label if false', () => { + const result = fn(value, { + label: false, + }); + expect(result.value).to.have.property('label', ''); + }); + + it('defaults to true which sets the context as the label', () => { + const result = fn(value); + expect(result.value).to.have.property('label', '0.33'); + }); + }); + + describe('font', () => { + it('sets the font style for the label', () => { + const result = fn(value, { + font: fontStyle, + }); + + expect(result.value).to.have.property('font'); + expect(result.value.font).to.have.keys(Object.keys(fontStyle)); + expect(result.value.font.spec).to.have.keys(Object.keys(fontStyle.spec)); + }); + + it('sets fill to color', () => { + const result = fn(value, { + font: fontStyle, + }); + expect(result.value.font.spec).to.have.property('fill', fontStyle.spec.color); + }); + + // TODO: write test when using an instance of the interpreter + // it("sets a default style for the label when not provided", () => {}); + }); + }); +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js index b5fd1a1333fc3..c4e465b76c812 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.js @@ -21,12 +21,13 @@ export const alterColumn = () => ({ }, type: { types: ['string'], - help: 'The type to convert the column to. Leave blank to not change type.', + help: 'The type to convert the column to. Leave blank to not change type', default: null, + options: ['null', 'boolean', 'number', 'string'], }, name: { types: ['string'], - help: 'The resultant column name. Leave blank to not rename.', + help: 'The resultant column name. Leave blank to not rename', default: null, }, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js index d583368266249..0d37c3b32c45f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.js @@ -21,7 +21,8 @@ export const axisConfig = () => ({ }, position: { types: ['string'], - help: 'Position of the axis labels. Eg, top, bottom, left, and right.', + help: 'Position of the axis labels - top, bottom, left, and right', + options: ['top', 'bottom', 'left', 'right'], default: '', }, min: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js index 84a5ba58a3731..b4579c414afce 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.js @@ -7,7 +7,7 @@ export const caseFn = () => ({ name: 'case', type: 'case', - help: 'Build a case (including a condition/result) to pass to the switch function.', + help: 'Build a case (including a condition/result) to pass to the switch function', args: { when: { aliases: ['_'], diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.js index c3ff1f7e3f6ea..c9dd2245b8696 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.js @@ -22,6 +22,7 @@ export const compare = () => ({ help: 'The operator to use in the comparison: ' + ' eq (equal), ne (not equal), lt (less than), gt (greater than), lte (less than equal), gte (greater than eq)', + options: ['eq', 'ne', 'lt', 'gt', 'lte', 'gte'], }, to: { aliases: ['this', 'b'], diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.js index 4fe85a72115d1..a5e71e3143e16 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { isValid } from '../../../common/lib/url'; +import { isValidUrl } from '../../../common/lib/url'; export const containerStyle = () => ({ name: 'containerStyle', @@ -41,11 +41,13 @@ export const containerStyle = () => ({ types: ['string'], help: 'Valid CSS background size string', default: 'contain', + options: ['contain', 'cover', 'auto'], }, backgroundRepeat: { types: ['string'], help: 'Valid CSS background repeat string', default: 'no-repeat', + options: ['repeat-x', 'repeat', 'space', 'round', 'no-repeat', 'space'], }, opacity: { types: ['number', 'null'], @@ -53,7 +55,8 @@ export const containerStyle = () => ({ }, overflow: { types: ['string'], - help: `Sets overflow of the container`, + help: 'Sets overflow of the container', + options: ['visible', 'hidden', 'scroll', 'auto'], }, }, fn: (context, args) => { @@ -64,7 +67,7 @@ export const containerStyle = () => ({ }; if (backgroundImage) { - if (!isValid(backgroundImage)) + if (!isValidUrl(backgroundImage)) throw new Error('Invalid backgroundImage. Please provide an asset or a URL.'); style.backgroundImage = `url(${backgroundImage})`; style.backgroundSize = backgroundSize; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js index 20fc9ca98f649..23b2631325763 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.js @@ -20,19 +20,19 @@ export const date = () => ({ context: { types: ['null'], }, - help: 'Returns the current time, or a time parsed from a string, as milliseconds since epoch.', + help: 'Returns the current time, or a time parsed from a string, as milliseconds since epoch', args: { value: { aliases: ['_'], types: ['string', 'null'], help: - 'An optional date string to parse into milliseconds since epoch. ' + - 'Can be either a valid Javascript Date input or a string to parse using the format argument. Must be an ISO 8601 string or you must provide the format.', + 'An optional date string to parse into milliseconds since epoch ' + + 'Can be either a valid Javascript Date input or a string to parse using the format argument. Must be an ISO 8601 string or you must provide the format', }, format: { types: ['string'], help: - 'The momentJS format for parsing the optional date string (See https://momentjs.com/docs/#/displaying/).', + 'The momentJS format for parsing the optional date string (See https://momentjs.com/docs/#/displaying/)', }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/font.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/font.js index ef78b7b9dd847..c8b0141d2ef24 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/font.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/font.js @@ -7,6 +7,23 @@ import inlineStyle from 'inline-style'; import { openSans } from '../../../common/lib/fonts'; +const weights = [ + 'normal', + 'bold', + 'bolder', + 'lighter', + '100', + '200', + '300', + '400', + '500', + '600', + '700', + '800', + '900', +]; +const alignments = ['center', 'left', 'right', 'justify']; + export const font = () => ({ name: 'font', aliases: [], @@ -40,41 +57,28 @@ export const font = () => ({ help: 'Set the font weight, e.g. normal, bold, bolder, lighter, 100, 200, 300, 400, 500, 600, 700, 800, 900', default: 'normal', + options: weights, }, underline: { types: ['boolean'], default: false, help: 'Underline the text, true or false', + options: [true, false], }, italic: { types: ['boolean'], default: false, help: 'Italicize, true or false', + options: [true, false], }, align: { types: ['string'], help: 'Horizontal text alignment', default: 'left', + options: alignments, }, }, fn: (context, args) => { - const weights = [ - 'normal', - 'bold', - 'bolder', - 'lighter', - '100', - '200', - '300', - '400', - '500', - '600', - '700', - '800', - '900', - ]; - const alignments = ['center', 'left', 'right', 'justified']; - if (!weights.includes(args.weight)) throw new Error(`Invalid font weight: ${args.weight}`); if (!alignments.includes(args.align)) throw new Error(`Invalid text alignment: ${args.align}`); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.js index 55af5f60ef97d..5bf6c429331f7 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.js @@ -4,10 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import { includes } from 'lodash'; import { resolveWithMissingImage } from '../../../common/lib/resolve_dataurl'; import { elasticLogo } from '../../lib/elastic_logo'; +const modes = ['contain', 'cover', 'stretch']; + export const image = () => ({ name: 'image', aliases: [], @@ -31,11 +32,11 @@ export const image = () => ({ '"cover" will fill the container with the image, cropping from the sides or bottom as needed.' + '"stretch" will resize the height and width of the image to 100% of the container', default: 'contain', + options: modes, }, }, fn: (context, { dataurl, mode }) => { - if (!includes(['contain', 'cover', 'stretch'], mode)) - throw '"mode" must be "contain", "cover", or "stretch"'; + if (!modes.includes(mode)) throw '"mode" must be "contain", "cover", or "stretch"'; const modeStyle = mode === 'stretch' ? '100% 100%' : mode; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.js index afc9ba665c09b..410dbc60db952 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.js @@ -40,6 +40,7 @@ import { palette } from './palette'; import { pie } from './pie'; import { plot } from './plot'; import { ply } from './ply'; +import { progress } from './progress'; import { render } from './render'; import { replace } from './replace'; import { rounddate } from './rounddate'; @@ -95,6 +96,7 @@ export const functions = [ pie, plot, ply, + progress, render, repeatImage, replace, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.js index 7a601f71b2229..4e5e04815d9c5 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.js @@ -24,11 +24,13 @@ export const palette = () => ({ types: ['boolean'], default: false, help: 'Prefer to make a gradient where supported and useful?', + options: [true, false], }, reverse: { type: ['boolean'], default: false, help: 'Reverse the palette', + options: [true, false], }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.js index fbdd2e9dde210..2cc0fbaeb30c0 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.js @@ -42,6 +42,7 @@ export const pie = () => ({ types: ['boolean'], default: true, help: 'Show pie labels', + options: [true, false], }, labelRadius: { types: ['number'], @@ -57,6 +58,7 @@ export const pie = () => ({ types: ['string', 'boolean'], help: 'Legend position, nw, sw, ne, se or false', default: false, + options: ['nw', 'sw', 'ne', 'se', false], }, tilt: { types: ['number'], diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.js index 2cf996f23cef0..c76a7d658da09 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.js @@ -47,6 +47,7 @@ export const plot = () => ({ types: ['string', 'boolean'], help: 'Legend position, nw, sw, ne, se or false', default: 'ne', + options: ['nw', 'sw', 'ne', 'se', false], }, yaxis: { types: ['boolean', 'axisConfig'], diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/progress.js new file mode 100644 index 0000000000000..453730b3f861a --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/progress.js @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { get } from 'lodash'; +import { openSans } from '../../../common/lib/fonts'; + +const shapes = [ + 'gauge', + 'horizontalBar', + 'horizontalPill', + 'semicircle', + 'unicorn', + 'verticalBar', + 'verticalPill', + 'wheel', +]; + +export const progress = () => ({ + name: 'progress', + aliases: [], + type: 'render', + help: 'Configure a progress element', + context: { + types: ['number'], + }, + args: { + shape: { + type: ['string'], + alias: ['_'], + help: `Select ${shapes.slice(0, -1).join(', ')}, or ${shapes.slice(-1)[0]}`, + options: shapes, + default: 'gauge', + }, + max: { + type: ['number'], + help: 'Maximum value of the progress element', + default: 1, + }, + valueColor: { + type: ['string'], + help: 'Color of the progress bar', + default: `#1785b0`, + }, + barColor: { + type: ['string'], + help: 'Color of the background bar', + default: `#f0f0f0`, + }, + valueWeight: { + type: ['number'], + help: 'Thickness of the progress bar', + default: 20, + }, + barWeight: { + type: ['number'], + help: 'Thickness of the background bar', + default: 20, + }, + label: { + type: ['boolean', 'string'], + help: `Set true/false to show/hide label or provide a string to display as the label`, + default: true, + }, + font: { + types: ['style'], + help: 'Font settings for the label. Technically you can stick other styles in here too!', + default: `{font size=24 family="${openSans.value}" color="#000000" align=center}`, + }, + }, + fn: (value, args) => { + if (args.max <= 0) throw new Error(`'max' must be greater than 0`); + if (value > args.max || value < 0) throw new Error(`Context must be between 0 and ${args.max}`); + + let label = ''; + if (args.label) label = typeof args.label === 'string' ? args.label : `${value}`; + + let font = {}; + + if (get(args, 'font.spec')) { + font = { ...args.font }; + font.spec.fill = args.font.spec.color; // SVG uses fill for font color + } + + return { + type: 'render', + as: 'progress', + value: { + value, + ...args, + label, + font, + }, + }; + }, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/register.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/register.js index f4e7fa4b467b5..c92bebac5d192 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { functions } from './index'; functions.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.js index 716ca8abc340d..50a832553ce4d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.js @@ -17,6 +17,7 @@ export const render = () => ({ types: ['string', 'null'], help: 'The element type to use in rendering. You probably want a specialized function instead, such as plot or grid', + options: ['debug', 'error', 'image', 'pie', 'plot', 'shape', 'table', 'text'], }, css: { types: ['string', 'null'], diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.js index 8c9e4f2af5914..9d54dc9363b95 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.js @@ -30,6 +30,7 @@ export const revealImage = () => ({ types: ['string'], help: 'Where to start from. Eg, top, left, bottom or right', default: 'bottom', + options: ['top', 'left', 'bottom', 'right'], }, }, fn: (percent, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js index 5af8d345df4a1..f6be205e7e824 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.js @@ -17,9 +17,9 @@ export const seriesStyle = () => ({ args: { label: { types: ['string'], - displayName: 'Series Label', + displayName: 'Series label', help: - 'The label of the line this style applies to, not the name you would like to give the line.', + 'The label of the line this style applies to, not the name you would like to give the line', }, color: { types: ['string', 'null'], @@ -33,29 +33,32 @@ export const seriesStyle = () => ({ }, bars: { types: ['number'], - displayName: 'Bar Width', + displayName: 'Bar width', help: 'Width of bars', }, points: { types: ['number'], - displayName: 'Show Points', + displayName: 'Show points', help: 'Size of points on line', }, fill: { types: ['number', 'boolean'], displayName: 'Fill points', help: 'Should we fill points?', + default: false, + options: [true, false], }, stack: { types: ['number', 'null'], - displayName: 'Stack Series', + displayName: 'Stack series', help: 'Should we stack the series? This is the stack "id". Series with the same stack id will be stacked together', }, horizontalBars: { types: ['boolean'], - displayName: 'Horizontal Bars Orientation', + displayName: 'Horizontal bars orientation', help: 'Sets the orientation of bars in the chart to horizontal', + options: [true, false], }, }, fn: (context, args) => ({ type: name, ...args }), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/shape.js index 27379a759608d..9edae93afbd69 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/shape.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/shape.js @@ -18,6 +18,24 @@ export const shape = () => ({ help: 'Pick a shape', aliases: ['_'], default: 'square', + options: [ + 'arrow', + 'arrowMulti', + 'bookmark', + 'cross', + 'circle', + 'hexagon', + 'kite', + 'pentagon', + 'rhombus', + 'semicircle', + 'speechBubble', + 'square', + 'star', + 'tag', + 'triangle', + 'triangleRight', + ], }, fill: { types: ['string', 'null'], @@ -39,6 +57,7 @@ export const shape = () => ({ types: ['boolean'], help: 'Select true to maintain aspect ratio', default: false, + options: [true, false], }, }, fn: (context, { shape, fill, border, borderWidth, maintainAspect }) => ({ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.js index b6b554c032281..abc61aa7eea62 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.js @@ -25,6 +25,7 @@ export const sort = () => ({ types: ['boolean'], help: 'Reverse the sort order. If reverse is not specified, the datatable will be sorted in ascending order.', + options: [true, false], }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js index 4b9e96bda7354..77580be49719a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.js @@ -9,7 +9,7 @@ import { getType } from '../../../common/lib/get_type'; export const staticColumn = () => ({ name: 'staticColumn', type: 'datatable', - help: 'Add a column with a static value.', + help: 'Add a column with a static value', context: { types: ['datatable'], }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js index 3afd345c65c4a..93899d79d7d54 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.js @@ -21,7 +21,8 @@ export const table = () => ({ paginate: { types: ['boolean'], default: true, - help: 'Show pagination controls. If set to false only the first page will be displayed.', + help: 'Show pagination controls. If set to false only the first page will be displayed', + options: [true, false], }, perPage: { types: ['number'], @@ -31,7 +32,8 @@ export const table = () => ({ showHeader: { types: ['boolean'], default: true, - help: 'Show or hide the header row with titles for each column.', + help: 'Show or hide the header row with titles for each column', + options: [true, false], }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.js index ef7466622c08b..fd856b14bcc73 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.js @@ -22,6 +22,7 @@ export const timefilterControl = () => ({ type: ['boolean'], help: 'Show the time filter as a button that triggers a popover', default: true, + options: [true, false], }, }, fn: (context, args) => { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/get_expression_type.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/get_expression_type.js deleted file mode 100644 index f22daa0a8cf51..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/get_expression_type.js +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import expect from 'expect.js'; -import { getExpressionType } from '../pointseries/lib/get_expression_type'; -import { emptyTable, testTable } from '../../common/__tests__/fixtures/test_tables'; - -describe('getExpressionType', () => { - it('returns the result type of an evaluated math expression', () => { - expect(getExpressionType(testTable.columns, '2')).to.be.equal('number'); - expect(getExpressionType(testTable.colunns, '2 + 3')).to.be.equal('number'); - expect(getExpressionType(testTable.columns, 'name')).to.be.equal('string'); - expect(getExpressionType(testTable.columns, 'time')).to.be.equal('date'); - expect(getExpressionType(testTable.columns, 'price')).to.be.equal('number'); - expect(getExpressionType(testTable.columns, 'quantity')).to.be.equal('number'); - expect(getExpressionType(testTable.columns, 'in_stock')).to.be.equal('boolean'); - expect(getExpressionType(testTable.columns, 'mean(price)')).to.be.equal('number'); - expect(getExpressionType(testTable.columns, 'count(name)')).to.be.equal('string'); - expect(getExpressionType(testTable.columns, 'random()')).to.be.equal('number'); - expect(getExpressionType(testTable.columns, 'mean(multiply(price,quantity))')).to.be.eql( - 'number' - ); - }); - it('returns date instead of number when referencing date column', () => { - expect(getExpressionType(testTable.columns, 'mean(time)')).to.be.equal('date'); - }); - it(`returns 'null' if referenced field does not exist in datatable`, () => { - expect(getExpressionType(testTable.columns, 'foo')).to.be.equal('null'); - expect(getExpressionType(emptyTable.columns, 'foo')).to.be.equal('null'); - expect(getExpressionType(emptyTable.columns, 'mean(foo)')).to.be.equal('string'); - }); -}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json deleted file mode 100644 index 62aec98a50a0e..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json +++ /dev/null @@ -1,10002 +0,0 @@ -[ - { - "age": 41, - "cost": 22.09, - "country": "CN", - "price": 52, - "project": "x-pack", - "state": "running", - "time": 1471590000000, - "username": "arobertson0" - }, - { - "age": 62, - "cost": 21.45, - "country": "RU", - "price": 53, - "project": "x-pack", - "state": "start", - "time": 1477292400000, - "username": "smeyer1" - }, - { - "age": 24, - "cost": 21.29, - "country": "FR", - "price": 53, - "project": "elasticsearch", - "state": "start", - "time": 1490425200000, - "username": "rcollins2" - }, - { - "age": 35, - "cost": 23.99, - "country": "PL", - "price": 52, - "project": "logstash", - "state": "start", - "time": 1477033200000, - "username": "lhoward3" - }, - { - "age": 79, - "cost": 22.09, - "country": "EC", - "price": 61, - "project": "kibana", - "state": "running", - "time": 1491116400000, - "username": "kcarroll4" - }, - { - "age": 69, - "cost": 22.9, - "country": "PE", - "price": 52, - "project": "x-pack", - "state": "done", - "time": 1476946800000, - "username": "handerson5" - }, - { - "age": 20, - "cost": 21.2, - "country": "JP", - "price": 65, - "project": "x-pack", - "state": "start", - "time": 1481094000000, - "username": "twashington6" - }, - { - "age": 56, - "cost": 24.19, - "country": "BG", - "price": 38, - "project": "logstash", - "state": "start", - "time": 1476601200000, - "username": "dmendoza7" - }, - { - "age": 48, - "cost": 21.37, - "country": "RU", - "price": 47, - "project": "x-pack", - "state": "start", - "time": 1478070000000, - "username": "staylor8" - }, - { - "age": 75, - "cost": 24.61, - "country": "ES", - "price": 58, - "project": "machine-learning", - "state": "running", - "time": 1483081200000, - "username": "mramirez9" - }, - { - "age": 33, - "cost": 21.82, - "country": "MX", - "price": 59, - "project": "machine-learning", - "state": "running", - "time": 1467529200000, - "username": "dandrewsa" - }, - { - "age": 61, - "cost": 22.57, - "country": "PL", - "price": 52, - "project": "machine-learning", - "state": "done", - "time": 1490252400000, - "username": "bwalkerb" - }, - { - "age": 69, - "cost": 22.28, - "country": "KR", - "price": 58, - "project": "x-pack", - "state": "running", - "time": 1470812400000, - "username": "vfoxc" - }, - { - "age": 75, - "cost": 22.07, - "country": "VN", - "price": 52, - "project": "machine-learning", - "state": "running", - "time": 1474441200000, - "username": "kdixond" - }, - { - "age": 62, - "cost": 23.3, - "country": "ID", - "price": 49, - "project": "x-pack", - "state": "done", - "time": 1488610800000, - "username": "rjacksone" - }, - { - "age": 54, - "cost": 21.96, - "country": "CF", - "price": 48, - "project": "machine-learning", - "state": "running", - "time": 1462086000000, - "username": "ecruzf" - }, - { - "age": 41, - "cost": 22.64, - "country": "JP", - "price": 48, - "project": "x-pack", - "state": "done", - "time": 1480748400000, - "username": "dfreemang" - }, - { - "age": 49, - "cost": 25.63, - "country": "CN", - "price": 56, - "project": "logstash", - "state": "done", - "time": 1478502000000, - "username": "jhernandezh" - }, - { - "age": 36, - "cost": 24.18, - "country": "JM", - "price": 59, - "project": "beats", - "state": "start", - "time": 1465628400000, - "username": "rcolemani" - }, - { - "age": 67, - "cost": 22.04, - "country": "CN", - "price": 66, - "project": "opbeat", - "state": "running", - "time": 1472626800000, - "username": "cbaileyj" - }, - { - "age": 25, - "cost": 24.02, - "country": "AR", - "price": 41, - "project": "opbeat", - "state": "start", - "time": 1488006000000, - "username": "hperryk" - }, - { - "age": 32, - "cost": 23.4, - "country": "CU", - "price": 59, - "project": "opbeat", - "state": "done", - "time": 1479711600000, - "username": "lfoxl" - }, - { - "age": 61, - "cost": 23.9, - "country": "CN", - "price": 56, - "project": "machine-learning", - "state": "start", - "time": 1476255600000, - "username": "cgrantm" - }, - { - "age": 30, - "cost": 23.46, - "country": "CN", - "price": 54, - "project": "kibana", - "state": "done", - "time": 1473231600000, - "username": "ewarrenn" - }, - { - "age": 28, - "cost": 22.8, - "country": "ID", - "price": 48, - "project": "logstash", - "state": "done", - "time": 1474182000000, - "username": "nrileyo" - }, - { - "age": 33, - "cost": 23.61, - "country": "RU", - "price": 53, - "project": "machine-learning", - "state": "start", - "time": 1490338800000, - "username": "swillisp" - }, - { - "age": 19, - "cost": 23.28, - "country": "ID", - "price": 64, - "project": "machine-learning", - "state": "done", - "time": 1461913200000, - "username": "jthompsonq" - }, - { - "age": 27, - "cost": 24.36, - "country": "AZ", - "price": 63, - "project": "x-pack", - "state": "start", - "time": 1483945200000, - "username": "bpricer" - }, - { - "age": 52, - "cost": 23.79, - "country": "AG", - "price": 57, - "project": "elasticsearch", - "state": "start", - "time": 1461222000000, - "username": "rgibsons" - }, - { - "age": 61, - "cost": 23.21, - "country": "CN", - "price": 70, - "project": "machine-learning", - "state": "done", - "time": 1482994800000, - "username": "cwashingtont" - }, - { - "age": 49, - "cost": 23.71, - "country": "US", - "price": 50, - "project": "logstash", - "state": "start", - "time": 1484722800000, - "username": "athompsonu" - }, - { - "age": 64, - "cost": 23.64, - "country": "BR", - "price": 47, - "project": "beats", - "state": "start", - "time": 1475910000000, - "username": "ewarrenv" - }, - { - "age": 36, - "cost": 24.03, - "country": "PE", - "price": 60, - "project": "beats", - "state": "start", - "time": 1472022000000, - "username": "mcruzw" - }, - { - "age": 45, - "cost": 23.13, - "country": "HR", - "price": 50, - "project": "elasticsearch", - "state": "done", - "time": 1463295600000, - "username": "brosex" - }, - { - "age": 30, - "cost": 22.37, - "country": "PK", - "price": 69, - "project": "kibana", - "state": "running", - "time": 1465455600000, - "username": "gberryy" - }, - { - "age": 49, - "cost": 23.96, - "country": "ID", - "price": 49, - "project": "logstash", - "state": "start", - "time": 1468220400000, - "username": "mortizz" - }, - { - "age": 73, - "cost": 22.36, - "country": "YE", - "price": 44, - "project": "elasticsearch", - "state": "running", - "time": 1477897200000, - "username": "pelliott10" - }, - { - "age": 43, - "cost": 20.38, - "country": "PT", - "price": 54, - "project": "beats", - "state": "done", - "time": 1475737200000, - "username": "rperkins11" - }, - { - "age": 30, - "cost": 22.96, - "country": "TZ", - "price": 42, - "project": "kibana", - "state": "done", - "time": 1482822000000, - "username": "rjohnson12" - }, - { - "age": 37, - "cost": 23.27, - "country": "AM", - "price": 57, - "project": "kibana", - "state": "done", - "time": 1473490800000, - "username": "chall13" - }, - { - "age": 79, - "cost": 22.06, - "country": "PH", - "price": 52, - "project": "kibana", - "state": "running", - "time": 1464850800000, - "username": "mwells14" - }, - { - "age": 34, - "cost": 21.81, - "country": "CZ", - "price": 54, - "project": "x-pack", - "state": "running", - "time": 1468306800000, - "username": "bbrown15" - }, - { - "age": 61, - "cost": 22.16, - "country": "ID", - "price": 56, - "project": "machine-learning", - "state": "running", - "time": 1470294000000, - "username": "bwood16" - }, - { - "age": 19, - "cost": 23.26, - "country": "ID", - "price": 56, - "project": "machine-learning", - "state": "done", - "time": 1474873200000, - "username": "sanderson17" - }, - { - "age": 21, - "cost": 22.56, - "country": "ID", - "price": 56, - "project": "logstash", - "state": "done", - "time": 1465801200000, - "username": "rbishop18" - }, - { - "age": 49, - "cost": 23.8, - "country": "PE", - "price": 52, - "project": "logstash", - "state": "start", - "time": 1487574000000, - "username": "kgomez19" - }, - { - "age": 60, - "cost": 22.33, - "country": "MG", - "price": 62, - "project": "opbeat", - "state": "running", - "time": 1485846000000, - "username": "jclark1a" - }, - { - "age": 78, - "cost": 21.46, - "country": "PT", - "price": 61, - "project": "beats", - "state": "start", - "time": 1474527600000, - "username": "cpeterson1b" - }, - { - "age": 78, - "cost": 22.74, - "country": "CN", - "price": 57, - "project": "beats", - "state": "done", - "time": 1461567600000, - "username": "ttaylor1c" - }, - { - "age": 58, - "cost": 23.41, - "country": "PS", - "price": 63, - "project": "kibana", - "state": "done", - "time": 1491634800000, - "username": "sdean1d" - }, - { - "age": 69, - "cost": 21.14, - "country": "RU", - "price": 47, - "project": "x-pack", - "state": "start", - "time": 1481698800000, - "username": "sfreeman1e" - }, - { - "age": 54, - "cost": 23.1, - "country": "CY", - "price": 49, - "project": "machine-learning", - "state": "done", - "time": 1462431600000, - "username": "rmccoy1f" - }, - { - "age": 43, - "cost": 23.55, - "country": "MX", - "price": 62, - "project": "beats", - "state": "start", - "time": 1461308400000, - "username": "kwallace1g" - }, - { - "age": 35, - "cost": 22.39, - "country": "ID", - "price": 59, - "project": "logstash", - "state": "running", - "time": 1468652400000, - "username": "jhunt1h" - }, - { - "age": 51, - "cost": 24.76, - "country": "LU", - "price": 64, - "project": "kibana", - "state": "running", - "time": 1472194800000, - "username": "ageorge1i" - }, - { - "age": 60, - "cost": 22.97, - "country": "HN", - "price": 71, - "project": "opbeat", - "state": "done", - "time": 1482735600000, - "username": "jsims1j" - }, - { - "age": 55, - "cost": 22.75, - "country": "ID", - "price": 54, - "project": "x-pack", - "state": "done", - "time": 1486537200000, - "username": "jwatkins1k" - }, - { - "age": 26, - "cost": 24.65, - "country": "PL", - "price": 61, - "project": "machine-learning", - "state": "running", - "time": 1465110000000, - "username": "jstanley1l" - }, - { - "age": 60, - "cost": 22.96, - "country": "NO", - "price": 56, - "project": "opbeat", - "state": "done", - "time": 1472367600000, - "username": "rking1m" - }, - { - "age": 56, - "cost": 23.93, - "country": "CN", - "price": 57, - "project": "logstash", - "state": "start", - "time": 1489561200000, - "username": "tmcdonald1n" - }, - { - "age": 19, - "cost": 21.46, - "country": "SA", - "price": 52, - "project": "machine-learning", - "state": "start", - "time": 1485586800000, - "username": "dharper1o" - }, - { - "age": 59, - "cost": 24.91, - "country": "SE", - "price": 52, - "project": "elasticsearch", - "state": "running", - "time": 1484031600000, - "username": "kwilson1p" - }, - { - "age": 49, - "cost": 22.91, - "country": "UG", - "price": 51, - "project": "logstash", - "state": "done", - "time": 1490166000000, - "username": "phansen1q" - }, - { - "age": 66, - "cost": 22.68, - "country": "ID", - "price": 52, - "project": "elasticsearch", - "state": "done", - "time": 1484377200000, - "username": "wrodriguez1r" - }, - { - "age": 80, - "cost": 21.29, - "country": "NG", - "price": 53, - "project": "elasticsearch", - "state": "start", - "time": 1474268400000, - "username": "hbowman1s" - }, - { - "age": 38, - "cost": 21.79, - "country": "ID", - "price": 55, - "project": "elasticsearch", - "state": "running", - "time": 1463122800000, - "username": "agonzales1t" - }, - { - "age": 61, - "cost": 24.5, - "country": "AF", - "price": 62, - "project": "machine-learning", - "state": "running", - "time": 1474268400000, - "username": "jmarshall1u" - }, - { - "age": 40, - "cost": 23.17, - "country": "AZ", - "price": 62, - "project": "machine-learning", - "state": "done", - "time": 1472626800000, - "username": "sadams1v" - }, - { - "age": 19, - "cost": 22.79, - "country": "FR", - "price": 60, - "project": "machine-learning", - "state": "done", - "time": 1479279600000, - "username": "athomas1w" - }, - { - "age": 48, - "cost": 22.15, - "country": "CN", - "price": 47, - "project": "x-pack", - "state": "running", - "time": 1483513200000, - "username": "jhanson1x" - }, - { - "age": 51, - "cost": 23.68, - "country": "BR", - "price": 56, - "project": "kibana", - "state": "start", - "time": 1478070000000, - "username": "smurphy1y" - }, - { - "age": 74, - "cost": 22.77, - "country": "ID", - "price": 59, - "project": "opbeat", - "state": "done", - "time": 1480921200000, - "username": "jaustin1z" - }, - { - "age": 63, - "cost": 23.42, - "country": "PL", - "price": 44, - "project": "logstash", - "state": "done", - "time": 1469948400000, - "username": "aburns20" - }, - { - "age": 58, - "cost": 22.63, - "country": "PH", - "price": 51, - "project": "kibana", - "state": "done", - "time": 1490770800000, - "username": "jmills21" - }, - { - "age": 49, - "cost": 22.47, - "country": "KP", - "price": 65, - "project": "logstash", - "state": "running", - "time": 1488438000000, - "username": "wmontgomery22" - }, - { - "age": 34, - "cost": 24.12, - "country": "YE", - "price": 67, - "project": "x-pack", - "state": "start", - "time": 1463468400000, - "username": "kbrooks23" - }, - { - "age": 55, - "cost": 22.93, - "country": "ID", - "price": 53, - "project": "x-pack", - "state": "done", - "time": 1473836400000, - "username": "dmarshall24" - }, - { - "age": 75, - "cost": 22.34, - "country": "PE", - "price": 41, - "project": "machine-learning", - "state": "running", - "time": 1471330800000, - "username": "rsmith25" - }, - { - "age": 62, - "cost": 23.06, - "country": "PT", - "price": 60, - "project": "x-pack", - "state": "done", - "time": 1490338800000, - "username": "amartinez26" - }, - { - "age": 69, - "cost": 24.24, - "country": "PL", - "price": 57, - "project": "x-pack", - "state": "start", - "time": 1466492400000, - "username": "bfranklin27" - }, - { - "age": 34, - "cost": 21.01, - "country": "GR", - "price": 45, - "project": "x-pack", - "state": "start", - "time": 1461222000000, - "username": "dhicks28" - }, - { - "age": 42, - "cost": 24.88, - "country": "GR", - "price": 43, - "project": "logstash", - "state": "running", - "time": 1476514800000, - "username": "hperez29" - }, - { - "age": 18, - "cost": 23.44, - "country": "CN", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1484118000000, - "username": "jchavez2a" - }, - { - "age": 80, - "cost": 22.87, - "country": "ID", - "price": 39, - "project": "elasticsearch", - "state": "done", - "time": 1471330800000, - "username": "krobinson2b" - }, - { - "age": 47, - "cost": 23.26, - "country": "PH", - "price": 49, - "project": "machine-learning", - "state": "done", - "time": 1468566000000, - "username": "aking2c" - }, - { - "age": 22, - "cost": 23.7, - "country": "ID", - "price": 61, - "project": "beats", - "state": "start", - "time": 1473404400000, - "username": "ediaz2d" - }, - { - "age": 61, - "cost": 23.28, - "country": "ID", - "price": 60, - "project": "machine-learning", - "state": "done", - "time": 1481785200000, - "username": "aevans2e" - }, - { - "age": 41, - "cost": 22.72, - "country": "ID", - "price": 44, - "project": "x-pack", - "state": "done", - "time": 1463554800000, - "username": "lperez2f" - }, - { - "age": 41, - "cost": 22.15, - "country": "RU", - "price": 45, - "project": "x-pack", - "state": "running", - "time": 1487833200000, - "username": "rmartinez2g" - }, - { - "age": 44, - "cost": 24.44, - "country": "GR", - "price": 71, - "project": "kibana", - "state": "start", - "time": 1470294000000, - "username": "hcrawford2h" - }, - { - "age": 72, - "cost": 21.46, - "country": "NG", - "price": 47, - "project": "kibana", - "state": "start", - "time": 1477119600000, - "username": "dramirez2i" - }, - { - "age": 31, - "cost": 22.45, - "country": "FR", - "price": 68, - "project": "elasticsearch", - "state": "running", - "time": 1487401200000, - "username": "greynolds2j" - }, - { - "age": 39, - "cost": 24.56, - "country": "KR", - "price": 58, - "project": "opbeat", - "state": "running", - "time": 1477810800000, - "username": "sjordan2k" - }, - { - "age": 54, - "cost": 22.52, - "country": "ZA", - "price": 80, - "project": "machine-learning", - "state": "done", - "time": 1487574000000, - "username": "pjohnston2l" - }, - { - "age": 39, - "cost": 21.86, - "country": "GR", - "price": 50, - "project": "opbeat", - "state": "running", - "time": 1485414000000, - "username": "ccarpenter2m" - }, - { - "age": 79, - "cost": 23.52, - "country": "SE", - "price": 54, - "project": "kibana", - "state": "start", - "time": 1488351600000, - "username": "bmorris2n" - }, - { - "age": 23, - "cost": 23.44, - "country": "BR", - "price": 39, - "project": "kibana", - "state": "done", - "time": 1472367600000, - "username": "mmoore2o" - }, - { - "age": 50, - "cost": 23.03, - "country": "CZ", - "price": 51, - "project": "beats", - "state": "done", - "time": 1478588400000, - "username": "jlawson2p" - }, - { - "age": 74, - "cost": 22.69, - "country": "CN", - "price": 79, - "project": "opbeat", - "state": "done", - "time": 1460530800000, - "username": "rjackson2q" - }, - { - "age": 39, - "cost": 23.73, - "country": "CN", - "price": 60, - "project": "opbeat", - "state": "start", - "time": 1489388400000, - "username": "tcole2r" - }, - { - "age": 47, - "cost": 20.51, - "country": "RU", - "price": 59, - "project": "machine-learning", - "state": "start", - "time": 1479625200000, - "username": "garnold2s" - }, - { - "age": 42, - "cost": 20.26, - "country": "JP", - "price": 53, - "project": "logstash", - "state": "done", - "time": 1482303600000, - "username": "khenry2t" - }, - { - "age": 21, - "cost": 23.71, - "country": "CU", - "price": 61, - "project": "logstash", - "state": "start", - "time": 1482562800000, - "username": "aalvarez2u" - }, - { - "age": 72, - "cost": 23.38, - "country": "CN", - "price": 62, - "project": "kibana", - "state": "done", - "time": 1465887600000, - "username": "cbrown2v" - }, - { - "age": 64, - "cost": 22.52, - "country": "NG", - "price": 43, - "project": "beats", - "state": "done", - "time": 1460617200000, - "username": "tblack2w" - }, - { - "age": 53, - "cost": 24.24, - "country": "MX", - "price": 71, - "project": "opbeat", - "state": "start", - "time": 1481698800000, - "username": "bdiaz2x" - }, - { - "age": 52, - "cost": 22.42, - "country": "PT", - "price": 56, - "project": "elasticsearch", - "state": "running", - "time": 1481958000000, - "username": "drobinson2y" - }, - { - "age": 32, - "cost": 23.84, - "country": "BR", - "price": 66, - "project": "opbeat", - "state": "start", - "time": 1476860400000, - "username": "jsnyder2z" - }, - { - "age": 50, - "cost": 23.18, - "country": "ID", - "price": 54, - "project": "beats", - "state": "done", - "time": 1476169200000, - "username": "rking30" - }, - { - "age": 25, - "cost": 22.43, - "country": "CN", - "price": 46, - "project": "opbeat", - "state": "running", - "time": 1485327600000, - "username": "tjohnston31" - }, - { - "age": 33, - "cost": 22.44, - "country": "MY", - "price": 55, - "project": "machine-learning", - "state": "running", - "time": 1472713200000, - "username": "bdaniels32" - }, - { - "age": 71, - "cost": 23.84, - "country": "BY", - "price": 42, - "project": "beats", - "state": "start", - "time": 1460962800000, - "username": "ggarza33" - }, - { - "age": 74, - "cost": 21.73, - "country": "GR", - "price": 58, - "project": "opbeat", - "state": "running", - "time": 1463382000000, - "username": "csmith34" - }, - { - "age": 57, - "cost": 21.62, - "country": "TH", - "price": 60, - "project": "beats", - "state": "running", - "time": 1486969200000, - "username": "bhall35" - }, - { - "age": 28, - "cost": 21.34, - "country": "CO", - "price": 50, - "project": "logstash", - "state": "start", - "time": 1491462000000, - "username": "jpalmer36" - }, - { - "age": 26, - "cost": 23.35, - "country": "ZA", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1471330800000, - "username": "akelly37" - }, - { - "age": 20, - "cost": 24.87, - "country": "JP", - "price": 66, - "project": "x-pack", - "state": "running", - "time": 1479366000000, - "username": "hbowman38" - }, - { - "age": 75, - "cost": 23.91, - "country": "MA", - "price": 59, - "project": "machine-learning", - "state": "start", - "time": 1466233200000, - "username": "wpierce39" - }, - { - "age": 62, - "cost": 20.83, - "country": "CN", - "price": 53, - "project": "x-pack", - "state": "start", - "time": 1464418800000, - "username": "eriley3a" - }, - { - "age": 45, - "cost": 22.57, - "country": "PT", - "price": 43, - "project": "elasticsearch", - "state": "done", - "time": 1471676400000, - "username": "emedina3b" - }, - { - "age": 72, - "cost": 22.45, - "country": "ID", - "price": 79, - "project": "kibana", - "state": "running", - "time": 1469516400000, - "username": "rlane3c" - }, - { - "age": 52, - "cost": 22.48, - "country": "ID", - "price": 61, - "project": "elasticsearch", - "state": "running", - "time": 1487228400000, - "username": "dwallace3d" - }, - { - "age": 36, - "cost": 23.89, - "country": "HR", - "price": 66, - "project": "beats", - "state": "start", - "time": 1462777200000, - "username": "jmcdonald3e" - }, - { - "age": 52, - "cost": 21.84, - "country": "RU", - "price": 56, - "project": "elasticsearch", - "state": "running", - "time": 1490166000000, - "username": "cschmidt3f" - }, - { - "age": 45, - "cost": 22.13, - "country": "ID", - "price": 54, - "project": "elasticsearch", - "state": "running", - "time": 1470207600000, - "username": "jfields3g" - }, - { - "age": 51, - "cost": 23.29, - "country": "CM", - "price": 48, - "project": "kibana", - "state": "done", - "time": 1475564400000, - "username": "kduncan3h" - }, - { - "age": 75, - "cost": 21.61, - "country": "ID", - "price": 58, - "project": "machine-learning", - "state": "running", - "time": 1480402800000, - "username": "award3i" - }, - { - "age": 44, - "cost": 21.09, - "country": "KN", - "price": 51, - "project": "kibana", - "state": "start", - "time": 1480575600000, - "username": "jking3j" - }, - { - "age": 53, - "cost": 24.07, - "country": "CU", - "price": 52, - "project": "opbeat", - "state": "start", - "time": 1489820400000, - "username": "ksanders3k" - }, - { - "age": 57, - "cost": 22.86, - "country": "BR", - "price": 40, - "project": "beats", - "state": "done", - "time": 1474700400000, - "username": "colson3l" - }, - { - "age": 77, - "cost": 22.88, - "country": "GT", - "price": 69, - "project": "logstash", - "state": "done", - "time": 1486537200000, - "username": "dpierce3m" - }, - { - "age": 56, - "cost": 22.79, - "country": "CN", - "price": 52, - "project": "logstash", - "state": "done", - "time": 1474959600000, - "username": "afoster3n" - }, - { - "age": 65, - "cost": 23.62, - "country": "VN", - "price": 43, - "project": "kibana", - "state": "start", - "time": 1485068400000, - "username": "phoward3o" - }, - { - "age": 66, - "cost": 22.32, - "country": "SE", - "price": 44, - "project": "elasticsearch", - "state": "running", - "time": 1473750000000, - "username": "rpalmer3p" - }, - { - "age": 34, - "cost": 21.86, - "country": "CN", - "price": 54, - "project": "x-pack", - "state": "running", - "time": 1480230000000, - "username": "bgordon3q" - }, - { - "age": 63, - "cost": 23.54, - "country": "ID", - "price": 59, - "project": "logstash", - "state": "start", - "time": 1484722800000, - "username": "cturner3r" - }, - { - "age": 20, - "cost": 21.73, - "country": "PS", - "price": 43, - "project": "x-pack", - "state": "running", - "time": 1480921200000, - "username": "jowens3s" - }, - { - "age": 65, - "cost": 23.34, - "country": "PL", - "price": 60, - "project": "kibana", - "state": "done", - "time": 1491548400000, - "username": "rdunn3t" - }, - { - "age": 44, - "cost": 22.12, - "country": "ID", - "price": 48, - "project": "kibana", - "state": "running", - "time": 1475391600000, - "username": "jhall3u" - }, - { - "age": 74, - "cost": 22.71, - "country": "TH", - "price": 57, - "project": "opbeat", - "state": "done", - "time": 1484982000000, - "username": "cmorris3v" - }, - { - "age": 64, - "cost": 23.85, - "country": "ID", - "price": 48, - "project": "beats", - "state": "start", - "time": 1475996400000, - "username": "dpierce3w" - }, - { - "age": 48, - "cost": 22.03, - "country": "CN", - "price": 66, - "project": "x-pack", - "state": "running", - "time": 1468825200000, - "username": "htaylor3x" - }, - { - "age": 59, - "cost": 22.88, - "country": "BG", - "price": 67, - "project": "elasticsearch", - "state": "done", - "time": 1470380400000, - "username": "hwagner3y" - }, - { - "age": 25, - "cost": 23.96, - "country": "JM", - "price": 50, - "project": "opbeat", - "state": "start", - "time": 1486796400000, - "username": "sholmes3z" - }, - { - "age": 62, - "cost": 23.1, - "country": "ID", - "price": 61, - "project": "x-pack", - "state": "done", - "time": 1467874800000, - "username": "grogers40" - }, - { - "age": 67, - "cost": 22.36, - "country": "PT", - "price": 50, - "project": "opbeat", - "state": "running", - "time": 1483686000000, - "username": "jphillips41" - }, - { - "age": 69, - "cost": 23.26, - "country": "TN", - "price": 75, - "project": "x-pack", - "state": "done", - "time": 1473836400000, - "username": "pmcdonald42" - }, - { - "age": 64, - "cost": 23.7, - "country": "PL", - "price": 57, - "project": "beats", - "state": "start", - "time": 1465801200000, - "username": "bsims43" - }, - { - "age": 80, - "cost": 24.38, - "country": "US", - "price": 56, - "project": "elasticsearch", - "state": "start", - "time": 1479193200000, - "username": "jmurray44" - }, - { - "age": 41, - "cost": 24.64, - "country": "PH", - "price": 58, - "project": "x-pack", - "state": "running", - "time": 1472022000000, - "username": "phenderson45" - }, - { - "age": 55, - "cost": 24.47, - "country": "ID", - "price": 63, - "project": "x-pack", - "state": "start", - "time": 1465974000000, - "username": "nhunt46" - }, - { - "age": 30, - "cost": 23.45, - "country": "CN", - "price": 54, - "project": "kibana", - "state": "done", - "time": 1469257200000, - "username": "rwalker47" - }, - { - "age": 31, - "cost": 22.09, - "country": "CO", - "price": 60, - "project": "elasticsearch", - "state": "running", - "time": 1482562800000, - "username": "dkim48" - }, - { - "age": 33, - "cost": 22.48, - "country": "NG", - "price": 61, - "project": "machine-learning", - "state": "running", - "time": 1486969200000, - "username": "dward49" - }, - { - "age": 68, - "cost": 23, - "country": "HN", - "price": 58, - "project": "machine-learning", - "state": "done", - "time": 1471762800000, - "username": "ahughes4a" - }, - { - "age": 32, - "cost": 21.74, - "country": "CN", - "price": 64, - "project": "opbeat", - "state": "running", - "time": 1491548400000, - "username": "jdunn4b" - }, - { - "age": 49, - "cost": 21.46, - "country": "DE", - "price": 65, - "project": "logstash", - "state": "start", - "time": 1466060400000, - "username": "psimmons4c" - }, - { - "age": 33, - "cost": 22.14, - "country": "CN", - "price": 52, - "project": "machine-learning", - "state": "running", - "time": 1460790000000, - "username": "tpierce4d" - }, - { - "age": 59, - "cost": 23.4, - "country": "GY", - "price": 59, - "project": "elasticsearch", - "state": "done", - "time": 1475650800000, - "username": "jchavez4e" - }, - { - "age": 60, - "cost": 20.92, - "country": "MK", - "price": 55, - "project": "opbeat", - "state": "start", - "time": 1486882800000, - "username": "awood4f" - }, - { - "age": 28, - "cost": 22.56, - "country": "PT", - "price": 58, - "project": "logstash", - "state": "done", - "time": 1491375600000, - "username": "psanchez4g" - }, - { - "age": 69, - "cost": 22.78, - "country": "TH", - "price": 54, - "project": "x-pack", - "state": "done", - "time": 1478588400000, - "username": "phansen4h" - }, - { - "age": 73, - "cost": 21.52, - "country": "CN", - "price": 54, - "project": "elasticsearch", - "state": "running", - "time": 1461308400000, - "username": "apierce4i" - }, - { - "age": 49, - "cost": 21.94, - "country": "CN", - "price": 55, - "project": "logstash", - "state": "running", - "time": 1467097200000, - "username": "cedwards4j" - }, - { - "age": 73, - "cost": 21.99, - "country": "JP", - "price": 56, - "project": "elasticsearch", - "state": "running", - "time": 1478329200000, - "username": "sford4k" - }, - { - "age": 64, - "cost": 23.14, - "country": "PH", - "price": 51, - "project": "beats", - "state": "done", - "time": 1483340400000, - "username": "kpeterson4l" - }, - { - "age": 53, - "cost": 22.97, - "country": "BR", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1486710000000, - "username": "bfoster4m" - }, - { - "age": 57, - "cost": 21.37, - "country": "CN", - "price": 67, - "project": "beats", - "state": "start", - "time": 1481526000000, - "username": "eturner4n" - }, - { - "age": 65, - "cost": 23.65, - "country": "CN", - "price": 61, - "project": "kibana", - "state": "start", - "time": 1469948400000, - "username": "kwilliamson4o" - }, - { - "age": 25, - "cost": 23.94, - "country": "ID", - "price": 50, - "project": "opbeat", - "state": "start", - "time": 1465801200000, - "username": "jfranklin4p" - }, - { - "age": 74, - "cost": 23.53, - "country": "CN", - "price": 52, - "project": "opbeat", - "state": "start", - "time": 1461481200000, - "username": "ecoleman4q" - }, - { - "age": 57, - "cost": 24.26, - "country": "CN", - "price": 71, - "project": "beats", - "state": "start", - "time": 1461481200000, - "username": "rray4r" - }, - { - "age": 67, - "cost": 21.4, - "country": "FR", - "price": 72, - "project": "opbeat", - "state": "start", - "time": 1465714800000, - "username": "mprice4s" - }, - { - "age": 39, - "cost": 23.47, - "country": "FR", - "price": 52, - "project": "opbeat", - "state": "done", - "time": 1486537200000, - "username": "krobertson4t" - }, - { - "age": 50, - "cost": 22.96, - "country": "PE", - "price": 59, - "project": "beats", - "state": "done", - "time": 1489388400000, - "username": "rwalker4u" - }, - { - "age": 26, - "cost": 23.99, - "country": "CN", - "price": 52, - "project": "machine-learning", - "state": "start", - "time": 1477033200000, - "username": "cdiaz4v" - }, - { - "age": 34, - "cost": 23.74, - "country": "US", - "price": 55, - "project": "x-pack", - "state": "start", - "time": 1474009200000, - "username": "cparker4w" - }, - { - "age": 38, - "cost": 23.23, - "country": "BR", - "price": 57, - "project": "elasticsearch", - "state": "done", - "time": 1489993200000, - "username": "cthompson4x" - }, - { - "age": 62, - "cost": 23.34, - "country": "PH", - "price": 42, - "project": "x-pack", - "state": "done", - "time": 1479711600000, - "username": "callen4y" - }, - { - "age": 33, - "cost": 22.24, - "country": "BR", - "price": 36, - "project": "machine-learning", - "state": "running", - "time": 1480662000000, - "username": "lbell4z" - }, - { - "age": 37, - "cost": 24.62, - "country": "CM", - "price": 51, - "project": "kibana", - "state": "running", - "time": 1465887600000, - "username": "hmoreno50" - }, - { - "age": 47, - "cost": 22.23, - "country": "PY", - "price": 53, - "project": "machine-learning", - "state": "running", - "time": 1460962800000, - "username": "jspencer51" - }, - { - "age": 38, - "cost": 23.38, - "country": "ID", - "price": 58, - "project": "elasticsearch", - "state": "done", - "time": 1491116400000, - "username": "bhamilton52" - }, - { - "age": 24, - "cost": 24.1, - "country": "CN", - "price": 58, - "project": "elasticsearch", - "state": "start", - "time": 1466492400000, - "username": "amatthews53" - }, - { - "age": 27, - "cost": 23.12, - "country": "ID", - "price": 68, - "project": "x-pack", - "state": "done", - "time": 1471330800000, - "username": "wjohnston54" - }, - { - "age": 28, - "cost": 22.07, - "country": "PL", - "price": 56, - "project": "logstash", - "state": "running", - "time": 1489302000000, - "username": "crice55" - }, - { - "age": 36, - "cost": 23.32, - "country": "BY", - "price": 60, - "project": "beats", - "state": "done", - "time": 1460790000000, - "username": "probinson56" - }, - { - "age": 44, - "cost": 24.17, - "country": "CN", - "price": 56, - "project": "kibana", - "state": "start", - "time": 1467961200000, - "username": "lmatthews57" - }, - { - "age": 80, - "cost": 21.56, - "country": "SE", - "price": 69, - "project": "elasticsearch", - "state": "running", - "time": 1469862000000, - "username": "scole58" - }, - { - "age": 50, - "cost": 23.15, - "country": "ID", - "price": 54, - "project": "beats", - "state": "done", - "time": 1491548400000, - "username": "gramirez59" - }, - { - "age": 18, - "cost": 23.94, - "country": "CN", - "price": 48, - "project": "opbeat", - "state": "start", - "time": 1482822000000, - "username": "jruiz5a" - }, - { - "age": 48, - "cost": 23.14, - "country": "ID", - "price": 54, - "project": "x-pack", - "state": "done", - "time": 1464332400000, - "username": "jramirez5b" - }, - { - "age": 64, - "cost": 20.38, - "country": "CZ", - "price": 63, - "project": "beats", - "state": "done", - "time": 1472281200000, - "username": "ppierce5c" - }, - { - "age": 45, - "cost": 23.47, - "country": "PH", - "price": 60, - "project": "elasticsearch", - "state": "done", - "time": 1465196400000, - "username": "rfranklin5d" - }, - { - "age": 65, - "cost": 22.87, - "country": "PH", - "price": 56, - "project": "kibana", - "state": "done", - "time": 1468306800000, - "username": "aevans5e" - }, - { - "age": 18, - "cost": 23.45, - "country": "BY", - "price": 71, - "project": "opbeat", - "state": "done", - "time": 1463814000000, - "username": "gday5f" - }, - { - "age": 42, - "cost": 23.44, - "country": "PY", - "price": 43, - "project": "logstash", - "state": "done", - "time": 1478156400000, - "username": "pwilliams5g" - }, - { - "age": 19, - "cost": 23.99, - "country": "MX", - "price": 53, - "project": "machine-learning", - "state": "start", - "time": 1470380400000, - "username": "mgray5h" - }, - { - "age": 64, - "cost": 22.94, - "country": "PL", - "price": 47, - "project": "beats", - "state": "done", - "time": 1465801200000, - "username": "mcarroll5i" - }, - { - "age": 49, - "cost": 24.38, - "country": "JP", - "price": 56, - "project": "logstash", - "state": "start", - "time": 1464246000000, - "username": "dmontgomery5j" - }, - { - "age": 71, - "cost": 23.72, - "country": "BY", - "price": 50, - "project": "beats", - "state": "start", - "time": 1484463600000, - "username": "rsims5k" - }, - { - "age": 38, - "cost": 22.02, - "country": "PH", - "price": 58, - "project": "elasticsearch", - "state": "running", - "time": 1469257200000, - "username": "jgreene5l" - }, - { - "age": 43, - "cost": 23.08, - "country": "EC", - "price": 64, - "project": "beats", - "state": "done", - "time": 1480230000000, - "username": "mmills5m" - }, - { - "age": 75, - "cost": 22.96, - "country": "ID", - "price": 54, - "project": "machine-learning", - "state": "done", - "time": 1472022000000, - "username": "rmoreno5n" - }, - { - "age": 28, - "cost": 24.37, - "country": "US", - "price": 57, - "project": "logstash", - "state": "start", - "time": 1460962800000, - "username": "kcole5o" - }, - { - "age": 75, - "cost": 21.92, - "country": "JP", - "price": 52, - "project": "machine-learning", - "state": "running", - "time": 1468393200000, - "username": "nwelch5p" - }, - { - "age": 66, - "cost": 21.96, - "country": "CN", - "price": 64, - "project": "elasticsearch", - "state": "running", - "time": 1464418800000, - "username": "gburton5q" - }, - { - "age": 32, - "cost": 23.14, - "country": "VE", - "price": 54, - "project": "opbeat", - "state": "done", - "time": 1485586800000, - "username": "dfisher5r" - }, - { - "age": 45, - "cost": 21.99, - "country": "US", - "price": 44, - "project": "elasticsearch", - "state": "running", - "time": 1485068400000, - "username": "mknight5s" - }, - { - "age": 23, - "cost": 22.97, - "country": "CN", - "price": 49, - "project": "kibana", - "state": "done", - "time": 1483426800000, - "username": "pgordon5t" - }, - { - "age": 31, - "cost": 21.85, - "country": "RU", - "price": 62, - "project": "elasticsearch", - "state": "running", - "time": 1471330800000, - "username": "bpowell5u" - }, - { - "age": 28, - "cost": 21.32, - "country": "CA", - "price": 58, - "project": "logstash", - "state": "start", - "time": 1487314800000, - "username": "creed5v" - }, - { - "age": 55, - "cost": 23.47, - "country": "CN", - "price": 59, - "project": "x-pack", - "state": "done", - "time": 1468998000000, - "username": "dgreene5w" - }, - { - "age": 53, - "cost": 21.72, - "country": "ID", - "price": 57, - "project": "opbeat", - "state": "running", - "time": 1482649200000, - "username": "areynolds5x" - }, - { - "age": 68, - "cost": 22.78, - "country": "AU", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1473750000000, - "username": "sharris5y" - }, - { - "age": 58, - "cost": 22.76, - "country": "LA", - "price": 56, - "project": "kibana", - "state": "done", - "time": 1474873200000, - "username": "jwatson5z" - }, - { - "age": 40, - "cost": 23.64, - "country": "CN", - "price": 52, - "project": "machine-learning", - "state": "start", - "time": 1490943600000, - "username": "flewis60" - }, - { - "age": 22, - "cost": 24.27, - "country": "CA", - "price": 44, - "project": "beats", - "state": "start", - "time": 1480402800000, - "username": "jdavis61" - }, - { - "age": 67, - "cost": 21.81, - "country": "ID", - "price": 48, - "project": "opbeat", - "state": "running", - "time": 1479279600000, - "username": "bmorrison62" - }, - { - "age": 66, - "cost": 24.82, - "country": "CN", - "price": 42, - "project": "elasticsearch", - "state": "running", - "time": 1482130800000, - "username": "wgordon63" - }, - { - "age": 33, - "cost": 22.6, - "country": "RU", - "price": 59, - "project": "machine-learning", - "state": "done", - "time": 1484118000000, - "username": "athompson64" - }, - { - "age": 28, - "cost": 22.56, - "country": "KZ", - "price": 52, - "project": "logstash", - "state": "done", - "time": 1467097200000, - "username": "bwright65" - }, - { - "age": 37, - "cost": 22.8, - "country": "CN", - "price": 54, - "project": "kibana", - "state": "done", - "time": 1490684400000, - "username": "jburke66" - }, - { - "age": 55, - "cost": 25.38, - "country": "CN", - "price": 41, - "project": "x-pack", - "state": "running", - "time": 1483081200000, - "username": "lmeyer67" - }, - { - "age": 47, - "cost": 22.35, - "country": "PH", - "price": 72, - "project": "machine-learning", - "state": "running", - "time": 1484031600000, - "username": "plane68" - }, - { - "age": 75, - "cost": 21.21, - "country": "AL", - "price": 64, - "project": "machine-learning", - "state": "start", - "time": 1478847600000, - "username": "nschmidt69" - }, - { - "age": 29, - "cost": 24.41, - "country": "CN", - "price": 60, - "project": "beats", - "state": "start", - "time": 1480662000000, - "username": "jdean6a" - }, - { - "age": 80, - "cost": 19.77, - "country": "CN", - "price": 64, - "project": "elasticsearch", - "state": "done", - "time": 1489993200000, - "username": "vvasquez6b" - }, - { - "age": 47, - "cost": 23.12, - "country": "CU", - "price": 53, - "project": "machine-learning", - "state": "done", - "time": 1460358000000, - "username": "jcarpenter6c" - }, - { - "age": 47, - "cost": 21.79, - "country": "VE", - "price": 52, - "project": "machine-learning", - "state": "running", - "time": 1471762800000, - "username": "ihowell6d" - }, - { - "age": 42, - "cost": 22.67, - "country": "PH", - "price": 55, - "project": "logstash", - "state": "done", - "time": 1488524400000, - "username": "lschmidt6e" - }, - { - "age": 78, - "cost": 22.2, - "country": "DE", - "price": 57, - "project": "beats", - "state": "running", - "time": 1475650800000, - "username": "lkennedy6f" - }, - { - "age": 77, - "cost": 22.19, - "country": "CN", - "price": 63, - "project": "logstash", - "state": "running", - "time": 1483945200000, - "username": "bgarza6g" - }, - { - "age": 38, - "cost": 23.47, - "country": "BR", - "price": 51, - "project": "elasticsearch", - "state": "done", - "time": 1477983600000, - "username": "rlewis6h" - }, - { - "age": 38, - "cost": 22.74, - "country": "PH", - "price": 59, - "project": "elasticsearch", - "state": "done", - "time": 1483513200000, - "username": "gwoods6i" - }, - { - "age": 77, - "cost": 22.8, - "country": "CN", - "price": 57, - "project": "logstash", - "state": "done", - "time": 1484031600000, - "username": "mcruz6j" - }, - { - "age": 23, - "cost": 22.9, - "country": "TH", - "price": 44, - "project": "kibana", - "state": "done", - "time": 1463900400000, - "username": "pthomas6k" - }, - { - "age": 47, - "cost": 23.4, - "country": "CA", - "price": 64, - "project": "machine-learning", - "state": "done", - "time": 1491548400000, - "username": "astanley6l" - }, - { - "age": 43, - "cost": 22.91, - "country": "CN", - "price": 50, - "project": "beats", - "state": "done", - "time": 1472886000000, - "username": "sharris6m" - }, - { - "age": 76, - "cost": 21.74, - "country": "ID", - "price": 55, - "project": "x-pack", - "state": "running", - "time": 1490943600000, - "username": "rreynolds6n" - }, - { - "age": 18, - "cost": 23.15, - "country": "RU", - "price": 56, - "project": "opbeat", - "state": "done", - "time": 1484550000000, - "username": "ewebb6o" - }, - { - "age": 50, - "cost": 23.16, - "country": "ID", - "price": 61, - "project": "beats", - "state": "done", - "time": 1461740400000, - "username": "tmorales6p" - }, - { - "age": 27, - "cost": 22.14, - "country": "SE", - "price": 45, - "project": "x-pack", - "state": "running", - "time": 1463727600000, - "username": "dmontgomery6q" - }, - { - "age": 23, - "cost": 24.03, - "country": "PS", - "price": 51, - "project": "kibana", - "state": "start", - "time": 1484031600000, - "username": "blynch6r" - }, - { - "age": 40, - "cost": 22.63, - "country": "CN", - "price": 70, - "project": "machine-learning", - "state": "done", - "time": 1483686000000, - "username": "fsullivan6s" - }, - { - "age": 80, - "cost": 25.11, - "country": "RU", - "price": 52, - "project": "elasticsearch", - "state": "running", - "time": 1476687600000, - "username": "jrobertson6t" - }, - { - "age": 28, - "cost": 22.92, - "country": "CN", - "price": 53, - "project": "logstash", - "state": "done", - "time": 1484031600000, - "username": "randrews6u" - }, - { - "age": 75, - "cost": 24.69, - "country": "AL", - "price": 46, - "project": "machine-learning", - "state": "running", - "time": 1462258800000, - "username": "pkim6v" - }, - { - "age": 34, - "cost": 21.66, - "country": "TH", - "price": 55, - "project": "x-pack", - "state": "running", - "time": 1490079600000, - "username": "aharris6w" - }, - { - "age": 78, - "cost": 20.89, - "country": "SI", - "price": 63, - "project": "beats", - "state": "start", - "time": 1485154800000, - "username": "dbarnes6x" - }, - { - "age": 75, - "cost": 22.08, - "country": "FR", - "price": 53, - "project": "machine-learning", - "state": "running", - "time": 1476428400000, - "username": "jhamilton6y" - }, - { - "age": 42, - "cost": 23.16, - "country": "CN", - "price": 50, - "project": "logstash", - "state": "done", - "time": 1473318000000, - "username": "lgibson6z" - }, - { - "age": 29, - "cost": 23.82, - "country": "ID", - "price": 55, - "project": "beats", - "state": "start", - "time": 1488870000000, - "username": "agordon70" - }, - { - "age": 27, - "cost": 23.25, - "country": "US", - "price": 40, - "project": "x-pack", - "state": "done", - "time": 1466319600000, - "username": "slewis71" - }, - { - "age": 67, - "cost": 23.92, - "country": "FI", - "price": 61, - "project": "opbeat", - "state": "start", - "time": 1478242800000, - "username": "slane72" - }, - { - "age": 69, - "cost": 24.53, - "country": "PH", - "price": 49, - "project": "x-pack", - "state": "running", - "time": 1484463600000, - "username": "rramos73" - }, - { - "age": 72, - "cost": 24.16, - "country": "ID", - "price": 59, - "project": "kibana", - "state": "start", - "time": 1480057200000, - "username": "dhawkins74" - }, - { - "age": 31, - "cost": 23.11, - "country": "CN", - "price": 64, - "project": "elasticsearch", - "state": "done", - "time": 1490598000000, - "username": "rlane75" - }, - { - "age": 31, - "cost": 23.41, - "country": "CN", - "price": 70, - "project": "elasticsearch", - "state": "done", - "time": 1490684400000, - "username": "pturner76" - }, - { - "age": 68, - "cost": 23.27, - "country": "JP", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1473404400000, - "username": "dlawrence77" - }, - { - "age": 19, - "cost": 23.72, - "country": "CN", - "price": 44, - "project": "machine-learning", - "state": "start", - "time": 1469084400000, - "username": "twelch78" - }, - { - "age": 79, - "cost": 23, - "country": "PH", - "price": 69, - "project": "kibana", - "state": "done", - "time": 1468393200000, - "username": "hwilliams79" - }, - { - "age": 26, - "cost": 23.19, - "country": "CN", - "price": 58, - "project": "machine-learning", - "state": "done", - "time": 1471071600000, - "username": "tbowman7a" - }, - { - "age": 33, - "cost": 22.87, - "country": "YE", - "price": 55, - "project": "machine-learning", - "state": "done", - "time": 1474009200000, - "username": "kwheeler7b" - }, - { - "age": 35, - "cost": 21.5, - "country": "KZ", - "price": 73, - "project": "logstash", - "state": "running", - "time": 1464073200000, - "username": "cgrant7c" - }, - { - "age": 30, - "cost": 22.25, - "country": "PS", - "price": 70, - "project": "kibana", - "state": "running", - "time": 1485154800000, - "username": "cbradley7d" - }, - { - "age": 37, - "cost": 25, - "country": "CN", - "price": 63, - "project": "kibana", - "state": "running", - "time": 1460876400000, - "username": "mrichardson7e" - }, - { - "age": 66, - "cost": 22.22, - "country": "GR", - "price": 61, - "project": "elasticsearch", - "state": "running", - "time": 1479798000000, - "username": "janderson7f" - }, - { - "age": 45, - "cost": 24.05, - "country": "ID", - "price": 59, - "project": "elasticsearch", - "state": "start", - "time": 1475823600000, - "username": "lgriffin7g" - }, - { - "age": 25, - "cost": 22.98, - "country": "ID", - "price": 48, - "project": "opbeat", - "state": "done", - "time": 1484290800000, - "username": "salvarez7h" - }, - { - "age": 36, - "cost": 24.01, - "country": "ID", - "price": 59, - "project": "beats", - "state": "start", - "time": 1474354800000, - "username": "pmills7i" - }, - { - "age": 23, - "cost": 23.07, - "country": "MU", - "price": 56, - "project": "kibana", - "state": "done", - "time": 1490598000000, - "username": "jdunn7j" - }, - { - "age": 68, - "cost": 23.31, - "country": "CN", - "price": 66, - "project": "machine-learning", - "state": "done", - "time": 1491462000000, - "username": "dwilson7k" - }, - { - "age": 78, - "cost": 21.12, - "country": "PH", - "price": 54, - "project": "beats", - "state": "start", - "time": 1467874800000, - "username": "relliott7l" - }, - { - "age": 64, - "cost": 22.85, - "country": "CN", - "price": 70, - "project": "beats", - "state": "done", - "time": 1462518000000, - "username": "drichardson7m" - }, - { - "age": 29, - "cost": 23.52, - "country": "ET", - "price": 51, - "project": "beats", - "state": "start", - "time": 1484982000000, - "username": "mrussell7n" - }, - { - "age": 48, - "cost": 22.43, - "country": "KM", - "price": 61, - "project": "x-pack", - "state": "running", - "time": 1482908400000, - "username": "eharris7o" - }, - { - "age": 59, - "cost": 21.09, - "country": "ZA", - "price": 58, - "project": "elasticsearch", - "state": "start", - "time": 1480489200000, - "username": "sbryant7p" - }, - { - "age": 67, - "cost": 23.3, - "country": "KG", - "price": 54, - "project": "opbeat", - "state": "done", - "time": 1466060400000, - "username": "mchavez7q" - }, - { - "age": 67, - "cost": 22.4, - "country": "MZ", - "price": 65, - "project": "opbeat", - "state": "running", - "time": 1462086000000, - "username": "emurray7r" - }, - { - "age": 47, - "cost": 21.95, - "country": "ID", - "price": 56, - "project": "machine-learning", - "state": "running", - "time": 1479798000000, - "username": "pmoore7s" - }, - { - "age": 77, - "cost": 24.34, - "country": "SE", - "price": 45, - "project": "logstash", - "state": "start", - "time": 1463727600000, - "username": "jdavis7t" - }, - { - "age": 30, - "cost": 23.66, - "country": "CN", - "price": 61, - "project": "kibana", - "state": "start", - "time": 1482822000000, - "username": "pstephens7u" - }, - { - "age": 74, - "cost": 22.75, - "country": "BY", - "price": 53, - "project": "opbeat", - "state": "done", - "time": 1485759600000, - "username": "cbell7v" - }, - { - "age": 52, - "cost": 21.84, - "country": "CN", - "price": 48, - "project": "elasticsearch", - "state": "running", - "time": 1489906800000, - "username": "agordon7w" - }, - { - "age": 76, - "cost": 22.54, - "country": "BR", - "price": 47, - "project": "x-pack", - "state": "done", - "time": 1480143600000, - "username": "cray7x" - }, - { - "age": 55, - "cost": 21.27, - "country": "PT", - "price": 46, - "project": "x-pack", - "state": "start", - "time": 1475132400000, - "username": "llong7y" - }, - { - "age": 64, - "cost": 22.86, - "country": "CN", - "price": 69, - "project": "beats", - "state": "done", - "time": 1461826800000, - "username": "lcoleman7z" - }, - { - "age": 20, - "cost": 23.15, - "country": "ID", - "price": 70, - "project": "x-pack", - "state": "done", - "time": 1466233200000, - "username": "wpalmer80" - }, - { - "age": 31, - "cost": 22, - "country": "ZA", - "price": 61, - "project": "elasticsearch", - "state": "running", - "time": 1473750000000, - "username": "dkim81" - }, - { - "age": 38, - "cost": 22.68, - "country": "PT", - "price": 50, - "project": "elasticsearch", - "state": "done", - "time": 1468911600000, - "username": "fsanders82" - }, - { - "age": 54, - "cost": 22.14, - "country": "UA", - "price": 61, - "project": "machine-learning", - "state": "running", - "time": 1484722800000, - "username": "jmiller83" - }, - { - "age": 43, - "cost": 23.1, - "country": "ZA", - "price": 56, - "project": "beats", - "state": "done", - "time": 1461481200000, - "username": "rreyes84" - }, - { - "age": 56, - "cost": 22.14, - "country": "MN", - "price": 48, - "project": "logstash", - "state": "running", - "time": 1466751600000, - "username": "jmills85" - }, - { - "age": 77, - "cost": 22.58, - "country": "CN", - "price": 57, - "project": "logstash", - "state": "done", - "time": 1474527600000, - "username": "slopez86" - }, - { - "age": 78, - "cost": 21.71, - "country": "CN", - "price": 54, - "project": "beats", - "state": "running", - "time": 1489561200000, - "username": "rthomas87" - }, - { - "age": 23, - "cost": 21.94, - "country": "FR", - "price": 73, - "project": "kibana", - "state": "running", - "time": 1475910000000, - "username": "eharris88" - }, - { - "age": 68, - "cost": 23.13, - "country": "PH", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1462950000000, - "username": "sjackson89" - }, - { - "age": 52, - "cost": 23.07, - "country": "GR", - "price": 52, - "project": "elasticsearch", - "state": "done", - "time": 1481353200000, - "username": "preynolds8a" - }, - { - "age": 46, - "cost": 24.87, - "country": "SE", - "price": 51, - "project": "opbeat", - "state": "running", - "time": 1465196400000, - "username": "bmorris8b" - }, - { - "age": 58, - "cost": 23.7, - "country": "ID", - "price": 53, - "project": "kibana", - "state": "start", - "time": 1485068400000, - "username": "rburns8c" - }, - { - "age": 64, - "cost": 22.76, - "country": "IR", - "price": 53, - "project": "beats", - "state": "done", - "time": 1481526000000, - "username": "jsimpson8d" - }, - { - "age": 29, - "cost": 24.01, - "country": "PH", - "price": 61, - "project": "beats", - "state": "start", - "time": 1476946800000, - "username": "dcarter8e" - }, - { - "age": 42, - "cost": 23.06, - "country": "CN", - "price": 57, - "project": "logstash", - "state": "done", - "time": 1489561200000, - "username": "jfisher8f" - }, - { - "age": 60, - "cost": 23.29, - "country": "RU", - "price": 49, - "project": "opbeat", - "state": "done", - "time": 1461740400000, - "username": "kramirez8g" - }, - { - "age": 77, - "cost": 23.35, - "country": "BR", - "price": 53, - "project": "logstash", - "state": "done", - "time": 1479279600000, - "username": "jowens8h" - }, - { - "age": 55, - "cost": 22.16, - "country": "PT", - "price": 58, - "project": "x-pack", - "state": "running", - "time": 1461567600000, - "username": "gweaver8i" - }, - { - "age": 70, - "cost": 21.65, - "country": "JM", - "price": 57, - "project": "logstash", - "state": "running", - "time": 1481958000000, - "username": "jharrison8j" - }, - { - "age": 76, - "cost": 22.98, - "country": "HN", - "price": 51, - "project": "x-pack", - "state": "done", - "time": 1466492400000, - "username": "chenderson8k" - }, - { - "age": 63, - "cost": 24.31, - "country": "PH", - "price": 61, - "project": "logstash", - "state": "start", - "time": 1472886000000, - "username": "lreynolds8l" - }, - { - "age": 18, - "cost": 23.62, - "country": "MA", - "price": 82, - "project": "opbeat", - "state": "start", - "time": 1474095600000, - "username": "ljacobs8m" - }, - { - "age": 34, - "cost": 24.18, - "country": "CN", - "price": 57, - "project": "x-pack", - "state": "start", - "time": 1476082800000, - "username": "pwheeler8n" - }, - { - "age": 50, - "cost": 22.96, - "country": "JP", - "price": 61, - "project": "beats", - "state": "done", - "time": 1480834800000, - "username": "lbrown8o" - }, - { - "age": 49, - "cost": 22.47, - "country": "FI", - "price": 49, - "project": "logstash", - "state": "running", - "time": 1463295600000, - "username": "jgibson8p" - }, - { - "age": 36, - "cost": 23.41, - "country": "MN", - "price": 60, - "project": "beats", - "state": "done", - "time": 1472626800000, - "username": "jfernandez8q" - }, - { - "age": 36, - "cost": 23.26, - "country": "GH", - "price": 55, - "project": "beats", - "state": "done", - "time": 1469602800000, - "username": "swatkins8r" - }, - { - "age": 33, - "cost": 22.15, - "country": "CN", - "price": 52, - "project": "machine-learning", - "state": "running", - "time": 1472972400000, - "username": "kalvarez8s" - }, - { - "age": 69, - "cost": 21, - "country": "FR", - "price": 65, - "project": "x-pack", - "state": "start", - "time": 1470639600000, - "username": "jwarren8t" - }, - { - "age": 68, - "cost": 23.57, - "country": "MN", - "price": 51, - "project": "machine-learning", - "state": "start", - "time": 1466838000000, - "username": "mwallace8u" - }, - { - "age": 31, - "cost": 23.94, - "country": "US", - "price": 54, - "project": "elasticsearch", - "state": "start", - "time": 1475996400000, - "username": "jmarshall8v" - }, - { - "age": 73, - "cost": 24.4, - "country": "RU", - "price": 52, - "project": "elasticsearch", - "state": "start", - "time": 1462431600000, - "username": "aellis8w" - }, - { - "age": 25, - "cost": 22.34, - "country": "PH", - "price": 68, - "project": "opbeat", - "state": "running", - "time": 1468047600000, - "username": "clopez8x" - }, - { - "age": 35, - "cost": 21.65, - "country": "CA", - "price": 63, - "project": "logstash", - "state": "running", - "time": 1474268400000, - "username": "astewart8y" - }, - { - "age": 34, - "cost": 22.75, - "country": "PL", - "price": 71, - "project": "x-pack", - "state": "done", - "time": 1469516400000, - "username": "hlewis8z" - }, - { - "age": 56, - "cost": 22.22, - "country": "MN", - "price": 54, - "project": "logstash", - "state": "running", - "time": 1480057200000, - "username": "wwheeler90" - }, - { - "age": 52, - "cost": 22.04, - "country": "AR", - "price": 49, - "project": "elasticsearch", - "state": "running", - "time": 1490338800000, - "username": "aelliott91" - }, - { - "age": 61, - "cost": 21.27, - "country": "PH", - "price": 55, - "project": "machine-learning", - "state": "start", - "time": 1485241200000, - "username": "khunter92" - }, - { - "age": 23, - "cost": 24.3, - "country": "PL", - "price": 59, - "project": "kibana", - "state": "start", - "time": 1477983600000, - "username": "treed93" - }, - { - "age": 54, - "cost": 23.5, - "country": "UA", - "price": 60, - "project": "machine-learning", - "state": "start", - "time": 1471590000000, - "username": "jperez94" - }, - { - "age": 80, - "cost": 22.4, - "country": "CN", - "price": 57, - "project": "elasticsearch", - "state": "running", - "time": 1468825200000, - "username": "tfowler95" - }, - { - "age": 80, - "cost": 20.93, - "country": "VE", - "price": 49, - "project": "elasticsearch", - "state": "start", - "time": 1474614000000, - "username": "brichardson96" - }, - { - "age": 59, - "cost": 23.28, - "country": "PT", - "price": 51, - "project": "elasticsearch", - "state": "done", - "time": 1488956400000, - "username": "kthomas97" - }, - { - "age": 49, - "cost": 23.26, - "country": "CA", - "price": 54, - "project": "logstash", - "state": "done", - "time": 1487487600000, - "username": "smason98" - }, - { - "age": 75, - "cost": 21.54, - "country": "ID", - "price": 59, - "project": "machine-learning", - "state": "running", - "time": 1472886000000, - "username": "aphillips99" - }, - { - "age": 40, - "cost": 23.23, - "country": "ID", - "price": 54, - "project": "machine-learning", - "state": "done", - "time": 1488006000000, - "username": "jlawrence9a" - }, - { - "age": 58, - "cost": 22.96, - "country": "TZ", - "price": 56, - "project": "kibana", - "state": "done", - "time": 1463036400000, - "username": "rcunningham9b" - }, - { - "age": 61, - "cost": 22.6, - "country": "PL", - "price": 64, - "project": "machine-learning", - "state": "done", - "time": 1476169200000, - "username": "aaustin9c" - }, - { - "age": 68, - "cost": 22.62, - "country": "GT", - "price": 59, - "project": "machine-learning", - "state": "done", - "time": 1464159600000, - "username": "pthompson9d" - }, - { - "age": 59, - "cost": 23.35, - "country": "GR", - "price": 52, - "project": "elasticsearch", - "state": "done", - "time": 1490511600000, - "username": "lscott9e" - }, - { - "age": 40, - "cost": 24.08, - "country": "LA", - "price": 50, - "project": "machine-learning", - "state": "start", - "time": 1471935600000, - "username": "emartinez9f" - }, - { - "age": 42, - "cost": 22.75, - "country": "HR", - "price": 70, - "project": "logstash", - "state": "done", - "time": 1462431600000, - "username": "kbanks9g" - }, - { - "age": 36, - "cost": 21.85, - "country": "BR", - "price": 45, - "project": "beats", - "state": "running", - "time": 1483599600000, - "username": "njames9h" - }, - { - "age": 31, - "cost": 23.26, - "country": "MX", - "price": 51, - "project": "elasticsearch", - "state": "done", - "time": 1463468400000, - "username": "cjordan9i" - }, - { - "age": 74, - "cost": 22.49, - "country": "BR", - "price": 53, - "project": "opbeat", - "state": "running", - "time": 1472626800000, - "username": "thowell9j" - }, - { - "age": 71, - "cost": 23.16, - "country": "ID", - "price": 47, - "project": "beats", - "state": "done", - "time": 1465714800000, - "username": "aramirez9k" - }, - { - "age": 19, - "cost": 21.01, - "country": "VE", - "price": 63, - "project": "machine-learning", - "state": "start", - "time": 1489129200000, - "username": "cgreen9l" - }, - { - "age": 41, - "cost": 23.07, - "country": "FR", - "price": 56, - "project": "x-pack", - "state": "done", - "time": 1463209200000, - "username": "fgardner9m" - }, - { - "age": 70, - "cost": 21.69, - "country": "UA", - "price": 65, - "project": "logstash", - "state": "running", - "time": 1474614000000, - "username": "bbennett9n" - }, - { - "age": 27, - "cost": 21.84, - "country": "SR", - "price": 65, - "project": "x-pack", - "state": "running", - "time": 1464591600000, - "username": "nferguson9o" - }, - { - "age": 27, - "cost": 22.63, - "country": "MX", - "price": 53, - "project": "x-pack", - "state": "done", - "time": 1481958000000, - "username": "rpatterson9p" - }, - { - "age": 71, - "cost": 23.16, - "country": "CN", - "price": 54, - "project": "beats", - "state": "done", - "time": 1469084400000, - "username": "twright9q" - }, - { - "age": 70, - "cost": 23.34, - "country": "PL", - "price": 49, - "project": "logstash", - "state": "done", - "time": 1482649200000, - "username": "hhughes9r" - }, - { - "age": 60, - "cost": 22.06, - "country": "MX", - "price": 59, - "project": "opbeat", - "state": "running", - "time": 1460617200000, - "username": "rjenkins9s" - }, - { - "age": 31, - "cost": 23.14, - "country": "BR", - "price": 59, - "project": "elasticsearch", - "state": "done", - "time": 1480662000000, - "username": "areynolds9t" - }, - { - "age": 75, - "cost": 23.13, - "country": "RU", - "price": 50, - "project": "machine-learning", - "state": "done", - "time": 1473318000000, - "username": "agordon9u" - }, - { - "age": 43, - "cost": 23.58, - "country": "CN", - "price": 52, - "project": "beats", - "state": "start", - "time": 1480057200000, - "username": "bmorris9v" - }, - { - "age": 55, - "cost": 23.86, - "country": "CN", - "price": 57, - "project": "x-pack", - "state": "start", - "time": 1469602800000, - "username": "hriley9w" - }, - { - "age": 48, - "cost": 23.28, - "country": "PH", - "price": 55, - "project": "x-pack", - "state": "done", - "time": 1465369200000, - "username": "psmith9x" - }, - { - "age": 36, - "cost": 23.87, - "country": "CA", - "price": 70, - "project": "beats", - "state": "start", - "time": 1466751600000, - "username": "dwilson9y" - }, - { - "age": 46, - "cost": 22.45, - "country": "RU", - "price": 53, - "project": "opbeat", - "state": "running", - "time": 1482822000000, - "username": "rsanders9z" - }, - { - "age": 61, - "cost": 23.43, - "country": "CN", - "price": 66, - "project": "machine-learning", - "state": "done", - "time": 1480143600000, - "username": "hharta0" - }, - { - "age": 51, - "cost": 23.73, - "country": "US", - "price": 56, - "project": "kibana", - "state": "start", - "time": 1468738800000, - "username": "jsullivana1" - }, - { - "age": 69, - "cost": 22.33, - "country": "ES", - "price": 55, - "project": "x-pack", - "state": "running", - "time": 1462258800000, - "username": "jrobertsona2" - }, - { - "age": 69, - "cost": 22.83, - "country": "CN", - "price": 57, - "project": "x-pack", - "state": "done", - "time": 1485759600000, - "username": "jkennedya3" - }, - { - "age": 32, - "cost": 21.46, - "country": "AR", - "price": 59, - "project": "opbeat", - "state": "start", - "time": 1466406000000, - "username": "crobertsa4" - }, - { - "age": 32, - "cost": 21.75, - "country": "NA", - "price": 49, - "project": "opbeat", - "state": "running", - "time": 1483945200000, - "username": "jcolea5" - }, - { - "age": 74, - "cost": 22.56, - "country": "PL", - "price": 55, - "project": "opbeat", - "state": "done", - "time": 1468825200000, - "username": "llonga6" - }, - { - "age": 70, - "cost": 23.63, - "country": "ID", - "price": 64, - "project": "logstash", - "state": "start", - "time": 1460530800000, - "username": "sgraya7" - }, - { - "age": 48, - "cost": 22.04, - "country": "AL", - "price": 49, - "project": "x-pack", - "state": "running", - "time": 1468306800000, - "username": "jgeorgea8" - }, - { - "age": 61, - "cost": 24.58, - "country": "SS", - "price": 59, - "project": "machine-learning", - "state": "running", - "time": 1486364400000, - "username": "ablacka9" - }, - { - "age": 27, - "cost": 23.69, - "country": "RU", - "price": 54, - "project": "x-pack", - "state": "start", - "time": 1461999600000, - "username": "jrileyaa" - }, - { - "age": 35, - "cost": 24.23, - "country": "CN", - "price": 62, - "project": "logstash", - "state": "start", - "time": 1466924400000, - "username": "jwalkerab" - }, - { - "age": 26, - "cost": 23.34, - "country": "PL", - "price": 58, - "project": "machine-learning", - "state": "done", - "time": 1486710000000, - "username": "vrussellac" - }, - { - "age": 27, - "cost": 22.1, - "country": "ID", - "price": 56, - "project": "x-pack", - "state": "running", - "time": 1478761200000, - "username": "acooperad" - }, - { - "age": 29, - "cost": 24.27, - "country": "MD", - "price": 55, - "project": "beats", - "state": "start", - "time": 1471244400000, - "username": "rhansonae" - }, - { - "age": 55, - "cost": 23.33, - "country": "SE", - "price": 60, - "project": "x-pack", - "state": "done", - "time": 1461826800000, - "username": "wmooreaf" - }, - { - "age": 33, - "cost": 23.42, - "country": "CO", - "price": 54, - "project": "machine-learning", - "state": "done", - "time": 1463986800000, - "username": "hmccoyag" - }, - { - "age": 75, - "cost": 24.45, - "country": "HR", - "price": 40, - "project": "machine-learning", - "state": "start", - "time": 1491462000000, - "username": "cbarnesah" - }, - { - "age": 60, - "cost": 22.59, - "country": "PT", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1469430000000, - "username": "jharrisai" - }, - { - "age": 58, - "cost": 21.94, - "country": "CN", - "price": 64, - "project": "kibana", - "state": "running", - "time": 1474441200000, - "username": "swardaj" - }, - { - "age": 51, - "cost": 20.57, - "country": "CN", - "price": 65, - "project": "kibana", - "state": "start", - "time": 1482217200000, - "username": "jhuntak" - }, - { - "age": 36, - "cost": 21.7, - "country": "CN", - "price": 52, - "project": "beats", - "state": "running", - "time": 1461481200000, - "username": "gmartinezal" - }, - { - "age": 19, - "cost": 22.56, - "country": "PA", - "price": 46, - "project": "machine-learning", - "state": "done", - "time": 1484463600000, - "username": "sturneram" - }, - { - "age": 40, - "cost": 23.12, - "country": "RU", - "price": 65, - "project": "machine-learning", - "state": "done", - "time": 1486537200000, - "username": "jortizan" - }, - { - "age": 73, - "cost": 22.32, - "country": "SI", - "price": 49, - "project": "elasticsearch", - "state": "running", - "time": 1467356400000, - "username": "gwatsonao" - }, - { - "age": 38, - "cost": 23.42, - "country": "UA", - "price": 56, - "project": "elasticsearch", - "state": "done", - "time": 1482476400000, - "username": "ckingap" - }, - { - "age": 32, - "cost": 23.07, - "country": "NO", - "price": 66, - "project": "opbeat", - "state": "done", - "time": 1488956400000, - "username": "nfreemanaq" - }, - { - "age": 21, - "cost": 21.13, - "country": "UY", - "price": 66, - "project": "logstash", - "state": "start", - "time": 1473058800000, - "username": "vandrewsar" - }, - { - "age": 46, - "cost": 24.48, - "country": "PH", - "price": 68, - "project": "opbeat", - "state": "start", - "time": 1472540400000, - "username": "jgonzalezas" - }, - { - "age": 72, - "cost": 23.11, - "country": "CI", - "price": 61, - "project": "kibana", - "state": "done", - "time": 1481180400000, - "username": "vkingat" - }, - { - "age": 75, - "cost": 22.27, - "country": "GH", - "price": 43, - "project": "machine-learning", - "state": "running", - "time": 1468047600000, - "username": "rdeanau" - }, - { - "age": 29, - "cost": 22.41, - "country": "ID", - "price": 63, - "project": "beats", - "state": "running", - "time": 1481526000000, - "username": "hfosterav" - }, - { - "age": 75, - "cost": 21.44, - "country": "SE", - "price": 63, - "project": "machine-learning", - "state": "start", - "time": 1475564400000, - "username": "fgarciaaw" - }, - { - "age": 44, - "cost": 23.87, - "country": "PH", - "price": 62, - "project": "kibana", - "state": "start", - "time": 1464937200000, - "username": "pwhiteax" - }, - { - "age": 53, - "cost": 22.79, - "country": "CN", - "price": 47, - "project": "opbeat", - "state": "done", - "time": 1491116400000, - "username": "chuntay" - }, - { - "age": 47, - "cost": 22.86, - "country": "CN", - "price": 60, - "project": "machine-learning", - "state": "done", - "time": 1478588400000, - "username": "dfranklinaz" - }, - { - "age": 71, - "cost": 24, - "country": "CZ", - "price": 64, - "project": "beats", - "state": "start", - "time": 1480230000000, - "username": "djacksonb0" - }, - { - "age": 44, - "cost": 21.93, - "country": "RU", - "price": 67, - "project": "kibana", - "state": "running", - "time": 1460358000000, - "username": "sbutlerb1" - }, - { - "age": 32, - "cost": 23.24, - "country": "GR", - "price": 41, - "project": "opbeat", - "state": "done", - "time": 1460962800000, - "username": "nporterb2" - }, - { - "age": 55, - "cost": 22.31, - "country": "RU", - "price": 65, - "project": "x-pack", - "state": "running", - "time": 1483167600000, - "username": "sburnsb3" - }, - { - "age": 59, - "cost": 23.16, - "country": "JP", - "price": 56, - "project": "elasticsearch", - "state": "done", - "time": 1468911600000, - "username": "jhendersonb4" - }, - { - "age": 73, - "cost": 22.79, - "country": "FR", - "price": 63, - "project": "elasticsearch", - "state": "done", - "time": 1479020400000, - "username": "dgonzalesb5" - }, - { - "age": 41, - "cost": 24.15, - "country": "ID", - "price": 64, - "project": "x-pack", - "state": "start", - "time": 1478674800000, - "username": "cbarnesb6" - }, - { - "age": 25, - "cost": 20.11, - "country": "ID", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1468652400000, - "username": "mcoxb7" - }, - { - "age": 74, - "cost": 24.27, - "country": "CN", - "price": 52, - "project": "opbeat", - "state": "start", - "time": 1478329200000, - "username": "rbowmanb8" - }, - { - "age": 43, - "cost": 23.9, - "country": "PE", - "price": 51, - "project": "beats", - "state": "start", - "time": 1472972400000, - "username": "dkingb9" - }, - { - "age": 33, - "cost": 21.86, - "country": "CN", - "price": 56, - "project": "machine-learning", - "state": "running", - "time": 1470898800000, - "username": "dwilliamsonba" - }, - { - "age": 32, - "cost": 21.96, - "country": "BR", - "price": 51, - "project": "opbeat", - "state": "running", - "time": 1479452400000, - "username": "jmorrisonbb" - }, - { - "age": 39, - "cost": 22.6, - "country": "PE", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1467529200000, - "username": "dcastillobc" - }, - { - "age": 30, - "cost": 22.08, - "country": "CN", - "price": 47, - "project": "kibana", - "state": "running", - "time": 1482822000000, - "username": "rgriffinbd" - }, - { - "age": 79, - "cost": 21.6, - "country": "VN", - "price": 49, - "project": "kibana", - "state": "running", - "time": 1479193200000, - "username": "ascottbe" - }, - { - "age": 71, - "cost": 21.06, - "country": "TH", - "price": 57, - "project": "beats", - "state": "start", - "time": 1475132400000, - "username": "dlynchbf" - }, - { - "age": 49, - "cost": 22.18, - "country": "ID", - "price": 54, - "project": "logstash", - "state": "running", - "time": 1471158000000, - "username": "epetersbg" - }, - { - "age": 53, - "cost": 22.57, - "country": "LU", - "price": 57, - "project": "opbeat", - "state": "done", - "time": 1477897200000, - "username": "agonzalezbh" - }, - { - "age": 23, - "cost": 24.78, - "country": "CN", - "price": 64, - "project": "kibana", - "state": "running", - "time": 1463814000000, - "username": "kcookbi" - }, - { - "age": 74, - "cost": 21.34, - "country": "WS", - "price": 47, - "project": "opbeat", - "state": "start", - "time": 1491548400000, - "username": "rjacksonbj" - }, - { - "age": 35, - "cost": 23.38, - "country": "RU", - "price": 50, - "project": "logstash", - "state": "done", - "time": 1475391600000, - "username": "cwellsbk" - }, - { - "age": 22, - "cost": 25.07, - "country": "PH", - "price": 59, - "project": "beats", - "state": "running", - "time": 1480748400000, - "username": "rgarzabl" - }, - { - "age": 37, - "cost": 23.48, - "country": "DK", - "price": 53, - "project": "kibana", - "state": "done", - "time": 1462431600000, - "username": "rramirezbm" - }, - { - "age": 66, - "cost": 24.11, - "country": "ID", - "price": 60, - "project": "elasticsearch", - "state": "start", - "time": 1489388400000, - "username": "jperezbn" - }, - { - "age": 33, - "cost": 22.4, - "country": "PL", - "price": 54, - "project": "machine-learning", - "state": "running", - "time": 1468998000000, - "username": "kricebo" - }, - { - "age": 23, - "cost": 24.47, - "country": "ID", - "price": 73, - "project": "kibana", - "state": "start", - "time": 1487833200000, - "username": "smoorebp" - }, - { - "age": 60, - "cost": 25.35, - "country": "PL", - "price": 57, - "project": "opbeat", - "state": "running", - "time": 1478242800000, - "username": "pwhitebq" - }, - { - "age": 75, - "cost": 22.58, - "country": "CN", - "price": 42, - "project": "machine-learning", - "state": "done", - "time": 1483340400000, - "username": "tleebr" - }, - { - "age": 18, - "cost": 23.18, - "country": "UG", - "price": 53, - "project": "opbeat", - "state": "done", - "time": 1467356400000, - "username": "bfrazierbs" - }, - { - "age": 57, - "cost": 23.39, - "country": "RU", - "price": 51, - "project": "beats", - "state": "done", - "time": 1482217200000, - "username": "salvarezbt" - }, - { - "age": 23, - "cost": 23.31, - "country": "CN", - "price": 45, - "project": "kibana", - "state": "done", - "time": 1490770800000, - "username": "bgonzalezbu" - }, - { - "age": 65, - "cost": 22.43, - "country": "CZ", - "price": 52, - "project": "kibana", - "state": "running", - "time": 1479711600000, - "username": "kdavisbv" - }, - { - "age": 31, - "cost": 23.73, - "country": "NI", - "price": 51, - "project": "elasticsearch", - "state": "start", - "time": 1485241200000, - "username": "jburtonbw" - }, - { - "age": 50, - "cost": 22.05, - "country": "KM", - "price": 57, - "project": "beats", - "state": "running", - "time": 1482476400000, - "username": "dgutierrezbx" - }, - { - "age": 47, - "cost": 22.76, - "country": "BR", - "price": 39, - "project": "machine-learning", - "state": "done", - "time": 1461567600000, - "username": "akelleyby" - }, - { - "age": 31, - "cost": 22.57, - "country": "DK", - "price": 48, - "project": "elasticsearch", - "state": "done", - "time": 1488438000000, - "username": "grobertsbz" - }, - { - "age": 21, - "cost": 23.62, - "country": "CN", - "price": 65, - "project": "logstash", - "state": "start", - "time": 1487142000000, - "username": "aweaverc0" - }, - { - "age": 50, - "cost": 23.85, - "country": "SE", - "price": 51, - "project": "beats", - "state": "start", - "time": 1491202800000, - "username": "charrisonc1" - }, - { - "age": 38, - "cost": 23.17, - "country": "PL", - "price": 52, - "project": "elasticsearch", - "state": "done", - "time": 1461826800000, - "username": "jlewisc2" - }, - { - "age": 47, - "cost": 22.21, - "country": "JP", - "price": 47, - "project": "machine-learning", - "state": "running", - "time": 1487487600000, - "username": "schavezc3" - }, - { - "age": 42, - "cost": 22.45, - "country": "BR", - "price": 56, - "project": "logstash", - "state": "running", - "time": 1462518000000, - "username": "acoxc4" - }, - { - "age": 52, - "cost": 21.66, - "country": "NG", - "price": 58, - "project": "elasticsearch", - "state": "running", - "time": 1470380400000, - "username": "jsanchezc5" - }, - { - "age": 79, - "cost": 23.36, - "country": "RU", - "price": 59, - "project": "kibana", - "state": "done", - "time": 1469343600000, - "username": "gpricec6" - }, - { - "age": 60, - "cost": 22.5, - "country": "CN", - "price": 51, - "project": "opbeat", - "state": "done", - "time": 1466492400000, - "username": "tgarrettc7" - }, - { - "age": 30, - "cost": 22.33, - "country": "RU", - "price": 53, - "project": "kibana", - "state": "running", - "time": 1464073200000, - "username": "llawrencec8" - }, - { - "age": 60, - "cost": 22.6, - "country": "RU", - "price": 47, - "project": "opbeat", - "state": "done", - "time": 1472540400000, - "username": "mgordonc9" - }, - { - "age": 36, - "cost": 23.62, - "country": "PL", - "price": 65, - "project": "beats", - "state": "start", - "time": 1486710000000, - "username": "jmendozaca" - }, - { - "age": 69, - "cost": 23.58, - "country": "CN", - "price": 58, - "project": "x-pack", - "state": "start", - "time": 1490857200000, - "username": "dsnydercb" - }, - { - "age": 20, - "cost": 22.55, - "country": "RU", - "price": 66, - "project": "x-pack", - "state": "done", - "time": 1473663600000, - "username": "pclarkcc" - }, - { - "age": 69, - "cost": 23.92, - "country": "PH", - "price": 60, - "project": "x-pack", - "state": "start", - "time": 1483426800000, - "username": "bkennedycd" - }, - { - "age": 73, - "cost": 23.46, - "country": "PH", - "price": 59, - "project": "elasticsearch", - "state": "done", - "time": 1476255600000, - "username": "gwalkerce" - }, - { - "age": 28, - "cost": 25.75, - "country": "ID", - "price": 50, - "project": "logstash", - "state": "done", - "time": 1475737200000, - "username": "bruizcf" - }, - { - "age": 21, - "cost": 22.5, - "country": "CN", - "price": 44, - "project": "logstash", - "state": "done", - "time": 1465196400000, - "username": "aflorescg" - }, - { - "age": 70, - "cost": 20.85, - "country": "MX", - "price": 47, - "project": "logstash", - "state": "start", - "time": 1472108400000, - "username": "eberrych" - }, - { - "age": 79, - "cost": 22.12, - "country": "SO", - "price": 57, - "project": "kibana", - "state": "running", - "time": 1486364400000, - "username": "ahudsonci" - }, - { - "age": 38, - "cost": 23.02, - "country": "ID", - "price": 50, - "project": "elasticsearch", - "state": "done", - "time": 1487660400000, - "username": "khawkinscj" - }, - { - "age": 38, - "cost": 23.25, - "country": "RU", - "price": 47, - "project": "elasticsearch", - "state": "done", - "time": 1486969200000, - "username": "mwagnerck" - }, - { - "age": 64, - "cost": 22.15, - "country": "CN", - "price": 57, - "project": "beats", - "state": "running", - "time": 1481353200000, - "username": "kbradleycl" - }, - { - "age": 36, - "cost": 24.74, - "country": "CN", - "price": 52, - "project": "beats", - "state": "running", - "time": 1468134000000, - "username": "ejenkinscm" - }, - { - "age": 19, - "cost": 22.69, - "country": "ZM", - "price": 59, - "project": "machine-learning", - "state": "done", - "time": 1476601200000, - "username": "cruizcn" - }, - { - "age": 53, - "cost": 25.07, - "country": "BR", - "price": 43, - "project": "opbeat", - "state": "running", - "time": 1487487600000, - "username": "ljamesco" - }, - { - "age": 26, - "cost": 23.43, - "country": "AE", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1470121200000, - "username": "kcarrollcp" - }, - { - "age": 44, - "cost": 21.62, - "country": "US", - "price": 69, - "project": "kibana", - "state": "running", - "time": 1470034800000, - "username": "mbryantcq" - }, - { - "age": 40, - "cost": 24.76, - "country": "DE", - "price": 40, - "project": "machine-learning", - "state": "running", - "time": 1490770800000, - "username": "jcrawfordcr" - }, - { - "age": 23, - "cost": 24.06, - "country": "JP", - "price": 67, - "project": "kibana", - "state": "start", - "time": 1472281200000, - "username": "bsimscs" - }, - { - "age": 23, - "cost": 22.84, - "country": "ID", - "price": 50, - "project": "kibana", - "state": "done", - "time": 1474268400000, - "username": "bphillipsct" - }, - { - "age": 79, - "cost": 22.51, - "country": "ID", - "price": 71, - "project": "kibana", - "state": "done", - "time": 1482562800000, - "username": "jortizcu" - }, - { - "age": 26, - "cost": 22.11, - "country": "ID", - "price": 57, - "project": "machine-learning", - "state": "running", - "time": 1471503600000, - "username": "dmartinezcv" - }, - { - "age": 61, - "cost": 21.3, - "country": "BR", - "price": 61, - "project": "machine-learning", - "state": "start", - "time": 1465455600000, - "username": "mgordoncw" - }, - { - "age": 68, - "cost": 23.92, - "country": "CN", - "price": 49, - "project": "machine-learning", - "state": "start", - "time": 1488092400000, - "username": "amasoncx" - }, - { - "age": 26, - "cost": 24.56, - "country": "UG", - "price": 66, - "project": "machine-learning", - "state": "running", - "time": 1462086000000, - "username": "whowellcy" - }, - { - "age": 67, - "cost": 24.98, - "country": "MY", - "price": 45, - "project": "opbeat", - "state": "running", - "time": 1479452400000, - "username": "bhuntcz" - }, - { - "age": 49, - "cost": 23.13, - "country": "ID", - "price": 60, - "project": "logstash", - "state": "done", - "time": 1460358000000, - "username": "agardnerd0" - }, - { - "age": 18, - "cost": 22.52, - "country": "ET", - "price": 48, - "project": "opbeat", - "state": "done", - "time": 1474700400000, - "username": "nduncand1" - }, - { - "age": 35, - "cost": 23.12, - "country": "MY", - "price": 53, - "project": "logstash", - "state": "done", - "time": 1491289200000, - "username": "mhernandezd2" - }, - { - "age": 54, - "cost": 23.35, - "country": "CN", - "price": 48, - "project": "machine-learning", - "state": "done", - "time": 1461394800000, - "username": "rcoled3" - }, - { - "age": 23, - "cost": 23.54, - "country": "NO", - "price": 48, - "project": "kibana", - "state": "start", - "time": 1474700400000, - "username": "jmarshalld4" - }, - { - "age": 66, - "cost": 22.95, - "country": "JM", - "price": 75, - "project": "elasticsearch", - "state": "done", - "time": 1482044400000, - "username": "phuntd5" - }, - { - "age": 29, - "cost": 21.87, - "country": "PH", - "price": 59, - "project": "beats", - "state": "running", - "time": 1475737200000, - "username": "adixond6" - }, - { - "age": 48, - "cost": 23.39, - "country": "CN", - "price": 58, - "project": "x-pack", - "state": "done", - "time": 1489734000000, - "username": "bgutierrezd7" - }, - { - "age": 65, - "cost": 21.78, - "country": "UA", - "price": 57, - "project": "kibana", - "state": "running", - "time": 1463382000000, - "username": "hnelsond8" - }, - { - "age": 30, - "cost": 22.99, - "country": "GY", - "price": 51, - "project": "kibana", - "state": "done", - "time": 1460271600000, - "username": "acollinsd9" - }, - { - "age": 33, - "cost": 23.3, - "country": "VN", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1490770800000, - "username": "tmillerda" - }, - { - "age": 26, - "cost": 22.67, - "country": "JP", - "price": 44, - "project": "machine-learning", - "state": "done", - "time": 1480402800000, - "username": "tmasondb" - }, - { - "age": 69, - "cost": 24.17, - "country": "PL", - "price": 72, - "project": "x-pack", - "state": "start", - "time": 1477551600000, - "username": "baustindc" - }, - { - "age": 53, - "cost": 22.38, - "country": "TH", - "price": 50, - "project": "opbeat", - "state": "running", - "time": 1489129200000, - "username": "dgriffindd" - }, - { - "age": 61, - "cost": 22.69, - "country": "AL", - "price": 48, - "project": "machine-learning", - "state": "done", - "time": 1467874800000, - "username": "dryande" - }, - { - "age": 57, - "cost": 23.94, - "country": "CN", - "price": 46, - "project": "beats", - "state": "start", - "time": 1460876400000, - "username": "kmurraydf" - }, - { - "age": 53, - "cost": 22.52, - "country": "ID", - "price": 42, - "project": "opbeat", - "state": "done", - "time": 1480057200000, - "username": "hdiazdg" - }, - { - "age": 64, - "cost": 22.93, - "country": "LT", - "price": 57, - "project": "beats", - "state": "done", - "time": 1483081200000, - "username": "anicholsdh" - }, - { - "age": 73, - "cost": 21.81, - "country": "US", - "price": 49, - "project": "elasticsearch", - "state": "running", - "time": 1477724400000, - "username": "wgreendi" - }, - { - "age": 47, - "cost": 24.86, - "country": "BR", - "price": 45, - "project": "machine-learning", - "state": "running", - "time": 1483513200000, - "username": "anicholsdj" - }, - { - "age": 57, - "cost": 21.42, - "country": "MN", - "price": 69, - "project": "beats", - "state": "start", - "time": 1483340400000, - "username": "fstevensdk" - }, - { - "age": 78, - "cost": 22.55, - "country": "CN", - "price": 58, - "project": "beats", - "state": "done", - "time": 1472454000000, - "username": "wfrazierdl" - }, - { - "age": 43, - "cost": 22.22, - "country": "ID", - "price": 57, - "project": "beats", - "state": "running", - "time": 1475305200000, - "username": "hbelldm" - }, - { - "age": 72, - "cost": 22.9, - "country": "CN", - "price": 47, - "project": "kibana", - "state": "done", - "time": 1480834800000, - "username": "edixondn" - }, - { - "age": 40, - "cost": 21.5, - "country": "AR", - "price": 57, - "project": "machine-learning", - "state": "running", - "time": 1480662000000, - "username": "kraydo" - }, - { - "age": 36, - "cost": 23.45, - "country": "RU", - "price": 43, - "project": "beats", - "state": "done", - "time": 1485241200000, - "username": "nmurphydp" - }, - { - "age": 56, - "cost": 23.03, - "country": "KR", - "price": 62, - "project": "logstash", - "state": "done", - "time": 1483426800000, - "username": "ssimsdq" - }, - { - "age": 18, - "cost": 22.57, - "country": "ID", - "price": 52, - "project": "opbeat", - "state": "done", - "time": 1485414000000, - "username": "brusselldr" - }, - { - "age": 41, - "cost": 21.47, - "country": "AL", - "price": 56, - "project": "x-pack", - "state": "start", - "time": 1477897200000, - "username": "mmillsds" - }, - { - "age": 46, - "cost": 21.8, - "country": "KE", - "price": 74, - "project": "opbeat", - "state": "running", - "time": 1488092400000, - "username": "jdixondt" - }, - { - "age": 66, - "cost": 24.32, - "country": "TH", - "price": 49, - "project": "elasticsearch", - "state": "start", - "time": 1479452400000, - "username": "bmurphydu" - }, - { - "age": 44, - "cost": 24.61, - "country": "NZ", - "price": 61, - "project": "kibana", - "state": "running", - "time": 1476946800000, - "username": "inicholsdv" - }, - { - "age": 64, - "cost": 21.53, - "country": "NL", - "price": 50, - "project": "beats", - "state": "running", - "time": 1464246000000, - "username": "hstanleydw" - }, - { - "age": 79, - "cost": 21.6, - "country": "CN", - "price": 63, - "project": "kibana", - "state": "running", - "time": 1479538800000, - "username": "nwatkinsdx" - }, - { - "age": 78, - "cost": 23.3, - "country": "PL", - "price": 61, - "project": "beats", - "state": "done", - "time": 1478415600000, - "username": "dmccoydy" - }, - { - "age": 33, - "cost": 24.21, - "country": "PA", - "price": 52, - "project": "machine-learning", - "state": "start", - "time": 1470812400000, - "username": "dchavezdz" - }, - { - "age": 76, - "cost": 23.57, - "country": "PE", - "price": 65, - "project": "x-pack", - "state": "start", - "time": 1467529200000, - "username": "jphillipse0" - }, - { - "age": 41, - "cost": 25.17, - "country": "ID", - "price": 55, - "project": "x-pack", - "state": "running", - "time": 1475046000000, - "username": "ppalmere1" - }, - { - "age": 56, - "cost": 22.74, - "country": "ID", - "price": 56, - "project": "logstash", - "state": "done", - "time": 1482476400000, - "username": "knelsone2" - }, - { - "age": 78, - "cost": 21.78, - "country": "GR", - "price": 57, - "project": "beats", - "state": "running", - "time": 1479020400000, - "username": "gclarke3" - }, - { - "age": 65, - "cost": 21.68, - "country": "VE", - "price": 39, - "project": "kibana", - "state": "running", - "time": 1474182000000, - "username": "rstewarte4" - }, - { - "age": 54, - "cost": 23.5, - "country": "CN", - "price": 65, - "project": "machine-learning", - "state": "start", - "time": 1467529200000, - "username": "vramose5" - }, - { - "age": 69, - "cost": 23.54, - "country": "CN", - "price": 52, - "project": "x-pack", - "state": "start", - "time": 1460617200000, - "username": "kkennedye6" - }, - { - "age": 64, - "cost": 24.08, - "country": "CN", - "price": 54, - "project": "beats", - "state": "start", - "time": 1463036400000, - "username": "sharveye7" - }, - { - "age": 44, - "cost": 24.9, - "country": "NO", - "price": 61, - "project": "kibana", - "state": "running", - "time": 1476514800000, - "username": "jandrewse8" - }, - { - "age": 72, - "cost": 24.49, - "country": "HN", - "price": 53, - "project": "kibana", - "state": "start", - "time": 1482130800000, - "username": "gwashingtone9" - }, - { - "age": 25, - "cost": 23.14, - "country": "CZ", - "price": 55, - "project": "opbeat", - "state": "done", - "time": 1479193200000, - "username": "tgrahamea" - }, - { - "age": 65, - "cost": 23.11, - "country": "GR", - "price": 53, - "project": "kibana", - "state": "done", - "time": 1464332400000, - "username": "awatsoneb" - }, - { - "age": 53, - "cost": 21.38, - "country": "ID", - "price": 46, - "project": "opbeat", - "state": "start", - "time": 1472540400000, - "username": "cnicholsec" - }, - { - "age": 74, - "cost": 24.07, - "country": "CN", - "price": 60, - "project": "opbeat", - "state": "start", - "time": 1473318000000, - "username": "dhamiltoned" - }, - { - "age": 31, - "cost": 22.77, - "country": "ID", - "price": 60, - "project": "elasticsearch", - "state": "done", - "time": 1489820400000, - "username": "pjordanee" - }, - { - "age": 32, - "cost": 22.87, - "country": "FR", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1464159600000, - "username": "rclarkef" - }, - { - "age": 63, - "cost": 24.53, - "country": "LI", - "price": 62, - "project": "logstash", - "state": "running", - "time": 1491462000000, - "username": "mgonzaleseg" - }, - { - "age": 73, - "cost": 21.39, - "country": "ID", - "price": 57, - "project": "elasticsearch", - "state": "start", - "time": 1473145200000, - "username": "tsnydereh" - }, - { - "age": 24, - "cost": 23.36, - "country": "PH", - "price": 54, - "project": "elasticsearch", - "state": "done", - "time": 1475564400000, - "username": "bedwardsei" - }, - { - "age": 33, - "cost": 22.73, - "country": "CN", - "price": 53, - "project": "machine-learning", - "state": "done", - "time": 1460358000000, - "username": "preyesej" - }, - { - "age": 22, - "cost": 22.35, - "country": "AR", - "price": 44, - "project": "beats", - "state": "running", - "time": 1472713200000, - "username": "aclarkek" - }, - { - "age": 27, - "cost": 22.26, - "country": "GH", - "price": 53, - "project": "x-pack", - "state": "running", - "time": 1487314800000, - "username": "wgeorgeel" - }, - { - "age": 25, - "cost": 23.06, - "country": "AZ", - "price": 53, - "project": "opbeat", - "state": "done", - "time": 1484204400000, - "username": "telliottem" - }, - { - "age": 57, - "cost": 24.79, - "country": "RU", - "price": 49, - "project": "beats", - "state": "running", - "time": 1487314800000, - "username": "lwooden" - }, - { - "age": 32, - "cost": 22.63, - "country": "PH", - "price": 53, - "project": "opbeat", - "state": "done", - "time": 1472886000000, - "username": "emitchelleo" - }, - { - "age": 73, - "cost": 20.87, - "country": "AR", - "price": 45, - "project": "elasticsearch", - "state": "start", - "time": 1471590000000, - "username": "ccarrep" - }, - { - "age": 25, - "cost": 21.37, - "country": "AR", - "price": 70, - "project": "opbeat", - "state": "start", - "time": 1482044400000, - "username": "mfishereq" - }, - { - "age": 40, - "cost": 23.42, - "country": "FR", - "price": 53, - "project": "machine-learning", - "state": "done", - "time": 1490943600000, - "username": "tgrayer" - }, - { - "age": 62, - "cost": 22.33, - "country": "KP", - "price": 64, - "project": "x-pack", - "state": "running", - "time": 1464332400000, - "username": "pstanleyes" - }, - { - "age": 73, - "cost": 23.69, - "country": "CN", - "price": 51, - "project": "elasticsearch", - "state": "start", - "time": 1479366000000, - "username": "nfoxet" - }, - { - "age": 21, - "cost": 21.33, - "country": "PT", - "price": 51, - "project": "logstash", - "state": "start", - "time": 1474441200000, - "username": "rstanleyeu" - }, - { - "age": 65, - "cost": 22.93, - "country": "PE", - "price": 50, - "project": "kibana", - "state": "done", - "time": 1476687600000, - "username": "jrobinsonev" - }, - { - "age": 21, - "cost": 22.89, - "country": "BD", - "price": 54, - "project": "logstash", - "state": "done", - "time": 1475391600000, - "username": "jrichardsew" - }, - { - "age": 24, - "cost": 21.94, - "country": "CN", - "price": 64, - "project": "elasticsearch", - "state": "running", - "time": 1471071600000, - "username": "hwebbex" - }, - { - "age": 46, - "cost": 21.95, - "country": "ID", - "price": 61, - "project": "opbeat", - "state": "running", - "time": 1479538800000, - "username": "awestey" - }, - { - "age": 64, - "cost": 22.09, - "country": "PL", - "price": 45, - "project": "beats", - "state": "running", - "time": 1462431600000, - "username": "ljacobsez" - }, - { - "age": 55, - "cost": 23.6, - "country": "GR", - "price": 54, - "project": "x-pack", - "state": "start", - "time": 1475478000000, - "username": "krussellf0" - }, - { - "age": 55, - "cost": 22.9, - "country": "PL", - "price": 63, - "project": "x-pack", - "state": "done", - "time": 1485154800000, - "username": "amedinaf1" - }, - { - "age": 38, - "cost": 22.83, - "country": "CN", - "price": 63, - "project": "elasticsearch", - "state": "done", - "time": 1473577200000, - "username": "tjenkinsf2" - }, - { - "age": 64, - "cost": 24.1, - "country": "ID", - "price": 44, - "project": "beats", - "state": "start", - "time": 1482822000000, - "username": "lrileyf3" - }, - { - "age": 52, - "cost": 21.41, - "country": "BR", - "price": 50, - "project": "elasticsearch", - "state": "start", - "time": 1480057200000, - "username": "dsimpsonf4" - }, - { - "age": 34, - "cost": 23.48, - "country": "BR", - "price": 66, - "project": "x-pack", - "state": "done", - "time": 1481612400000, - "username": "nwoodsf5" - }, - { - "age": 65, - "cost": 23.04, - "country": "KR", - "price": 75, - "project": "kibana", - "state": "done", - "time": 1464850800000, - "username": "acruzf6" - }, - { - "age": 45, - "cost": 25, - "country": "SE", - "price": 54, - "project": "elasticsearch", - "state": "running", - "time": 1466838000000, - "username": "rmyersf7" - }, - { - "age": 29, - "cost": 21.82, - "country": "TL", - "price": 54, - "project": "beats", - "state": "running", - "time": 1474441200000, - "username": "sfowlerf8" - }, - { - "age": 51, - "cost": 22.2, - "country": "IL", - "price": 54, - "project": "kibana", - "state": "running", - "time": 1463641200000, - "username": "bsimsf9" - }, - { - "age": 23, - "cost": 22.49, - "country": "CN", - "price": 54, - "project": "kibana", - "state": "running", - "time": 1472367600000, - "username": "acampbellfa" - }, - { - "age": 35, - "cost": 23.36, - "country": "RU", - "price": 54, - "project": "logstash", - "state": "done", - "time": 1472799600000, - "username": "llarsonfb" - }, - { - "age": 32, - "cost": 23, - "country": "CN", - "price": 66, - "project": "opbeat", - "state": "done", - "time": 1479625200000, - "username": "kbanksfc" - }, - { - "age": 64, - "cost": 21.07, - "country": "CN", - "price": 56, - "project": "beats", - "state": "start", - "time": 1486882800000, - "username": "jwatkinsfd" - }, - { - "age": 23, - "cost": 23.87, - "country": "PT", - "price": 58, - "project": "kibana", - "state": "start", - "time": 1485846000000, - "username": "kfranklinfe" - }, - { - "age": 22, - "cost": 21.68, - "country": "MX", - "price": 60, - "project": "beats", - "state": "running", - "time": 1479366000000, - "username": "jhuntff" - }, - { - "age": 58, - "cost": 24.67, - "country": "AM", - "price": 57, - "project": "kibana", - "state": "running", - "time": 1488265200000, - "username": "njenkinsfg" - }, - { - "age": 78, - "cost": 24.49, - "country": "CN", - "price": 49, - "project": "beats", - "state": "start", - "time": 1464159600000, - "username": "mjenkinsfh" - }, - { - "age": 46, - "cost": 23.31, - "country": "JP", - "price": 57, - "project": "opbeat", - "state": "done", - "time": 1465974000000, - "username": "adayfi" - }, - { - "age": 68, - "cost": 23.91, - "country": "PF", - "price": 58, - "project": "machine-learning", - "state": "start", - "time": 1479452400000, - "username": "lcoxfj" - }, - { - "age": 79, - "cost": 23.67, - "country": "CA", - "price": 62, - "project": "kibana", - "state": "start", - "time": 1479538800000, - "username": "dhansenfk" - }, - { - "age": 70, - "cost": 23.46, - "country": "VE", - "price": 66, - "project": "logstash", - "state": "done", - "time": 1464073200000, - "username": "rharrisonfl" - }, - { - "age": 71, - "cost": 22.41, - "country": "RS", - "price": 55, - "project": "beats", - "state": "running", - "time": 1472886000000, - "username": "aromerofm" - }, - { - "age": 58, - "cost": 22.99, - "country": "BR", - "price": 66, - "project": "kibana", - "state": "done", - "time": 1484550000000, - "username": "hfoxfn" - }, - { - "age": 21, - "cost": 23.59, - "country": "UA", - "price": 57, - "project": "logstash", - "state": "start", - "time": 1489906800000, - "username": "hrodriguezfo" - }, - { - "age": 34, - "cost": 22.48, - "country": "MK", - "price": 67, - "project": "x-pack", - "state": "running", - "time": 1463382000000, - "username": "kmasonfp" - }, - { - "age": 52, - "cost": 23.43, - "country": "CN", - "price": 58, - "project": "elasticsearch", - "state": "done", - "time": 1475478000000, - "username": "mrileyfq" - }, - { - "age": 24, - "cost": 23.1, - "country": "NZ", - "price": 64, - "project": "elasticsearch", - "state": "done", - "time": 1472022000000, - "username": "tkellyfr" - }, - { - "age": 52, - "cost": 21.59, - "country": "CN", - "price": 72, - "project": "elasticsearch", - "state": "running", - "time": 1490079600000, - "username": "jrileyfs" - }, - { - "age": 40, - "cost": 22.7, - "country": "MX", - "price": 58, - "project": "machine-learning", - "state": "done", - "time": 1484204400000, - "username": "mspencerft" - }, - { - "age": 34, - "cost": 22.01, - "country": "AL", - "price": 58, - "project": "x-pack", - "state": "running", - "time": 1486191600000, - "username": "kburkefu" - }, - { - "age": 66, - "cost": 24.78, - "country": "CN", - "price": 55, - "project": "elasticsearch", - "state": "running", - "time": 1478329200000, - "username": "nturnerfv" - }, - { - "age": 62, - "cost": 22.81, - "country": "ES", - "price": 50, - "project": "x-pack", - "state": "done", - "time": 1460530800000, - "username": "jsmithfw" - }, - { - "age": 56, - "cost": 23.34, - "country": "PH", - "price": 58, - "project": "logstash", - "state": "done", - "time": 1476082800000, - "username": "jrichardsonfx" - }, - { - "age": 32, - "cost": 23.19, - "country": "US", - "price": 67, - "project": "opbeat", - "state": "done", - "time": 1475650800000, - "username": "shernandezfy" - }, - { - "age": 37, - "cost": 23.15, - "country": "CN", - "price": 61, - "project": "kibana", - "state": "done", - "time": 1485500400000, - "username": "hjacobsfz" - }, - { - "age": 29, - "cost": 22.66, - "country": "EC", - "price": 63, - "project": "beats", - "state": "done", - "time": 1483254000000, - "username": "cbennettg0" - }, - { - "age": 48, - "cost": 23.19, - "country": "CM", - "price": 58, - "project": "x-pack", - "state": "done", - "time": 1463900400000, - "username": "aarnoldg1" - }, - { - "age": 63, - "cost": 24.93, - "country": "PT", - "price": 61, - "project": "logstash", - "state": "running", - "time": 1472022000000, - "username": "mgilbertg2" - }, - { - "age": 31, - "cost": 22.81, - "country": "PA", - "price": 54, - "project": "elasticsearch", - "state": "done", - "time": 1482044400000, - "username": "rcoxg3" - }, - { - "age": 72, - "cost": 24.23, - "country": "RU", - "price": 60, - "project": "kibana", - "state": "start", - "time": 1471676400000, - "username": "twhiteg4" - }, - { - "age": 42, - "cost": 22.72, - "country": "BR", - "price": 53, - "project": "logstash", - "state": "done", - "time": 1486710000000, - "username": "lcarpenterg5" - }, - { - "age": 27, - "cost": 23.16, - "country": "BA", - "price": 70, - "project": "x-pack", - "state": "done", - "time": 1481612400000, - "username": "eharrisong6" - }, - { - "age": 46, - "cost": 24.18, - "country": "NP", - "price": 52, - "project": "opbeat", - "state": "start", - "time": 1461222000000, - "username": "hharrisong7" - }, - { - "age": 24, - "cost": 22.94, - "country": "PT", - "price": 59, - "project": "elasticsearch", - "state": "done", - "time": 1484377200000, - "username": "jgibsong8" - }, - { - "age": 38, - "cost": 21.91, - "country": "BO", - "price": 51, - "project": "elasticsearch", - "state": "running", - "time": 1474527600000, - "username": "rwilliamsg9" - }, - { - "age": 77, - "cost": 24.88, - "country": "CN", - "price": 64, - "project": "logstash", - "state": "running", - "time": 1470466800000, - "username": "htaylorga" - }, - { - "age": 64, - "cost": 23.03, - "country": "PT", - "price": 64, - "project": "beats", - "state": "done", - "time": 1464764400000, - "username": "vwebbgb" - }, - { - "age": 43, - "cost": 21.21, - "country": "JP", - "price": 66, - "project": "beats", - "state": "start", - "time": 1491202800000, - "username": "tbrowngc" - }, - { - "age": 73, - "cost": 23.85, - "country": "CN", - "price": 55, - "project": "elasticsearch", - "state": "start", - "time": 1477638000000, - "username": "bmontgomerygd" - }, - { - "age": 78, - "cost": 24.05, - "country": "VN", - "price": 59, - "project": "beats", - "state": "start", - "time": 1480921200000, - "username": "jrileyge" - }, - { - "age": 44, - "cost": 23.43, - "country": "ID", - "price": 55, - "project": "kibana", - "state": "done", - "time": 1487574000000, - "username": "bpetersgf" - }, - { - "age": 31, - "cost": 21.69, - "country": "PH", - "price": 54, - "project": "elasticsearch", - "state": "running", - "time": 1467615600000, - "username": "awilliamsgg" - }, - { - "age": 79, - "cost": 22.26, - "country": "CO", - "price": 58, - "project": "kibana", - "state": "running", - "time": 1478588400000, - "username": "bcoxgh" - }, - { - "age": 47, - "cost": 24.85, - "country": "PH", - "price": 74, - "project": "machine-learning", - "state": "running", - "time": 1461826800000, - "username": "jchavezgi" - }, - { - "age": 19, - "cost": 23.61, - "country": "AZ", - "price": 63, - "project": "machine-learning", - "state": "start", - "time": 1476946800000, - "username": "bstanleygj" - }, - { - "age": 49, - "cost": 22.66, - "country": "RU", - "price": 55, - "project": "logstash", - "state": "done", - "time": 1475046000000, - "username": "lortizgk" - }, - { - "age": 65, - "cost": 21.86, - "country": "YE", - "price": 33, - "project": "kibana", - "state": "running", - "time": 1462345200000, - "username": "cjohnsongl" - }, - { - "age": 30, - "cost": 23.26, - "country": "NZ", - "price": 55, - "project": "kibana", - "state": "done", - "time": 1484636400000, - "username": "sfernandezgm" - }, - { - "age": 75, - "cost": 22.78, - "country": "GB", - "price": 54, - "project": "machine-learning", - "state": "done", - "time": 1491721200000, - "username": "astevensgn" - }, - { - "age": 57, - "cost": 24.28, - "country": "VE", - "price": 55, - "project": "beats", - "state": "start", - "time": 1480575600000, - "username": "hgreengo" - }, - { - "age": 67, - "cost": 21.68, - "country": "FR", - "price": 45, - "project": "opbeat", - "state": "running", - "time": 1485932400000, - "username": "tgutierrezgp" - }, - { - "age": 59, - "cost": 25.04, - "country": "PL", - "price": 53, - "project": "elasticsearch", - "state": "running", - "time": 1481266800000, - "username": "rmorenogq" - }, - { - "age": 57, - "cost": 23.46, - "country": "PE", - "price": 48, - "project": "beats", - "state": "done", - "time": 1464332400000, - "username": "esandersgr" - }, - { - "age": 21, - "cost": 22.72, - "country": "CN", - "price": 49, - "project": "logstash", - "state": "done", - "time": 1477119600000, - "username": "sleegs" - }, - { - "age": 74, - "cost": 21.44, - "country": "RU", - "price": 64, - "project": "opbeat", - "state": "start", - "time": 1485414000000, - "username": "ktaylorgt" - }, - { - "age": 24, - "cost": 23.26, - "country": "ID", - "price": 44, - "project": "elasticsearch", - "state": "done", - "time": 1482217200000, - "username": "dgeorgegu" - }, - { - "age": 27, - "cost": 22.47, - "country": "ID", - "price": 57, - "project": "x-pack", - "state": "running", - "time": 1468134000000, - "username": "swarrengv" - }, - { - "age": 62, - "cost": 22.32, - "country": "JP", - "price": 52, - "project": "x-pack", - "state": "running", - "time": 1481353200000, - "username": "sdeangw" - }, - { - "age": 36, - "cost": 22.85, - "country": "MO", - "price": 49, - "project": "beats", - "state": "done", - "time": 1483167600000, - "username": "rmyersgx" - }, - { - "age": 31, - "cost": 25.49, - "country": "CN", - "price": 64, - "project": "elasticsearch", - "state": "running", - "time": 1469430000000, - "username": "lwilsongy" - }, - { - "age": 75, - "cost": 23.08, - "country": "CN", - "price": 57, - "project": "machine-learning", - "state": "done", - "time": 1472713200000, - "username": "friveragz" - }, - { - "age": 75, - "cost": 22.93, - "country": "RU", - "price": 66, - "project": "machine-learning", - "state": "done", - "time": 1470553200000, - "username": "awebbh0" - }, - { - "age": 18, - "cost": 23.41, - "country": "CN", - "price": 46, - "project": "opbeat", - "state": "done", - "time": 1486105200000, - "username": "fyoungh1" - }, - { - "age": 76, - "cost": 22.25, - "country": "PH", - "price": 57, - "project": "x-pack", - "state": "running", - "time": 1474354800000, - "username": "jbakerh2" - }, - { - "age": 56, - "cost": 21.42, - "country": "PL", - "price": 66, - "project": "logstash", - "state": "start", - "time": 1461394800000, - "username": "wwalkerh3" - }, - { - "age": 23, - "cost": 21.33, - "country": "MX", - "price": 53, - "project": "kibana", - "state": "start", - "time": 1489042800000, - "username": "nwatsonh4" - }, - { - "age": 22, - "cost": 23.46, - "country": "PH", - "price": 46, - "project": "beats", - "state": "done", - "time": 1487055600000, - "username": "dsullivanh5" - }, - { - "age": 65, - "cost": 21.73, - "country": "GT", - "price": 50, - "project": "kibana", - "state": "running", - "time": 1480489200000, - "username": "jcastilloh6" - }, - { - "age": 20, - "cost": 24.24, - "country": "BR", - "price": 50, - "project": "x-pack", - "state": "start", - "time": 1481266800000, - "username": "rgreeneh7" - }, - { - "age": 40, - "cost": 23.22, - "country": "ZA", - "price": 62, - "project": "machine-learning", - "state": "done", - "time": 1469948400000, - "username": "gsmithh8" - }, - { - "age": 31, - "cost": 20.87, - "country": "VU", - "price": 65, - "project": "elasticsearch", - "state": "start", - "time": 1486623600000, - "username": "rramosh9" - }, - { - "age": 73, - "cost": 21.73, - "country": "DO", - "price": 61, - "project": "elasticsearch", - "state": "running", - "time": 1460876400000, - "username": "chansenha" - }, - { - "age": 23, - "cost": 22.63, - "country": "ID", - "price": 64, - "project": "kibana", - "state": "done", - "time": 1488092400000, - "username": "hblackhb" - }, - { - "age": 52, - "cost": 22.56, - "country": "RU", - "price": 52, - "project": "elasticsearch", - "state": "done", - "time": 1480662000000, - "username": "ebakerhc" - }, - { - "age": 27, - "cost": 22.53, - "country": "VE", - "price": 46, - "project": "x-pack", - "state": "done", - "time": 1480316400000, - "username": "tryanhd" - }, - { - "age": 73, - "cost": 23.69, - "country": "MY", - "price": 64, - "project": "elasticsearch", - "state": "start", - "time": 1474009200000, - "username": "adiazhe" - }, - { - "age": 62, - "cost": 25.48, - "country": "UA", - "price": 61, - "project": "x-pack", - "state": "running", - "time": 1461394800000, - "username": "darnoldhf" - }, - { - "age": 37, - "cost": 24.07, - "country": "PL", - "price": 57, - "project": "kibana", - "state": "start", - "time": 1481785200000, - "username": "cgrayhg" - }, - { - "age": 62, - "cost": 23.32, - "country": "GR", - "price": 72, - "project": "x-pack", - "state": "done", - "time": 1465196400000, - "username": "smedinahh" - }, - { - "age": 71, - "cost": 22.75, - "country": "GE", - "price": 59, - "project": "beats", - "state": "done", - "time": 1463209200000, - "username": "jmccoyhi" - }, - { - "age": 44, - "cost": 22.34, - "country": "CN", - "price": 59, - "project": "kibana", - "state": "running", - "time": 1477551600000, - "username": "ameyerhj" - }, - { - "age": 44, - "cost": 20.24, - "country": "PT", - "price": 51, - "project": "kibana", - "state": "done", - "time": 1486969200000, - "username": "wwrighthk" - }, - { - "age": 19, - "cost": 23.86, - "country": "FI", - "price": 63, - "project": "machine-learning", - "state": "start", - "time": 1476255600000, - "username": "wtuckerhl" - }, - { - "age": 51, - "cost": 24.79, - "country": "NA", - "price": 61, - "project": "kibana", - "state": "running", - "time": 1465023600000, - "username": "greedhm" - }, - { - "age": 23, - "cost": 24.51, - "country": "JP", - "price": 61, - "project": "kibana", - "state": "running", - "time": 1480575600000, - "username": "fpaynehn" - }, - { - "age": 29, - "cost": 22.18, - "country": "CN", - "price": 54, - "project": "beats", - "state": "running", - "time": 1462431600000, - "username": "aperryho" - }, - { - "age": 62, - "cost": 21.38, - "country": "CN", - "price": 51, - "project": "x-pack", - "state": "start", - "time": 1471676400000, - "username": "arobertshp" - }, - { - "age": 67, - "cost": 23.81, - "country": "UY", - "price": 68, - "project": "opbeat", - "state": "start", - "time": 1481353200000, - "username": "mallenhq" - }, - { - "age": 78, - "cost": 21.55, - "country": "PA", - "price": 49, - "project": "beats", - "state": "running", - "time": 1467356400000, - "username": "mcruzhr" - }, - { - "age": 36, - "cost": 23.41, - "country": "VN", - "price": 50, - "project": "beats", - "state": "done", - "time": 1478674800000, - "username": "rwagnerhs" - }, - { - "age": 76, - "cost": 24.18, - "country": "CN", - "price": 57, - "project": "x-pack", - "state": "start", - "time": 1483772400000, - "username": "mevansht" - }, - { - "age": 59, - "cost": 22.6, - "country": "VE", - "price": 64, - "project": "elasticsearch", - "state": "done", - "time": 1465714800000, - "username": "nknighthu" - }, - { - "age": 30, - "cost": 21.37, - "country": "ZM", - "price": 68, - "project": "kibana", - "state": "start", - "time": 1480489200000, - "username": "jharrishv" - }, - { - "age": 70, - "cost": 24.13, - "country": "HU", - "price": 50, - "project": "logstash", - "state": "start", - "time": 1470121200000, - "username": "wkimhw" - }, - { - "age": 55, - "cost": 22.34, - "country": "CN", - "price": 43, - "project": "x-pack", - "state": "running", - "time": 1485932400000, - "username": "ejacksonhx" - }, - { - "age": 54, - "cost": 23.08, - "country": "ID", - "price": 54, - "project": "machine-learning", - "state": "done", - "time": 1484722800000, - "username": "mstewarthy" - }, - { - "age": 29, - "cost": 23.4, - "country": "ID", - "price": 65, - "project": "beats", - "state": "done", - "time": 1471330800000, - "username": "psimpsonhz" - }, - { - "age": 19, - "cost": 21.08, - "country": "UA", - "price": 51, - "project": "machine-learning", - "state": "start", - "time": 1472367600000, - "username": "jkingi0" - }, - { - "age": 49, - "cost": 22.83, - "country": "PL", - "price": 57, - "project": "logstash", - "state": "done", - "time": 1468393200000, - "username": "jrileyi1" - }, - { - "age": 56, - "cost": 21.82, - "country": "RU", - "price": 51, - "project": "logstash", - "state": "running", - "time": 1482303600000, - "username": "tdixoni2" - }, - { - "age": 67, - "cost": 23.07, - "country": "ID", - "price": 41, - "project": "opbeat", - "state": "done", - "time": 1468652400000, - "username": "jmitchelli3" - }, - { - "age": 40, - "cost": 23.65, - "country": "PT", - "price": 53, - "project": "machine-learning", - "state": "start", - "time": 1474614000000, - "username": "dcoxi4" - }, - { - "age": 61, - "cost": 23.72, - "country": "CN", - "price": 57, - "project": "machine-learning", - "state": "start", - "time": 1486018800000, - "username": "tporteri5" - }, - { - "age": 24, - "cost": 24.68, - "country": "SE", - "price": 74, - "project": "elasticsearch", - "state": "running", - "time": 1469084400000, - "username": "rwagneri6" - }, - { - "age": 35, - "cost": 22.38, - "country": "FR", - "price": 51, - "project": "logstash", - "state": "running", - "time": 1490425200000, - "username": "gnelsoni7" - }, - { - "age": 38, - "cost": 23.99, - "country": "LA", - "price": 53, - "project": "elasticsearch", - "state": "start", - "time": 1468652400000, - "username": "cmcdonaldi8" - }, - { - "age": 60, - "cost": 22.86, - "country": "KE", - "price": 65, - "project": "opbeat", - "state": "done", - "time": 1461654000000, - "username": "hjordani9" - }, - { - "age": 79, - "cost": 23.56, - "country": "PH", - "price": 57, - "project": "kibana", - "state": "start", - "time": 1474095600000, - "username": "hwalkeria" - }, - { - "age": 54, - "cost": 23.63, - "country": "CN", - "price": 50, - "project": "machine-learning", - "state": "start", - "time": 1479020400000, - "username": "lstanleyib" - }, - { - "age": 35, - "cost": 23.24, - "country": "TT", - "price": 63, - "project": "logstash", - "state": "done", - "time": 1479538800000, - "username": "jrogersic" - }, - { - "age": 72, - "cost": 21.98, - "country": "JP", - "price": 60, - "project": "kibana", - "state": "running", - "time": 1483254000000, - "username": "aperryid" - }, - { - "age": 50, - "cost": 23.65, - "country": "RU", - "price": 48, - "project": "beats", - "state": "start", - "time": 1486364400000, - "username": "mjordanie" - }, - { - "age": 59, - "cost": 23.36, - "country": "ID", - "price": 59, - "project": "elasticsearch", - "state": "done", - "time": 1478415600000, - "username": "pcookif" - }, - { - "age": 25, - "cost": 22.79, - "country": "UG", - "price": 62, - "project": "opbeat", - "state": "done", - "time": 1489129200000, - "username": "cblackig" - }, - { - "age": 39, - "cost": 22.77, - "country": "AR", - "price": 60, - "project": "opbeat", - "state": "done", - "time": 1461913200000, - "username": "djohnsonih" - }, - { - "age": 23, - "cost": 20.45, - "country": "PH", - "price": 52, - "project": "kibana", - "state": "done", - "time": 1475132400000, - "username": "bturnerii" - }, - { - "age": 46, - "cost": 21.79, - "country": "CN", - "price": 55, - "project": "opbeat", - "state": "running", - "time": 1471849200000, - "username": "colsonij" - }, - { - "age": 45, - "cost": 22.68, - "country": "CZ", - "price": 58, - "project": "elasticsearch", - "state": "done", - "time": 1491116400000, - "username": "tmurphyik" - }, - { - "age": 54, - "cost": 19.57, - "country": "PH", - "price": 68, - "project": "machine-learning", - "state": "done", - "time": 1463122800000, - "username": "tshawil" - }, - { - "age": 76, - "cost": 25.04, - "country": "SE", - "price": 47, - "project": "x-pack", - "state": "running", - "time": 1470726000000, - "username": "lgilbertim" - }, - { - "age": 53, - "cost": 23.85, - "country": "GR", - "price": 44, - "project": "opbeat", - "state": "start", - "time": 1474441200000, - "username": "jbakerin" - }, - { - "age": 44, - "cost": 23.22, - "country": "MY", - "price": 65, - "project": "kibana", - "state": "done", - "time": 1479279600000, - "username": "jmurphyio" - }, - { - "age": 32, - "cost": 23.15, - "country": "SE", - "price": 54, - "project": "opbeat", - "state": "done", - "time": 1481180400000, - "username": "glawrenceip" - }, - { - "age": 36, - "cost": 23.06, - "country": "VN", - "price": 56, - "project": "beats", - "state": "done", - "time": 1464937200000, - "username": "jsancheziq" - }, - { - "age": 70, - "cost": 22.77, - "country": "TH", - "price": 54, - "project": "logstash", - "state": "done", - "time": 1466233200000, - "username": "mchapmanir" - }, - { - "age": 24, - "cost": 23.14, - "country": "BR", - "price": 54, - "project": "elasticsearch", - "state": "done", - "time": 1469775600000, - "username": "sbutleris" - }, - { - "age": 50, - "cost": 23.01, - "country": "PT", - "price": 51, - "project": "beats", - "state": "done", - "time": 1477638000000, - "username": "rowensit" - }, - { - "age": 76, - "cost": 22.91, - "country": "ID", - "price": 58, - "project": "x-pack", - "state": "done", - "time": 1472713200000, - "username": "nfrankliniu" - }, - { - "age": 55, - "cost": 23.46, - "country": "AR", - "price": 63, - "project": "x-pack", - "state": "done", - "time": 1477638000000, - "username": "bwhiteiv" - }, - { - "age": 26, - "cost": 21.02, - "country": "ID", - "price": 46, - "project": "machine-learning", - "state": "start", - "time": 1472454000000, - "username": "mrossiw" - }, - { - "age": 61, - "cost": 20.32, - "country": "VN", - "price": 52, - "project": "machine-learning", - "state": "done", - "time": 1474700400000, - "username": "pyoungix" - }, - { - "age": 30, - "cost": 21.94, - "country": "BR", - "price": 53, - "project": "kibana", - "state": "running", - "time": 1464591600000, - "username": "rkimiy" - }, - { - "age": 36, - "cost": 22.09, - "country": "RU", - "price": 64, - "project": "beats", - "state": "running", - "time": 1462863600000, - "username": "pwallaceiz" - }, - { - "age": 54, - "cost": 21.56, - "country": "ID", - "price": 49, - "project": "machine-learning", - "state": "running", - "time": 1490857200000, - "username": "tadamsj0" - }, - { - "age": 56, - "cost": 20.35, - "country": "CN", - "price": 49, - "project": "logstash", - "state": "done", - "time": 1462777200000, - "username": "kmoorej1" - }, - { - "age": 55, - "cost": 22.67, - "country": "PT", - "price": 51, - "project": "x-pack", - "state": "done", - "time": 1468566000000, - "username": "abradleyj2" - }, - { - "age": 34, - "cost": 23.52, - "country": "SI", - "price": 57, - "project": "x-pack", - "state": "start", - "time": 1481698800000, - "username": "trodriguezj3" - }, - { - "age": 39, - "cost": 22.71, - "country": "CN", - "price": 63, - "project": "opbeat", - "state": "done", - "time": 1461999600000, - "username": "jbrownj4" - }, - { - "age": 46, - "cost": 24.28, - "country": "BA", - "price": 59, - "project": "opbeat", - "state": "start", - "time": 1485586800000, - "username": "dmccoyj5" - }, - { - "age": 19, - "cost": 23.55, - "country": "VN", - "price": 51, - "project": "machine-learning", - "state": "start", - "time": 1490943600000, - "username": "ahansenj6" - }, - { - "age": 58, - "cost": 22.23, - "country": "CN", - "price": 51, - "project": "kibana", - "state": "running", - "time": 1461222000000, - "username": "eedwardsj7" - }, - { - "age": 49, - "cost": 23.17, - "country": "PL", - "price": 51, - "project": "logstash", - "state": "done", - "time": 1473750000000, - "username": "jfordj8" - }, - { - "age": 62, - "cost": 23.59, - "country": "CN", - "price": 65, - "project": "x-pack", - "state": "start", - "time": 1479193200000, - "username": "kharrisj9" - }, - { - "age": 78, - "cost": 21.63, - "country": "PL", - "price": 73, - "project": "beats", - "state": "running", - "time": 1479625200000, - "username": "rbradleyja" - }, - { - "age": 63, - "cost": 22.74, - "country": "HR", - "price": 56, - "project": "logstash", - "state": "done", - "time": 1478674800000, - "username": "nholmesjb" - }, - { - "age": 79, - "cost": 22.79, - "country": "UA", - "price": 51, - "project": "kibana", - "state": "done", - "time": 1470121200000, - "username": "psimsjc" - }, - { - "age": 34, - "cost": 22.44, - "country": "PH", - "price": 40, - "project": "x-pack", - "state": "running", - "time": 1474527600000, - "username": "tbanksjd" - }, - { - "age": 59, - "cost": 22.2, - "country": "CR", - "price": 56, - "project": "elasticsearch", - "state": "running", - "time": 1482303600000, - "username": "dallenje" - }, - { - "age": 40, - "cost": 23.81, - "country": "ID", - "price": 50, - "project": "machine-learning", - "state": "start", - "time": 1460876400000, - "username": "kramosjf" - }, - { - "age": 39, - "cost": 22.07, - "country": "ID", - "price": 59, - "project": "opbeat", - "state": "running", - "time": 1463122800000, - "username": "rshawjg" - }, - { - "age": 60, - "cost": 22.42, - "country": "NL", - "price": 74, - "project": "opbeat", - "state": "running", - "time": 1480402800000, - "username": "vhilljh" - }, - { - "age": 29, - "cost": 23.29, - "country": "ID", - "price": 52, - "project": "beats", - "state": "done", - "time": 1462258800000, - "username": "lholmesji" - }, - { - "age": 22, - "cost": 22.52, - "country": "PL", - "price": 60, - "project": "beats", - "state": "done", - "time": 1477551600000, - "username": "pgarrettjj" - }, - { - "age": 69, - "cost": 22.94, - "country": "ES", - "price": 55, - "project": "x-pack", - "state": "done", - "time": 1468479600000, - "username": "tstonejk" - }, - { - "age": 74, - "cost": 23.1, - "country": "CN", - "price": 61, - "project": "opbeat", - "state": "done", - "time": 1472972400000, - "username": "jgriffinjl" - }, - { - "age": 30, - "cost": 20.85, - "country": "CN", - "price": 63, - "project": "kibana", - "state": "start", - "time": 1483426800000, - "username": "sholmesjm" - }, - { - "age": 56, - "cost": 23.14, - "country": "CN", - "price": 61, - "project": "logstash", - "state": "done", - "time": 1479193200000, - "username": "khayesjn" - }, - { - "age": 69, - "cost": 23.86, - "country": "BG", - "price": 57, - "project": "x-pack", - "state": "start", - "time": 1478761200000, - "username": "jfoxjo" - }, - { - "age": 32, - "cost": 22.75, - "country": "CN", - "price": 53, - "project": "opbeat", - "state": "done", - "time": 1460444400000, - "username": "swhitejp" - }, - { - "age": 45, - "cost": 21.48, - "country": "PH", - "price": 55, - "project": "elasticsearch", - "state": "start", - "time": 1488610800000, - "username": "hmorganjq" - }, - { - "age": 63, - "cost": 23.52, - "country": "CO", - "price": 63, - "project": "logstash", - "state": "start", - "time": 1462172400000, - "username": "agarciajr" - }, - { - "age": 48, - "cost": 24.18, - "country": "ID", - "price": 68, - "project": "x-pack", - "state": "start", - "time": 1489734000000, - "username": "sgeorgejs" - }, - { - "age": 18, - "cost": 23.02, - "country": "MX", - "price": 49, - "project": "opbeat", - "state": "done", - "time": 1486796400000, - "username": "agardnerjt" - }, - { - "age": 52, - "cost": 25.13, - "country": "CN", - "price": 63, - "project": "elasticsearch", - "state": "running", - "time": 1460703600000, - "username": "dsullivanju" - }, - { - "age": 46, - "cost": 23.58, - "country": "CO", - "price": 46, - "project": "opbeat", - "state": "start", - "time": 1464159600000, - "username": "mmoralesjv" - }, - { - "age": 42, - "cost": 23.93, - "country": "ID", - "price": 48, - "project": "logstash", - "state": "start", - "time": 1482822000000, - "username": "pgonzalezjw" - }, - { - "age": 38, - "cost": 22.12, - "country": "CN", - "price": 64, - "project": "elasticsearch", - "state": "running", - "time": 1475650800000, - "username": "jbanksjx" - }, - { - "age": 34, - "cost": 20.84, - "country": "AR", - "price": 52, - "project": "x-pack", - "state": "start", - "time": 1490252400000, - "username": "bricejy" - }, - { - "age": 59, - "cost": 22.7, - "country": "CN", - "price": 51, - "project": "elasticsearch", - "state": "done", - "time": 1470121200000, - "username": "eburnsjz" - }, - { - "age": 50, - "cost": 23.41, - "country": "CL", - "price": 59, - "project": "beats", - "state": "done", - "time": 1477033200000, - "username": "awallacek0" - }, - { - "age": 21, - "cost": 22.31, - "country": "DO", - "price": 69, - "project": "logstash", - "state": "running", - "time": 1472799600000, - "username": "bhamiltonk1" - }, - { - "age": 51, - "cost": 22.98, - "country": "TN", - "price": 62, - "project": "kibana", - "state": "done", - "time": 1483945200000, - "username": "lstevensk2" - }, - { - "age": 26, - "cost": 23.88, - "country": "XK", - "price": 53, - "project": "machine-learning", - "state": "start", - "time": 1462777200000, - "username": "emartinezk3" - }, - { - "age": 72, - "cost": 21.86, - "country": "JP", - "price": 48, - "project": "kibana", - "state": "running", - "time": 1473404400000, - "username": "driverak4" - }, - { - "age": 72, - "cost": 22.86, - "country": "CN", - "price": 46, - "project": "kibana", - "state": "done", - "time": 1483772400000, - "username": "khamiltonk5" - }, - { - "age": 48, - "cost": 21.64, - "country": "PE", - "price": 64, - "project": "x-pack", - "state": "running", - "time": 1476687600000, - "username": "tandersonk6" - }, - { - "age": 54, - "cost": 22.4, - "country": "PK", - "price": 53, - "project": "machine-learning", - "state": "running", - "time": 1486710000000, - "username": "ljenkinsk7" - }, - { - "age": 45, - "cost": 22.52, - "country": "RU", - "price": 51, - "project": "elasticsearch", - "state": "done", - "time": 1472540400000, - "username": "asandersk8" - }, - { - "age": 22, - "cost": 24.14, - "country": "MN", - "price": 52, - "project": "beats", - "state": "start", - "time": 1470034800000, - "username": "fwilliamsonk9" - }, - { - "age": 20, - "cost": 24.37, - "country": "JP", - "price": 67, - "project": "x-pack", - "state": "start", - "time": 1483081200000, - "username": "dortizka" - }, - { - "age": 37, - "cost": 24.62, - "country": "BD", - "price": 50, - "project": "kibana", - "state": "running", - "time": 1477983600000, - "username": "jpalmerkb" - }, - { - "age": 49, - "cost": 23.75, - "country": "BW", - "price": 40, - "project": "logstash", - "state": "start", - "time": 1482130800000, - "username": "areyeskc" - }, - { - "age": 39, - "cost": 22.17, - "country": "PL", - "price": 52, - "project": "opbeat", - "state": "running", - "time": 1463986800000, - "username": "jtuckerkd" - }, - { - "age": 71, - "cost": 21.39, - "country": "CN", - "price": 68, - "project": "beats", - "state": "start", - "time": 1485932400000, - "username": "rhickske" - }, - { - "age": 39, - "cost": 23.42, - "country": "CN", - "price": 49, - "project": "opbeat", - "state": "done", - "time": 1463122800000, - "username": "cgrahamkf" - }, - { - "age": 67, - "cost": 22.17, - "country": "ZA", - "price": 61, - "project": "opbeat", - "state": "running", - "time": 1472713200000, - "username": "jwestkg" - }, - { - "age": 56, - "cost": 21.53, - "country": "CN", - "price": 66, - "project": "logstash", - "state": "running", - "time": 1486969200000, - "username": "cpricekh" - }, - { - "age": 39, - "cost": 22.95, - "country": "PH", - "price": 45, - "project": "opbeat", - "state": "done", - "time": 1469948400000, - "username": "hyoungki" - }, - { - "age": 22, - "cost": 22.89, - "country": "EC", - "price": 59, - "project": "beats", - "state": "done", - "time": 1475737200000, - "username": "lsanderskj" - }, - { - "age": 49, - "cost": 22.96, - "country": "SE", - "price": 67, - "project": "logstash", - "state": "done", - "time": 1473836400000, - "username": "mfrazierkk" - }, - { - "age": 54, - "cost": 22.97, - "country": "AS", - "price": 60, - "project": "machine-learning", - "state": "done", - "time": 1466146800000, - "username": "sowenskl" - }, - { - "age": 68, - "cost": 22.21, - "country": "PA", - "price": 51, - "project": "machine-learning", - "state": "running", - "time": 1475391600000, - "username": "atuckerkm" - }, - { - "age": 74, - "cost": 21.47, - "country": "SE", - "price": 56, - "project": "opbeat", - "state": "start", - "time": 1475305200000, - "username": "cstanleykn" - }, - { - "age": 63, - "cost": 23.89, - "country": "FR", - "price": 55, - "project": "logstash", - "state": "start", - "time": 1484031600000, - "username": "jgrayko" - }, - { - "age": 57, - "cost": 23.97, - "country": "TT", - "price": 59, - "project": "beats", - "state": "start", - "time": 1472454000000, - "username": "ldeankp" - }, - { - "age": 43, - "cost": 21.55, - "country": "CN", - "price": 52, - "project": "beats", - "state": "running", - "time": 1463468400000, - "username": "rphillipskq" - }, - { - "age": 18, - "cost": 23.64, - "country": "RU", - "price": 62, - "project": "opbeat", - "state": "start", - "time": 1486882800000, - "username": "jnicholskr" - }, - { - "age": 54, - "cost": 22.83, - "country": "PT", - "price": 47, - "project": "machine-learning", - "state": "done", - "time": 1490684400000, - "username": "rthomasks" - }, - { - "age": 68, - "cost": 22.98, - "country": "JP", - "price": 52, - "project": "machine-learning", - "state": "done", - "time": 1476082800000, - "username": "wdaykt" - }, - { - "age": 62, - "cost": 23.17, - "country": "FR", - "price": 67, - "project": "x-pack", - "state": "done", - "time": 1491548400000, - "username": "kboydku" - }, - { - "age": 66, - "cost": 21.87, - "country": "NI", - "price": 62, - "project": "elasticsearch", - "state": "running", - "time": 1484550000000, - "username": "kmillskv" - }, - { - "age": 77, - "cost": 24.15, - "country": "FR", - "price": 63, - "project": "logstash", - "state": "start", - "time": 1465282800000, - "username": "dporterkw" - }, - { - "age": 36, - "cost": 23.24, - "country": "BD", - "price": 43, - "project": "beats", - "state": "done", - "time": 1479193200000, - "username": "rbradleykx" - }, - { - "age": 75, - "cost": 23.8, - "country": "CA", - "price": 50, - "project": "machine-learning", - "state": "start", - "time": 1464246000000, - "username": "kbradleyky" - }, - { - "age": 72, - "cost": 23.15, - "country": "MD", - "price": 62, - "project": "kibana", - "state": "done", - "time": 1465887600000, - "username": "sortizkz" - }, - { - "age": 27, - "cost": 22.38, - "country": "PL", - "price": 51, - "project": "x-pack", - "state": "running", - "time": 1475823600000, - "username": "mrodriguezl0" - }, - { - "age": 56, - "cost": 22.82, - "country": "AZ", - "price": 64, - "project": "logstash", - "state": "done", - "time": 1470639600000, - "username": "pwatkinsl1" - }, - { - "age": 57, - "cost": 23.17, - "country": "FR", - "price": 62, - "project": "beats", - "state": "done", - "time": 1471158000000, - "username": "jbrooksl2" - }, - { - "age": 76, - "cost": 22.55, - "country": "FR", - "price": 69, - "project": "x-pack", - "state": "done", - "time": 1472194800000, - "username": "rgardnerl3" - }, - { - "age": 21, - "cost": 23.76, - "country": "SE", - "price": 60, - "project": "logstash", - "state": "start", - "time": 1471935600000, - "username": "adeanl4" - }, - { - "age": 64, - "cost": 24.01, - "country": "PL", - "price": 60, - "project": "beats", - "state": "start", - "time": 1471935600000, - "username": "wwarrenl5" - }, - { - "age": 58, - "cost": 22.33, - "country": "RU", - "price": 55, - "project": "kibana", - "state": "running", - "time": 1470553200000, - "username": "mellisl6" - }, - { - "age": 71, - "cost": 22.93, - "country": "RU", - "price": 53, - "project": "beats", - "state": "done", - "time": 1475564400000, - "username": "kwhitel7" - }, - { - "age": 75, - "cost": 24.37, - "country": "EE", - "price": 69, - "project": "machine-learning", - "state": "start", - "time": 1484550000000, - "username": "jburnsl8" - }, - { - "age": 74, - "cost": 22.96, - "country": "GR", - "price": 58, - "project": "opbeat", - "state": "done", - "time": 1478156400000, - "username": "dwillisl9" - }, - { - "age": 56, - "cost": 24.64, - "country": "US", - "price": 56, - "project": "logstash", - "state": "running", - "time": 1468134000000, - "username": "lfoxla" - }, - { - "age": 20, - "cost": 23, - "country": "FR", - "price": 54, - "project": "x-pack", - "state": "done", - "time": 1478934000000, - "username": "mreedlb" - }, - { - "age": 32, - "cost": 23.91, - "country": "GR", - "price": 58, - "project": "opbeat", - "state": "start", - "time": 1462086000000, - "username": "cpiercelc" - }, - { - "age": 68, - "cost": 22.7, - "country": "CA", - "price": 42, - "project": "machine-learning", - "state": "done", - "time": 1472194800000, - "username": "rreynoldsld" - }, - { - "age": 56, - "cost": 23.64, - "country": "PH", - "price": 64, - "project": "logstash", - "state": "start", - "time": 1489906800000, - "username": "mwilsonle" - }, - { - "age": 29, - "cost": 24.34, - "country": "PE", - "price": 53, - "project": "beats", - "state": "start", - "time": 1477292400000, - "username": "msimmonslf" - }, - { - "age": 23, - "cost": 23.55, - "country": "RU", - "price": 63, - "project": "kibana", - "state": "start", - "time": 1476601200000, - "username": "smyerslg" - }, - { - "age": 27, - "cost": 22.07, - "country": "PT", - "price": 52, - "project": "x-pack", - "state": "running", - "time": 1483513200000, - "username": "jowenslh" - }, - { - "age": 79, - "cost": 22.69, - "country": "ID", - "price": 54, - "project": "kibana", - "state": "done", - "time": 1470380400000, - "username": "dadamsli" - }, - { - "age": 40, - "cost": 22.55, - "country": "UA", - "price": 60, - "project": "machine-learning", - "state": "done", - "time": 1467356400000, - "username": "sdavislj" - }, - { - "age": 38, - "cost": 22.83, - "country": "CN", - "price": 49, - "project": "elasticsearch", - "state": "done", - "time": 1491634800000, - "username": "anguyenlk" - }, - { - "age": 45, - "cost": 22.83, - "country": "CD", - "price": 55, - "project": "elasticsearch", - "state": "done", - "time": 1474786800000, - "username": "bgreenell" - }, - { - "age": 77, - "cost": 23.5, - "country": "BR", - "price": 47, - "project": "logstash", - "state": "start", - "time": 1467183600000, - "username": "jfullerlm" - }, - { - "age": 73, - "cost": 23.12, - "country": "CN", - "price": 63, - "project": "elasticsearch", - "state": "done", - "time": 1474527600000, - "username": "jhernandezln" - }, - { - "age": 66, - "cost": 21.12, - "country": "BR", - "price": 66, - "project": "elasticsearch", - "state": "start", - "time": 1463554800000, - "username": "lcruzlo" - }, - { - "age": 48, - "cost": 23, - "country": "IR", - "price": 44, - "project": "x-pack", - "state": "done", - "time": 1475996400000, - "username": "afloreslp" - }, - { - "age": 75, - "cost": 24.27, - "country": "SI", - "price": 57, - "project": "machine-learning", - "state": "start", - "time": 1470898800000, - "username": "trichardslq" - }, - { - "age": 49, - "cost": 24.58, - "country": "PH", - "price": 64, - "project": "logstash", - "state": "running", - "time": 1471676400000, - "username": "lweaverlr" - }, - { - "age": 76, - "cost": 22.8, - "country": "KN", - "price": 46, - "project": "x-pack", - "state": "done", - "time": 1481094000000, - "username": "hjohnstonls" - }, - { - "age": 73, - "cost": 24.34, - "country": "JO", - "price": 69, - "project": "elasticsearch", - "state": "start", - "time": 1485327600000, - "username": "roliverlt" - }, - { - "age": 63, - "cost": 23.63, - "country": "RU", - "price": 51, - "project": "logstash", - "state": "start", - "time": 1481180400000, - "username": "jfernandezlu" - }, - { - "age": 51, - "cost": 23.79, - "country": "PH", - "price": 67, - "project": "kibana", - "state": "start", - "time": 1470985200000, - "username": "rpattersonlv" - }, - { - "age": 27, - "cost": 24.02, - "country": "CN", - "price": 42, - "project": "x-pack", - "state": "start", - "time": 1474354800000, - "username": "rburtonlw" - }, - { - "age": 60, - "cost": 22.32, - "country": "CO", - "price": 63, - "project": "opbeat", - "state": "running", - "time": 1481094000000, - "username": "ehickslx" - }, - { - "age": 70, - "cost": 22.92, - "country": "MX", - "price": 59, - "project": "logstash", - "state": "done", - "time": 1487833200000, - "username": "mstevensly" - }, - { - "age": 37, - "cost": 21.53, - "country": "PH", - "price": 55, - "project": "kibana", - "state": "running", - "time": 1486969200000, - "username": "cbutlerlz" - }, - { - "age": 34, - "cost": 22.3, - "country": "FR", - "price": 54, - "project": "x-pack", - "state": "running", - "time": 1472281200000, - "username": "kbarnesm0" - }, - { - "age": 43, - "cost": 22.29, - "country": "SV", - "price": 58, - "project": "beats", - "state": "running", - "time": 1479625200000, - "username": "ajohnstonm1" - }, - { - "age": 58, - "cost": 22.92, - "country": "ID", - "price": 57, - "project": "kibana", - "state": "done", - "time": 1488438000000, - "username": "afieldsm2" - }, - { - "age": 69, - "cost": 24.44, - "country": "PT", - "price": 52, - "project": "x-pack", - "state": "start", - "time": 1463209200000, - "username": "jgilbertm3" - }, - { - "age": 43, - "cost": 23.54, - "country": "KZ", - "price": 62, - "project": "beats", - "state": "start", - "time": 1474354800000, - "username": "sgarrettm4" - }, - { - "age": 31, - "cost": 22.92, - "country": "RU", - "price": 54, - "project": "elasticsearch", - "state": "done", - "time": 1478847600000, - "username": "hsimsm5" - }, - { - "age": 23, - "cost": 23.61, - "country": "MG", - "price": 65, - "project": "kibana", - "state": "start", - "time": 1467529200000, - "username": "ehallm6" - }, - { - "age": 35, - "cost": 22.2, - "country": "RU", - "price": 48, - "project": "logstash", - "state": "running", - "time": 1482476400000, - "username": "msimsm7" - }, - { - "age": 33, - "cost": 23.94, - "country": "PT", - "price": 42, - "project": "machine-learning", - "state": "start", - "time": 1489215600000, - "username": "djamesm8" - }, - { - "age": 65, - "cost": 21.95, - "country": "RU", - "price": 61, - "project": "kibana", - "state": "running", - "time": 1465369200000, - "username": "ahansonm9" - }, - { - "age": 31, - "cost": 21.43, - "country": "CN", - "price": 65, - "project": "elasticsearch", - "state": "start", - "time": 1491634800000, - "username": "whunterma" - }, - { - "age": 36, - "cost": 23.01, - "country": "ET", - "price": 62, - "project": "beats", - "state": "done", - "time": 1462258800000, - "username": "jstanleymb" - }, - { - "age": 52, - "cost": 23.95, - "country": "ID", - "price": 50, - "project": "elasticsearch", - "state": "start", - "time": 1482217200000, - "username": "ngriffinmc" - }, - { - "age": 63, - "cost": 23.27, - "country": "SE", - "price": 66, - "project": "logstash", - "state": "done", - "time": 1474354800000, - "username": "talexandermd" - }, - { - "age": 68, - "cost": 24.56, - "country": "MX", - "price": 56, - "project": "machine-learning", - "state": "running", - "time": 1481266800000, - "username": "tgonzalezme" - }, - { - "age": 78, - "cost": 23.07, - "country": "RU", - "price": 61, - "project": "beats", - "state": "done", - "time": 1478761200000, - "username": "sfreemanmf" - }, - { - "age": 65, - "cost": 24.37, - "country": "CN", - "price": 54, - "project": "kibana", - "state": "start", - "time": 1481094000000, - "username": "hhuntmg" - }, - { - "age": 65, - "cost": 21.48, - "country": "CZ", - "price": 47, - "project": "kibana", - "state": "start", - "time": 1476342000000, - "username": "sdeanmh" - }, - { - "age": 21, - "cost": 23.25, - "country": "RU", - "price": 62, - "project": "logstash", - "state": "done", - "time": 1461567600000, - "username": "kellismi" - }, - { - "age": 76, - "cost": 23.03, - "country": "VN", - "price": 59, - "project": "x-pack", - "state": "done", - "time": 1487401200000, - "username": "emillermj" - }, - { - "age": 41, - "cost": 23.05, - "country": "PH", - "price": 63, - "project": "x-pack", - "state": "done", - "time": 1462518000000, - "username": "mbaileymk" - }, - { - "age": 50, - "cost": 23.57, - "country": "US", - "price": 56, - "project": "beats", - "state": "start", - "time": 1477724400000, - "username": "rfosterml" - }, - { - "age": 21, - "cost": 23.43, - "country": "UA", - "price": 69, - "project": "logstash", - "state": "done", - "time": 1486191600000, - "username": "praymm" - }, - { - "age": 25, - "cost": 22.65, - "country": "TH", - "price": 56, - "project": "opbeat", - "state": "done", - "time": 1475046000000, - "username": "shuntmn" - }, - { - "age": 69, - "cost": 22.23, - "country": "PH", - "price": 63, - "project": "x-pack", - "state": "running", - "time": 1468047600000, - "username": "aromeromo" - }, - { - "age": 28, - "cost": 24.8, - "country": "MY", - "price": 44, - "project": "logstash", - "state": "running", - "time": 1476428400000, - "username": "lmeyermp" - }, - { - "age": 72, - "cost": 22.49, - "country": "CZ", - "price": 46, - "project": "kibana", - "state": "running", - "time": 1482130800000, - "username": "jreynoldsmq" - }, - { - "age": 50, - "cost": 21.4, - "country": "MA", - "price": 38, - "project": "beats", - "state": "start", - "time": 1477119600000, - "username": "bfieldsmr" - }, - { - "age": 56, - "cost": 22.34, - "country": "GR", - "price": 53, - "project": "logstash", - "state": "running", - "time": 1461826800000, - "username": "jnguyenms" - }, - { - "age": 64, - "cost": 22.22, - "country": "CO", - "price": 62, - "project": "beats", - "state": "running", - "time": 1464678000000, - "username": "tchapmanmt" - }, - { - "age": 20, - "cost": 23.03, - "country": "CN", - "price": 61, - "project": "x-pack", - "state": "done", - "time": 1489042800000, - "username": "ajacobsmu" - }, - { - "age": 18, - "cost": 23.43, - "country": "CN", - "price": 54, - "project": "opbeat", - "state": "done", - "time": 1460271600000, - "username": "kphillipsmv" - }, - { - "age": 30, - "cost": 23.6, - "country": "CO", - "price": 67, - "project": "kibana", - "state": "start", - "time": 1467961200000, - "username": "glongmw" - }, - { - "age": 53, - "cost": 23.57, - "country": "PH", - "price": 52, - "project": "opbeat", - "state": "start", - "time": 1479625200000, - "username": "lmitchellmx" - }, - { - "age": 68, - "cost": 24.13, - "country": "PL", - "price": 53, - "project": "machine-learning", - "state": "start", - "time": 1486710000000, - "username": "jcarrollmy" - }, - { - "age": 55, - "cost": 21.96, - "country": "CN", - "price": 57, - "project": "x-pack", - "state": "running", - "time": 1490079600000, - "username": "wspencermz" - }, - { - "age": 35, - "cost": 21.84, - "country": "NO", - "price": 71, - "project": "logstash", - "state": "running", - "time": 1460271600000, - "username": "jfloresn0" - }, - { - "age": 34, - "cost": 23.2, - "country": "BR", - "price": 53, - "project": "x-pack", - "state": "done", - "time": 1486969200000, - "username": "jramirezn1" - }, - { - "age": 73, - "cost": 24.19, - "country": "CN", - "price": 52, - "project": "elasticsearch", - "state": "start", - "time": 1487919600000, - "username": "plarsonn2" - }, - { - "age": 58, - "cost": 23.32, - "country": "PH", - "price": 51, - "project": "kibana", - "state": "done", - "time": 1487055600000, - "username": "mreidn3" - }, - { - "age": 21, - "cost": 22.42, - "country": "CN", - "price": 49, - "project": "logstash", - "state": "running", - "time": 1463295600000, - "username": "sfraziern4" - }, - { - "age": 39, - "cost": 23.2, - "country": "IT", - "price": 52, - "project": "opbeat", - "state": "done", - "time": 1467442800000, - "username": "agarcian5" - }, - { - "age": 50, - "cost": 22.33, - "country": "PL", - "price": 52, - "project": "beats", - "state": "running", - "time": 1473145200000, - "username": "jryann6" - }, - { - "age": 43, - "cost": 23, - "country": "IR", - "price": 61, - "project": "beats", - "state": "done", - "time": 1475823600000, - "username": "wmyersn7" - }, - { - "age": 67, - "cost": 22.35, - "country": "ID", - "price": 55, - "project": "opbeat", - "state": "running", - "time": 1485327600000, - "username": "btuckern8" - }, - { - "age": 50, - "cost": 23.54, - "country": "FR", - "price": 60, - "project": "beats", - "state": "start", - "time": 1489474800000, - "username": "agarcian9" - }, - { - "age": 27, - "cost": 23.86, - "country": "RU", - "price": 44, - "project": "x-pack", - "state": "start", - "time": 1488783600000, - "username": "dcampbellna" - }, - { - "age": 27, - "cost": 23.1, - "country": "FR", - "price": 52, - "project": "x-pack", - "state": "done", - "time": 1477724400000, - "username": "nwarrennb" - }, - { - "age": 33, - "cost": 22.7, - "country": "HU", - "price": 51, - "project": "machine-learning", - "state": "done", - "time": 1474182000000, - "username": "ajenkinsnc" - }, - { - "age": 26, - "cost": 23.57, - "country": "PE", - "price": 47, - "project": "machine-learning", - "state": "start", - "time": 1487660400000, - "username": "crichardsnd" - }, - { - "age": 39, - "cost": 23.16, - "country": "CN", - "price": 62, - "project": "opbeat", - "state": "done", - "time": 1462431600000, - "username": "edavisne" - }, - { - "age": 43, - "cost": 22.96, - "country": "ID", - "price": 71, - "project": "beats", - "state": "done", - "time": 1468825200000, - "username": "cbaileynf" - }, - { - "age": 75, - "cost": 23.09, - "country": "PL", - "price": 58, - "project": "machine-learning", - "state": "done", - "time": 1481871600000, - "username": "cpetersng" - }, - { - "age": 38, - "cost": 23.48, - "country": "MA", - "price": 53, - "project": "elasticsearch", - "state": "done", - "time": 1462086000000, - "username": "jlanenh" - }, - { - "age": 67, - "cost": 23.05, - "country": "CO", - "price": 50, - "project": "opbeat", - "state": "done", - "time": 1476169200000, - "username": "dsimmonsni" - }, - { - "age": 47, - "cost": 24.1, - "country": "VN", - "price": 56, - "project": "machine-learning", - "state": "start", - "time": 1490770800000, - "username": "kwarrennj" - }, - { - "age": 39, - "cost": 22.49, - "country": "ID", - "price": 69, - "project": "opbeat", - "state": "running", - "time": 1476255600000, - "username": "ptorresnk" - }, - { - "age": 78, - "cost": 22.26, - "country": "IR", - "price": 71, - "project": "beats", - "state": "running", - "time": 1489647600000, - "username": "aramireznl" - }, - { - "age": 63, - "cost": 22.76, - "country": "AM", - "price": 57, - "project": "logstash", - "state": "done", - "time": 1466665200000, - "username": "jjenkinsnm" - }, - { - "age": 28, - "cost": 21.97, - "country": "BR", - "price": 51, - "project": "logstash", - "state": "running", - "time": 1466578800000, - "username": "swalkernn" - }, - { - "age": 65, - "cost": 24.83, - "country": "RU", - "price": 45, - "project": "kibana", - "state": "running", - "time": 1486882800000, - "username": "brobertsno" - }, - { - "age": 59, - "cost": 22.21, - "country": "CN", - "price": 69, - "project": "elasticsearch", - "state": "running", - "time": 1490943600000, - "username": "bberrynp" - }, - { - "age": 62, - "cost": 23.66, - "country": "CN", - "price": 60, - "project": "x-pack", - "state": "start", - "time": 1462777200000, - "username": "lrodrigueznq" - }, - { - "age": 77, - "cost": 23.61, - "country": "CN", - "price": 46, - "project": "logstash", - "state": "start", - "time": 1471244400000, - "username": "jreidnr" - }, - { - "age": 18, - "cost": 23.58, - "country": "TZ", - "price": 62, - "project": "opbeat", - "state": "start", - "time": 1475132400000, - "username": "jmurrayns" - }, - { - "age": 47, - "cost": 24.46, - "country": "VE", - "price": 67, - "project": "machine-learning", - "state": "start", - "time": 1468911600000, - "username": "gtaylornt" - }, - { - "age": 23, - "cost": 21.78, - "country": "ID", - "price": 63, - "project": "kibana", - "state": "running", - "time": 1486191600000, - "username": "rgriffinnu" - }, - { - "age": 35, - "cost": 23.07, - "country": "IL", - "price": 59, - "project": "logstash", - "state": "done", - "time": 1466838000000, - "username": "sfieldsnv" - }, - { - "age": 55, - "cost": 23.21, - "country": "CN", - "price": 69, - "project": "x-pack", - "state": "done", - "time": 1476601200000, - "username": "ereidnw" - }, - { - "age": 23, - "cost": 24.26, - "country": "PL", - "price": 45, - "project": "kibana", - "state": "start", - "time": 1464678000000, - "username": "bhawkinsnx" - }, - { - "age": 18, - "cost": 22.98, - "country": "CN", - "price": 65, - "project": "opbeat", - "state": "done", - "time": 1474441200000, - "username": "cgrayny" - }, - { - "age": 66, - "cost": 22.83, - "country": "MX", - "price": 47, - "project": "elasticsearch", - "state": "done", - "time": 1470466800000, - "username": "fhughesnz" - }, - { - "age": 57, - "cost": 22.92, - "country": "NG", - "price": 53, - "project": "beats", - "state": "done", - "time": 1470466800000, - "username": "lwelcho0" - }, - { - "age": 80, - "cost": 23.97, - "country": "SE", - "price": 61, - "project": "elasticsearch", - "state": "start", - "time": 1491375600000, - "username": "jwatkinso1" - }, - { - "age": 46, - "cost": 23.36, - "country": "JP", - "price": 59, - "project": "opbeat", - "state": "done", - "time": 1481353200000, - "username": "awoodo2" - }, - { - "age": 74, - "cost": 21.17, - "country": "CN", - "price": 65, - "project": "opbeat", - "state": "start", - "time": 1486969200000, - "username": "pmatthewso3" - }, - { - "age": 36, - "cost": 22.96, - "country": "CZ", - "price": 55, - "project": "beats", - "state": "done", - "time": 1474009200000, - "username": "rhudsono4" - }, - { - "age": 62, - "cost": 21.58, - "country": "SE", - "price": 57, - "project": "x-pack", - "state": "running", - "time": 1481094000000, - "username": "rwardo5" - }, - { - "age": 54, - "cost": 24.58, - "country": "CN", - "price": 65, - "project": "machine-learning", - "state": "running", - "time": 1486882800000, - "username": "cgomezo6" - }, - { - "age": 58, - "cost": 22.56, - "country": "FR", - "price": 52, - "project": "kibana", - "state": "done", - "time": 1468393200000, - "username": "jburtono7" - }, - { - "age": 47, - "cost": 23.38, - "country": "IE", - "price": 45, - "project": "machine-learning", - "state": "done", - "time": 1461567600000, - "username": "dcarpentero8" - }, - { - "age": 41, - "cost": 23.42, - "country": "ID", - "price": 46, - "project": "x-pack", - "state": "done", - "time": 1485154800000, - "username": "thunto9" - }, - { - "age": 47, - "cost": 23.2, - "country": "PL", - "price": 53, - "project": "machine-learning", - "state": "done", - "time": 1489647600000, - "username": "ssnyderoa" - }, - { - "age": 80, - "cost": 22.7, - "country": "US", - "price": 57, - "project": "elasticsearch", - "state": "done", - "time": 1465282800000, - "username": "mkimob" - }, - { - "age": 22, - "cost": 21.66, - "country": "PH", - "price": 43, - "project": "beats", - "state": "running", - "time": 1462086000000, - "username": "ehansonoc" - }, - { - "age": 37, - "cost": 22.29, - "country": "RU", - "price": 56, - "project": "kibana", - "state": "running", - "time": 1463036400000, - "username": "wspencerod" - }, - { - "age": 65, - "cost": 23.28, - "country": "ES", - "price": 61, - "project": "kibana", - "state": "done", - "time": 1478934000000, - "username": "khansenoe" - }, - { - "age": 64, - "cost": 24.75, - "country": "JP", - "price": 63, - "project": "beats", - "state": "running", - "time": 1473836400000, - "username": "jcruzof" - }, - { - "age": 51, - "cost": 22.73, - "country": "PE", - "price": 54, - "project": "kibana", - "state": "done", - "time": 1467097200000, - "username": "tkelleyog" - }, - { - "age": 76, - "cost": 23.04, - "country": "RU", - "price": 51, - "project": "x-pack", - "state": "done", - "time": 1468998000000, - "username": "jbrooksoh" - }, - { - "age": 31, - "cost": 23.49, - "country": "PH", - "price": 55, - "project": "elasticsearch", - "state": "done", - "time": 1465542000000, - "username": "ncooperoi" - }, - { - "age": 78, - "cost": 23.66, - "country": "JP", - "price": 59, - "project": "beats", - "state": "start", - "time": 1475478000000, - "username": "ddiazoj" - }, - { - "age": 64, - "cost": 24.02, - "country": "HN", - "price": 57, - "project": "beats", - "state": "start", - "time": 1462345200000, - "username": "kpowellok" - }, - { - "age": 72, - "cost": 24.54, - "country": "ID", - "price": 60, - "project": "kibana", - "state": "running", - "time": 1476514800000, - "username": "pporterol" - }, - { - "age": 57, - "cost": 21.5, - "country": "DE", - "price": 59, - "project": "beats", - "state": "running", - "time": 1481266800000, - "username": "hgarzaom" - }, - { - "age": 71, - "cost": 22.81, - "country": "ZA", - "price": 45, - "project": "beats", - "state": "done", - "time": 1480748400000, - "username": "wevanson" - }, - { - "age": 50, - "cost": 24.02, - "country": "GR", - "price": 70, - "project": "beats", - "state": "start", - "time": 1470985200000, - "username": "jlaneoo" - }, - { - "age": 23, - "cost": 21.49, - "country": "PH", - "price": 49, - "project": "kibana", - "state": "start", - "time": 1467270000000, - "username": "gfergusonop" - }, - { - "age": 23, - "cost": 22.64, - "country": "ID", - "price": 60, - "project": "kibana", - "state": "done", - "time": 1482303600000, - "username": "rwillisoq" - }, - { - "age": 80, - "cost": 23.37, - "country": "CN", - "price": 68, - "project": "elasticsearch", - "state": "done", - "time": 1490598000000, - "username": "nfulleror" - }, - { - "age": 65, - "cost": 23.47, - "country": "SE", - "price": 48, - "project": "kibana", - "state": "done", - "time": 1484463600000, - "username": "tellisos" - }, - { - "age": 38, - "cost": 24.55, - "country": "RS", - "price": 53, - "project": "elasticsearch", - "state": "running", - "time": 1461654000000, - "username": "mfosterot" - }, - { - "age": 70, - "cost": 21.01, - "country": "CN", - "price": 66, - "project": "logstash", - "state": "start", - "time": 1484895600000, - "username": "astevensou" - }, - { - "age": 65, - "cost": 23.49, - "country": "TH", - "price": 51, - "project": "kibana", - "state": "done", - "time": 1468911600000, - "username": "bdixonov" - }, - { - "age": 36, - "cost": 24.22, - "country": "ID", - "price": 45, - "project": "beats", - "state": "start", - "time": 1481785200000, - "username": "fbrooksow" - }, - { - "age": 61, - "cost": 23.65, - "country": "UA", - "price": 48, - "project": "machine-learning", - "state": "start", - "time": 1479798000000, - "username": "pbryantox" - }, - { - "age": 44, - "cost": 23.09, - "country": "CN", - "price": 53, - "project": "kibana", - "state": "done", - "time": 1471417200000, - "username": "jsullivanoy" - }, - { - "age": 27, - "cost": 23.29, - "country": "ID", - "price": 49, - "project": "x-pack", - "state": "done", - "time": 1491375600000, - "username": "revansoz" - }, - { - "age": 38, - "cost": 23.81, - "country": "LU", - "price": 56, - "project": "elasticsearch", - "state": "start", - "time": 1465887600000, - "username": "schavezp0" - }, - { - "age": 64, - "cost": 23.07, - "country": "CN", - "price": 56, - "project": "beats", - "state": "done", - "time": 1462518000000, - "username": "imorganp1" - }, - { - "age": 80, - "cost": 21.95, - "country": "MX", - "price": 49, - "project": "elasticsearch", - "state": "running", - "time": 1468998000000, - "username": "sfullerp2" - }, - { - "age": 36, - "cost": 21.16, - "country": "ID", - "price": 56, - "project": "beats", - "state": "start", - "time": 1491202800000, - "username": "hjonesp3" - }, - { - "age": 51, - "cost": 23.67, - "country": "SI", - "price": 56, - "project": "kibana", - "state": "start", - "time": 1472454000000, - "username": "abaileyp4" - }, - { - "age": 35, - "cost": 23.26, - "country": "IS", - "price": 69, - "project": "logstash", - "state": "done", - "time": 1472540400000, - "username": "chowardp5" - }, - { - "age": 72, - "cost": 22.88, - "country": "ZA", - "price": 50, - "project": "kibana", - "state": "done", - "time": 1474441200000, - "username": "jandersonp6" - }, - { - "age": 25, - "cost": 23.37, - "country": "RU", - "price": 61, - "project": "opbeat", - "state": "done", - "time": 1472022000000, - "username": "pclarkp7" - }, - { - "age": 58, - "cost": 23.99, - "country": "NG", - "price": 48, - "project": "kibana", - "state": "start", - "time": 1484722800000, - "username": "trichardsonp8" - }, - { - "age": 63, - "cost": 21.74, - "country": "MY", - "price": 50, - "project": "logstash", - "state": "running", - "time": 1467010800000, - "username": "jleep9" - }, - { - "age": 50, - "cost": 22.3, - "country": "SY", - "price": 63, - "project": "beats", - "state": "running", - "time": 1491116400000, - "username": "gbowmanpa" - }, - { - "age": 31, - "cost": 22.65, - "country": "CN", - "price": 52, - "project": "elasticsearch", - "state": "done", - "time": 1483686000000, - "username": "hburtonpb" - }, - { - "age": 61, - "cost": 22.95, - "country": "SI", - "price": 61, - "project": "machine-learning", - "state": "done", - "time": 1489129200000, - "username": "ewoodspc" - }, - { - "age": 61, - "cost": 23.15, - "country": "KE", - "price": 53, - "project": "machine-learning", - "state": "done", - "time": 1467529200000, - "username": "hhawkinspd" - }, - { - "age": 76, - "cost": 22.12, - "country": "CN", - "price": 65, - "project": "x-pack", - "state": "running", - "time": 1488178800000, - "username": "ebowmanpe" - }, - { - "age": 68, - "cost": 24.14, - "country": "LK", - "price": 57, - "project": "machine-learning", - "state": "start", - "time": 1463554800000, - "username": "bflorespf" - }, - { - "age": 33, - "cost": 22.67, - "country": "TH", - "price": 47, - "project": "machine-learning", - "state": "done", - "time": 1464246000000, - "username": "plawsonpg" - }, - { - "age": 27, - "cost": 20.8, - "country": "SE", - "price": 69, - "project": "x-pack", - "state": "start", - "time": 1490338800000, - "username": "hfullerph" - }, - { - "age": 32, - "cost": 21.8, - "country": "AM", - "price": 56, - "project": "opbeat", - "state": "running", - "time": 1471330800000, - "username": "tfranklinpi" - }, - { - "age": 42, - "cost": 23.23, - "country": "BR", - "price": 54, - "project": "logstash", - "state": "done", - "time": 1462086000000, - "username": "jwebbpj" - }, - { - "age": 49, - "cost": 24.36, - "country": "MK", - "price": 45, - "project": "logstash", - "state": "start", - "time": 1462345200000, - "username": "cwarrenpk" - }, - { - "age": 51, - "cost": 24.68, - "country": "PH", - "price": 54, - "project": "kibana", - "state": "running", - "time": 1463986800000, - "username": "dmurphypl" - }, - { - "age": 63, - "cost": 22.54, - "country": "RS", - "price": 62, - "project": "logstash", - "state": "done", - "time": 1472454000000, - "username": "bwestpm" - }, - { - "age": 50, - "cost": 24.51, - "country": "AU", - "price": 40, - "project": "beats", - "state": "running", - "time": 1470380400000, - "username": "bhernandezpn" - }, - { - "age": 51, - "cost": 23.23, - "country": "JP", - "price": 70, - "project": "kibana", - "state": "done", - "time": 1489474800000, - "username": "jalexanderpo" - }, - { - "age": 73, - "cost": 22.16, - "country": "AF", - "price": 63, - "project": "elasticsearch", - "state": "running", - "time": 1476946800000, - "username": "dmorganpp" - }, - { - "age": 78, - "cost": 22.69, - "country": "FI", - "price": 59, - "project": "beats", - "state": "done", - "time": 1482908400000, - "username": "lweaverpq" - }, - { - "age": 65, - "cost": 21.09, - "country": "BI", - "price": 58, - "project": "kibana", - "state": "start", - "time": 1460876400000, - "username": "jbaileypr" - }, - { - "age": 32, - "cost": 23.25, - "country": "RU", - "price": 50, - "project": "opbeat", - "state": "done", - "time": 1471244400000, - "username": "kreyesps" - }, - { - "age": 27, - "cost": 22.53, - "country": "PT", - "price": 61, - "project": "x-pack", - "state": "done", - "time": 1487919600000, - "username": "mlynchpt" - }, - { - "age": 59, - "cost": 23.47, - "country": "CO", - "price": 48, - "project": "elasticsearch", - "state": "done", - "time": 1465196400000, - "username": "tpiercepu" - }, - { - "age": 77, - "cost": 23.02, - "country": "SE", - "price": 47, - "project": "logstash", - "state": "done", - "time": 1480489200000, - "username": "ewebbpv" - }, - { - "age": 44, - "cost": 24.28, - "country": "RU", - "price": 64, - "project": "kibana", - "state": "start", - "time": 1480316400000, - "username": "drosspw" - }, - { - "age": 34, - "cost": 22.06, - "country": "IR", - "price": 58, - "project": "x-pack", - "state": "running", - "time": 1476601200000, - "username": "jmccoypx" - }, - { - "age": 60, - "cost": 21.06, - "country": "AR", - "price": 40, - "project": "opbeat", - "state": "start", - "time": 1467874800000, - "username": "bwhitepy" - }, - { - "age": 33, - "cost": 22.08, - "country": "BR", - "price": 44, - "project": "machine-learning", - "state": "running", - "time": 1480662000000, - "username": "jkellypz" - }, - { - "age": 59, - "cost": 23.5, - "country": "CZ", - "price": 54, - "project": "elasticsearch", - "state": "start", - "time": 1473231600000, - "username": "darmstrongq0" - }, - { - "age": 73, - "cost": 21.15, - "country": "GR", - "price": 52, - "project": "elasticsearch", - "state": "start", - "time": 1481612400000, - "username": "dperryq1" - }, - { - "age": 49, - "cost": 22.39, - "country": "TH", - "price": 54, - "project": "logstash", - "state": "running", - "time": 1488178800000, - "username": "dschmidtq2" - }, - { - "age": 65, - "cost": 24.42, - "country": "CZ", - "price": 54, - "project": "kibana", - "state": "start", - "time": 1468220400000, - "username": "aandrewsq3" - }, - { - "age": 49, - "cost": 21.22, - "country": "GH", - "price": 60, - "project": "logstash", - "state": "start", - "time": 1491030000000, - "username": "ameyerq4" - }, - { - "age": 39, - "cost": 23.53, - "country": "ID", - "price": 64, - "project": "opbeat", - "state": "start", - "time": 1484463600000, - "username": "dwoodsq5" - }, - { - "age": 19, - "cost": 23.49, - "country": "CN", - "price": 51, - "project": "machine-learning", - "state": "done", - "time": 1467183600000, - "username": "jmooreq6" - }, - { - "age": 27, - "cost": 23.14, - "country": "NG", - "price": 56, - "project": "x-pack", - "state": "done", - "time": 1482822000000, - "username": "sspencerq7" - }, - { - "age": 30, - "cost": 23.07, - "country": "MX", - "price": 66, - "project": "kibana", - "state": "done", - "time": 1481785200000, - "username": "jtorresq8" - }, - { - "age": 67, - "cost": 23.06, - "country": "DO", - "price": 49, - "project": "opbeat", - "state": "done", - "time": 1466924400000, - "username": "mwestq9" - }, - { - "age": 38, - "cost": 23.48, - "country": "CN", - "price": 61, - "project": "elasticsearch", - "state": "done", - "time": 1487487600000, - "username": "mnguyenqa" - }, - { - "age": 68, - "cost": 23.41, - "country": "MX", - "price": 52, - "project": "machine-learning", - "state": "done", - "time": 1476169200000, - "username": "mroseqb" - }, - { - "age": 25, - "cost": 22.11, - "country": "TH", - "price": 39, - "project": "opbeat", - "state": "running", - "time": 1477983600000, - "username": "mjacksonqc" - }, - { - "age": 20, - "cost": 22.46, - "country": "ID", - "price": 55, - "project": "x-pack", - "state": "running", - "time": 1487833200000, - "username": "cyoungqd" - }, - { - "age": 64, - "cost": 21.55, - "country": "ET", - "price": 60, - "project": "beats", - "state": "running", - "time": 1464850800000, - "username": "cjenkinsqe" - }, - { - "age": 25, - "cost": 22.36, - "country": "SE", - "price": 50, - "project": "opbeat", - "state": "running", - "time": 1482822000000, - "username": "jhartqf" - }, - { - "age": 45, - "cost": 23.73, - "country": "CN", - "price": 47, - "project": "elasticsearch", - "state": "start", - "time": 1465887600000, - "username": "cgutierrezqg" - }, - { - "age": 49, - "cost": 24.47, - "country": "CN", - "price": 63, - "project": "logstash", - "state": "start", - "time": 1487228400000, - "username": "pgarzaqh" - }, - { - "age": 72, - "cost": 21.43, - "country": "ID", - "price": 74, - "project": "kibana", - "state": "start", - "time": 1474959600000, - "username": "jbrownqi" - }, - { - "age": 48, - "cost": 22.55, - "country": "TH", - "price": 54, - "project": "x-pack", - "state": "done", - "time": 1462863600000, - "username": "jhartqj" - }, - { - "age": 80, - "cost": 23.91, - "country": "CN", - "price": 56, - "project": "elasticsearch", - "state": "start", - "time": 1488610800000, - "username": "dscottqk" - }, - { - "age": 54, - "cost": 23.68, - "country": "SE", - "price": 58, - "project": "machine-learning", - "state": "start", - "time": 1481785200000, - "username": "wlittleql" - }, - { - "age": 18, - "cost": 22.39, - "country": "PH", - "price": 49, - "project": "opbeat", - "state": "running", - "time": 1465974000000, - "username": "sfieldsqm" - }, - { - "age": 32, - "cost": 23.4, - "country": "CN", - "price": 66, - "project": "opbeat", - "state": "done", - "time": 1487833200000, - "username": "alarsonqn" - }, - { - "age": 71, - "cost": 22.45, - "country": "RU", - "price": 49, - "project": "beats", - "state": "running", - "time": 1487314800000, - "username": "dowensqo" - }, - { - "age": 68, - "cost": 22.67, - "country": "PE", - "price": 66, - "project": "machine-learning", - "state": "done", - "time": 1485673200000, - "username": "jolsonqp" - }, - { - "age": 45, - "cost": 21.87, - "country": "FR", - "price": 63, - "project": "elasticsearch", - "state": "running", - "time": 1483945200000, - "username": "galvarezqq" - }, - { - "age": 74, - "cost": 23.68, - "country": "BR", - "price": 51, - "project": "opbeat", - "state": "start", - "time": 1479279600000, - "username": "rcooperqr" - }, - { - "age": 21, - "cost": 22, - "country": "FR", - "price": 55, - "project": "logstash", - "state": "running", - "time": 1473922800000, - "username": "dclarkqs" - }, - { - "age": 48, - "cost": 21.99, - "country": "CN", - "price": 66, - "project": "x-pack", - "state": "running", - "time": 1463986800000, - "username": "rdunnqt" - }, - { - "age": 58, - "cost": 23.27, - "country": "CN", - "price": 63, - "project": "kibana", - "state": "done", - "time": 1470380400000, - "username": "jpetersqu" - }, - { - "age": 26, - "cost": 22.51, - "country": "CN", - "price": 59, - "project": "machine-learning", - "state": "done", - "time": 1476082800000, - "username": "nrobertsqv" - }, - { - "age": 29, - "cost": 23.92, - "country": "HT", - "price": 66, - "project": "beats", - "state": "start", - "time": 1490079600000, - "username": "jwestqw" - }, - { - "age": 69, - "cost": 23.67, - "country": "AR", - "price": 52, - "project": "x-pack", - "state": "start", - "time": 1475650800000, - "username": "awardqx" - }, - { - "age": 66, - "cost": 24.03, - "country": "US", - "price": 74, - "project": "elasticsearch", - "state": "start", - "time": 1479970800000, - "username": "tgilbertqy" - }, - { - "age": 30, - "cost": 24.41, - "country": "HN", - "price": 63, - "project": "kibana", - "state": "start", - "time": 1465455600000, - "username": "jstevensqz" - }, - { - "age": 43, - "cost": 22.71, - "country": "ID", - "price": 57, - "project": "beats", - "state": "done", - "time": 1489734000000, - "username": "kmeyerr0" - }, - { - "age": 19, - "cost": 23.65, - "country": "PL", - "price": 42, - "project": "machine-learning", - "state": "start", - "time": 1480143600000, - "username": "kpiercer1" - }, - { - "age": 48, - "cost": 24.15, - "country": "ID", - "price": 54, - "project": "x-pack", - "state": "start", - "time": 1481958000000, - "username": "dscottr2" - }, - { - "age": 19, - "cost": 22.23, - "country": "PT", - "price": 52, - "project": "machine-learning", - "state": "running", - "time": 1474700400000, - "username": "hstewartr3" - }, - { - "age": 22, - "cost": 22.95, - "country": "ID", - "price": 53, - "project": "beats", - "state": "done", - "time": 1482649200000, - "username": "ckimr4" - }, - { - "age": 26, - "cost": 24.6, - "country": "RU", - "price": 61, - "project": "machine-learning", - "state": "running", - "time": 1486278000000, - "username": "mgutierrezr5" - }, - { - "age": 22, - "cost": 25.56, - "country": "TH", - "price": 60, - "project": "beats", - "state": "done", - "time": 1460876400000, - "username": "hgrahamr6" - }, - { - "age": 57, - "cost": 21.5, - "country": "ID", - "price": 52, - "project": "beats", - "state": "running", - "time": 1461308400000, - "username": "dfosterr7" - }, - { - "age": 22, - "cost": 23.1, - "country": "CN", - "price": 39, - "project": "beats", - "state": "done", - "time": 1468911600000, - "username": "awebbr8" - }, - { - "age": 42, - "cost": 23.1, - "country": "GH", - "price": 62, - "project": "logstash", - "state": "done", - "time": 1488438000000, - "username": "lpetersr9" - }, - { - "age": 67, - "cost": 22.55, - "country": "ID", - "price": 54, - "project": "opbeat", - "state": "done", - "time": 1486450800000, - "username": "tpattersonra" - }, - { - "age": 76, - "cost": 21.94, - "country": "PL", - "price": 46, - "project": "x-pack", - "state": "running", - "time": 1476342000000, - "username": "rsimsrb" - }, - { - "age": 76, - "cost": 23.93, - "country": "VE", - "price": 52, - "project": "x-pack", - "state": "start", - "time": 1481612400000, - "username": "spetersonrc" - }, - { - "age": 61, - "cost": 22.17, - "country": "ID", - "price": 53, - "project": "machine-learning", - "state": "running", - "time": 1471330800000, - "username": "amontgomeryrd" - }, - { - "age": 60, - "cost": 22.7, - "country": "CN", - "price": 66, - "project": "opbeat", - "state": "done", - "time": 1465542000000, - "username": "swelchre" - }, - { - "age": 72, - "cost": 24.2, - "country": "FR", - "price": 59, - "project": "kibana", - "state": "start", - "time": 1467961200000, - "username": "cgordonrf" - }, - { - "age": 78, - "cost": 24.82, - "country": "NZ", - "price": 62, - "project": "beats", - "state": "running", - "time": 1462777200000, - "username": "dmartinezrg" - }, - { - "age": 62, - "cost": 22.55, - "country": "ID", - "price": 48, - "project": "x-pack", - "state": "done", - "time": 1490166000000, - "username": "cwashingtonrh" - }, - { - "age": 35, - "cost": 22.99, - "country": "ID", - "price": 60, - "project": "logstash", - "state": "done", - "time": 1475478000000, - "username": "cpayneri" - }, - { - "age": 68, - "cost": 22.32, - "country": "CN", - "price": 62, - "project": "machine-learning", - "state": "running", - "time": 1488092400000, - "username": "aperkinsrj" - }, - { - "age": 58, - "cost": 24.25, - "country": "RU", - "price": 57, - "project": "kibana", - "state": "start", - "time": 1463468400000, - "username": "swatkinsrk" - }, - { - "age": 77, - "cost": 23.67, - "country": "ID", - "price": 41, - "project": "logstash", - "state": "start", - "time": 1466146800000, - "username": "smoorerl" - }, - { - "age": 67, - "cost": 22.45, - "country": "ID", - "price": 52, - "project": "opbeat", - "state": "running", - "time": 1484895600000, - "username": "mlopezrm" - }, - { - "age": 49, - "cost": 24.46, - "country": "CN", - "price": 47, - "project": "logstash", - "state": "start", - "time": 1474959600000, - "username": "pshawrn" - }, - { - "age": 26, - "cost": 21.59, - "country": "CN", - "price": 45, - "project": "machine-learning", - "state": "running", - "time": 1482303600000, - "username": "rwagnerro" - }, - { - "age": 36, - "cost": 23.84, - "country": "BR", - "price": 44, - "project": "beats", - "state": "start", - "time": 1488006000000, - "username": "dmatthewsrp" - }, - { - "age": 46, - "cost": 23.65, - "country": "CN", - "price": 56, - "project": "opbeat", - "state": "start", - "time": 1476946800000, - "username": "btorresrq" - }, - { - "age": 49, - "cost": 22.57, - "country": "ID", - "price": 52, - "project": "logstash", - "state": "done", - "time": 1472367600000, - "username": "elawrencerr" - } -] \ No newline at end of file diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.js deleted file mode 100644 index 5c3b000100eb0..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.js +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { sortBy } from 'lodash'; -import { queryDatatable } from '../../../../common/lib/datatable/query'; -import { getDemoRows } from './get_demo_rows'; - -export const demodata = () => ({ - name: 'demodata', - aliases: [], - type: 'datatable', - help: 'A mock data set that includes project CI times with usernames, countries and run phases.', - context: { - types: ['filter'], - }, - args: { - type: { - types: ['string', 'null'], - aliases: ['_'], - help: 'The name of the demo data set to use', - default: 'ci', - }, - }, - fn: (context, args) => { - const demoRows = getDemoRows(args.type); - let set = {}; - if (args.type === 'ci') { - set = { - columns: [ - { name: 'time', type: 'date' }, - { name: 'cost', type: 'number' }, - { name: 'username', type: 'string' }, - { name: 'price', type: 'number' }, - { name: 'age', type: 'number' }, - { name: 'country', type: 'string' }, - { name: 'state', type: 'string' }, - { name: 'project', type: 'string' }, - ], - rows: sortBy(demoRows, 'time'), - }; - } else if (args.type === 'shirts') { - set = { - columns: [ - { name: 'size', type: 'string' }, - { name: 'color', type: 'string' }, - { name: 'price', type: 'number' }, - { name: 'cut', type: 'string' }, - ], - rows: demoRows, - }; - } - - const { columns, rows } = set; - return queryDatatable( - { - type: 'datatable', - columns, - rows, - }, - context - ); - }, -}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs/index.js deleted file mode 100644 index 7cb559b10464b..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs/index.js +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import squel from 'squel'; -import { map, zipObject } from 'lodash'; -import { buildBoolArray } from '../../../../server/lib/build_bool_array'; -import { normalizeType } from '../../../../server/lib/normalize_type'; -import { sanitizeName } from '../../../../server/lib/sanitize_name'; - -export const esdocs = () => ({ - name: 'esdocs', - type: 'datatable', - help: - 'Query elasticsearch and get back raw documents. We recommend you specify the fields you want, ' + - 'especially if you are going to ask for a lot of rows', - context: { - types: ['filter'], - }, - args: { - index: { - types: ['string', 'null'], - default: '_all', - help: 'Specify an index pattern. Eg "logstash-*"', - }, - query: { - types: ['string'], - aliases: ['_', 'q'], - help: 'A Lucene query string', - default: '-_index:.kibana', - }, - sort: { - types: ['string', 'null'], - help: 'Sort directions as "field, direction". Eg "@timestamp, desc" or "bytes, asc"', - }, - fields: { - help: 'Comma separated list of fields. Fewer fields will perform better.', - types: ['string', 'null'], - }, - metaFields: { - help: 'Comma separated list of meta fields, eg "_index,_type"', - types: ['string', 'null'], - }, - count: { - types: ['number'], - default: 100, - help: 'The number of docs to pull back. Smaller numbers perform better', - }, - }, - fn: (context, args, handlers) => { - context.and = context.and.concat([ - { - type: 'luceneQueryString', - query: args.query, - }, - ]); - - let query = squel - .select({ - autoQuoteTableNames: true, - autoQuoteFieldNames: true, - autoQuoteAliasNames: true, - nameQuoteCharacter: '"', - }) - .from(args.index.toLowerCase()); - - if (args.fields) { - const fields = args.fields.split(',').map(field => field.trim()); - fields.forEach(field => (query = query.field(field))); - } - - if (args.sort) { - const [sortField, sortOrder] = args.sort.split(',').map(str => str.trim()); - if (sortField) query.order(`"${sortField}"`, sortOrder.toLowerCase() === 'asc'); - } - - return handlers - .elasticsearchClient('transport.request', { - path: '/_xpack/sql?format=json', - method: 'POST', - body: { - fetch_size: args.count, - query: query.toString(), - filter: { - bool: { - must: [{ match_all: {} }, ...buildBoolArray(context.and)], - }, - }, - }, - }) - .then(res => { - const columns = res.columns.map(({ name, type }) => { - return { name: sanitizeName(name), type: normalizeType(type) }; - }); - const columnNames = map(columns, 'name'); - const rows = res.rows.map(row => zipObject(columnNames, row)); - return { - type: 'datatable', - columns, - rows, - }; - }); - }, -}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.js deleted file mode 100644 index 7e519f965ddbd..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.js +++ /dev/null @@ -1,177 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import uniqBy from 'lodash.uniqby'; -import { evaluate } from 'tinymath'; -import { groupBy, zipObject, omit, values } from 'lodash'; -import moment from 'moment'; -import { pivotObjectArray } from '../../../../common/lib/pivot_object_array'; -import { unquoteString } from '../../../../common/lib/unquote_string'; -import { isColumnReference } from './lib/is_column_reference'; -import { getExpressionType } from './lib/get_expression_type'; - -// TODO: pointseries performs poorly, that's why we run it on the server. - -const columnExists = (cols, colName) => cols.includes(unquoteString(colName)); - -export const pointseries = () => ({ - name: 'pointseries', - type: 'pointseries', - help: - 'Turn a datatable into a point series model. Currently we differentiate measure from dimensions by looking for a [TinyMath function](http://canvas.elastic.co/reference/tinymath.html). ' + - 'If you enter a TinyMath expression in your argument, we treat that argument as a measure, otherwise it is a dimension. Dimensions are combined to create unique ' + - 'keys. Measures are then deduplicated by those keys using the specified TinyMath function', - context: { - types: ['datatable'], - }, - args: { - x: { - types: ['string', 'null'], - help: 'The values along the X-axis', - }, - y: { - types: ['string', 'null'], - help: 'The values along the y-axis', - }, - color: { - types: ['string', 'null'], - help: "An expression to use in determining the mark's color", // If you need categorization, transform the field. - }, - size: { - types: ['string', 'null'], - help: 'For elements that support it, the size of the marks', - }, - text: { - types: ['string', 'null'], - help: 'For use in charts that support it, the text to show in the mark', - }, - // In the future it may make sense to add things like shape, or tooltip values, but I think what we have is good for now - // The way the function below is written you can add as many arbitrary named args as you want. - }, - fn: (context, args) => { - // Note: can't replace pivotObjectArray with datatableToMathContext, lose name of non-numeric columns - const columnNames = context.columns.map(col => col.name); - const mathScope = pivotObjectArray(context.rows, columnNames); - const autoQuoteColumn = col => { - if (!columnNames.includes(col)) return col; - return col.match(/\s/) ? `'${col}'` : col; - }; - - const measureNames = []; - const dimensions = []; - const columns = {}; - - // Separates args into dimensions and measures arrays - // by checking if arg is a column reference (dimension) - Object.keys(args).forEach(arg => { - const mathExp = autoQuoteColumn(args[arg]); - - if (mathExp != null && mathExp.trim() !== '') { - const col = { - type: '', - role: '', - expression: mathExp, - }; - - if (isColumnReference(mathExp)) { - // TODO: Do something better if the column does not exist - if (!columnExists(columnNames, mathExp)) return; - - dimensions.push({ - name: arg, - value: mathExp, - }); - col.type = getExpressionType(context.columns, mathExp); - col.role = 'dimension'; - } else { - measureNames.push(arg); - col.type = 'number'; - col.role = 'measure'; - } - - columns[arg] = col; - } - }); - - const PRIMARY_KEY = '%%CANVAS_POINTSERIES_PRIMARY_KEY%%'; - const rows = context.rows.map((row, i) => ({ ...row, [PRIMARY_KEY]: i })); - - function normalizeValue(expression, value) { - switch (getExpressionType(context.columns, expression)) { - case 'string': - return String(value); - case 'number': - return Number(value); - case 'date': - return moment(value).valueOf(); - default: - return value; - } - } - - // Dimensions - // Group rows by their dimension values, using the argument values and preserving the PRIMARY_KEY - // There's probably a better way to do this - const results = rows.reduce((acc, row, i) => { - const newRow = dimensions.reduce( - (acc, { name, value }) => { - try { - acc[name] = args[name] ? normalizeValue(value, evaluate(value, mathScope)[i]) : '_all'; - } catch (e) { - // TODO: handle invalid column names... - // Do nothing if column does not exist - // acc[dimension] = '_all'; - } - return acc; - }, - { [PRIMARY_KEY]: row[PRIMARY_KEY] } - ); - - return Object.assign(acc, { [row[PRIMARY_KEY]]: newRow }); - }, {}); - - // Measures - // First group up all of the distinct dimensioned bits. Each of these will be reduced to just 1 value - // for each measure - const measureKeys = groupBy(rows, row => - dimensions.map(({ name }) => (args[name] ? row[args[name]] : '_all')).join('::%BURLAP%::') - ); - - // Then compute that 1 value for each measure - values(measureKeys).forEach(rows => { - const subtable = { type: 'datatable', columns: context.columns, rows: rows }; - const subScope = pivotObjectArray(subtable.rows, subtable.columns.map(col => col.name)); - const measureValues = measureNames.map(measure => { - try { - const ev = evaluate(args[measure], subScope); - if (Array.isArray(ev)) - throw new Error('Expressions must be wrapped in a function such as sum()'); - - return ev; - } catch (e) { - // TODO: don't catch if eval to Array - return null; - } - }); - - rows.forEach(row => { - Object.assign(results[row[PRIMARY_KEY]], zipObject(measureNames, measureValues)); - }); - }); - - // It only makes sense to uniq the rows in a point series as 2 values can not exist in the exact same place at the same time. - const resultingRows = uniqBy( - values(results).map(row => omit(row, PRIMARY_KEY)), - JSON.stringify - ); - - return { - type: 'pointseries', - columns: columns, - rows: resultingRows, - }; - }, -}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js deleted file mode 100644 index ccfd8417d5cb4..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { parse } from 'tinymath'; -import { getFieldType } from '../../../../../common/lib/get_field_type'; -import { isColumnReference } from './is_column_reference'; -import { getFieldNames } from './get_field_names'; - -export function getExpressionType(columns, mathExpression) { - // if isColumnReference returns true, then mathExpression is just a string - // referencing a column in a datatable - if (isColumnReference(mathExpression)) return getFieldType(columns, mathExpression); - - const parsedMath = parse(mathExpression); - - if (parsedMath.args) { - const fieldNames = parsedMath.args.reduce(getFieldNames, []); - - if (fieldNames.length > 0) { - const fieldTypes = fieldNames.reduce((types, name) => { - const type = getFieldType(columns, name); - if (type !== 'null' && types.indexOf(type) === -1) return types.concat(type); - - return types; - }, []); - - return fieldTypes.length === 1 ? fieldTypes[0] : 'string'; - } - return 'number'; - } - - return typeof parsedMath; -} diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/register.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/register.js index f4e7fa4b467b5..c400811c1cd6d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/register.js @@ -4,6 +4,6 @@ * you may not use this file except in compliance with the Elastic License. */ -import { functions } from './index'; +import { functions } from './src/index'; functions.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/demodata.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/demodata.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/demodata.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/demodata.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/get_expression_type.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/get_expression_type.js new file mode 100644 index 0000000000000..93db2accedd0e --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/get_expression_type.js @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from 'expect.js'; +import { getExpressionType } from '../pointseries/lib/get_expression_type'; +import { emptyTable, testTable } from '../../../common/__tests__/fixtures/test_tables'; + +describe('getExpressionType', () => { + it('returns the result type of an evaluated math expression', () => { + expect(getExpressionType(testTable.columns, '2')).to.be.equal('number'); + expect(getExpressionType(testTable.colunns, '2 + 3')).to.be.equal('number'); + expect(getExpressionType(testTable.columns, 'name')).to.be.equal('string'); + expect(getExpressionType(testTable.columns, 'time')).to.be.equal('date'); + expect(getExpressionType(testTable.columns, 'price')).to.be.equal('number'); + expect(getExpressionType(testTable.columns, 'quantity')).to.be.equal('number'); + expect(getExpressionType(testTable.columns, 'in_stock')).to.be.equal('boolean'); + expect(getExpressionType(testTable.columns, 'mean(price)')).to.be.equal('number'); + expect(getExpressionType(testTable.columns, 'count(name)')).to.be.equal('string'); + expect(getExpressionType(testTable.columns, 'random()')).to.be.equal('number'); + expect(getExpressionType(testTable.columns, 'mean(multiply(price,quantity))')).to.be.eql( + 'number' + ); + }); + it('returns date instead of number when referencing date column', () => { + expect(getExpressionType(testTable.columns, 'mean(time)')).to.be.equal('date'); + }); + it(`returns 'null' if referenced field does not exist in datatable`, () => { + expect(getExpressionType(testTable.columns, 'foo')).to.be.equal('null'); + expect(getExpressionType(emptyTable.columns, 'foo')).to.be.equal('null'); + expect(getExpressionType(emptyTable.columns, 'mean(foo)')).to.be.equal('string'); + }); +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/get_field_names.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/get_field_names.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/get_field_names.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/get_field_names.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/is_column_reference.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/is_column_reference.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/is_column_reference.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/is_column_reference.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/pointseries.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/pointseries.js similarity index 98% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/pointseries.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/pointseries.js index c2c7fb8f4a477..42de75f69efb7 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/__tests__/pointseries.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/__tests__/pointseries.js @@ -6,7 +6,7 @@ import expect from 'expect.js'; import { pointseries } from '../pointseries'; -import { emptyTable, testTable } from '../../common/__tests__/fixtures/test_tables'; +import { emptyTable, testTable } from '../../../common/__tests__/fixtures/test_tables'; describe('pointseries', () => { const fn = pointseries().fn; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/ci.json b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/ci.json new file mode 100644 index 0000000000000..92517e5478150 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/ci.json @@ -0,0 +1,11002 @@ +[ + { + "age": 41, + "cost": 22.09, + "country": "CN", + "price": 52, + "project": "x-pack", + "state": "running", + "time": 1471590000000, + "username": "arobertson0", + "percent_uptime": 0.67 + }, + { + "age": 62, + "cost": 21.45, + "country": "RU", + "price": 53, + "project": "x-pack", + "state": "start", + "time": 1477292400000, + "username": "smeyer1", + "percent_uptime": 0.66 + }, + { + "age": 24, + "cost": 21.29, + "country": "FR", + "price": 53, + "project": "elasticsearch", + "state": "start", + "time": 1490425200000, + "username": "rcollins2", + "percent_uptime": 0.19 + }, + { + "age": 35, + "cost": 23.99, + "country": "PL", + "price": 52, + "project": "logstash", + "state": "start", + "time": 1477033200000, + "username": "lhoward3", + "percent_uptime": 0.03 + }, + { + "age": 79, + "cost": 22.09, + "country": "EC", + "price": 61, + "project": "kibana", + "state": "running", + "time": 1491116400000, + "username": "kcarroll4", + "percent_uptime": 0.59 + }, + { + "age": 69, + "cost": 22.9, + "country": "PE", + "price": 52, + "project": "x-pack", + "state": "done", + "time": 1476946800000, + "username": "handerson5", + "percent_uptime": 0.78 + }, + { + "age": 20, + "cost": 21.2, + "country": "JP", + "price": 65, + "project": "x-pack", + "state": "start", + "time": 1481094000000, + "username": "twashington6", + "percent_uptime": 0.52 + }, + { + "age": 56, + "cost": 24.19, + "country": "BG", + "price": 38, + "project": "logstash", + "state": "start", + "time": 1476601200000, + "username": "dmendoza7", + "percent_uptime": 0.47 + }, + { + "age": 48, + "cost": 21.37, + "country": "RU", + "price": 47, + "project": "x-pack", + "state": "start", + "time": 1478070000000, + "username": "staylor8", + "percent_uptime": 0.13 + }, + { + "age": 75, + "cost": 24.61, + "country": "ES", + "price": 58, + "project": "machine-learning", + "state": "running", + "time": 1483081200000, + "username": "mramirez9", + "percent_uptime": 0.72 + }, + { + "age": 33, + "cost": 21.82, + "country": "MX", + "price": 59, + "project": "machine-learning", + "state": "running", + "time": 1467529200000, + "username": "dandrewsa", + "percent_uptime": 0.4 + }, + { + "age": 61, + "cost": 22.57, + "country": "PL", + "price": 52, + "project": "machine-learning", + "state": "done", + "time": 1490252400000, + "username": "bwalkerb", + "percent_uptime": 0.64 + }, + { + "age": 69, + "cost": 22.28, + "country": "KR", + "price": 58, + "project": "x-pack", + "state": "running", + "time": 1470812400000, + "username": "vfoxc", + "percent_uptime": 0.79 + }, + { + "age": 75, + "cost": 22.07, + "country": "VN", + "price": 52, + "project": "machine-learning", + "state": "running", + "time": 1474441200000, + "username": "kdixond", + "percent_uptime": 0.59 + }, + { + "age": 62, + "cost": 23.3, + "country": "ID", + "price": 49, + "project": "x-pack", + "state": "done", + "time": 1488610800000, + "username": "rjacksone", + "percent_uptime": 0.92 + }, + { + "age": 54, + "cost": 21.96, + "country": "CF", + "price": 48, + "project": "machine-learning", + "state": "running", + "time": 1462086000000, + "username": "ecruzf", + "percent_uptime": 0.32 + }, + { + "age": 41, + "cost": 22.64, + "country": "JP", + "price": 48, + "project": "x-pack", + "state": "done", + "time": 1480748400000, + "username": "dfreemang", + "percent_uptime": 0.34 + }, + { + "age": 49, + "cost": 25.63, + "country": "CN", + "price": 56, + "project": "logstash", + "state": "done", + "time": 1478502000000, + "username": "jhernandezh", + "percent_uptime": 0.2 + }, + { + "age": 36, + "cost": 24.18, + "country": "JM", + "price": 59, + "project": "beats", + "state": "start", + "time": 1465628400000, + "username": "rcolemani", + "percent_uptime": 0.32 + }, + { + "age": 67, + "cost": 22.04, + "country": "CN", + "price": 66, + "project": "opbeat", + "state": "running", + "time": 1472626800000, + "username": "cbaileyj", + "percent_uptime": 0.44 + }, + { + "age": 25, + "cost": 24.02, + "country": "AR", + "price": 41, + "project": "opbeat", + "state": "start", + "time": 1488006000000, + "username": "hperryk", + "percent_uptime": 0.98 + }, + { + "age": 32, + "cost": 23.4, + "country": "CU", + "price": 59, + "project": "opbeat", + "state": "done", + "time": 1479711600000, + "username": "lfoxl", + "percent_uptime": 0.29 + }, + { + "age": 61, + "cost": 23.9, + "country": "CN", + "price": 56, + "project": "machine-learning", + "state": "start", + "time": 1476255600000, + "username": "cgrantm", + "percent_uptime": 0.94 + }, + { + "age": 30, + "cost": 23.46, + "country": "CN", + "price": 54, + "project": "kibana", + "state": "done", + "time": 1473231600000, + "username": "ewarrenn", + "percent_uptime": 0.22 + }, + { + "age": 28, + "cost": 22.8, + "country": "ID", + "price": 48, + "project": "logstash", + "state": "done", + "time": 1474182000000, + "username": "nrileyo", + "percent_uptime": 0.83 + }, + { + "age": 33, + "cost": 23.61, + "country": "RU", + "price": 53, + "project": "machine-learning", + "state": "start", + "time": 1490338800000, + "username": "swillisp", + "percent_uptime": 0.92 + }, + { + "age": 19, + "cost": 23.28, + "country": "ID", + "price": 64, + "project": "machine-learning", + "state": "done", + "time": 1461913200000, + "username": "jthompsonq", + "percent_uptime": 0.55 + }, + { + "age": 27, + "cost": 24.36, + "country": "AZ", + "price": 63, + "project": "x-pack", + "state": "start", + "time": 1483945200000, + "username": "bpricer", + "percent_uptime": 0.76 + }, + { + "age": 52, + "cost": 23.79, + "country": "AG", + "price": 57, + "project": "elasticsearch", + "state": "start", + "time": 1461222000000, + "username": "rgibsons", + "percent_uptime": 0.27 + }, + { + "age": 61, + "cost": 23.21, + "country": "CN", + "price": 70, + "project": "machine-learning", + "state": "done", + "time": 1482994800000, + "username": "cwashingtont", + "percent_uptime": 0.98 + }, + { + "age": 49, + "cost": 23.71, + "country": "US", + "price": 50, + "project": "logstash", + "state": "start", + "time": 1484722800000, + "username": "athompsonu", + "percent_uptime": 0.7 + }, + { + "age": 64, + "cost": 23.64, + "country": "BR", + "price": 47, + "project": "beats", + "state": "start", + "time": 1475910000000, + "username": "ewarrenv", + "percent_uptime": 0.68 + }, + { + "age": 36, + "cost": 24.03, + "country": "PE", + "price": 60, + "project": "beats", + "state": "start", + "time": 1472022000000, + "username": "mcruzw", + "percent_uptime": 0.85 + }, + { + "age": 45, + "cost": 23.13, + "country": "HR", + "price": 50, + "project": "elasticsearch", + "state": "done", + "time": 1463295600000, + "username": "brosex", + "percent_uptime": 0.72 + }, + { + "age": 30, + "cost": 22.37, + "country": "PK", + "price": 69, + "project": "kibana", + "state": "running", + "time": 1465455600000, + "username": "gberryy", + "percent_uptime": 0.24 + }, + { + "age": 49, + "cost": 23.96, + "country": "ID", + "price": 49, + "project": "logstash", + "state": "start", + "time": 1468220400000, + "username": "mortizz", + "percent_uptime": 0.13 + }, + { + "age": 73, + "cost": 22.36, + "country": "YE", + "price": 44, + "project": "elasticsearch", + "state": "running", + "time": 1477897200000, + "username": "pelliott10", + "percent_uptime": 0.61 + }, + { + "age": 43, + "cost": 20.38, + "country": "PT", + "price": 54, + "project": "beats", + "state": "done", + "time": 1475737200000, + "username": "rperkins11", + "percent_uptime": 0.11 + }, + { + "age": 30, + "cost": 22.96, + "country": "TZ", + "price": 42, + "project": "kibana", + "state": "done", + "time": 1482822000000, + "username": "rjohnson12", + "percent_uptime": 0.96 + }, + { + "age": 37, + "cost": 23.27, + "country": "AM", + "price": 57, + "project": "kibana", + "state": "done", + "time": 1473490800000, + "username": "chall13", + "percent_uptime": 0.72 + }, + { + "age": 79, + "cost": 22.06, + "country": "PH", + "price": 52, + "project": "kibana", + "state": "running", + "time": 1464850800000, + "username": "mwells14", + "percent_uptime": 0.93 + }, + { + "age": 34, + "cost": 21.81, + "country": "CZ", + "price": 54, + "project": "x-pack", + "state": "running", + "time": 1468306800000, + "username": "bbrown15", + "percent_uptime": 0.72 + }, + { + "age": 61, + "cost": 22.16, + "country": "ID", + "price": 56, + "project": "machine-learning", + "state": "running", + "time": 1470294000000, + "username": "bwood16", + "percent_uptime": 0.38 + }, + { + "age": 19, + "cost": 23.26, + "country": "ID", + "price": 56, + "project": "machine-learning", + "state": "done", + "time": 1474873200000, + "username": "sanderson17", + "percent_uptime": 0.86 + }, + { + "age": 21, + "cost": 22.56, + "country": "ID", + "price": 56, + "project": "logstash", + "state": "done", + "time": 1465801200000, + "username": "rbishop18", + "percent_uptime": 0.46 + }, + { + "age": 49, + "cost": 23.8, + "country": "PE", + "price": 52, + "project": "logstash", + "state": "start", + "time": 1487574000000, + "username": "kgomez19", + "percent_uptime": 0.9 + }, + { + "age": 60, + "cost": 22.33, + "country": "MG", + "price": 62, + "project": "opbeat", + "state": "running", + "time": 1485846000000, + "username": "jclark1a", + "percent_uptime": 0.85 + }, + { + "age": 78, + "cost": 21.46, + "country": "PT", + "price": 61, + "project": "beats", + "state": "start", + "time": 1474527600000, + "username": "cpeterson1b", + "percent_uptime": 0.8 + }, + { + "age": 78, + "cost": 22.74, + "country": "CN", + "price": 57, + "project": "beats", + "state": "done", + "time": 1461567600000, + "username": "ttaylor1c", + "percent_uptime": 0.97 + }, + { + "age": 58, + "cost": 23.41, + "country": "PS", + "price": 63, + "project": "kibana", + "state": "done", + "time": 1491634800000, + "username": "sdean1d", + "percent_uptime": 0.77 + }, + { + "age": 69, + "cost": 21.14, + "country": "RU", + "price": 47, + "project": "x-pack", + "state": "start", + "time": 1481698800000, + "username": "sfreeman1e", + "percent_uptime": 0.96 + }, + { + "age": 54, + "cost": 23.1, + "country": "CY", + "price": 49, + "project": "machine-learning", + "state": "done", + "time": 1462431600000, + "username": "rmccoy1f", + "percent_uptime": 0.48 + }, + { + "age": 43, + "cost": 23.55, + "country": "MX", + "price": 62, + "project": "beats", + "state": "start", + "time": 1461308400000, + "username": "kwallace1g", + "percent_uptime": 0.99 + }, + { + "age": 35, + "cost": 22.39, + "country": "ID", + "price": 59, + "project": "logstash", + "state": "running", + "time": 1468652400000, + "username": "jhunt1h", + "percent_uptime": 0.22 + }, + { + "age": 51, + "cost": 24.76, + "country": "LU", + "price": 64, + "project": "kibana", + "state": "running", + "time": 1472194800000, + "username": "ageorge1i", + "percent_uptime": 0.93 + }, + { + "age": 60, + "cost": 22.97, + "country": "HN", + "price": 71, + "project": "opbeat", + "state": "done", + "time": 1482735600000, + "username": "jsims1j", + "percent_uptime": 0.92 + }, + { + "age": 55, + "cost": 22.75, + "country": "ID", + "price": 54, + "project": "x-pack", + "state": "done", + "time": 1486537200000, + "username": "jwatkins1k", + "percent_uptime": 0.59 + }, + { + "age": 26, + "cost": 24.65, + "country": "PL", + "price": 61, + "project": "machine-learning", + "state": "running", + "time": 1465110000000, + "username": "jstanley1l", + "percent_uptime": 0.94 + }, + { + "age": 60, + "cost": 22.96, + "country": "NO", + "price": 56, + "project": "opbeat", + "state": "done", + "time": 1472367600000, + "username": "rking1m", + "percent_uptime": 0.07 + }, + { + "age": 56, + "cost": 23.93, + "country": "CN", + "price": 57, + "project": "logstash", + "state": "start", + "time": 1489561200000, + "username": "tmcdonald1n", + "percent_uptime": 0.24 + }, + { + "age": 19, + "cost": 21.46, + "country": "SA", + "price": 52, + "project": "machine-learning", + "state": "start", + "time": 1485586800000, + "username": "dharper1o", + "percent_uptime": 0.58 + }, + { + "age": 59, + "cost": 24.91, + "country": "SE", + "price": 52, + "project": "elasticsearch", + "state": "running", + "time": 1484031600000, + "username": "kwilson1p", + "percent_uptime": 0.43 + }, + { + "age": 49, + "cost": 22.91, + "country": "UG", + "price": 51, + "project": "logstash", + "state": "done", + "time": 1490166000000, + "username": "phansen1q", + "percent_uptime": 0.84 + }, + { + "age": 66, + "cost": 22.68, + "country": "ID", + "price": 52, + "project": "elasticsearch", + "state": "done", + "time": 1484377200000, + "username": "wrodriguez1r", + "percent_uptime": 0.6 + }, + { + "age": 80, + "cost": 21.29, + "country": "NG", + "price": 53, + "project": "elasticsearch", + "state": "start", + "time": 1474268400000, + "username": "hbowman1s", + "percent_uptime": 0.21 + }, + { + "age": 38, + "cost": 21.79, + "country": "ID", + "price": 55, + "project": "elasticsearch", + "state": "running", + "time": 1463122800000, + "username": "agonzales1t", + "percent_uptime": 0.57 + }, + { + "age": 61, + "cost": 24.5, + "country": "AF", + "price": 62, + "project": "machine-learning", + "state": "running", + "time": 1474268400000, + "username": "jmarshall1u", + "percent_uptime": 0.12 + }, + { + "age": 40, + "cost": 23.17, + "country": "AZ", + "price": 62, + "project": "machine-learning", + "state": "done", + "time": 1472626800000, + "username": "sadams1v", + "percent_uptime": 0.23 + }, + { + "age": 19, + "cost": 22.79, + "country": "FR", + "price": 60, + "project": "machine-learning", + "state": "done", + "time": 1479279600000, + "username": "athomas1w", + "percent_uptime": 0.55 + }, + { + "age": 48, + "cost": 22.15, + "country": "CN", + "price": 47, + "project": "x-pack", + "state": "running", + "time": 1483513200000, + "username": "jhanson1x", + "percent_uptime": 0.32 + }, + { + "age": 51, + "cost": 23.68, + "country": "BR", + "price": 56, + "project": "kibana", + "state": "start", + "time": 1478070000000, + "username": "smurphy1y", + "percent_uptime": 0.77 + }, + { + "age": 74, + "cost": 22.77, + "country": "ID", + "price": 59, + "project": "opbeat", + "state": "done", + "time": 1480921200000, + "username": "jaustin1z", + "percent_uptime": 0.69 + }, + { + "age": 63, + "cost": 23.42, + "country": "PL", + "price": 44, + "project": "logstash", + "state": "done", + "time": 1469948400000, + "username": "aburns20", + "percent_uptime": 0.3 + }, + { + "age": 58, + "cost": 22.63, + "country": "PH", + "price": 51, + "project": "kibana", + "state": "done", + "time": 1490770800000, + "username": "jmills21", + "percent_uptime": 0.9 + }, + { + "age": 49, + "cost": 22.47, + "country": "KP", + "price": 65, + "project": "logstash", + "state": "running", + "time": 1488438000000, + "username": "wmontgomery22", + "percent_uptime": 0.32 + }, + { + "age": 34, + "cost": 24.12, + "country": "YE", + "price": 67, + "project": "x-pack", + "state": "start", + "time": 1463468400000, + "username": "kbrooks23", + "percent_uptime": 0.69 + }, + { + "age": 55, + "cost": 22.93, + "country": "ID", + "price": 53, + "project": "x-pack", + "state": "done", + "time": 1473836400000, + "username": "dmarshall24", + "percent_uptime": 0.22 + }, + { + "age": 75, + "cost": 22.34, + "country": "PE", + "price": 41, + "project": "machine-learning", + "state": "running", + "time": 1471330800000, + "username": "rsmith25", + "percent_uptime": 0.73 + }, + { + "age": 62, + "cost": 23.06, + "country": "PT", + "price": 60, + "project": "x-pack", + "state": "done", + "time": 1490338800000, + "username": "amartinez26", + "percent_uptime": 0.96 + }, + { + "age": 69, + "cost": 24.24, + "country": "PL", + "price": 57, + "project": "x-pack", + "state": "start", + "time": 1466492400000, + "username": "bfranklin27", + "percent_uptime": 0.09 + }, + { + "age": 34, + "cost": 21.01, + "country": "GR", + "price": 45, + "project": "x-pack", + "state": "start", + "time": 1461222000000, + "username": "dhicks28", + "percent_uptime": 0.23 + }, + { + "age": 42, + "cost": 24.88, + "country": "GR", + "price": 43, + "project": "logstash", + "state": "running", + "time": 1476514800000, + "username": "hperez29", + "percent_uptime": 0.27 + }, + { + "age": 18, + "cost": 23.44, + "country": "CN", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1484118000000, + "username": "jchavez2a", + "percent_uptime": 0.08 + }, + { + "age": 80, + "cost": 22.87, + "country": "ID", + "price": 39, + "project": "elasticsearch", + "state": "done", + "time": 1471330800000, + "username": "krobinson2b", + "percent_uptime": 0.39 + }, + { + "age": 47, + "cost": 23.26, + "country": "PH", + "price": 49, + "project": "machine-learning", + "state": "done", + "time": 1468566000000, + "username": "aking2c", + "percent_uptime": 0.56 + }, + { + "age": 22, + "cost": 23.7, + "country": "ID", + "price": 61, + "project": "beats", + "state": "start", + "time": 1473404400000, + "username": "ediaz2d", + "percent_uptime": 0.35 + }, + { + "age": 61, + "cost": 23.28, + "country": "ID", + "price": 60, + "project": "machine-learning", + "state": "done", + "time": 1481785200000, + "username": "aevans2e", + "percent_uptime": 0.36 + }, + { + "age": 41, + "cost": 22.72, + "country": "ID", + "price": 44, + "project": "x-pack", + "state": "done", + "time": 1463554800000, + "username": "lperez2f", + "percent_uptime": 0.7 + }, + { + "age": 41, + "cost": 22.15, + "country": "RU", + "price": 45, + "project": "x-pack", + "state": "running", + "time": 1487833200000, + "username": "rmartinez2g", + "percent_uptime": 0.08 + }, + { + "age": 44, + "cost": 24.44, + "country": "GR", + "price": 71, + "project": "kibana", + "state": "start", + "time": 1470294000000, + "username": "hcrawford2h", + "percent_uptime": 0.19 + }, + { + "age": 72, + "cost": 21.46, + "country": "NG", + "price": 47, + "project": "kibana", + "state": "start", + "time": 1477119600000, + "username": "dramirez2i", + "percent_uptime": 0.53 + }, + { + "age": 31, + "cost": 22.45, + "country": "FR", + "price": 68, + "project": "elasticsearch", + "state": "running", + "time": 1487401200000, + "username": "greynolds2j", + "percent_uptime": 0.5 + }, + { + "age": 39, + "cost": 24.56, + "country": "KR", + "price": 58, + "project": "opbeat", + "state": "running", + "time": 1477810800000, + "username": "sjordan2k", + "percent_uptime": 0.51 + }, + { + "age": 54, + "cost": 22.52, + "country": "ZA", + "price": 80, + "project": "machine-learning", + "state": "done", + "time": 1487574000000, + "username": "pjohnston2l", + "percent_uptime": 0.16 + }, + { + "age": 39, + "cost": 21.86, + "country": "GR", + "price": 50, + "project": "opbeat", + "state": "running", + "time": 1485414000000, + "username": "ccarpenter2m", + "percent_uptime": 0.15 + }, + { + "age": 79, + "cost": 23.52, + "country": "SE", + "price": 54, + "project": "kibana", + "state": "start", + "time": 1488351600000, + "username": "bmorris2n", + "percent_uptime": 0.33 + }, + { + "age": 23, + "cost": 23.44, + "country": "BR", + "price": 39, + "project": "kibana", + "state": "done", + "time": 1472367600000, + "username": "mmoore2o", + "percent_uptime": 0.75 + }, + { + "age": 50, + "cost": 23.03, + "country": "CZ", + "price": 51, + "project": "beats", + "state": "done", + "time": 1478588400000, + "username": "jlawson2p", + "percent_uptime": 0.74 + }, + { + "age": 74, + "cost": 22.69, + "country": "CN", + "price": 79, + "project": "opbeat", + "state": "done", + "time": 1460530800000, + "username": "rjackson2q", + "percent_uptime": 0.02 + }, + { + "age": 39, + "cost": 23.73, + "country": "CN", + "price": 60, + "project": "opbeat", + "state": "start", + "time": 1489388400000, + "username": "tcole2r", + "percent_uptime": 0.52 + }, + { + "age": 47, + "cost": 20.51, + "country": "RU", + "price": 59, + "project": "machine-learning", + "state": "start", + "time": 1479625200000, + "username": "garnold2s", + "percent_uptime": 0.76 + }, + { + "age": 42, + "cost": 20.26, + "country": "JP", + "price": 53, + "project": "logstash", + "state": "done", + "time": 1482303600000, + "username": "khenry2t", + "percent_uptime": 0.33 + }, + { + "age": 21, + "cost": 23.71, + "country": "CU", + "price": 61, + "project": "logstash", + "state": "start", + "time": 1482562800000, + "username": "aalvarez2u", + "percent_uptime": 0.18 + }, + { + "age": 72, + "cost": 23.38, + "country": "CN", + "price": 62, + "project": "kibana", + "state": "done", + "time": 1465887600000, + "username": "cbrown2v", + "percent_uptime": 0.66 + }, + { + "age": 64, + "cost": 22.52, + "country": "NG", + "price": 43, + "project": "beats", + "state": "done", + "time": 1460617200000, + "username": "tblack2w", + "percent_uptime": 0.43 + }, + { + "age": 53, + "cost": 24.24, + "country": "MX", + "price": 71, + "project": "opbeat", + "state": "start", + "time": 1481698800000, + "username": "bdiaz2x", + "percent_uptime": 0.61 + }, + { + "age": 52, + "cost": 22.42, + "country": "PT", + "price": 56, + "project": "elasticsearch", + "state": "running", + "time": 1481958000000, + "username": "drobinson2y", + "percent_uptime": 0.74 + }, + { + "age": 32, + "cost": 23.84, + "country": "BR", + "price": 66, + "project": "opbeat", + "state": "start", + "time": 1476860400000, + "username": "jsnyder2z", + "percent_uptime": 0.97 + }, + { + "age": 50, + "cost": 23.18, + "country": "ID", + "price": 54, + "project": "beats", + "state": "done", + "time": 1476169200000, + "username": "rking30", + "percent_uptime": 0.01 + }, + { + "age": 25, + "cost": 22.43, + "country": "CN", + "price": 46, + "project": "opbeat", + "state": "running", + "time": 1485327600000, + "username": "tjohnston31", + "percent_uptime": 0.43 + }, + { + "age": 33, + "cost": 22.44, + "country": "MY", + "price": 55, + "project": "machine-learning", + "state": "running", + "time": 1472713200000, + "username": "bdaniels32", + "percent_uptime": 0.67 + }, + { + "age": 71, + "cost": 23.84, + "country": "BY", + "price": 42, + "project": "beats", + "state": "start", + "time": 1460962800000, + "username": "ggarza33", + "percent_uptime": 0.55 + }, + { + "age": 74, + "cost": 21.73, + "country": "GR", + "price": 58, + "project": "opbeat", + "state": "running", + "time": 1463382000000, + "username": "csmith34", + "percent_uptime": 0.3 + }, + { + "age": 57, + "cost": 21.62, + "country": "TH", + "price": 60, + "project": "beats", + "state": "running", + "time": 1486969200000, + "username": "bhall35", + "percent_uptime": 0.92 + }, + { + "age": 28, + "cost": 21.34, + "country": "CO", + "price": 50, + "project": "logstash", + "state": "start", + "time": 1491462000000, + "username": "jpalmer36", + "percent_uptime": 0.82 + }, + { + "age": 26, + "cost": 23.35, + "country": "ZA", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1471330800000, + "username": "akelly37", + "percent_uptime": 0.43 + }, + { + "age": 20, + "cost": 24.87, + "country": "JP", + "price": 66, + "project": "x-pack", + "state": "running", + "time": 1479366000000, + "username": "hbowman38", + "percent_uptime": 0.78 + }, + { + "age": 75, + "cost": 23.91, + "country": "MA", + "price": 59, + "project": "machine-learning", + "state": "start", + "time": 1466233200000, + "username": "wpierce39", + "percent_uptime": 0.15 + }, + { + "age": 62, + "cost": 20.83, + "country": "CN", + "price": 53, + "project": "x-pack", + "state": "start", + "time": 1464418800000, + "username": "eriley3a", + "percent_uptime": 0.65 + }, + { + "age": 45, + "cost": 22.57, + "country": "PT", + "price": 43, + "project": "elasticsearch", + "state": "done", + "time": 1471676400000, + "username": "emedina3b", + "percent_uptime": 0.28 + }, + { + "age": 72, + "cost": 22.45, + "country": "ID", + "price": 79, + "project": "kibana", + "state": "running", + "time": 1469516400000, + "username": "rlane3c", + "percent_uptime": 0.37 + }, + { + "age": 52, + "cost": 22.48, + "country": "ID", + "price": 61, + "project": "elasticsearch", + "state": "running", + "time": 1487228400000, + "username": "dwallace3d", + "percent_uptime": 0.27 + }, + { + "age": 36, + "cost": 23.89, + "country": "HR", + "price": 66, + "project": "beats", + "state": "start", + "time": 1462777200000, + "username": "jmcdonald3e", + "percent_uptime": 0.03 + }, + { + "age": 52, + "cost": 21.84, + "country": "RU", + "price": 56, + "project": "elasticsearch", + "state": "running", + "time": 1490166000000, + "username": "cschmidt3f", + "percent_uptime": 0.69 + }, + { + "age": 45, + "cost": 22.13, + "country": "ID", + "price": 54, + "project": "elasticsearch", + "state": "running", + "time": 1470207600000, + "username": "jfields3g", + "percent_uptime": 0.76 + }, + { + "age": 51, + "cost": 23.29, + "country": "CM", + "price": 48, + "project": "kibana", + "state": "done", + "time": 1475564400000, + "username": "kduncan3h", + "percent_uptime": 0.24 + }, + { + "age": 75, + "cost": 21.61, + "country": "ID", + "price": 58, + "project": "machine-learning", + "state": "running", + "time": 1480402800000, + "username": "award3i", + "percent_uptime": 0.16 + }, + { + "age": 44, + "cost": 21.09, + "country": "KN", + "price": 51, + "project": "kibana", + "state": "start", + "time": 1480575600000, + "username": "jking3j", + "percent_uptime": 0.83 + }, + { + "age": 53, + "cost": 24.07, + "country": "CU", + "price": 52, + "project": "opbeat", + "state": "start", + "time": 1489820400000, + "username": "ksanders3k", + "percent_uptime": 0.24 + }, + { + "age": 57, + "cost": 22.86, + "country": "BR", + "price": 40, + "project": "beats", + "state": "done", + "time": 1474700400000, + "username": "colson3l", + "percent_uptime": 0.55 + }, + { + "age": 77, + "cost": 22.88, + "country": "GT", + "price": 69, + "project": "logstash", + "state": "done", + "time": 1486537200000, + "username": "dpierce3m", + "percent_uptime": 0.43 + }, + { + "age": 56, + "cost": 22.79, + "country": "CN", + "price": 52, + "project": "logstash", + "state": "done", + "time": 1474959600000, + "username": "afoster3n", + "percent_uptime": 0.99 + }, + { + "age": 65, + "cost": 23.62, + "country": "VN", + "price": 43, + "project": "kibana", + "state": "start", + "time": 1485068400000, + "username": "phoward3o", + "percent_uptime": 0.63 + }, + { + "age": 66, + "cost": 22.32, + "country": "SE", + "price": 44, + "project": "elasticsearch", + "state": "running", + "time": 1473750000000, + "username": "rpalmer3p", + "percent_uptime": 0.29 + }, + { + "age": 34, + "cost": 21.86, + "country": "CN", + "price": 54, + "project": "x-pack", + "state": "running", + "time": 1480230000000, + "username": "bgordon3q", + "percent_uptime": 0.06 + }, + { + "age": 63, + "cost": 23.54, + "country": "ID", + "price": 59, + "project": "logstash", + "state": "start", + "time": 1484722800000, + "username": "cturner3r", + "percent_uptime": 0.59 + }, + { + "age": 20, + "cost": 21.73, + "country": "PS", + "price": 43, + "project": "x-pack", + "state": "running", + "time": 1480921200000, + "username": "jowens3s", + "percent_uptime": 0.61 + }, + { + "age": 65, + "cost": 23.34, + "country": "PL", + "price": 60, + "project": "kibana", + "state": "done", + "time": 1491548400000, + "username": "rdunn3t", + "percent_uptime": 0.96 + }, + { + "age": 44, + "cost": 22.12, + "country": "ID", + "price": 48, + "project": "kibana", + "state": "running", + "time": 1475391600000, + "username": "jhall3u", + "percent_uptime": 0.47 + }, + { + "age": 74, + "cost": 22.71, + "country": "TH", + "price": 57, + "project": "opbeat", + "state": "done", + "time": 1484982000000, + "username": "cmorris3v", + "percent_uptime": 0.44 + }, + { + "age": 64, + "cost": 23.85, + "country": "ID", + "price": 48, + "project": "beats", + "state": "start", + "time": 1475996400000, + "username": "dpierce3w", + "percent_uptime": 0.13 + }, + { + "age": 48, + "cost": 22.03, + "country": "CN", + "price": 66, + "project": "x-pack", + "state": "running", + "time": 1468825200000, + "username": "htaylor3x", + "percent_uptime": 0.29 + }, + { + "age": 59, + "cost": 22.88, + "country": "BG", + "price": 67, + "project": "elasticsearch", + "state": "done", + "time": 1470380400000, + "username": "hwagner3y", + "percent_uptime": 0.9 + }, + { + "age": 25, + "cost": 23.96, + "country": "JM", + "price": 50, + "project": "opbeat", + "state": "start", + "time": 1486796400000, + "username": "sholmes3z", + "percent_uptime": 0.97 + }, + { + "age": 62, + "cost": 23.1, + "country": "ID", + "price": 61, + "project": "x-pack", + "state": "done", + "time": 1467874800000, + "username": "grogers40", + "percent_uptime": 0.03 + }, + { + "age": 67, + "cost": 22.36, + "country": "PT", + "price": 50, + "project": "opbeat", + "state": "running", + "time": 1483686000000, + "username": "jphillips41", + "percent_uptime": 0.47 + }, + { + "age": 69, + "cost": 23.26, + "country": "TN", + "price": 75, + "project": "x-pack", + "state": "done", + "time": 1473836400000, + "username": "pmcdonald42", + "percent_uptime": 0.24 + }, + { + "age": 64, + "cost": 23.7, + "country": "PL", + "price": 57, + "project": "beats", + "state": "start", + "time": 1465801200000, + "username": "bsims43", + "percent_uptime": 0.36 + }, + { + "age": 80, + "cost": 24.38, + "country": "US", + "price": 56, + "project": "elasticsearch", + "state": "start", + "time": 1479193200000, + "username": "jmurray44", + "percent_uptime": 0.65 + }, + { + "age": 41, + "cost": 24.64, + "country": "PH", + "price": 58, + "project": "x-pack", + "state": "running", + "time": 1472022000000, + "username": "phenderson45", + "percent_uptime": 0.21 + }, + { + "age": 55, + "cost": 24.47, + "country": "ID", + "price": 63, + "project": "x-pack", + "state": "start", + "time": 1465974000000, + "username": "nhunt46", + "percent_uptime": 0.01 + }, + { + "age": 30, + "cost": 23.45, + "country": "CN", + "price": 54, + "project": "kibana", + "state": "done", + "time": 1469257200000, + "username": "rwalker47", + "percent_uptime": 0.88 + }, + { + "age": 31, + "cost": 22.09, + "country": "CO", + "price": 60, + "project": "elasticsearch", + "state": "running", + "time": 1482562800000, + "username": "dkim48", + "percent_uptime": 0.43 + }, + { + "age": 33, + "cost": 22.48, + "country": "NG", + "price": 61, + "project": "machine-learning", + "state": "running", + "time": 1486969200000, + "username": "dward49", + "percent_uptime": 0.32 + }, + { + "age": 68, + "cost": 23, + "country": "HN", + "price": 58, + "project": "machine-learning", + "state": "done", + "time": 1471762800000, + "username": "ahughes4a", + "percent_uptime": 0.8 + }, + { + "age": 32, + "cost": 21.74, + "country": "CN", + "price": 64, + "project": "opbeat", + "state": "running", + "time": 1491548400000, + "username": "jdunn4b", + "percent_uptime": 0.76 + }, + { + "age": 49, + "cost": 21.46, + "country": "DE", + "price": 65, + "project": "logstash", + "state": "start", + "time": 1466060400000, + "username": "psimmons4c", + "percent_uptime": 0.34 + }, + { + "age": 33, + "cost": 22.14, + "country": "CN", + "price": 52, + "project": "machine-learning", + "state": "running", + "time": 1460790000000, + "username": "tpierce4d", + "percent_uptime": 0.43 + }, + { + "age": 59, + "cost": 23.4, + "country": "GY", + "price": 59, + "project": "elasticsearch", + "state": "done", + "time": 1475650800000, + "username": "jchavez4e", + "percent_uptime": 0.75 + }, + { + "age": 60, + "cost": 20.92, + "country": "MK", + "price": 55, + "project": "opbeat", + "state": "start", + "time": 1486882800000, + "username": "awood4f", + "percent_uptime": 0.84 + }, + { + "age": 28, + "cost": 22.56, + "country": "PT", + "price": 58, + "project": "logstash", + "state": "done", + "time": 1491375600000, + "username": "psanchez4g", + "percent_uptime": 0.48 + }, + { + "age": 69, + "cost": 22.78, + "country": "TH", + "price": 54, + "project": "x-pack", + "state": "done", + "time": 1478588400000, + "username": "phansen4h", + "percent_uptime": 0.58 + }, + { + "age": 73, + "cost": 21.52, + "country": "CN", + "price": 54, + "project": "elasticsearch", + "state": "running", + "time": 1461308400000, + "username": "apierce4i", + "percent_uptime": 0.92 + }, + { + "age": 49, + "cost": 21.94, + "country": "CN", + "price": 55, + "project": "logstash", + "state": "running", + "time": 1467097200000, + "username": "cedwards4j", + "percent_uptime": 0.47 + }, + { + "age": 73, + "cost": 21.99, + "country": "JP", + "price": 56, + "project": "elasticsearch", + "state": "running", + "time": 1478329200000, + "username": "sford4k", + "percent_uptime": 0.79 + }, + { + "age": 64, + "cost": 23.14, + "country": "PH", + "price": 51, + "project": "beats", + "state": "done", + "time": 1483340400000, + "username": "kpeterson4l", + "percent_uptime": 0.64 + }, + { + "age": 53, + "cost": 22.97, + "country": "BR", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1486710000000, + "username": "bfoster4m", + "percent_uptime": 0.07 + }, + { + "age": 57, + "cost": 21.37, + "country": "CN", + "price": 67, + "project": "beats", + "state": "start", + "time": 1481526000000, + "username": "eturner4n", + "percent_uptime": 0.72 + }, + { + "age": 65, + "cost": 23.65, + "country": "CN", + "price": 61, + "project": "kibana", + "state": "start", + "time": 1469948400000, + "username": "kwilliamson4o", + "percent_uptime": 0.67 + }, + { + "age": 25, + "cost": 23.94, + "country": "ID", + "price": 50, + "project": "opbeat", + "state": "start", + "time": 1465801200000, + "username": "jfranklin4p", + "percent_uptime": 0.57 + }, + { + "age": 74, + "cost": 23.53, + "country": "CN", + "price": 52, + "project": "opbeat", + "state": "start", + "time": 1461481200000, + "username": "ecoleman4q", + "percent_uptime": 0.48 + }, + { + "age": 57, + "cost": 24.26, + "country": "CN", + "price": 71, + "project": "beats", + "state": "start", + "time": 1461481200000, + "username": "rray4r", + "percent_uptime": 0.17 + }, + { + "age": 67, + "cost": 21.4, + "country": "FR", + "price": 72, + "project": "opbeat", + "state": "start", + "time": 1465714800000, + "username": "mprice4s", + "percent_uptime": 0.66 + }, + { + "age": 39, + "cost": 23.47, + "country": "FR", + "price": 52, + "project": "opbeat", + "state": "done", + "time": 1486537200000, + "username": "krobertson4t", + "percent_uptime": 0.27 + }, + { + "age": 50, + "cost": 22.96, + "country": "PE", + "price": 59, + "project": "beats", + "state": "done", + "time": 1489388400000, + "username": "rwalker4u", + "percent_uptime": 0.13 + }, + { + "age": 26, + "cost": 23.99, + "country": "CN", + "price": 52, + "project": "machine-learning", + "state": "start", + "time": 1477033200000, + "username": "cdiaz4v", + "percent_uptime": 0.13 + }, + { + "age": 34, + "cost": 23.74, + "country": "US", + "price": 55, + "project": "x-pack", + "state": "start", + "time": 1474009200000, + "username": "cparker4w", + "percent_uptime": 0.06 + }, + { + "age": 38, + "cost": 23.23, + "country": "BR", + "price": 57, + "project": "elasticsearch", + "state": "done", + "time": 1489993200000, + "username": "cthompson4x", + "percent_uptime": 0.53 + }, + { + "age": 62, + "cost": 23.34, + "country": "PH", + "price": 42, + "project": "x-pack", + "state": "done", + "time": 1479711600000, + "username": "callen4y", + "percent_uptime": 0.12 + }, + { + "age": 33, + "cost": 22.24, + "country": "BR", + "price": 36, + "project": "machine-learning", + "state": "running", + "time": 1480662000000, + "username": "lbell4z", + "percent_uptime": 0.67 + }, + { + "age": 37, + "cost": 24.62, + "country": "CM", + "price": 51, + "project": "kibana", + "state": "running", + "time": 1465887600000, + "username": "hmoreno50", + "percent_uptime": 0.66 + }, + { + "age": 47, + "cost": 22.23, + "country": "PY", + "price": 53, + "project": "machine-learning", + "state": "running", + "time": 1460962800000, + "username": "jspencer51", + "percent_uptime": 0.63 + }, + { + "age": 38, + "cost": 23.38, + "country": "ID", + "price": 58, + "project": "elasticsearch", + "state": "done", + "time": 1491116400000, + "username": "bhamilton52", + "percent_uptime": 0.17 + }, + { + "age": 24, + "cost": 24.1, + "country": "CN", + "price": 58, + "project": "elasticsearch", + "state": "start", + "time": 1466492400000, + "username": "amatthews53", + "percent_uptime": 0.54 + }, + { + "age": 27, + "cost": 23.12, + "country": "ID", + "price": 68, + "project": "x-pack", + "state": "done", + "time": 1471330800000, + "username": "wjohnston54", + "percent_uptime": 0.49 + }, + { + "age": 28, + "cost": 22.07, + "country": "PL", + "price": 56, + "project": "logstash", + "state": "running", + "time": 1489302000000, + "username": "crice55", + "percent_uptime": 0.28 + }, + { + "age": 36, + "cost": 23.32, + "country": "BY", + "price": 60, + "project": "beats", + "state": "done", + "time": 1460790000000, + "username": "probinson56", + "percent_uptime": 0.45 + }, + { + "age": 44, + "cost": 24.17, + "country": "CN", + "price": 56, + "project": "kibana", + "state": "start", + "time": 1467961200000, + "username": "lmatthews57", + "percent_uptime": 0.08 + }, + { + "age": 80, + "cost": 21.56, + "country": "SE", + "price": 69, + "project": "elasticsearch", + "state": "running", + "time": 1469862000000, + "username": "scole58", + "percent_uptime": 0.71 + }, + { + "age": 50, + "cost": 23.15, + "country": "ID", + "price": 54, + "project": "beats", + "state": "done", + "time": 1491548400000, + "username": "gramirez59", + "percent_uptime": 0.76 + }, + { + "age": 18, + "cost": 23.94, + "country": "CN", + "price": 48, + "project": "opbeat", + "state": "start", + "time": 1482822000000, + "username": "jruiz5a", + "percent_uptime": 0.18 + }, + { + "age": 48, + "cost": 23.14, + "country": "ID", + "price": 54, + "project": "x-pack", + "state": "done", + "time": 1464332400000, + "username": "jramirez5b", + "percent_uptime": 0.32 + }, + { + "age": 64, + "cost": 20.38, + "country": "CZ", + "price": 63, + "project": "beats", + "state": "done", + "time": 1472281200000, + "username": "ppierce5c", + "percent_uptime": 0.64 + }, + { + "age": 45, + "cost": 23.47, + "country": "PH", + "price": 60, + "project": "elasticsearch", + "state": "done", + "time": 1465196400000, + "username": "rfranklin5d", + "percent_uptime": 0.39 + }, + { + "age": 65, + "cost": 22.87, + "country": "PH", + "price": 56, + "project": "kibana", + "state": "done", + "time": 1468306800000, + "username": "aevans5e", + "percent_uptime": 0.18 + }, + { + "age": 18, + "cost": 23.45, + "country": "BY", + "price": 71, + "project": "opbeat", + "state": "done", + "time": 1463814000000, + "username": "gday5f", + "percent_uptime": 0.51 + }, + { + "age": 42, + "cost": 23.44, + "country": "PY", + "price": 43, + "project": "logstash", + "state": "done", + "time": 1478156400000, + "username": "pwilliams5g", + "percent_uptime": 0.29 + }, + { + "age": 19, + "cost": 23.99, + "country": "MX", + "price": 53, + "project": "machine-learning", + "state": "start", + "time": 1470380400000, + "username": "mgray5h", + "percent_uptime": 0.58 + }, + { + "age": 64, + "cost": 22.94, + "country": "PL", + "price": 47, + "project": "beats", + "state": "done", + "time": 1465801200000, + "username": "mcarroll5i", + "percent_uptime": 0.31 + }, + { + "age": 49, + "cost": 24.38, + "country": "JP", + "price": 56, + "project": "logstash", + "state": "start", + "time": 1464246000000, + "username": "dmontgomery5j", + "percent_uptime": 0.4 + }, + { + "age": 71, + "cost": 23.72, + "country": "BY", + "price": 50, + "project": "beats", + "state": "start", + "time": 1484463600000, + "username": "rsims5k", + "percent_uptime": 0.1 + }, + { + "age": 38, + "cost": 22.02, + "country": "PH", + "price": 58, + "project": "elasticsearch", + "state": "running", + "time": 1469257200000, + "username": "jgreene5l", + "percent_uptime": 0.78 + }, + { + "age": 43, + "cost": 23.08, + "country": "EC", + "price": 64, + "project": "beats", + "state": "done", + "time": 1480230000000, + "username": "mmills5m", + "percent_uptime": 0.1 + }, + { + "age": 75, + "cost": 22.96, + "country": "ID", + "price": 54, + "project": "machine-learning", + "state": "done", + "time": 1472022000000, + "username": "rmoreno5n", + "percent_uptime": 0.04 + }, + { + "age": 28, + "cost": 24.37, + "country": "US", + "price": 57, + "project": "logstash", + "state": "start", + "time": 1460962800000, + "username": "kcole5o", + "percent_uptime": 0.18 + }, + { + "age": 75, + "cost": 21.92, + "country": "JP", + "price": 52, + "project": "machine-learning", + "state": "running", + "time": 1468393200000, + "username": "nwelch5p", + "percent_uptime": 0.26 + }, + { + "age": 66, + "cost": 21.96, + "country": "CN", + "price": 64, + "project": "elasticsearch", + "state": "running", + "time": 1464418800000, + "username": "gburton5q", + "percent_uptime": 0.24 + }, + { + "age": 32, + "cost": 23.14, + "country": "VE", + "price": 54, + "project": "opbeat", + "state": "done", + "time": 1485586800000, + "username": "dfisher5r", + "percent_uptime": 0.42 + }, + { + "age": 45, + "cost": 21.99, + "country": "US", + "price": 44, + "project": "elasticsearch", + "state": "running", + "time": 1485068400000, + "username": "mknight5s", + "percent_uptime": 0.35 + }, + { + "age": 23, + "cost": 22.97, + "country": "CN", + "price": 49, + "project": "kibana", + "state": "done", + "time": 1483426800000, + "username": "pgordon5t", + "percent_uptime": 0.73 + }, + { + "age": 31, + "cost": 21.85, + "country": "RU", + "price": 62, + "project": "elasticsearch", + "state": "running", + "time": 1471330800000, + "username": "bpowell5u", + "percent_uptime": 0.63 + }, + { + "age": 28, + "cost": 21.32, + "country": "CA", + "price": 58, + "project": "logstash", + "state": "start", + "time": 1487314800000, + "username": "creed5v", + "percent_uptime": 0.27 + }, + { + "age": 55, + "cost": 23.47, + "country": "CN", + "price": 59, + "project": "x-pack", + "state": "done", + "time": 1468998000000, + "username": "dgreene5w", + "percent_uptime": 0.5 + }, + { + "age": 53, + "cost": 21.72, + "country": "ID", + "price": 57, + "project": "opbeat", + "state": "running", + "time": 1482649200000, + "username": "areynolds5x", + "percent_uptime": 0.4 + }, + { + "age": 68, + "cost": 22.78, + "country": "AU", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1473750000000, + "username": "sharris5y", + "percent_uptime": 0.18 + }, + { + "age": 58, + "cost": 22.76, + "country": "LA", + "price": 56, + "project": "kibana", + "state": "done", + "time": 1474873200000, + "username": "jwatson5z", + "percent_uptime": 0.63 + }, + { + "age": 40, + "cost": 23.64, + "country": "CN", + "price": 52, + "project": "machine-learning", + "state": "start", + "time": 1490943600000, + "username": "flewis60", + "percent_uptime": 0.76 + }, + { + "age": 22, + "cost": 24.27, + "country": "CA", + "price": 44, + "project": "beats", + "state": "start", + "time": 1480402800000, + "username": "jdavis61", + "percent_uptime": 0.97 + }, + { + "age": 67, + "cost": 21.81, + "country": "ID", + "price": 48, + "project": "opbeat", + "state": "running", + "time": 1479279600000, + "username": "bmorrison62", + "percent_uptime": 0.27 + }, + { + "age": 66, + "cost": 24.82, + "country": "CN", + "price": 42, + "project": "elasticsearch", + "state": "running", + "time": 1482130800000, + "username": "wgordon63", + "percent_uptime": 0.86 + }, + { + "age": 33, + "cost": 22.6, + "country": "RU", + "price": 59, + "project": "machine-learning", + "state": "done", + "time": 1484118000000, + "username": "athompson64", + "percent_uptime": 0.09 + }, + { + "age": 28, + "cost": 22.56, + "country": "KZ", + "price": 52, + "project": "logstash", + "state": "done", + "time": 1467097200000, + "username": "bwright65", + "percent_uptime": 0.93 + }, + { + "age": 37, + "cost": 22.8, + "country": "CN", + "price": 54, + "project": "kibana", + "state": "done", + "time": 1490684400000, + "username": "jburke66", + "percent_uptime": 0.7 + }, + { + "age": 55, + "cost": 25.38, + "country": "CN", + "price": 41, + "project": "x-pack", + "state": "running", + "time": 1483081200000, + "username": "lmeyer67", + "percent_uptime": 0.44 + }, + { + "age": 47, + "cost": 22.35, + "country": "PH", + "price": 72, + "project": "machine-learning", + "state": "running", + "time": 1484031600000, + "username": "plane68", + "percent_uptime": 0.9 + }, + { + "age": 75, + "cost": 21.21, + "country": "AL", + "price": 64, + "project": "machine-learning", + "state": "start", + "time": 1478847600000, + "username": "nschmidt69", + "percent_uptime": 0.75 + }, + { + "age": 29, + "cost": 24.41, + "country": "CN", + "price": 60, + "project": "beats", + "state": "start", + "time": 1480662000000, + "username": "jdean6a", + "percent_uptime": 0.8 + }, + { + "age": 80, + "cost": 19.77, + "country": "CN", + "price": 64, + "project": "elasticsearch", + "state": "done", + "time": 1489993200000, + "username": "vvasquez6b", + "percent_uptime": 0.01 + }, + { + "age": 47, + "cost": 23.12, + "country": "CU", + "price": 53, + "project": "machine-learning", + "state": "done", + "time": 1460358000000, + "username": "jcarpenter6c", + "percent_uptime": 0.58 + }, + { + "age": 47, + "cost": 21.79, + "country": "VE", + "price": 52, + "project": "machine-learning", + "state": "running", + "time": 1471762800000, + "username": "ihowell6d", + "percent_uptime": 0.96 + }, + { + "age": 42, + "cost": 22.67, + "country": "PH", + "price": 55, + "project": "logstash", + "state": "done", + "time": 1488524400000, + "username": "lschmidt6e", + "percent_uptime": 0.68 + }, + { + "age": 78, + "cost": 22.2, + "country": "DE", + "price": 57, + "project": "beats", + "state": "running", + "time": 1475650800000, + "username": "lkennedy6f", + "percent_uptime": 0.28 + }, + { + "age": 77, + "cost": 22.19, + "country": "CN", + "price": 63, + "project": "logstash", + "state": "running", + "time": 1483945200000, + "username": "bgarza6g", + "percent_uptime": 0.86 + }, + { + "age": 38, + "cost": 23.47, + "country": "BR", + "price": 51, + "project": "elasticsearch", + "state": "done", + "time": 1477983600000, + "username": "rlewis6h", + "percent_uptime": 0.63 + }, + { + "age": 38, + "cost": 22.74, + "country": "PH", + "price": 59, + "project": "elasticsearch", + "state": "done", + "time": 1483513200000, + "username": "gwoods6i", + "percent_uptime": 0.58 + }, + { + "age": 77, + "cost": 22.8, + "country": "CN", + "price": 57, + "project": "logstash", + "state": "done", + "time": 1484031600000, + "username": "mcruz6j", + "percent_uptime": 0.98 + }, + { + "age": 23, + "cost": 22.9, + "country": "TH", + "price": 44, + "project": "kibana", + "state": "done", + "time": 1463900400000, + "username": "pthomas6k", + "percent_uptime": 0.19 + }, + { + "age": 47, + "cost": 23.4, + "country": "CA", + "price": 64, + "project": "machine-learning", + "state": "done", + "time": 1491548400000, + "username": "astanley6l", + "percent_uptime": 0.5 + }, + { + "age": 43, + "cost": 22.91, + "country": "CN", + "price": 50, + "project": "beats", + "state": "done", + "time": 1472886000000, + "username": "sharris6m", + "percent_uptime": 0.26 + }, + { + "age": 76, + "cost": 21.74, + "country": "ID", + "price": 55, + "project": "x-pack", + "state": "running", + "time": 1490943600000, + "username": "rreynolds6n", + "percent_uptime": 0.23 + }, + { + "age": 18, + "cost": 23.15, + "country": "RU", + "price": 56, + "project": "opbeat", + "state": "done", + "time": 1484550000000, + "username": "ewebb6o", + "percent_uptime": 0.2 + }, + { + "age": 50, + "cost": 23.16, + "country": "ID", + "price": 61, + "project": "beats", + "state": "done", + "time": 1461740400000, + "username": "tmorales6p", + "percent_uptime": 0.46 + }, + { + "age": 27, + "cost": 22.14, + "country": "SE", + "price": 45, + "project": "x-pack", + "state": "running", + "time": 1463727600000, + "username": "dmontgomery6q", + "percent_uptime": 0.99 + }, + { + "age": 23, + "cost": 24.03, + "country": "PS", + "price": 51, + "project": "kibana", + "state": "start", + "time": 1484031600000, + "username": "blynch6r", + "percent_uptime": 0.35 + }, + { + "age": 40, + "cost": 22.63, + "country": "CN", + "price": 70, + "project": "machine-learning", + "state": "done", + "time": 1483686000000, + "username": "fsullivan6s", + "percent_uptime": 0.42 + }, + { + "age": 80, + "cost": 25.11, + "country": "RU", + "price": 52, + "project": "elasticsearch", + "state": "running", + "time": 1476687600000, + "username": "jrobertson6t", + "percent_uptime": 0.05 + }, + { + "age": 28, + "cost": 22.92, + "country": "CN", + "price": 53, + "project": "logstash", + "state": "done", + "time": 1484031600000, + "username": "randrews6u", + "percent_uptime": 0.51 + }, + { + "age": 75, + "cost": 24.69, + "country": "AL", + "price": 46, + "project": "machine-learning", + "state": "running", + "time": 1462258800000, + "username": "pkim6v", + "percent_uptime": 0.43 + }, + { + "age": 34, + "cost": 21.66, + "country": "TH", + "price": 55, + "project": "x-pack", + "state": "running", + "time": 1490079600000, + "username": "aharris6w", + "percent_uptime": 0.15 + }, + { + "age": 78, + "cost": 20.89, + "country": "SI", + "price": 63, + "project": "beats", + "state": "start", + "time": 1485154800000, + "username": "dbarnes6x", + "percent_uptime": 0.38 + }, + { + "age": 75, + "cost": 22.08, + "country": "FR", + "price": 53, + "project": "machine-learning", + "state": "running", + "time": 1476428400000, + "username": "jhamilton6y", + "percent_uptime": 0.92 + }, + { + "age": 42, + "cost": 23.16, + "country": "CN", + "price": 50, + "project": "logstash", + "state": "done", + "time": 1473318000000, + "username": "lgibson6z", + "percent_uptime": 0.47 + }, + { + "age": 29, + "cost": 23.82, + "country": "ID", + "price": 55, + "project": "beats", + "state": "start", + "time": 1488870000000, + "username": "agordon70", + "percent_uptime": 0.27 + }, + { + "age": 27, + "cost": 23.25, + "country": "US", + "price": 40, + "project": "x-pack", + "state": "done", + "time": 1466319600000, + "username": "slewis71", + "percent_uptime": 0.78 + }, + { + "age": 67, + "cost": 23.92, + "country": "FI", + "price": 61, + "project": "opbeat", + "state": "start", + "time": 1478242800000, + "username": "slane72", + "percent_uptime": 0.09 + }, + { + "age": 69, + "cost": 24.53, + "country": "PH", + "price": 49, + "project": "x-pack", + "state": "running", + "time": 1484463600000, + "username": "rramos73", + "percent_uptime": 0.86 + }, + { + "age": 72, + "cost": 24.16, + "country": "ID", + "price": 59, + "project": "kibana", + "state": "start", + "time": 1480057200000, + "username": "dhawkins74", + "percent_uptime": 0.28 + }, + { + "age": 31, + "cost": 23.11, + "country": "CN", + "price": 64, + "project": "elasticsearch", + "state": "done", + "time": 1490598000000, + "username": "rlane75", + "percent_uptime": 0.15 + }, + { + "age": 31, + "cost": 23.41, + "country": "CN", + "price": 70, + "project": "elasticsearch", + "state": "done", + "time": 1490684400000, + "username": "pturner76", + "percent_uptime": 0.84 + }, + { + "age": 68, + "cost": 23.27, + "country": "JP", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1473404400000, + "username": "dlawrence77", + "percent_uptime": 0.61 + }, + { + "age": 19, + "cost": 23.72, + "country": "CN", + "price": 44, + "project": "machine-learning", + "state": "start", + "time": 1469084400000, + "username": "twelch78", + "percent_uptime": 0.54 + }, + { + "age": 79, + "cost": 23, + "country": "PH", + "price": 69, + "project": "kibana", + "state": "done", + "time": 1468393200000, + "username": "hwilliams79", + "percent_uptime": 0.94 + }, + { + "age": 26, + "cost": 23.19, + "country": "CN", + "price": 58, + "project": "machine-learning", + "state": "done", + "time": 1471071600000, + "username": "tbowman7a", + "percent_uptime": 0.49 + }, + { + "age": 33, + "cost": 22.87, + "country": "YE", + "price": 55, + "project": "machine-learning", + "state": "done", + "time": 1474009200000, + "username": "kwheeler7b", + "percent_uptime": 0.09 + }, + { + "age": 35, + "cost": 21.5, + "country": "KZ", + "price": 73, + "project": "logstash", + "state": "running", + "time": 1464073200000, + "username": "cgrant7c", + "percent_uptime": 0.33 + }, + { + "age": 30, + "cost": 22.25, + "country": "PS", + "price": 70, + "project": "kibana", + "state": "running", + "time": 1485154800000, + "username": "cbradley7d", + "percent_uptime": 0.53 + }, + { + "age": 37, + "cost": 25, + "country": "CN", + "price": 63, + "project": "kibana", + "state": "running", + "time": 1460876400000, + "username": "mrichardson7e", + "percent_uptime": 0.87 + }, + { + "age": 66, + "cost": 22.22, + "country": "GR", + "price": 61, + "project": "elasticsearch", + "state": "running", + "time": 1479798000000, + "username": "janderson7f", + "percent_uptime": 0.49 + }, + { + "age": 45, + "cost": 24.05, + "country": "ID", + "price": 59, + "project": "elasticsearch", + "state": "start", + "time": 1475823600000, + "username": "lgriffin7g", + "percent_uptime": 0.36 + }, + { + "age": 25, + "cost": 22.98, + "country": "ID", + "price": 48, + "project": "opbeat", + "state": "done", + "time": 1484290800000, + "username": "salvarez7h", + "percent_uptime": 0.83 + }, + { + "age": 36, + "cost": 24.01, + "country": "ID", + "price": 59, + "project": "beats", + "state": "start", + "time": 1474354800000, + "username": "pmills7i", + "percent_uptime": 0.59 + }, + { + "age": 23, + "cost": 23.07, + "country": "MU", + "price": 56, + "project": "kibana", + "state": "done", + "time": 1490598000000, + "username": "jdunn7j", + "percent_uptime": 0.46 + }, + { + "age": 68, + "cost": 23.31, + "country": "CN", + "price": 66, + "project": "machine-learning", + "state": "done", + "time": 1491462000000, + "username": "dwilson7k", + "percent_uptime": 0.72 + }, + { + "age": 78, + "cost": 21.12, + "country": "PH", + "price": 54, + "project": "beats", + "state": "start", + "time": 1467874800000, + "username": "relliott7l", + "percent_uptime": 0.32 + }, + { + "age": 64, + "cost": 22.85, + "country": "CN", + "price": 70, + "project": "beats", + "state": "done", + "time": 1462518000000, + "username": "drichardson7m", + "percent_uptime": 0.73 + }, + { + "age": 29, + "cost": 23.52, + "country": "ET", + "price": 51, + "project": "beats", + "state": "start", + "time": 1484982000000, + "username": "mrussell7n", + "percent_uptime": 0.43 + }, + { + "age": 48, + "cost": 22.43, + "country": "KM", + "price": 61, + "project": "x-pack", + "state": "running", + "time": 1482908400000, + "username": "eharris7o", + "percent_uptime": 0.7 + }, + { + "age": 59, + "cost": 21.09, + "country": "ZA", + "price": 58, + "project": "elasticsearch", + "state": "start", + "time": 1480489200000, + "username": "sbryant7p", + "percent_uptime": 0.29 + }, + { + "age": 67, + "cost": 23.3, + "country": "KG", + "price": 54, + "project": "opbeat", + "state": "done", + "time": 1466060400000, + "username": "mchavez7q", + "percent_uptime": 0.36 + }, + { + "age": 67, + "cost": 22.4, + "country": "MZ", + "price": 65, + "project": "opbeat", + "state": "running", + "time": 1462086000000, + "username": "emurray7r", + "percent_uptime": 0.29 + }, + { + "age": 47, + "cost": 21.95, + "country": "ID", + "price": 56, + "project": "machine-learning", + "state": "running", + "time": 1479798000000, + "username": "pmoore7s", + "percent_uptime": 0.98 + }, + { + "age": 77, + "cost": 24.34, + "country": "SE", + "price": 45, + "project": "logstash", + "state": "start", + "time": 1463727600000, + "username": "jdavis7t", + "percent_uptime": 0.99 + }, + { + "age": 30, + "cost": 23.66, + "country": "CN", + "price": 61, + "project": "kibana", + "state": "start", + "time": 1482822000000, + "username": "pstephens7u", + "percent_uptime": 0.64 + }, + { + "age": 74, + "cost": 22.75, + "country": "BY", + "price": 53, + "project": "opbeat", + "state": "done", + "time": 1485759600000, + "username": "cbell7v", + "percent_uptime": 0.11 + }, + { + "age": 52, + "cost": 21.84, + "country": "CN", + "price": 48, + "project": "elasticsearch", + "state": "running", + "time": 1489906800000, + "username": "agordon7w", + "percent_uptime": 0.32 + }, + { + "age": 76, + "cost": 22.54, + "country": "BR", + "price": 47, + "project": "x-pack", + "state": "done", + "time": 1480143600000, + "username": "cray7x", + "percent_uptime": 0.87 + }, + { + "age": 55, + "cost": 21.27, + "country": "PT", + "price": 46, + "project": "x-pack", + "state": "start", + "time": 1475132400000, + "username": "llong7y", + "percent_uptime": 0.57 + }, + { + "age": 64, + "cost": 22.86, + "country": "CN", + "price": 69, + "project": "beats", + "state": "done", + "time": 1461826800000, + "username": "lcoleman7z", + "percent_uptime": 0.03 + }, + { + "age": 20, + "cost": 23.15, + "country": "ID", + "price": 70, + "project": "x-pack", + "state": "done", + "time": 1466233200000, + "username": "wpalmer80", + "percent_uptime": 0.59 + }, + { + "age": 31, + "cost": 22, + "country": "ZA", + "price": 61, + "project": "elasticsearch", + "state": "running", + "time": 1473750000000, + "username": "dkim81", + "percent_uptime": 0.93 + }, + { + "age": 38, + "cost": 22.68, + "country": "PT", + "price": 50, + "project": "elasticsearch", + "state": "done", + "time": 1468911600000, + "username": "fsanders82", + "percent_uptime": 0.65 + }, + { + "age": 54, + "cost": 22.14, + "country": "UA", + "price": 61, + "project": "machine-learning", + "state": "running", + "time": 1484722800000, + "username": "jmiller83", + "percent_uptime": 0.35 + }, + { + "age": 43, + "cost": 23.1, + "country": "ZA", + "price": 56, + "project": "beats", + "state": "done", + "time": 1461481200000, + "username": "rreyes84", + "percent_uptime": 0.99 + }, + { + "age": 56, + "cost": 22.14, + "country": "MN", + "price": 48, + "project": "logstash", + "state": "running", + "time": 1466751600000, + "username": "jmills85", + "percent_uptime": 0.53 + }, + { + "age": 77, + "cost": 22.58, + "country": "CN", + "price": 57, + "project": "logstash", + "state": "done", + "time": 1474527600000, + "username": "slopez86", + "percent_uptime": 0.85 + }, + { + "age": 78, + "cost": 21.71, + "country": "CN", + "price": 54, + "project": "beats", + "state": "running", + "time": 1489561200000, + "username": "rthomas87", + "percent_uptime": 0.63 + }, + { + "age": 23, + "cost": 21.94, + "country": "FR", + "price": 73, + "project": "kibana", + "state": "running", + "time": 1475910000000, + "username": "eharris88", + "percent_uptime": 0.28 + }, + { + "age": 68, + "cost": 23.13, + "country": "PH", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1462950000000, + "username": "sjackson89", + "percent_uptime": 0.48 + }, + { + "age": 52, + "cost": 23.07, + "country": "GR", + "price": 52, + "project": "elasticsearch", + "state": "done", + "time": 1481353200000, + "username": "preynolds8a", + "percent_uptime": 0.43 + }, + { + "age": 46, + "cost": 24.87, + "country": "SE", + "price": 51, + "project": "opbeat", + "state": "running", + "time": 1465196400000, + "username": "bmorris8b", + "percent_uptime": 0.54 + }, + { + "age": 58, + "cost": 23.7, + "country": "ID", + "price": 53, + "project": "kibana", + "state": "start", + "time": 1485068400000, + "username": "rburns8c", + "percent_uptime": 0.62 + }, + { + "age": 64, + "cost": 22.76, + "country": "IR", + "price": 53, + "project": "beats", + "state": "done", + "time": 1481526000000, + "username": "jsimpson8d", + "percent_uptime": 0.45 + }, + { + "age": 29, + "cost": 24.01, + "country": "PH", + "price": 61, + "project": "beats", + "state": "start", + "time": 1476946800000, + "username": "dcarter8e", + "percent_uptime": 0.25 + }, + { + "age": 42, + "cost": 23.06, + "country": "CN", + "price": 57, + "project": "logstash", + "state": "done", + "time": 1489561200000, + "username": "jfisher8f", + "percent_uptime": 0.52 + }, + { + "age": 60, + "cost": 23.29, + "country": "RU", + "price": 49, + "project": "opbeat", + "state": "done", + "time": 1461740400000, + "username": "kramirez8g", + "percent_uptime": 0.78 + }, + { + "age": 77, + "cost": 23.35, + "country": "BR", + "price": 53, + "project": "logstash", + "state": "done", + "time": 1479279600000, + "username": "jowens8h", + "percent_uptime": 0.31 + }, + { + "age": 55, + "cost": 22.16, + "country": "PT", + "price": 58, + "project": "x-pack", + "state": "running", + "time": 1461567600000, + "username": "gweaver8i", + "percent_uptime": 0.01 + }, + { + "age": 70, + "cost": 21.65, + "country": "JM", + "price": 57, + "project": "logstash", + "state": "running", + "time": 1481958000000, + "username": "jharrison8j", + "percent_uptime": 0.87 + }, + { + "age": 76, + "cost": 22.98, + "country": "HN", + "price": 51, + "project": "x-pack", + "state": "done", + "time": 1466492400000, + "username": "chenderson8k", + "percent_uptime": 0.47 + }, + { + "age": 63, + "cost": 24.31, + "country": "PH", + "price": 61, + "project": "logstash", + "state": "start", + "time": 1472886000000, + "username": "lreynolds8l", + "percent_uptime": 0.78 + }, + { + "age": 18, + "cost": 23.62, + "country": "MA", + "price": 82, + "project": "opbeat", + "state": "start", + "time": 1474095600000, + "username": "ljacobs8m", + "percent_uptime": 0.09 + }, + { + "age": 34, + "cost": 24.18, + "country": "CN", + "price": 57, + "project": "x-pack", + "state": "start", + "time": 1476082800000, + "username": "pwheeler8n", + "percent_uptime": 0.45 + }, + { + "age": 50, + "cost": 22.96, + "country": "JP", + "price": 61, + "project": "beats", + "state": "done", + "time": 1480834800000, + "username": "lbrown8o", + "percent_uptime": 0.9 + }, + { + "age": 49, + "cost": 22.47, + "country": "FI", + "price": 49, + "project": "logstash", + "state": "running", + "time": 1463295600000, + "username": "jgibson8p", + "percent_uptime": 0.48 + }, + { + "age": 36, + "cost": 23.41, + "country": "MN", + "price": 60, + "project": "beats", + "state": "done", + "time": 1472626800000, + "username": "jfernandez8q", + "percent_uptime": 0.26 + }, + { + "age": 36, + "cost": 23.26, + "country": "GH", + "price": 55, + "project": "beats", + "state": "done", + "time": 1469602800000, + "username": "swatkins8r", + "percent_uptime": 0.04 + }, + { + "age": 33, + "cost": 22.15, + "country": "CN", + "price": 52, + "project": "machine-learning", + "state": "running", + "time": 1472972400000, + "username": "kalvarez8s", + "percent_uptime": 0.29 + }, + { + "age": 69, + "cost": 21, + "country": "FR", + "price": 65, + "project": "x-pack", + "state": "start", + "time": 1470639600000, + "username": "jwarren8t", + "percent_uptime": 0.94 + }, + { + "age": 68, + "cost": 23.57, + "country": "MN", + "price": 51, + "project": "machine-learning", + "state": "start", + "time": 1466838000000, + "username": "mwallace8u", + "percent_uptime": 0.6 + }, + { + "age": 31, + "cost": 23.94, + "country": "US", + "price": 54, + "project": "elasticsearch", + "state": "start", + "time": 1475996400000, + "username": "jmarshall8v", + "percent_uptime": 0.54 + }, + { + "age": 73, + "cost": 24.4, + "country": "RU", + "price": 52, + "project": "elasticsearch", + "state": "start", + "time": 1462431600000, + "username": "aellis8w", + "percent_uptime": 0.72 + }, + { + "age": 25, + "cost": 22.34, + "country": "PH", + "price": 68, + "project": "opbeat", + "state": "running", + "time": 1468047600000, + "username": "clopez8x", + "percent_uptime": 0.5 + }, + { + "age": 35, + "cost": 21.65, + "country": "CA", + "price": 63, + "project": "logstash", + "state": "running", + "time": 1474268400000, + "username": "astewart8y", + "percent_uptime": 0.35 + }, + { + "age": 34, + "cost": 22.75, + "country": "PL", + "price": 71, + "project": "x-pack", + "state": "done", + "time": 1469516400000, + "username": "hlewis8z", + "percent_uptime": 0.05 + }, + { + "age": 56, + "cost": 22.22, + "country": "MN", + "price": 54, + "project": "logstash", + "state": "running", + "time": 1480057200000, + "username": "wwheeler90", + "percent_uptime": 0.36 + }, + { + "age": 52, + "cost": 22.04, + "country": "AR", + "price": 49, + "project": "elasticsearch", + "state": "running", + "time": 1490338800000, + "username": "aelliott91", + "percent_uptime": 0.23 + }, + { + "age": 61, + "cost": 21.27, + "country": "PH", + "price": 55, + "project": "machine-learning", + "state": "start", + "time": 1485241200000, + "username": "khunter92", + "percent_uptime": 0.35 + }, + { + "age": 23, + "cost": 24.3, + "country": "PL", + "price": 59, + "project": "kibana", + "state": "start", + "time": 1477983600000, + "username": "treed93", + "percent_uptime": 0.17 + }, + { + "age": 54, + "cost": 23.5, + "country": "UA", + "price": 60, + "project": "machine-learning", + "state": "start", + "time": 1471590000000, + "username": "jperez94", + "percent_uptime": 0.63 + }, + { + "age": 80, + "cost": 22.4, + "country": "CN", + "price": 57, + "project": "elasticsearch", + "state": "running", + "time": 1468825200000, + "username": "tfowler95", + "percent_uptime": 0.78 + }, + { + "age": 80, + "cost": 20.93, + "country": "VE", + "price": 49, + "project": "elasticsearch", + "state": "start", + "time": 1474614000000, + "username": "brichardson96", + "percent_uptime": 0.55 + }, + { + "age": 59, + "cost": 23.28, + "country": "PT", + "price": 51, + "project": "elasticsearch", + "state": "done", + "time": 1488956400000, + "username": "kthomas97", + "percent_uptime": 0.61 + }, + { + "age": 49, + "cost": 23.26, + "country": "CA", + "price": 54, + "project": "logstash", + "state": "done", + "time": 1487487600000, + "username": "smason98", + "percent_uptime": 0.57 + }, + { + "age": 75, + "cost": 21.54, + "country": "ID", + "price": 59, + "project": "machine-learning", + "state": "running", + "time": 1472886000000, + "username": "aphillips99", + "percent_uptime": 0.55 + }, + { + "age": 40, + "cost": 23.23, + "country": "ID", + "price": 54, + "project": "machine-learning", + "state": "done", + "time": 1488006000000, + "username": "jlawrence9a", + "percent_uptime": 0.48 + }, + { + "age": 58, + "cost": 22.96, + "country": "TZ", + "price": 56, + "project": "kibana", + "state": "done", + "time": 1463036400000, + "username": "rcunningham9b", + "percent_uptime": 0.19 + }, + { + "age": 61, + "cost": 22.6, + "country": "PL", + "price": 64, + "project": "machine-learning", + "state": "done", + "time": 1476169200000, + "username": "aaustin9c", + "percent_uptime": 0.21 + }, + { + "age": 68, + "cost": 22.62, + "country": "GT", + "price": 59, + "project": "machine-learning", + "state": "done", + "time": 1464159600000, + "username": "pthompson9d", + "percent_uptime": 0.99 + }, + { + "age": 59, + "cost": 23.35, + "country": "GR", + "price": 52, + "project": "elasticsearch", + "state": "done", + "time": 1490511600000, + "username": "lscott9e", + "percent_uptime": 0.71 + }, + { + "age": 40, + "cost": 24.08, + "country": "LA", + "price": 50, + "project": "machine-learning", + "state": "start", + "time": 1471935600000, + "username": "emartinez9f", + "percent_uptime": 0.28 + }, + { + "age": 42, + "cost": 22.75, + "country": "HR", + "price": 70, + "project": "logstash", + "state": "done", + "time": 1462431600000, + "username": "kbanks9g", + "percent_uptime": 0.34 + }, + { + "age": 36, + "cost": 21.85, + "country": "BR", + "price": 45, + "project": "beats", + "state": "running", + "time": 1483599600000, + "username": "njames9h", + "percent_uptime": 0.34 + }, + { + "age": 31, + "cost": 23.26, + "country": "MX", + "price": 51, + "project": "elasticsearch", + "state": "done", + "time": 1463468400000, + "username": "cjordan9i", + "percent_uptime": 0.3 + }, + { + "age": 74, + "cost": 22.49, + "country": "BR", + "price": 53, + "project": "opbeat", + "state": "running", + "time": 1472626800000, + "username": "thowell9j", + "percent_uptime": 0.19 + }, + { + "age": 71, + "cost": 23.16, + "country": "ID", + "price": 47, + "project": "beats", + "state": "done", + "time": 1465714800000, + "username": "aramirez9k", + "percent_uptime": 0.19 + }, + { + "age": 19, + "cost": 21.01, + "country": "VE", + "price": 63, + "project": "machine-learning", + "state": "start", + "time": 1489129200000, + "username": "cgreen9l", + "percent_uptime": 0.47 + }, + { + "age": 41, + "cost": 23.07, + "country": "FR", + "price": 56, + "project": "x-pack", + "state": "done", + "time": 1463209200000, + "username": "fgardner9m", + "percent_uptime": 0.19 + }, + { + "age": 70, + "cost": 21.69, + "country": "UA", + "price": 65, + "project": "logstash", + "state": "running", + "time": 1474614000000, + "username": "bbennett9n", + "percent_uptime": 0.85 + }, + { + "age": 27, + "cost": 21.84, + "country": "SR", + "price": 65, + "project": "x-pack", + "state": "running", + "time": 1464591600000, + "username": "nferguson9o", + "percent_uptime": 0.98 + }, + { + "age": 27, + "cost": 22.63, + "country": "MX", + "price": 53, + "project": "x-pack", + "state": "done", + "time": 1481958000000, + "username": "rpatterson9p", + "percent_uptime": 0.7 + }, + { + "age": 71, + "cost": 23.16, + "country": "CN", + "price": 54, + "project": "beats", + "state": "done", + "time": 1469084400000, + "username": "twright9q", + "percent_uptime": 0.34 + }, + { + "age": 70, + "cost": 23.34, + "country": "PL", + "price": 49, + "project": "logstash", + "state": "done", + "time": 1482649200000, + "username": "hhughes9r", + "percent_uptime": 0.85 + }, + { + "age": 60, + "cost": 22.06, + "country": "MX", + "price": 59, + "project": "opbeat", + "state": "running", + "time": 1460617200000, + "username": "rjenkins9s", + "percent_uptime": 0.44 + }, + { + "age": 31, + "cost": 23.14, + "country": "BR", + "price": 59, + "project": "elasticsearch", + "state": "done", + "time": 1480662000000, + "username": "areynolds9t", + "percent_uptime": 0.82 + }, + { + "age": 75, + "cost": 23.13, + "country": "RU", + "price": 50, + "project": "machine-learning", + "state": "done", + "time": 1473318000000, + "username": "agordon9u", + "percent_uptime": 0.53 + }, + { + "age": 43, + "cost": 23.58, + "country": "CN", + "price": 52, + "project": "beats", + "state": "start", + "time": 1480057200000, + "username": "bmorris9v", + "percent_uptime": 0.79 + }, + { + "age": 55, + "cost": 23.86, + "country": "CN", + "price": 57, + "project": "x-pack", + "state": "start", + "time": 1469602800000, + "username": "hriley9w", + "percent_uptime": 0.6 + }, + { + "age": 48, + "cost": 23.28, + "country": "PH", + "price": 55, + "project": "x-pack", + "state": "done", + "time": 1465369200000, + "username": "psmith9x", + "percent_uptime": 0.9 + }, + { + "age": 36, + "cost": 23.87, + "country": "CA", + "price": 70, + "project": "beats", + "state": "start", + "time": 1466751600000, + "username": "dwilson9y", + "percent_uptime": 0.75 + }, + { + "age": 46, + "cost": 22.45, + "country": "RU", + "price": 53, + "project": "opbeat", + "state": "running", + "time": 1482822000000, + "username": "rsanders9z", + "percent_uptime": 0.51 + }, + { + "age": 61, + "cost": 23.43, + "country": "CN", + "price": 66, + "project": "machine-learning", + "state": "done", + "time": 1480143600000, + "username": "hharta0", + "percent_uptime": 0.74 + }, + { + "age": 51, + "cost": 23.73, + "country": "US", + "price": 56, + "project": "kibana", + "state": "start", + "time": 1468738800000, + "username": "jsullivana1", + "percent_uptime": 0.48 + }, + { + "age": 69, + "cost": 22.33, + "country": "ES", + "price": 55, + "project": "x-pack", + "state": "running", + "time": 1462258800000, + "username": "jrobertsona2", + "percent_uptime": 0.08 + }, + { + "age": 69, + "cost": 22.83, + "country": "CN", + "price": 57, + "project": "x-pack", + "state": "done", + "time": 1485759600000, + "username": "jkennedya3", + "percent_uptime": 0.65 + }, + { + "age": 32, + "cost": 21.46, + "country": "AR", + "price": 59, + "project": "opbeat", + "state": "start", + "time": 1466406000000, + "username": "crobertsa4", + "percent_uptime": 0.59 + }, + { + "age": 32, + "cost": 21.75, + "country": "NA", + "price": 49, + "project": "opbeat", + "state": "running", + "time": 1483945200000, + "username": "jcolea5", + "percent_uptime": 0.87 + }, + { + "age": 74, + "cost": 22.56, + "country": "PL", + "price": 55, + "project": "opbeat", + "state": "done", + "time": 1468825200000, + "username": "llonga6", + "percent_uptime": 0.39 + }, + { + "age": 70, + "cost": 23.63, + "country": "ID", + "price": 64, + "project": "logstash", + "state": "start", + "time": 1460530800000, + "username": "sgraya7", + "percent_uptime": 0 + }, + { + "age": 48, + "cost": 22.04, + "country": "AL", + "price": 49, + "project": "x-pack", + "state": "running", + "time": 1468306800000, + "username": "jgeorgea8", + "percent_uptime": 0.02 + }, + { + "age": 61, + "cost": 24.58, + "country": "SS", + "price": 59, + "project": "machine-learning", + "state": "running", + "time": 1486364400000, + "username": "ablacka9", + "percent_uptime": 0.55 + }, + { + "age": 27, + "cost": 23.69, + "country": "RU", + "price": 54, + "project": "x-pack", + "state": "start", + "time": 1461999600000, + "username": "jrileyaa", + "percent_uptime": 0.44 + }, + { + "age": 35, + "cost": 24.23, + "country": "CN", + "price": 62, + "project": "logstash", + "state": "start", + "time": 1466924400000, + "username": "jwalkerab", + "percent_uptime": 0.24 + }, + { + "age": 26, + "cost": 23.34, + "country": "PL", + "price": 58, + "project": "machine-learning", + "state": "done", + "time": 1486710000000, + "username": "vrussellac", + "percent_uptime": 0.7 + }, + { + "age": 27, + "cost": 22.1, + "country": "ID", + "price": 56, + "project": "x-pack", + "state": "running", + "time": 1478761200000, + "username": "acooperad", + "percent_uptime": 0.54 + }, + { + "age": 29, + "cost": 24.27, + "country": "MD", + "price": 55, + "project": "beats", + "state": "start", + "time": 1471244400000, + "username": "rhansonae", + "percent_uptime": 0.04 + }, + { + "age": 55, + "cost": 23.33, + "country": "SE", + "price": 60, + "project": "x-pack", + "state": "done", + "time": 1461826800000, + "username": "wmooreaf", + "percent_uptime": 0.64 + }, + { + "age": 33, + "cost": 23.42, + "country": "CO", + "price": 54, + "project": "machine-learning", + "state": "done", + "time": 1463986800000, + "username": "hmccoyag", + "percent_uptime": 0.28 + }, + { + "age": 75, + "cost": 24.45, + "country": "HR", + "price": 40, + "project": "machine-learning", + "state": "start", + "time": 1491462000000, + "username": "cbarnesah", + "percent_uptime": 0.22 + }, + { + "age": 60, + "cost": 22.59, + "country": "PT", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1469430000000, + "username": "jharrisai", + "percent_uptime": 0.9 + }, + { + "age": 58, + "cost": 21.94, + "country": "CN", + "price": 64, + "project": "kibana", + "state": "running", + "time": 1474441200000, + "username": "swardaj", + "percent_uptime": 0.03 + }, + { + "age": 51, + "cost": 20.57, + "country": "CN", + "price": 65, + "project": "kibana", + "state": "start", + "time": 1482217200000, + "username": "jhuntak", + "percent_uptime": 0.65 + }, + { + "age": 36, + "cost": 21.7, + "country": "CN", + "price": 52, + "project": "beats", + "state": "running", + "time": 1461481200000, + "username": "gmartinezal", + "percent_uptime": 0.81 + }, + { + "age": 19, + "cost": 22.56, + "country": "PA", + "price": 46, + "project": "machine-learning", + "state": "done", + "time": 1484463600000, + "username": "sturneram", + "percent_uptime": 0.72 + }, + { + "age": 40, + "cost": 23.12, + "country": "RU", + "price": 65, + "project": "machine-learning", + "state": "done", + "time": 1486537200000, + "username": "jortizan", + "percent_uptime": 0.39 + }, + { + "age": 73, + "cost": 22.32, + "country": "SI", + "price": 49, + "project": "elasticsearch", + "state": "running", + "time": 1467356400000, + "username": "gwatsonao", + "percent_uptime": 0.24 + }, + { + "age": 38, + "cost": 23.42, + "country": "UA", + "price": 56, + "project": "elasticsearch", + "state": "done", + "time": 1482476400000, + "username": "ckingap", + "percent_uptime": 0.99 + }, + { + "age": 32, + "cost": 23.07, + "country": "NO", + "price": 66, + "project": "opbeat", + "state": "done", + "time": 1488956400000, + "username": "nfreemanaq", + "percent_uptime": 0.71 + }, + { + "age": 21, + "cost": 21.13, + "country": "UY", + "price": 66, + "project": "logstash", + "state": "start", + "time": 1473058800000, + "username": "vandrewsar", + "percent_uptime": 0.98 + }, + { + "age": 46, + "cost": 24.48, + "country": "PH", + "price": 68, + "project": "opbeat", + "state": "start", + "time": 1472540400000, + "username": "jgonzalezas", + "percent_uptime": 0.75 + }, + { + "age": 72, + "cost": 23.11, + "country": "CI", + "price": 61, + "project": "kibana", + "state": "done", + "time": 1481180400000, + "username": "vkingat", + "percent_uptime": 0.97 + }, + { + "age": 75, + "cost": 22.27, + "country": "GH", + "price": 43, + "project": "machine-learning", + "state": "running", + "time": 1468047600000, + "username": "rdeanau", + "percent_uptime": 0.1 + }, + { + "age": 29, + "cost": 22.41, + "country": "ID", + "price": 63, + "project": "beats", + "state": "running", + "time": 1481526000000, + "username": "hfosterav", + "percent_uptime": 0.19 + }, + { + "age": 75, + "cost": 21.44, + "country": "SE", + "price": 63, + "project": "machine-learning", + "state": "start", + "time": 1475564400000, + "username": "fgarciaaw", + "percent_uptime": 0.95 + }, + { + "age": 44, + "cost": 23.87, + "country": "PH", + "price": 62, + "project": "kibana", + "state": "start", + "time": 1464937200000, + "username": "pwhiteax", + "percent_uptime": 0.29 + }, + { + "age": 53, + "cost": 22.79, + "country": "CN", + "price": 47, + "project": "opbeat", + "state": "done", + "time": 1491116400000, + "username": "chuntay", + "percent_uptime": 0.14 + }, + { + "age": 47, + "cost": 22.86, + "country": "CN", + "price": 60, + "project": "machine-learning", + "state": "done", + "time": 1478588400000, + "username": "dfranklinaz", + "percent_uptime": 0.16 + }, + { + "age": 71, + "cost": 24, + "country": "CZ", + "price": 64, + "project": "beats", + "state": "start", + "time": 1480230000000, + "username": "djacksonb0", + "percent_uptime": 0.35 + }, + { + "age": 44, + "cost": 21.93, + "country": "RU", + "price": 67, + "project": "kibana", + "state": "running", + "time": 1460358000000, + "username": "sbutlerb1", + "percent_uptime": 0.21 + }, + { + "age": 32, + "cost": 23.24, + "country": "GR", + "price": 41, + "project": "opbeat", + "state": "done", + "time": 1460962800000, + "username": "nporterb2", + "percent_uptime": 0.16 + }, + { + "age": 55, + "cost": 22.31, + "country": "RU", + "price": 65, + "project": "x-pack", + "state": "running", + "time": 1483167600000, + "username": "sburnsb3", + "percent_uptime": 0.08 + }, + { + "age": 59, + "cost": 23.16, + "country": "JP", + "price": 56, + "project": "elasticsearch", + "state": "done", + "time": 1468911600000, + "username": "jhendersonb4", + "percent_uptime": 0.62 + }, + { + "age": 73, + "cost": 22.79, + "country": "FR", + "price": 63, + "project": "elasticsearch", + "state": "done", + "time": 1479020400000, + "username": "dgonzalesb5", + "percent_uptime": 0.99 + }, + { + "age": 41, + "cost": 24.15, + "country": "ID", + "price": 64, + "project": "x-pack", + "state": "start", + "time": 1478674800000, + "username": "cbarnesb6", + "percent_uptime": 0.26 + }, + { + "age": 25, + "cost": 20.11, + "country": "ID", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1468652400000, + "username": "mcoxb7", + "percent_uptime": 0.19 + }, + { + "age": 74, + "cost": 24.27, + "country": "CN", + "price": 52, + "project": "opbeat", + "state": "start", + "time": 1478329200000, + "username": "rbowmanb8", + "percent_uptime": 0.4 + }, + { + "age": 43, + "cost": 23.9, + "country": "PE", + "price": 51, + "project": "beats", + "state": "start", + "time": 1472972400000, + "username": "dkingb9", + "percent_uptime": 0.85 + }, + { + "age": 33, + "cost": 21.86, + "country": "CN", + "price": 56, + "project": "machine-learning", + "state": "running", + "time": 1470898800000, + "username": "dwilliamsonba", + "percent_uptime": 0.48 + }, + { + "age": 32, + "cost": 21.96, + "country": "BR", + "price": 51, + "project": "opbeat", + "state": "running", + "time": 1479452400000, + "username": "jmorrisonbb", + "percent_uptime": 0.44 + }, + { + "age": 39, + "cost": 22.6, + "country": "PE", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1467529200000, + "username": "dcastillobc", + "percent_uptime": 0.46 + }, + { + "age": 30, + "cost": 22.08, + "country": "CN", + "price": 47, + "project": "kibana", + "state": "running", + "time": 1482822000000, + "username": "rgriffinbd", + "percent_uptime": 0.94 + }, + { + "age": 79, + "cost": 21.6, + "country": "VN", + "price": 49, + "project": "kibana", + "state": "running", + "time": 1479193200000, + "username": "ascottbe", + "percent_uptime": 0.33 + }, + { + "age": 71, + "cost": 21.06, + "country": "TH", + "price": 57, + "project": "beats", + "state": "start", + "time": 1475132400000, + "username": "dlynchbf", + "percent_uptime": 0.66 + }, + { + "age": 49, + "cost": 22.18, + "country": "ID", + "price": 54, + "project": "logstash", + "state": "running", + "time": 1471158000000, + "username": "epetersbg", + "percent_uptime": 0.55 + }, + { + "age": 53, + "cost": 22.57, + "country": "LU", + "price": 57, + "project": "opbeat", + "state": "done", + "time": 1477897200000, + "username": "agonzalezbh", + "percent_uptime": 0.24 + }, + { + "age": 23, + "cost": 24.78, + "country": "CN", + "price": 64, + "project": "kibana", + "state": "running", + "time": 1463814000000, + "username": "kcookbi", + "percent_uptime": 0.96 + }, + { + "age": 74, + "cost": 21.34, + "country": "WS", + "price": 47, + "project": "opbeat", + "state": "start", + "time": 1491548400000, + "username": "rjacksonbj", + "percent_uptime": 0.13 + }, + { + "age": 35, + "cost": 23.38, + "country": "RU", + "price": 50, + "project": "logstash", + "state": "done", + "time": 1475391600000, + "username": "cwellsbk", + "percent_uptime": 0.86 + }, + { + "age": 22, + "cost": 25.07, + "country": "PH", + "price": 59, + "project": "beats", + "state": "running", + "time": 1480748400000, + "username": "rgarzabl", + "percent_uptime": 0.42 + }, + { + "age": 37, + "cost": 23.48, + "country": "DK", + "price": 53, + "project": "kibana", + "state": "done", + "time": 1462431600000, + "username": "rramirezbm", + "percent_uptime": 0.8 + }, + { + "age": 66, + "cost": 24.11, + "country": "ID", + "price": 60, + "project": "elasticsearch", + "state": "start", + "time": 1489388400000, + "username": "jperezbn", + "percent_uptime": 0.56 + }, + { + "age": 33, + "cost": 22.4, + "country": "PL", + "price": 54, + "project": "machine-learning", + "state": "running", + "time": 1468998000000, + "username": "kricebo", + "percent_uptime": 0.48 + }, + { + "age": 23, + "cost": 24.47, + "country": "ID", + "price": 73, + "project": "kibana", + "state": "start", + "time": 1487833200000, + "username": "smoorebp", + "percent_uptime": 0.72 + }, + { + "age": 60, + "cost": 25.35, + "country": "PL", + "price": 57, + "project": "opbeat", + "state": "running", + "time": 1478242800000, + "username": "pwhitebq", + "percent_uptime": 0.77 + }, + { + "age": 75, + "cost": 22.58, + "country": "CN", + "price": 42, + "project": "machine-learning", + "state": "done", + "time": 1483340400000, + "username": "tleebr", + "percent_uptime": 0.1 + }, + { + "age": 18, + "cost": 23.18, + "country": "UG", + "price": 53, + "project": "opbeat", + "state": "done", + "time": 1467356400000, + "username": "bfrazierbs", + "percent_uptime": 0.71 + }, + { + "age": 57, + "cost": 23.39, + "country": "RU", + "price": 51, + "project": "beats", + "state": "done", + "time": 1482217200000, + "username": "salvarezbt", + "percent_uptime": 0.75 + }, + { + "age": 23, + "cost": 23.31, + "country": "CN", + "price": 45, + "project": "kibana", + "state": "done", + "time": 1490770800000, + "username": "bgonzalezbu", + "percent_uptime": 0.32 + }, + { + "age": 65, + "cost": 22.43, + "country": "CZ", + "price": 52, + "project": "kibana", + "state": "running", + "time": 1479711600000, + "username": "kdavisbv", + "percent_uptime": 0.83 + }, + { + "age": 31, + "cost": 23.73, + "country": "NI", + "price": 51, + "project": "elasticsearch", + "state": "start", + "time": 1485241200000, + "username": "jburtonbw", + "percent_uptime": 0.27 + }, + { + "age": 50, + "cost": 22.05, + "country": "KM", + "price": 57, + "project": "beats", + "state": "running", + "time": 1482476400000, + "username": "dgutierrezbx", + "percent_uptime": 0.66 + }, + { + "age": 47, + "cost": 22.76, + "country": "BR", + "price": 39, + "project": "machine-learning", + "state": "done", + "time": 1461567600000, + "username": "akelleyby", + "percent_uptime": 0.23 + }, + { + "age": 31, + "cost": 22.57, + "country": "DK", + "price": 48, + "project": "elasticsearch", + "state": "done", + "time": 1488438000000, + "username": "grobertsbz", + "percent_uptime": 0.43 + }, + { + "age": 21, + "cost": 23.62, + "country": "CN", + "price": 65, + "project": "logstash", + "state": "start", + "time": 1487142000000, + "username": "aweaverc0", + "percent_uptime": 0.41 + }, + { + "age": 50, + "cost": 23.85, + "country": "SE", + "price": 51, + "project": "beats", + "state": "start", + "time": 1491202800000, + "username": "charrisonc1", + "percent_uptime": 0.81 + }, + { + "age": 38, + "cost": 23.17, + "country": "PL", + "price": 52, + "project": "elasticsearch", + "state": "done", + "time": 1461826800000, + "username": "jlewisc2", + "percent_uptime": 0.23 + }, + { + "age": 47, + "cost": 22.21, + "country": "JP", + "price": 47, + "project": "machine-learning", + "state": "running", + "time": 1487487600000, + "username": "schavezc3", + "percent_uptime": 0.9 + }, + { + "age": 42, + "cost": 22.45, + "country": "BR", + "price": 56, + "project": "logstash", + "state": "running", + "time": 1462518000000, + "username": "acoxc4", + "percent_uptime": 0.36 + }, + { + "age": 52, + "cost": 21.66, + "country": "NG", + "price": 58, + "project": "elasticsearch", + "state": "running", + "time": 1470380400000, + "username": "jsanchezc5", + "percent_uptime": 0.51 + }, + { + "age": 79, + "cost": 23.36, + "country": "RU", + "price": 59, + "project": "kibana", + "state": "done", + "time": 1469343600000, + "username": "gpricec6", + "percent_uptime": 0.37 + }, + { + "age": 60, + "cost": 22.5, + "country": "CN", + "price": 51, + "project": "opbeat", + "state": "done", + "time": 1466492400000, + "username": "tgarrettc7", + "percent_uptime": 0.85 + }, + { + "age": 30, + "cost": 22.33, + "country": "RU", + "price": 53, + "project": "kibana", + "state": "running", + "time": 1464073200000, + "username": "llawrencec8", + "percent_uptime": 0.42 + }, + { + "age": 60, + "cost": 22.6, + "country": "RU", + "price": 47, + "project": "opbeat", + "state": "done", + "time": 1472540400000, + "username": "mgordonc9", + "percent_uptime": 0.37 + }, + { + "age": 36, + "cost": 23.62, + "country": "PL", + "price": 65, + "project": "beats", + "state": "start", + "time": 1486710000000, + "username": "jmendozaca", + "percent_uptime": 0.9 + }, + { + "age": 69, + "cost": 23.58, + "country": "CN", + "price": 58, + "project": "x-pack", + "state": "start", + "time": 1490857200000, + "username": "dsnydercb", + "percent_uptime": 0.97 + }, + { + "age": 20, + "cost": 22.55, + "country": "RU", + "price": 66, + "project": "x-pack", + "state": "done", + "time": 1473663600000, + "username": "pclarkcc", + "percent_uptime": 0.46 + }, + { + "age": 69, + "cost": 23.92, + "country": "PH", + "price": 60, + "project": "x-pack", + "state": "start", + "time": 1483426800000, + "username": "bkennedycd", + "percent_uptime": 0.22 + }, + { + "age": 73, + "cost": 23.46, + "country": "PH", + "price": 59, + "project": "elasticsearch", + "state": "done", + "time": 1476255600000, + "username": "gwalkerce", + "percent_uptime": 0.08 + }, + { + "age": 28, + "cost": 25.75, + "country": "ID", + "price": 50, + "project": "logstash", + "state": "done", + "time": 1475737200000, + "username": "bruizcf", + "percent_uptime": 0.2 + }, + { + "age": 21, + "cost": 22.5, + "country": "CN", + "price": 44, + "project": "logstash", + "state": "done", + "time": 1465196400000, + "username": "aflorescg", + "percent_uptime": 0.78 + }, + { + "age": 70, + "cost": 20.85, + "country": "MX", + "price": 47, + "project": "logstash", + "state": "start", + "time": 1472108400000, + "username": "eberrych", + "percent_uptime": 0.65 + }, + { + "age": 79, + "cost": 22.12, + "country": "SO", + "price": 57, + "project": "kibana", + "state": "running", + "time": 1486364400000, + "username": "ahudsonci", + "percent_uptime": 0.78 + }, + { + "age": 38, + "cost": 23.02, + "country": "ID", + "price": 50, + "project": "elasticsearch", + "state": "done", + "time": 1487660400000, + "username": "khawkinscj", + "percent_uptime": 0.6 + }, + { + "age": 38, + "cost": 23.25, + "country": "RU", + "price": 47, + "project": "elasticsearch", + "state": "done", + "time": 1486969200000, + "username": "mwagnerck", + "percent_uptime": 0.95 + }, + { + "age": 64, + "cost": 22.15, + "country": "CN", + "price": 57, + "project": "beats", + "state": "running", + "time": 1481353200000, + "username": "kbradleycl", + "percent_uptime": 0.87 + }, + { + "age": 36, + "cost": 24.74, + "country": "CN", + "price": 52, + "project": "beats", + "state": "running", + "time": 1468134000000, + "username": "ejenkinscm", + "percent_uptime": 0.59 + }, + { + "age": 19, + "cost": 22.69, + "country": "ZM", + "price": 59, + "project": "machine-learning", + "state": "done", + "time": 1476601200000, + "username": "cruizcn", + "percent_uptime": 0.32 + }, + { + "age": 53, + "cost": 25.07, + "country": "BR", + "price": 43, + "project": "opbeat", + "state": "running", + "time": 1487487600000, + "username": "ljamesco", + "percent_uptime": 0.43 + }, + { + "age": 26, + "cost": 23.43, + "country": "AE", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1470121200000, + "username": "kcarrollcp", + "percent_uptime": 0.06 + }, + { + "age": 44, + "cost": 21.62, + "country": "US", + "price": 69, + "project": "kibana", + "state": "running", + "time": 1470034800000, + "username": "mbryantcq", + "percent_uptime": 0.52 + }, + { + "age": 40, + "cost": 24.76, + "country": "DE", + "price": 40, + "project": "machine-learning", + "state": "running", + "time": 1490770800000, + "username": "jcrawfordcr", + "percent_uptime": 0.67 + }, + { + "age": 23, + "cost": 24.06, + "country": "JP", + "price": 67, + "project": "kibana", + "state": "start", + "time": 1472281200000, + "username": "bsimscs", + "percent_uptime": 0.85 + }, + { + "age": 23, + "cost": 22.84, + "country": "ID", + "price": 50, + "project": "kibana", + "state": "done", + "time": 1474268400000, + "username": "bphillipsct", + "percent_uptime": 0.8 + }, + { + "age": 79, + "cost": 22.51, + "country": "ID", + "price": 71, + "project": "kibana", + "state": "done", + "time": 1482562800000, + "username": "jortizcu", + "percent_uptime": 0.41 + }, + { + "age": 26, + "cost": 22.11, + "country": "ID", + "price": 57, + "project": "machine-learning", + "state": "running", + "time": 1471503600000, + "username": "dmartinezcv", + "percent_uptime": 0.95 + }, + { + "age": 61, + "cost": 21.3, + "country": "BR", + "price": 61, + "project": "machine-learning", + "state": "start", + "time": 1465455600000, + "username": "mgordoncw", + "percent_uptime": 0.2 + }, + { + "age": 68, + "cost": 23.92, + "country": "CN", + "price": 49, + "project": "machine-learning", + "state": "start", + "time": 1488092400000, + "username": "amasoncx", + "percent_uptime": 0.58 + }, + { + "age": 26, + "cost": 24.56, + "country": "UG", + "price": 66, + "project": "machine-learning", + "state": "running", + "time": 1462086000000, + "username": "whowellcy", + "percent_uptime": 0.3 + }, + { + "age": 67, + "cost": 24.98, + "country": "MY", + "price": 45, + "project": "opbeat", + "state": "running", + "time": 1479452400000, + "username": "bhuntcz", + "percent_uptime": 0.43 + }, + { + "age": 49, + "cost": 23.13, + "country": "ID", + "price": 60, + "project": "logstash", + "state": "done", + "time": 1460358000000, + "username": "agardnerd0", + "percent_uptime": 0.05 + }, + { + "age": 18, + "cost": 22.52, + "country": "ET", + "price": 48, + "project": "opbeat", + "state": "done", + "time": 1474700400000, + "username": "nduncand1", + "percent_uptime": 0.18 + }, + { + "age": 35, + "cost": 23.12, + "country": "MY", + "price": 53, + "project": "logstash", + "state": "done", + "time": 1491289200000, + "username": "mhernandezd2", + "percent_uptime": 0.14 + }, + { + "age": 54, + "cost": 23.35, + "country": "CN", + "price": 48, + "project": "machine-learning", + "state": "done", + "time": 1461394800000, + "username": "rcoled3", + "percent_uptime": 0.67 + }, + { + "age": 23, + "cost": 23.54, + "country": "NO", + "price": 48, + "project": "kibana", + "state": "start", + "time": 1474700400000, + "username": "jmarshalld4", + "percent_uptime": 0.52 + }, + { + "age": 66, + "cost": 22.95, + "country": "JM", + "price": 75, + "project": "elasticsearch", + "state": "done", + "time": 1482044400000, + "username": "phuntd5", + "percent_uptime": 0.52 + }, + { + "age": 29, + "cost": 21.87, + "country": "PH", + "price": 59, + "project": "beats", + "state": "running", + "time": 1475737200000, + "username": "adixond6", + "percent_uptime": 0.35 + }, + { + "age": 48, + "cost": 23.39, + "country": "CN", + "price": 58, + "project": "x-pack", + "state": "done", + "time": 1489734000000, + "username": "bgutierrezd7", + "percent_uptime": 0.33 + }, + { + "age": 65, + "cost": 21.78, + "country": "UA", + "price": 57, + "project": "kibana", + "state": "running", + "time": 1463382000000, + "username": "hnelsond8", + "percent_uptime": 0.5 + }, + { + "age": 30, + "cost": 22.99, + "country": "GY", + "price": 51, + "project": "kibana", + "state": "done", + "time": 1460271600000, + "username": "acollinsd9", + "percent_uptime": 0.77 + }, + { + "age": 33, + "cost": 23.3, + "country": "VN", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1490770800000, + "username": "tmillerda", + "percent_uptime": 0.78 + }, + { + "age": 26, + "cost": 22.67, + "country": "JP", + "price": 44, + "project": "machine-learning", + "state": "done", + "time": 1480402800000, + "username": "tmasondb", + "percent_uptime": 0.31 + }, + { + "age": 69, + "cost": 24.17, + "country": "PL", + "price": 72, + "project": "x-pack", + "state": "start", + "time": 1477551600000, + "username": "baustindc", + "percent_uptime": 0.21 + }, + { + "age": 53, + "cost": 22.38, + "country": "TH", + "price": 50, + "project": "opbeat", + "state": "running", + "time": 1489129200000, + "username": "dgriffindd", + "percent_uptime": 0.79 + }, + { + "age": 61, + "cost": 22.69, + "country": "AL", + "price": 48, + "project": "machine-learning", + "state": "done", + "time": 1467874800000, + "username": "dryande", + "percent_uptime": 0.02 + }, + { + "age": 57, + "cost": 23.94, + "country": "CN", + "price": 46, + "project": "beats", + "state": "start", + "time": 1460876400000, + "username": "kmurraydf", + "percent_uptime": 0.85 + }, + { + "age": 53, + "cost": 22.52, + "country": "ID", + "price": 42, + "project": "opbeat", + "state": "done", + "time": 1480057200000, + "username": "hdiazdg", + "percent_uptime": 0.15 + }, + { + "age": 64, + "cost": 22.93, + "country": "LT", + "price": 57, + "project": "beats", + "state": "done", + "time": 1483081200000, + "username": "anicholsdh", + "percent_uptime": 0.3 + }, + { + "age": 73, + "cost": 21.81, + "country": "US", + "price": 49, + "project": "elasticsearch", + "state": "running", + "time": 1477724400000, + "username": "wgreendi", + "percent_uptime": 0.23 + }, + { + "age": 47, + "cost": 24.86, + "country": "BR", + "price": 45, + "project": "machine-learning", + "state": "running", + "time": 1483513200000, + "username": "anicholsdj", + "percent_uptime": 0.01 + }, + { + "age": 57, + "cost": 21.42, + "country": "MN", + "price": 69, + "project": "beats", + "state": "start", + "time": 1483340400000, + "username": "fstevensdk", + "percent_uptime": 0.02 + }, + { + "age": 78, + "cost": 22.55, + "country": "CN", + "price": 58, + "project": "beats", + "state": "done", + "time": 1472454000000, + "username": "wfrazierdl", + "percent_uptime": 0.41 + }, + { + "age": 43, + "cost": 22.22, + "country": "ID", + "price": 57, + "project": "beats", + "state": "running", + "time": 1475305200000, + "username": "hbelldm", + "percent_uptime": 0.66 + }, + { + "age": 72, + "cost": 22.9, + "country": "CN", + "price": 47, + "project": "kibana", + "state": "done", + "time": 1480834800000, + "username": "edixondn", + "percent_uptime": 0.5 + }, + { + "age": 40, + "cost": 21.5, + "country": "AR", + "price": 57, + "project": "machine-learning", + "state": "running", + "time": 1480662000000, + "username": "kraydo", + "percent_uptime": 0.98 + }, + { + "age": 36, + "cost": 23.45, + "country": "RU", + "price": 43, + "project": "beats", + "state": "done", + "time": 1485241200000, + "username": "nmurphydp", + "percent_uptime": 0.14 + }, + { + "age": 56, + "cost": 23.03, + "country": "KR", + "price": 62, + "project": "logstash", + "state": "done", + "time": 1483426800000, + "username": "ssimsdq", + "percent_uptime": 0.32 + }, + { + "age": 18, + "cost": 22.57, + "country": "ID", + "price": 52, + "project": "opbeat", + "state": "done", + "time": 1485414000000, + "username": "brusselldr", + "percent_uptime": 0.02 + }, + { + "age": 41, + "cost": 21.47, + "country": "AL", + "price": 56, + "project": "x-pack", + "state": "start", + "time": 1477897200000, + "username": "mmillsds", + "percent_uptime": 0.78 + }, + { + "age": 46, + "cost": 21.8, + "country": "KE", + "price": 74, + "project": "opbeat", + "state": "running", + "time": 1488092400000, + "username": "jdixondt", + "percent_uptime": 0.68 + }, + { + "age": 66, + "cost": 24.32, + "country": "TH", + "price": 49, + "project": "elasticsearch", + "state": "start", + "time": 1479452400000, + "username": "bmurphydu", + "percent_uptime": 0.68 + }, + { + "age": 44, + "cost": 24.61, + "country": "NZ", + "price": 61, + "project": "kibana", + "state": "running", + "time": 1476946800000, + "username": "inicholsdv", + "percent_uptime": 0.6 + }, + { + "age": 64, + "cost": 21.53, + "country": "NL", + "price": 50, + "project": "beats", + "state": "running", + "time": 1464246000000, + "username": "hstanleydw", + "percent_uptime": 0.56 + }, + { + "age": 79, + "cost": 21.6, + "country": "CN", + "price": 63, + "project": "kibana", + "state": "running", + "time": 1479538800000, + "username": "nwatkinsdx", + "percent_uptime": 0.98 + }, + { + "age": 78, + "cost": 23.3, + "country": "PL", + "price": 61, + "project": "beats", + "state": "done", + "time": 1478415600000, + "username": "dmccoydy", + "percent_uptime": 0.09 + }, + { + "age": 33, + "cost": 24.21, + "country": "PA", + "price": 52, + "project": "machine-learning", + "state": "start", + "time": 1470812400000, + "username": "dchavezdz", + "percent_uptime": 0.41 + }, + { + "age": 76, + "cost": 23.57, + "country": "PE", + "price": 65, + "project": "x-pack", + "state": "start", + "time": 1467529200000, + "username": "jphillipse0", + "percent_uptime": 0.98 + }, + { + "age": 41, + "cost": 25.17, + "country": "ID", + "price": 55, + "project": "x-pack", + "state": "running", + "time": 1475046000000, + "username": "ppalmere1", + "percent_uptime": 0.98 + }, + { + "age": 56, + "cost": 22.74, + "country": "ID", + "price": 56, + "project": "logstash", + "state": "done", + "time": 1482476400000, + "username": "knelsone2", + "percent_uptime": 0.53 + }, + { + "age": 78, + "cost": 21.78, + "country": "GR", + "price": 57, + "project": "beats", + "state": "running", + "time": 1479020400000, + "username": "gclarke3", + "percent_uptime": 0.11 + }, + { + "age": 65, + "cost": 21.68, + "country": "VE", + "price": 39, + "project": "kibana", + "state": "running", + "time": 1474182000000, + "username": "rstewarte4", + "percent_uptime": 0.92 + }, + { + "age": 54, + "cost": 23.5, + "country": "CN", + "price": 65, + "project": "machine-learning", + "state": "start", + "time": 1467529200000, + "username": "vramose5", + "percent_uptime": 0.12 + }, + { + "age": 69, + "cost": 23.54, + "country": "CN", + "price": 52, + "project": "x-pack", + "state": "start", + "time": 1460617200000, + "username": "kkennedye6", + "percent_uptime": 1 + }, + { + "age": 64, + "cost": 24.08, + "country": "CN", + "price": 54, + "project": "beats", + "state": "start", + "time": 1463036400000, + "username": "sharveye7", + "percent_uptime": 0.28 + }, + { + "age": 44, + "cost": 24.9, + "country": "NO", + "price": 61, + "project": "kibana", + "state": "running", + "time": 1476514800000, + "username": "jandrewse8", + "percent_uptime": 0.95 + }, + { + "age": 72, + "cost": 24.49, + "country": "HN", + "price": 53, + "project": "kibana", + "state": "start", + "time": 1482130800000, + "username": "gwashingtone9", + "percent_uptime": 0.05 + }, + { + "age": 25, + "cost": 23.14, + "country": "CZ", + "price": 55, + "project": "opbeat", + "state": "done", + "time": 1479193200000, + "username": "tgrahamea", + "percent_uptime": 0.86 + }, + { + "age": 65, + "cost": 23.11, + "country": "GR", + "price": 53, + "project": "kibana", + "state": "done", + "time": 1464332400000, + "username": "awatsoneb", + "percent_uptime": 0.01 + }, + { + "age": 53, + "cost": 21.38, + "country": "ID", + "price": 46, + "project": "opbeat", + "state": "start", + "time": 1472540400000, + "username": "cnicholsec", + "percent_uptime": 0.35 + }, + { + "age": 74, + "cost": 24.07, + "country": "CN", + "price": 60, + "project": "opbeat", + "state": "start", + "time": 1473318000000, + "username": "dhamiltoned", + "percent_uptime": 0.73 + }, + { + "age": 31, + "cost": 22.77, + "country": "ID", + "price": 60, + "project": "elasticsearch", + "state": "done", + "time": 1489820400000, + "username": "pjordanee", + "percent_uptime": 0.48 + }, + { + "age": 32, + "cost": 22.87, + "country": "FR", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1464159600000, + "username": "rclarkef", + "percent_uptime": 0.81 + }, + { + "age": 63, + "cost": 24.53, + "country": "LI", + "price": 62, + "project": "logstash", + "state": "running", + "time": 1491462000000, + "username": "mgonzaleseg", + "percent_uptime": 0.34 + }, + { + "age": 73, + "cost": 21.39, + "country": "ID", + "price": 57, + "project": "elasticsearch", + "state": "start", + "time": 1473145200000, + "username": "tsnydereh", + "percent_uptime": 0.02 + }, + { + "age": 24, + "cost": 23.36, + "country": "PH", + "price": 54, + "project": "elasticsearch", + "state": "done", + "time": 1475564400000, + "username": "bedwardsei", + "percent_uptime": 0.52 + }, + { + "age": 33, + "cost": 22.73, + "country": "CN", + "price": 53, + "project": "machine-learning", + "state": "done", + "time": 1460358000000, + "username": "preyesej", + "percent_uptime": 0.39 + }, + { + "age": 22, + "cost": 22.35, + "country": "AR", + "price": 44, + "project": "beats", + "state": "running", + "time": 1472713200000, + "username": "aclarkek", + "percent_uptime": 0.77 + }, + { + "age": 27, + "cost": 22.26, + "country": "GH", + "price": 53, + "project": "x-pack", + "state": "running", + "time": 1487314800000, + "username": "wgeorgeel", + "percent_uptime": 0.34 + }, + { + "age": 25, + "cost": 23.06, + "country": "AZ", + "price": 53, + "project": "opbeat", + "state": "done", + "time": 1484204400000, + "username": "telliottem", + "percent_uptime": 0.21 + }, + { + "age": 57, + "cost": 24.79, + "country": "RU", + "price": 49, + "project": "beats", + "state": "running", + "time": 1487314800000, + "username": "lwooden", + "percent_uptime": 0.16 + }, + { + "age": 32, + "cost": 22.63, + "country": "PH", + "price": 53, + "project": "opbeat", + "state": "done", + "time": 1472886000000, + "username": "emitchelleo", + "percent_uptime": 0.35 + }, + { + "age": 73, + "cost": 20.87, + "country": "AR", + "price": 45, + "project": "elasticsearch", + "state": "start", + "time": 1471590000000, + "username": "ccarrep", + "percent_uptime": 0.01 + }, + { + "age": 25, + "cost": 21.37, + "country": "AR", + "price": 70, + "project": "opbeat", + "state": "start", + "time": 1482044400000, + "username": "mfishereq", + "percent_uptime": 0.57 + }, + { + "age": 40, + "cost": 23.42, + "country": "FR", + "price": 53, + "project": "machine-learning", + "state": "done", + "time": 1490943600000, + "username": "tgrayer", + "percent_uptime": 0.99 + }, + { + "age": 62, + "cost": 22.33, + "country": "KP", + "price": 64, + "project": "x-pack", + "state": "running", + "time": 1464332400000, + "username": "pstanleyes", + "percent_uptime": 0.57 + }, + { + "age": 73, + "cost": 23.69, + "country": "CN", + "price": 51, + "project": "elasticsearch", + "state": "start", + "time": 1479366000000, + "username": "nfoxet", + "percent_uptime": 0.81 + }, + { + "age": 21, + "cost": 21.33, + "country": "PT", + "price": 51, + "project": "logstash", + "state": "start", + "time": 1474441200000, + "username": "rstanleyeu", + "percent_uptime": 0 + }, + { + "age": 65, + "cost": 22.93, + "country": "PE", + "price": 50, + "project": "kibana", + "state": "done", + "time": 1476687600000, + "username": "jrobinsonev", + "percent_uptime": 0.18 + }, + { + "age": 21, + "cost": 22.89, + "country": "BD", + "price": 54, + "project": "logstash", + "state": "done", + "time": 1475391600000, + "username": "jrichardsew", + "percent_uptime": 0.32 + }, + { + "age": 24, + "cost": 21.94, + "country": "CN", + "price": 64, + "project": "elasticsearch", + "state": "running", + "time": 1471071600000, + "username": "hwebbex", + "percent_uptime": 0.72 + }, + { + "age": 46, + "cost": 21.95, + "country": "ID", + "price": 61, + "project": "opbeat", + "state": "running", + "time": 1479538800000, + "username": "awestey", + "percent_uptime": 0.64 + }, + { + "age": 64, + "cost": 22.09, + "country": "PL", + "price": 45, + "project": "beats", + "state": "running", + "time": 1462431600000, + "username": "ljacobsez", + "percent_uptime": 0.33 + }, + { + "age": 55, + "cost": 23.6, + "country": "GR", + "price": 54, + "project": "x-pack", + "state": "start", + "time": 1475478000000, + "username": "krussellf0", + "percent_uptime": 0 + }, + { + "age": 55, + "cost": 22.9, + "country": "PL", + "price": 63, + "project": "x-pack", + "state": "done", + "time": 1485154800000, + "username": "amedinaf1", + "percent_uptime": 0.17 + }, + { + "age": 38, + "cost": 22.83, + "country": "CN", + "price": 63, + "project": "elasticsearch", + "state": "done", + "time": 1473577200000, + "username": "tjenkinsf2", + "percent_uptime": 0.18 + }, + { + "age": 64, + "cost": 24.1, + "country": "ID", + "price": 44, + "project": "beats", + "state": "start", + "time": 1482822000000, + "username": "lrileyf3", + "percent_uptime": 0.42 + }, + { + "age": 52, + "cost": 21.41, + "country": "BR", + "price": 50, + "project": "elasticsearch", + "state": "start", + "time": 1480057200000, + "username": "dsimpsonf4", + "percent_uptime": 0.63 + }, + { + "age": 34, + "cost": 23.48, + "country": "BR", + "price": 66, + "project": "x-pack", + "state": "done", + "time": 1481612400000, + "username": "nwoodsf5", + "percent_uptime": 0.82 + }, + { + "age": 65, + "cost": 23.04, + "country": "KR", + "price": 75, + "project": "kibana", + "state": "done", + "time": 1464850800000, + "username": "acruzf6", + "percent_uptime": 0.1 + }, + { + "age": 45, + "cost": 25, + "country": "SE", + "price": 54, + "project": "elasticsearch", + "state": "running", + "time": 1466838000000, + "username": "rmyersf7", + "percent_uptime": 0.47 + }, + { + "age": 29, + "cost": 21.82, + "country": "TL", + "price": 54, + "project": "beats", + "state": "running", + "time": 1474441200000, + "username": "sfowlerf8", + "percent_uptime": 0.02 + }, + { + "age": 51, + "cost": 22.2, + "country": "IL", + "price": 54, + "project": "kibana", + "state": "running", + "time": 1463641200000, + "username": "bsimsf9", + "percent_uptime": 0.66 + }, + { + "age": 23, + "cost": 22.49, + "country": "CN", + "price": 54, + "project": "kibana", + "state": "running", + "time": 1472367600000, + "username": "acampbellfa", + "percent_uptime": 0.99 + }, + { + "age": 35, + "cost": 23.36, + "country": "RU", + "price": 54, + "project": "logstash", + "state": "done", + "time": 1472799600000, + "username": "llarsonfb", + "percent_uptime": 0.63 + }, + { + "age": 32, + "cost": 23, + "country": "CN", + "price": 66, + "project": "opbeat", + "state": "done", + "time": 1479625200000, + "username": "kbanksfc", + "percent_uptime": 0.57 + }, + { + "age": 64, + "cost": 21.07, + "country": "CN", + "price": 56, + "project": "beats", + "state": "start", + "time": 1486882800000, + "username": "jwatkinsfd", + "percent_uptime": 0.64 + }, + { + "age": 23, + "cost": 23.87, + "country": "PT", + "price": 58, + "project": "kibana", + "state": "start", + "time": 1485846000000, + "username": "kfranklinfe", + "percent_uptime": 0.81 + }, + { + "age": 22, + "cost": 21.68, + "country": "MX", + "price": 60, + "project": "beats", + "state": "running", + "time": 1479366000000, + "username": "jhuntff", + "percent_uptime": 0.05 + }, + { + "age": 58, + "cost": 24.67, + "country": "AM", + "price": 57, + "project": "kibana", + "state": "running", + "time": 1488265200000, + "username": "njenkinsfg", + "percent_uptime": 0.32 + }, + { + "age": 78, + "cost": 24.49, + "country": "CN", + "price": 49, + "project": "beats", + "state": "start", + "time": 1464159600000, + "username": "mjenkinsfh", + "percent_uptime": 0.73 + }, + { + "age": 46, + "cost": 23.31, + "country": "JP", + "price": 57, + "project": "opbeat", + "state": "done", + "time": 1465974000000, + "username": "adayfi", + "percent_uptime": 0.55 + }, + { + "age": 68, + "cost": 23.91, + "country": "PF", + "price": 58, + "project": "machine-learning", + "state": "start", + "time": 1479452400000, + "username": "lcoxfj", + "percent_uptime": 0.21 + }, + { + "age": 79, + "cost": 23.67, + "country": "CA", + "price": 62, + "project": "kibana", + "state": "start", + "time": 1479538800000, + "username": "dhansenfk", + "percent_uptime": 0.59 + }, + { + "age": 70, + "cost": 23.46, + "country": "VE", + "price": 66, + "project": "logstash", + "state": "done", + "time": 1464073200000, + "username": "rharrisonfl", + "percent_uptime": 0.57 + }, + { + "age": 71, + "cost": 22.41, + "country": "RS", + "price": 55, + "project": "beats", + "state": "running", + "time": 1472886000000, + "username": "aromerofm", + "percent_uptime": 0.02 + }, + { + "age": 58, + "cost": 22.99, + "country": "BR", + "price": 66, + "project": "kibana", + "state": "done", + "time": 1484550000000, + "username": "hfoxfn", + "percent_uptime": 0.04 + }, + { + "age": 21, + "cost": 23.59, + "country": "UA", + "price": 57, + "project": "logstash", + "state": "start", + "time": 1489906800000, + "username": "hrodriguezfo", + "percent_uptime": 0.24 + }, + { + "age": 34, + "cost": 22.48, + "country": "MK", + "price": 67, + "project": "x-pack", + "state": "running", + "time": 1463382000000, + "username": "kmasonfp", + "percent_uptime": 0.86 + }, + { + "age": 52, + "cost": 23.43, + "country": "CN", + "price": 58, + "project": "elasticsearch", + "state": "done", + "time": 1475478000000, + "username": "mrileyfq", + "percent_uptime": 0.34 + }, + { + "age": 24, + "cost": 23.1, + "country": "NZ", + "price": 64, + "project": "elasticsearch", + "state": "done", + "time": 1472022000000, + "username": "tkellyfr", + "percent_uptime": 0.53 + }, + { + "age": 52, + "cost": 21.59, + "country": "CN", + "price": 72, + "project": "elasticsearch", + "state": "running", + "time": 1490079600000, + "username": "jrileyfs", + "percent_uptime": 0.28 + }, + { + "age": 40, + "cost": 22.7, + "country": "MX", + "price": 58, + "project": "machine-learning", + "state": "done", + "time": 1484204400000, + "username": "mspencerft", + "percent_uptime": 0.09 + }, + { + "age": 34, + "cost": 22.01, + "country": "AL", + "price": 58, + "project": "x-pack", + "state": "running", + "time": 1486191600000, + "username": "kburkefu", + "percent_uptime": 0.44 + }, + { + "age": 66, + "cost": 24.78, + "country": "CN", + "price": 55, + "project": "elasticsearch", + "state": "running", + "time": 1478329200000, + "username": "nturnerfv", + "percent_uptime": 0.14 + }, + { + "age": 62, + "cost": 22.81, + "country": "ES", + "price": 50, + "project": "x-pack", + "state": "done", + "time": 1460530800000, + "username": "jsmithfw", + "percent_uptime": 0.14 + }, + { + "age": 56, + "cost": 23.34, + "country": "PH", + "price": 58, + "project": "logstash", + "state": "done", + "time": 1476082800000, + "username": "jrichardsonfx", + "percent_uptime": 0.59 + }, + { + "age": 32, + "cost": 23.19, + "country": "US", + "price": 67, + "project": "opbeat", + "state": "done", + "time": 1475650800000, + "username": "shernandezfy", + "percent_uptime": 0.08 + }, + { + "age": 37, + "cost": 23.15, + "country": "CN", + "price": 61, + "project": "kibana", + "state": "done", + "time": 1485500400000, + "username": "hjacobsfz", + "percent_uptime": 0.66 + }, + { + "age": 29, + "cost": 22.66, + "country": "EC", + "price": 63, + "project": "beats", + "state": "done", + "time": 1483254000000, + "username": "cbennettg0", + "percent_uptime": 0.36 + }, + { + "age": 48, + "cost": 23.19, + "country": "CM", + "price": 58, + "project": "x-pack", + "state": "done", + "time": 1463900400000, + "username": "aarnoldg1", + "percent_uptime": 0.86 + }, + { + "age": 63, + "cost": 24.93, + "country": "PT", + "price": 61, + "project": "logstash", + "state": "running", + "time": 1472022000000, + "username": "mgilbertg2", + "percent_uptime": 0.56 + }, + { + "age": 31, + "cost": 22.81, + "country": "PA", + "price": 54, + "project": "elasticsearch", + "state": "done", + "time": 1482044400000, + "username": "rcoxg3", + "percent_uptime": 0.77 + }, + { + "age": 72, + "cost": 24.23, + "country": "RU", + "price": 60, + "project": "kibana", + "state": "start", + "time": 1471676400000, + "username": "twhiteg4", + "percent_uptime": 0.94 + }, + { + "age": 42, + "cost": 22.72, + "country": "BR", + "price": 53, + "project": "logstash", + "state": "done", + "time": 1486710000000, + "username": "lcarpenterg5", + "percent_uptime": 0.03 + }, + { + "age": 27, + "cost": 23.16, + "country": "BA", + "price": 70, + "project": "x-pack", + "state": "done", + "time": 1481612400000, + "username": "eharrisong6", + "percent_uptime": 0.69 + }, + { + "age": 46, + "cost": 24.18, + "country": "NP", + "price": 52, + "project": "opbeat", + "state": "start", + "time": 1461222000000, + "username": "hharrisong7", + "percent_uptime": 0.39 + }, + { + "age": 24, + "cost": 22.94, + "country": "PT", + "price": 59, + "project": "elasticsearch", + "state": "done", + "time": 1484377200000, + "username": "jgibsong8", + "percent_uptime": 0.57 + }, + { + "age": 38, + "cost": 21.91, + "country": "BO", + "price": 51, + "project": "elasticsearch", + "state": "running", + "time": 1474527600000, + "username": "rwilliamsg9", + "percent_uptime": 0.32 + }, + { + "age": 77, + "cost": 24.88, + "country": "CN", + "price": 64, + "project": "logstash", + "state": "running", + "time": 1470466800000, + "username": "htaylorga", + "percent_uptime": 0.87 + }, + { + "age": 64, + "cost": 23.03, + "country": "PT", + "price": 64, + "project": "beats", + "state": "done", + "time": 1464764400000, + "username": "vwebbgb", + "percent_uptime": 0.78 + }, + { + "age": 43, + "cost": 21.21, + "country": "JP", + "price": 66, + "project": "beats", + "state": "start", + "time": 1491202800000, + "username": "tbrowngc", + "percent_uptime": 0.91 + }, + { + "age": 73, + "cost": 23.85, + "country": "CN", + "price": 55, + "project": "elasticsearch", + "state": "start", + "time": 1477638000000, + "username": "bmontgomerygd", + "percent_uptime": 0.71 + }, + { + "age": 78, + "cost": 24.05, + "country": "VN", + "price": 59, + "project": "beats", + "state": "start", + "time": 1480921200000, + "username": "jrileyge", + "percent_uptime": 0.89 + }, + { + "age": 44, + "cost": 23.43, + "country": "ID", + "price": 55, + "project": "kibana", + "state": "done", + "time": 1487574000000, + "username": "bpetersgf", + "percent_uptime": 0.16 + }, + { + "age": 31, + "cost": 21.69, + "country": "PH", + "price": 54, + "project": "elasticsearch", + "state": "running", + "time": 1467615600000, + "username": "awilliamsgg", + "percent_uptime": 0.82 + }, + { + "age": 79, + "cost": 22.26, + "country": "CO", + "price": 58, + "project": "kibana", + "state": "running", + "time": 1478588400000, + "username": "bcoxgh", + "percent_uptime": 0.33 + }, + { + "age": 47, + "cost": 24.85, + "country": "PH", + "price": 74, + "project": "machine-learning", + "state": "running", + "time": 1461826800000, + "username": "jchavezgi", + "percent_uptime": 0.93 + }, + { + "age": 19, + "cost": 23.61, + "country": "AZ", + "price": 63, + "project": "machine-learning", + "state": "start", + "time": 1476946800000, + "username": "bstanleygj", + "percent_uptime": 0.97 + }, + { + "age": 49, + "cost": 22.66, + "country": "RU", + "price": 55, + "project": "logstash", + "state": "done", + "time": 1475046000000, + "username": "lortizgk", + "percent_uptime": 0.5 + }, + { + "age": 65, + "cost": 21.86, + "country": "YE", + "price": 33, + "project": "kibana", + "state": "running", + "time": 1462345200000, + "username": "cjohnsongl", + "percent_uptime": 0.1 + }, + { + "age": 30, + "cost": 23.26, + "country": "NZ", + "price": 55, + "project": "kibana", + "state": "done", + "time": 1484636400000, + "username": "sfernandezgm", + "percent_uptime": 0.3 + }, + { + "age": 75, + "cost": 22.78, + "country": "GB", + "price": 54, + "project": "machine-learning", + "state": "done", + "time": 1491721200000, + "username": "astevensgn", + "percent_uptime": 0.73 + }, + { + "age": 57, + "cost": 24.28, + "country": "VE", + "price": 55, + "project": "beats", + "state": "start", + "time": 1480575600000, + "username": "hgreengo", + "percent_uptime": 0.59 + }, + { + "age": 67, + "cost": 21.68, + "country": "FR", + "price": 45, + "project": "opbeat", + "state": "running", + "time": 1485932400000, + "username": "tgutierrezgp", + "percent_uptime": 0.47 + }, + { + "age": 59, + "cost": 25.04, + "country": "PL", + "price": 53, + "project": "elasticsearch", + "state": "running", + "time": 1481266800000, + "username": "rmorenogq", + "percent_uptime": 0.12 + }, + { + "age": 57, + "cost": 23.46, + "country": "PE", + "price": 48, + "project": "beats", + "state": "done", + "time": 1464332400000, + "username": "esandersgr", + "percent_uptime": 0.44 + }, + { + "age": 21, + "cost": 22.72, + "country": "CN", + "price": 49, + "project": "logstash", + "state": "done", + "time": 1477119600000, + "username": "sleegs", + "percent_uptime": 0.69 + }, + { + "age": 74, + "cost": 21.44, + "country": "RU", + "price": 64, + "project": "opbeat", + "state": "start", + "time": 1485414000000, + "username": "ktaylorgt", + "percent_uptime": 0.63 + }, + { + "age": 24, + "cost": 23.26, + "country": "ID", + "price": 44, + "project": "elasticsearch", + "state": "done", + "time": 1482217200000, + "username": "dgeorgegu", + "percent_uptime": 0.65 + }, + { + "age": 27, + "cost": 22.47, + "country": "ID", + "price": 57, + "project": "x-pack", + "state": "running", + "time": 1468134000000, + "username": "swarrengv", + "percent_uptime": 0.24 + }, + { + "age": 62, + "cost": 22.32, + "country": "JP", + "price": 52, + "project": "x-pack", + "state": "running", + "time": 1481353200000, + "username": "sdeangw", + "percent_uptime": 0.29 + }, + { + "age": 36, + "cost": 22.85, + "country": "MO", + "price": 49, + "project": "beats", + "state": "done", + "time": 1483167600000, + "username": "rmyersgx", + "percent_uptime": 0.78 + }, + { + "age": 31, + "cost": 25.49, + "country": "CN", + "price": 64, + "project": "elasticsearch", + "state": "running", + "time": 1469430000000, + "username": "lwilsongy", + "percent_uptime": 0.19 + }, + { + "age": 75, + "cost": 23.08, + "country": "CN", + "price": 57, + "project": "machine-learning", + "state": "done", + "time": 1472713200000, + "username": "friveragz", + "percent_uptime": 0.56 + }, + { + "age": 75, + "cost": 22.93, + "country": "RU", + "price": 66, + "project": "machine-learning", + "state": "done", + "time": 1470553200000, + "username": "awebbh0", + "percent_uptime": 0.33 + }, + { + "age": 18, + "cost": 23.41, + "country": "CN", + "price": 46, + "project": "opbeat", + "state": "done", + "time": 1486105200000, + "username": "fyoungh1", + "percent_uptime": 0.08 + }, + { + "age": 76, + "cost": 22.25, + "country": "PH", + "price": 57, + "project": "x-pack", + "state": "running", + "time": 1474354800000, + "username": "jbakerh2", + "percent_uptime": 0.52 + }, + { + "age": 56, + "cost": 21.42, + "country": "PL", + "price": 66, + "project": "logstash", + "state": "start", + "time": 1461394800000, + "username": "wwalkerh3", + "percent_uptime": 0.35 + }, + { + "age": 23, + "cost": 21.33, + "country": "MX", + "price": 53, + "project": "kibana", + "state": "start", + "time": 1489042800000, + "username": "nwatsonh4", + "percent_uptime": 0.88 + }, + { + "age": 22, + "cost": 23.46, + "country": "PH", + "price": 46, + "project": "beats", + "state": "done", + "time": 1487055600000, + "username": "dsullivanh5", + "percent_uptime": 0.9 + }, + { + "age": 65, + "cost": 21.73, + "country": "GT", + "price": 50, + "project": "kibana", + "state": "running", + "time": 1480489200000, + "username": "jcastilloh6", + "percent_uptime": 1 + }, + { + "age": 20, + "cost": 24.24, + "country": "BR", + "price": 50, + "project": "x-pack", + "state": "start", + "time": 1481266800000, + "username": "rgreeneh7", + "percent_uptime": 0.81 + }, + { + "age": 40, + "cost": 23.22, + "country": "ZA", + "price": 62, + "project": "machine-learning", + "state": "done", + "time": 1469948400000, + "username": "gsmithh8", + "percent_uptime": 0.95 + }, + { + "age": 31, + "cost": 20.87, + "country": "VU", + "price": 65, + "project": "elasticsearch", + "state": "start", + "time": 1486623600000, + "username": "rramosh9", + "percent_uptime": 0.02 + }, + { + "age": 73, + "cost": 21.73, + "country": "DO", + "price": 61, + "project": "elasticsearch", + "state": "running", + "time": 1460876400000, + "username": "chansenha", + "percent_uptime": 0.95 + }, + { + "age": 23, + "cost": 22.63, + "country": "ID", + "price": 64, + "project": "kibana", + "state": "done", + "time": 1488092400000, + "username": "hblackhb", + "percent_uptime": 0.3 + }, + { + "age": 52, + "cost": 22.56, + "country": "RU", + "price": 52, + "project": "elasticsearch", + "state": "done", + "time": 1480662000000, + "username": "ebakerhc", + "percent_uptime": 0.66 + }, + { + "age": 27, + "cost": 22.53, + "country": "VE", + "price": 46, + "project": "x-pack", + "state": "done", + "time": 1480316400000, + "username": "tryanhd", + "percent_uptime": 0.3 + }, + { + "age": 73, + "cost": 23.69, + "country": "MY", + "price": 64, + "project": "elasticsearch", + "state": "start", + "time": 1474009200000, + "username": "adiazhe", + "percent_uptime": 0.16 + }, + { + "age": 62, + "cost": 25.48, + "country": "UA", + "price": 61, + "project": "x-pack", + "state": "running", + "time": 1461394800000, + "username": "darnoldhf", + "percent_uptime": 0.65 + }, + { + "age": 37, + "cost": 24.07, + "country": "PL", + "price": 57, + "project": "kibana", + "state": "start", + "time": 1481785200000, + "username": "cgrayhg", + "percent_uptime": 0.7 + }, + { + "age": 62, + "cost": 23.32, + "country": "GR", + "price": 72, + "project": "x-pack", + "state": "done", + "time": 1465196400000, + "username": "smedinahh", + "percent_uptime": 0.47 + }, + { + "age": 71, + "cost": 22.75, + "country": "GE", + "price": 59, + "project": "beats", + "state": "done", + "time": 1463209200000, + "username": "jmccoyhi", + "percent_uptime": 0.5 + }, + { + "age": 44, + "cost": 22.34, + "country": "CN", + "price": 59, + "project": "kibana", + "state": "running", + "time": 1477551600000, + "username": "ameyerhj", + "percent_uptime": 0.17 + }, + { + "age": 44, + "cost": 20.24, + "country": "PT", + "price": 51, + "project": "kibana", + "state": "done", + "time": 1486969200000, + "username": "wwrighthk", + "percent_uptime": 0.98 + }, + { + "age": 19, + "cost": 23.86, + "country": "FI", + "price": 63, + "project": "machine-learning", + "state": "start", + "time": 1476255600000, + "username": "wtuckerhl", + "percent_uptime": 0.87 + }, + { + "age": 51, + "cost": 24.79, + "country": "NA", + "price": 61, + "project": "kibana", + "state": "running", + "time": 1465023600000, + "username": "greedhm", + "percent_uptime": 0.13 + }, + { + "age": 23, + "cost": 24.51, + "country": "JP", + "price": 61, + "project": "kibana", + "state": "running", + "time": 1480575600000, + "username": "fpaynehn", + "percent_uptime": 0.8 + }, + { + "age": 29, + "cost": 22.18, + "country": "CN", + "price": 54, + "project": "beats", + "state": "running", + "time": 1462431600000, + "username": "aperryho", + "percent_uptime": 0.49 + }, + { + "age": 62, + "cost": 21.38, + "country": "CN", + "price": 51, + "project": "x-pack", + "state": "start", + "time": 1471676400000, + "username": "arobertshp", + "percent_uptime": 0.16 + }, + { + "age": 67, + "cost": 23.81, + "country": "UY", + "price": 68, + "project": "opbeat", + "state": "start", + "time": 1481353200000, + "username": "mallenhq", + "percent_uptime": 0.45 + }, + { + "age": 78, + "cost": 21.55, + "country": "PA", + "price": 49, + "project": "beats", + "state": "running", + "time": 1467356400000, + "username": "mcruzhr", + "percent_uptime": 0.94 + }, + { + "age": 36, + "cost": 23.41, + "country": "VN", + "price": 50, + "project": "beats", + "state": "done", + "time": 1478674800000, + "username": "rwagnerhs", + "percent_uptime": 0.78 + }, + { + "age": 76, + "cost": 24.18, + "country": "CN", + "price": 57, + "project": "x-pack", + "state": "start", + "time": 1483772400000, + "username": "mevansht", + "percent_uptime": 0.3 + }, + { + "age": 59, + "cost": 22.6, + "country": "VE", + "price": 64, + "project": "elasticsearch", + "state": "done", + "time": 1465714800000, + "username": "nknighthu", + "percent_uptime": 0.43 + }, + { + "age": 30, + "cost": 21.37, + "country": "ZM", + "price": 68, + "project": "kibana", + "state": "start", + "time": 1480489200000, + "username": "jharrishv", + "percent_uptime": 0.38 + }, + { + "age": 70, + "cost": 24.13, + "country": "HU", + "price": 50, + "project": "logstash", + "state": "start", + "time": 1470121200000, + "username": "wkimhw", + "percent_uptime": 0.68 + }, + { + "age": 55, + "cost": 22.34, + "country": "CN", + "price": 43, + "project": "x-pack", + "state": "running", + "time": 1485932400000, + "username": "ejacksonhx", + "percent_uptime": 0.6 + }, + { + "age": 54, + "cost": 23.08, + "country": "ID", + "price": 54, + "project": "machine-learning", + "state": "done", + "time": 1484722800000, + "username": "mstewarthy", + "percent_uptime": 0.93 + }, + { + "age": 29, + "cost": 23.4, + "country": "ID", + "price": 65, + "project": "beats", + "state": "done", + "time": 1471330800000, + "username": "psimpsonhz", + "percent_uptime": 0.99 + }, + { + "age": 19, + "cost": 21.08, + "country": "UA", + "price": 51, + "project": "machine-learning", + "state": "start", + "time": 1472367600000, + "username": "jkingi0", + "percent_uptime": 0.82 + }, + { + "age": 49, + "cost": 22.83, + "country": "PL", + "price": 57, + "project": "logstash", + "state": "done", + "time": 1468393200000, + "username": "jrileyi1", + "percent_uptime": 0.68 + }, + { + "age": 56, + "cost": 21.82, + "country": "RU", + "price": 51, + "project": "logstash", + "state": "running", + "time": 1482303600000, + "username": "tdixoni2", + "percent_uptime": 0.33 + }, + { + "age": 67, + "cost": 23.07, + "country": "ID", + "price": 41, + "project": "opbeat", + "state": "done", + "time": 1468652400000, + "username": "jmitchelli3", + "percent_uptime": 0.98 + }, + { + "age": 40, + "cost": 23.65, + "country": "PT", + "price": 53, + "project": "machine-learning", + "state": "start", + "time": 1474614000000, + "username": "dcoxi4", + "percent_uptime": 0.57 + }, + { + "age": 61, + "cost": 23.72, + "country": "CN", + "price": 57, + "project": "machine-learning", + "state": "start", + "time": 1486018800000, + "username": "tporteri5", + "percent_uptime": 0.79 + }, + { + "age": 24, + "cost": 24.68, + "country": "SE", + "price": 74, + "project": "elasticsearch", + "state": "running", + "time": 1469084400000, + "username": "rwagneri6", + "percent_uptime": 0.19 + }, + { + "age": 35, + "cost": 22.38, + "country": "FR", + "price": 51, + "project": "logstash", + "state": "running", + "time": 1490425200000, + "username": "gnelsoni7", + "percent_uptime": 0.67 + }, + { + "age": 38, + "cost": 23.99, + "country": "LA", + "price": 53, + "project": "elasticsearch", + "state": "start", + "time": 1468652400000, + "username": "cmcdonaldi8", + "percent_uptime": 0.82 + }, + { + "age": 60, + "cost": 22.86, + "country": "KE", + "price": 65, + "project": "opbeat", + "state": "done", + "time": 1461654000000, + "username": "hjordani9", + "percent_uptime": 0.82 + }, + { + "age": 79, + "cost": 23.56, + "country": "PH", + "price": 57, + "project": "kibana", + "state": "start", + "time": 1474095600000, + "username": "hwalkeria", + "percent_uptime": 0.39 + }, + { + "age": 54, + "cost": 23.63, + "country": "CN", + "price": 50, + "project": "machine-learning", + "state": "start", + "time": 1479020400000, + "username": "lstanleyib", + "percent_uptime": 0.09 + }, + { + "age": 35, + "cost": 23.24, + "country": "TT", + "price": 63, + "project": "logstash", + "state": "done", + "time": 1479538800000, + "username": "jrogersic", + "percent_uptime": 0.47 + }, + { + "age": 72, + "cost": 21.98, + "country": "JP", + "price": 60, + "project": "kibana", + "state": "running", + "time": 1483254000000, + "username": "aperryid", + "percent_uptime": 0.64 + }, + { + "age": 50, + "cost": 23.65, + "country": "RU", + "price": 48, + "project": "beats", + "state": "start", + "time": 1486364400000, + "username": "mjordanie", + "percent_uptime": 0.98 + }, + { + "age": 59, + "cost": 23.36, + "country": "ID", + "price": 59, + "project": "elasticsearch", + "state": "done", + "time": 1478415600000, + "username": "pcookif", + "percent_uptime": 0.14 + }, + { + "age": 25, + "cost": 22.79, + "country": "UG", + "price": 62, + "project": "opbeat", + "state": "done", + "time": 1489129200000, + "username": "cblackig", + "percent_uptime": 0.27 + }, + { + "age": 39, + "cost": 22.77, + "country": "AR", + "price": 60, + "project": "opbeat", + "state": "done", + "time": 1461913200000, + "username": "djohnsonih", + "percent_uptime": 0.01 + }, + { + "age": 23, + "cost": 20.45, + "country": "PH", + "price": 52, + "project": "kibana", + "state": "done", + "time": 1475132400000, + "username": "bturnerii", + "percent_uptime": 0.82 + }, + { + "age": 46, + "cost": 21.79, + "country": "CN", + "price": 55, + "project": "opbeat", + "state": "running", + "time": 1471849200000, + "username": "colsonij", + "percent_uptime": 0.44 + }, + { + "age": 45, + "cost": 22.68, + "country": "CZ", + "price": 58, + "project": "elasticsearch", + "state": "done", + "time": 1491116400000, + "username": "tmurphyik", + "percent_uptime": 0.58 + }, + { + "age": 54, + "cost": 19.57, + "country": "PH", + "price": 68, + "project": "machine-learning", + "state": "done", + "time": 1463122800000, + "username": "tshawil", + "percent_uptime": 0.57 + }, + { + "age": 76, + "cost": 25.04, + "country": "SE", + "price": 47, + "project": "x-pack", + "state": "running", + "time": 1470726000000, + "username": "lgilbertim", + "percent_uptime": 0.71 + }, + { + "age": 53, + "cost": 23.85, + "country": "GR", + "price": 44, + "project": "opbeat", + "state": "start", + "time": 1474441200000, + "username": "jbakerin", + "percent_uptime": 0.93 + }, + { + "age": 44, + "cost": 23.22, + "country": "MY", + "price": 65, + "project": "kibana", + "state": "done", + "time": 1479279600000, + "username": "jmurphyio", + "percent_uptime": 0.96 + }, + { + "age": 32, + "cost": 23.15, + "country": "SE", + "price": 54, + "project": "opbeat", + "state": "done", + "time": 1481180400000, + "username": "glawrenceip", + "percent_uptime": 0.66 + }, + { + "age": 36, + "cost": 23.06, + "country": "VN", + "price": 56, + "project": "beats", + "state": "done", + "time": 1464937200000, + "username": "jsancheziq", + "percent_uptime": 0.48 + }, + { + "age": 70, + "cost": 22.77, + "country": "TH", + "price": 54, + "project": "logstash", + "state": "done", + "time": 1466233200000, + "username": "mchapmanir", + "percent_uptime": 0.77 + }, + { + "age": 24, + "cost": 23.14, + "country": "BR", + "price": 54, + "project": "elasticsearch", + "state": "done", + "time": 1469775600000, + "username": "sbutleris", + "percent_uptime": 0.13 + }, + { + "age": 50, + "cost": 23.01, + "country": "PT", + "price": 51, + "project": "beats", + "state": "done", + "time": 1477638000000, + "username": "rowensit", + "percent_uptime": 0.4 + }, + { + "age": 76, + "cost": 22.91, + "country": "ID", + "price": 58, + "project": "x-pack", + "state": "done", + "time": 1472713200000, + "username": "nfrankliniu", + "percent_uptime": 0.09 + }, + { + "age": 55, + "cost": 23.46, + "country": "AR", + "price": 63, + "project": "x-pack", + "state": "done", + "time": 1477638000000, + "username": "bwhiteiv", + "percent_uptime": 0.51 + }, + { + "age": 26, + "cost": 21.02, + "country": "ID", + "price": 46, + "project": "machine-learning", + "state": "start", + "time": 1472454000000, + "username": "mrossiw", + "percent_uptime": 0.8 + }, + { + "age": 61, + "cost": 20.32, + "country": "VN", + "price": 52, + "project": "machine-learning", + "state": "done", + "time": 1474700400000, + "username": "pyoungix", + "percent_uptime": 1 + }, + { + "age": 30, + "cost": 21.94, + "country": "BR", + "price": 53, + "project": "kibana", + "state": "running", + "time": 1464591600000, + "username": "rkimiy", + "percent_uptime": 1 + }, + { + "age": 36, + "cost": 22.09, + "country": "RU", + "price": 64, + "project": "beats", + "state": "running", + "time": 1462863600000, + "username": "pwallaceiz", + "percent_uptime": 0.51 + }, + { + "age": 54, + "cost": 21.56, + "country": "ID", + "price": 49, + "project": "machine-learning", + "state": "running", + "time": 1490857200000, + "username": "tadamsj0", + "percent_uptime": 0.56 + }, + { + "age": 56, + "cost": 20.35, + "country": "CN", + "price": 49, + "project": "logstash", + "state": "done", + "time": 1462777200000, + "username": "kmoorej1", + "percent_uptime": 0.25 + }, + { + "age": 55, + "cost": 22.67, + "country": "PT", + "price": 51, + "project": "x-pack", + "state": "done", + "time": 1468566000000, + "username": "abradleyj2", + "percent_uptime": 0.65 + }, + { + "age": 34, + "cost": 23.52, + "country": "SI", + "price": 57, + "project": "x-pack", + "state": "start", + "time": 1481698800000, + "username": "trodriguezj3", + "percent_uptime": 0.56 + }, + { + "age": 39, + "cost": 22.71, + "country": "CN", + "price": 63, + "project": "opbeat", + "state": "done", + "time": 1461999600000, + "username": "jbrownj4", + "percent_uptime": 0.36 + }, + { + "age": 46, + "cost": 24.28, + "country": "BA", + "price": 59, + "project": "opbeat", + "state": "start", + "time": 1485586800000, + "username": "dmccoyj5", + "percent_uptime": 0.16 + }, + { + "age": 19, + "cost": 23.55, + "country": "VN", + "price": 51, + "project": "machine-learning", + "state": "start", + "time": 1490943600000, + "username": "ahansenj6", + "percent_uptime": 0.87 + }, + { + "age": 58, + "cost": 22.23, + "country": "CN", + "price": 51, + "project": "kibana", + "state": "running", + "time": 1461222000000, + "username": "eedwardsj7", + "percent_uptime": 0.48 + }, + { + "age": 49, + "cost": 23.17, + "country": "PL", + "price": 51, + "project": "logstash", + "state": "done", + "time": 1473750000000, + "username": "jfordj8", + "percent_uptime": 0.87 + }, + { + "age": 62, + "cost": 23.59, + "country": "CN", + "price": 65, + "project": "x-pack", + "state": "start", + "time": 1479193200000, + "username": "kharrisj9", + "percent_uptime": 0.55 + }, + { + "age": 78, + "cost": 21.63, + "country": "PL", + "price": 73, + "project": "beats", + "state": "running", + "time": 1479625200000, + "username": "rbradleyja", + "percent_uptime": 0.17 + }, + { + "age": 63, + "cost": 22.74, + "country": "HR", + "price": 56, + "project": "logstash", + "state": "done", + "time": 1478674800000, + "username": "nholmesjb", + "percent_uptime": 0.16 + }, + { + "age": 79, + "cost": 22.79, + "country": "UA", + "price": 51, + "project": "kibana", + "state": "done", + "time": 1470121200000, + "username": "psimsjc", + "percent_uptime": 0.91 + }, + { + "age": 34, + "cost": 22.44, + "country": "PH", + "price": 40, + "project": "x-pack", + "state": "running", + "time": 1474527600000, + "username": "tbanksjd", + "percent_uptime": 0.29 + }, + { + "age": 59, + "cost": 22.2, + "country": "CR", + "price": 56, + "project": "elasticsearch", + "state": "running", + "time": 1482303600000, + "username": "dallenje", + "percent_uptime": 0.21 + }, + { + "age": 40, + "cost": 23.81, + "country": "ID", + "price": 50, + "project": "machine-learning", + "state": "start", + "time": 1460876400000, + "username": "kramosjf", + "percent_uptime": 0.55 + }, + { + "age": 39, + "cost": 22.07, + "country": "ID", + "price": 59, + "project": "opbeat", + "state": "running", + "time": 1463122800000, + "username": "rshawjg", + "percent_uptime": 0.27 + }, + { + "age": 60, + "cost": 22.42, + "country": "NL", + "price": 74, + "project": "opbeat", + "state": "running", + "time": 1480402800000, + "username": "vhilljh", + "percent_uptime": 0.16 + }, + { + "age": 29, + "cost": 23.29, + "country": "ID", + "price": 52, + "project": "beats", + "state": "done", + "time": 1462258800000, + "username": "lholmesji", + "percent_uptime": 0.8 + }, + { + "age": 22, + "cost": 22.52, + "country": "PL", + "price": 60, + "project": "beats", + "state": "done", + "time": 1477551600000, + "username": "pgarrettjj", + "percent_uptime": 0.08 + }, + { + "age": 69, + "cost": 22.94, + "country": "ES", + "price": 55, + "project": "x-pack", + "state": "done", + "time": 1468479600000, + "username": "tstonejk", + "percent_uptime": 0.2 + }, + { + "age": 74, + "cost": 23.1, + "country": "CN", + "price": 61, + "project": "opbeat", + "state": "done", + "time": 1472972400000, + "username": "jgriffinjl", + "percent_uptime": 0.35 + }, + { + "age": 30, + "cost": 20.85, + "country": "CN", + "price": 63, + "project": "kibana", + "state": "start", + "time": 1483426800000, + "username": "sholmesjm", + "percent_uptime": 0.91 + }, + { + "age": 56, + "cost": 23.14, + "country": "CN", + "price": 61, + "project": "logstash", + "state": "done", + "time": 1479193200000, + "username": "khayesjn", + "percent_uptime": 0.85 + }, + { + "age": 69, + "cost": 23.86, + "country": "BG", + "price": 57, + "project": "x-pack", + "state": "start", + "time": 1478761200000, + "username": "jfoxjo", + "percent_uptime": 0.25 + }, + { + "age": 32, + "cost": 22.75, + "country": "CN", + "price": 53, + "project": "opbeat", + "state": "done", + "time": 1460444400000, + "username": "swhitejp", + "percent_uptime": 0.91 + }, + { + "age": 45, + "cost": 21.48, + "country": "PH", + "price": 55, + "project": "elasticsearch", + "state": "start", + "time": 1488610800000, + "username": "hmorganjq", + "percent_uptime": 0.86 + }, + { + "age": 63, + "cost": 23.52, + "country": "CO", + "price": 63, + "project": "logstash", + "state": "start", + "time": 1462172400000, + "username": "agarciajr", + "percent_uptime": 0.47 + }, + { + "age": 48, + "cost": 24.18, + "country": "ID", + "price": 68, + "project": "x-pack", + "state": "start", + "time": 1489734000000, + "username": "sgeorgejs", + "percent_uptime": 0 + }, + { + "age": 18, + "cost": 23.02, + "country": "MX", + "price": 49, + "project": "opbeat", + "state": "done", + "time": 1486796400000, + "username": "agardnerjt", + "percent_uptime": 0.17 + }, + { + "age": 52, + "cost": 25.13, + "country": "CN", + "price": 63, + "project": "elasticsearch", + "state": "running", + "time": 1460703600000, + "username": "dsullivanju", + "percent_uptime": 0.45 + }, + { + "age": 46, + "cost": 23.58, + "country": "CO", + "price": 46, + "project": "opbeat", + "state": "start", + "time": 1464159600000, + "username": "mmoralesjv", + "percent_uptime": 0.02 + }, + { + "age": 42, + "cost": 23.93, + "country": "ID", + "price": 48, + "project": "logstash", + "state": "start", + "time": 1482822000000, + "username": "pgonzalezjw", + "percent_uptime": 0.52 + }, + { + "age": 38, + "cost": 22.12, + "country": "CN", + "price": 64, + "project": "elasticsearch", + "state": "running", + "time": 1475650800000, + "username": "jbanksjx", + "percent_uptime": 0.61 + }, + { + "age": 34, + "cost": 20.84, + "country": "AR", + "price": 52, + "project": "x-pack", + "state": "start", + "time": 1490252400000, + "username": "bricejy", + "percent_uptime": 0.27 + }, + { + "age": 59, + "cost": 22.7, + "country": "CN", + "price": 51, + "project": "elasticsearch", + "state": "done", + "time": 1470121200000, + "username": "eburnsjz", + "percent_uptime": 0.31 + }, + { + "age": 50, + "cost": 23.41, + "country": "CL", + "price": 59, + "project": "beats", + "state": "done", + "time": 1477033200000, + "username": "awallacek0", + "percent_uptime": 0.92 + }, + { + "age": 21, + "cost": 22.31, + "country": "DO", + "price": 69, + "project": "logstash", + "state": "running", + "time": 1472799600000, + "username": "bhamiltonk1", + "percent_uptime": 0.61 + }, + { + "age": 51, + "cost": 22.98, + "country": "TN", + "price": 62, + "project": "kibana", + "state": "done", + "time": 1483945200000, + "username": "lstevensk2", + "percent_uptime": 0.27 + }, + { + "age": 26, + "cost": 23.88, + "country": "XK", + "price": 53, + "project": "machine-learning", + "state": "start", + "time": 1462777200000, + "username": "emartinezk3", + "percent_uptime": 0.38 + }, + { + "age": 72, + "cost": 21.86, + "country": "JP", + "price": 48, + "project": "kibana", + "state": "running", + "time": 1473404400000, + "username": "driverak4", + "percent_uptime": 0.22 + }, + { + "age": 72, + "cost": 22.86, + "country": "CN", + "price": 46, + "project": "kibana", + "state": "done", + "time": 1483772400000, + "username": "khamiltonk5", + "percent_uptime": 0.86 + }, + { + "age": 48, + "cost": 21.64, + "country": "PE", + "price": 64, + "project": "x-pack", + "state": "running", + "time": 1476687600000, + "username": "tandersonk6", + "percent_uptime": 0.32 + }, + { + "age": 54, + "cost": 22.4, + "country": "PK", + "price": 53, + "project": "machine-learning", + "state": "running", + "time": 1486710000000, + "username": "ljenkinsk7", + "percent_uptime": 0.82 + }, + { + "age": 45, + "cost": 22.52, + "country": "RU", + "price": 51, + "project": "elasticsearch", + "state": "done", + "time": 1472540400000, + "username": "asandersk8", + "percent_uptime": 0.06 + }, + { + "age": 22, + "cost": 24.14, + "country": "MN", + "price": 52, + "project": "beats", + "state": "start", + "time": 1470034800000, + "username": "fwilliamsonk9", + "percent_uptime": 0.36 + }, + { + "age": 20, + "cost": 24.37, + "country": "JP", + "price": 67, + "project": "x-pack", + "state": "start", + "time": 1483081200000, + "username": "dortizka", + "percent_uptime": 0.65 + }, + { + "age": 37, + "cost": 24.62, + "country": "BD", + "price": 50, + "project": "kibana", + "state": "running", + "time": 1477983600000, + "username": "jpalmerkb", + "percent_uptime": 0.47 + }, + { + "age": 49, + "cost": 23.75, + "country": "BW", + "price": 40, + "project": "logstash", + "state": "start", + "time": 1482130800000, + "username": "areyeskc", + "percent_uptime": 0.46 + }, + { + "age": 39, + "cost": 22.17, + "country": "PL", + "price": 52, + "project": "opbeat", + "state": "running", + "time": 1463986800000, + "username": "jtuckerkd", + "percent_uptime": 0.78 + }, + { + "age": 71, + "cost": 21.39, + "country": "CN", + "price": 68, + "project": "beats", + "state": "start", + "time": 1485932400000, + "username": "rhickske", + "percent_uptime": 0.77 + }, + { + "age": 39, + "cost": 23.42, + "country": "CN", + "price": 49, + "project": "opbeat", + "state": "done", + "time": 1463122800000, + "username": "cgrahamkf", + "percent_uptime": 0.14 + }, + { + "age": 67, + "cost": 22.17, + "country": "ZA", + "price": 61, + "project": "opbeat", + "state": "running", + "time": 1472713200000, + "username": "jwestkg", + "percent_uptime": 0.6 + }, + { + "age": 56, + "cost": 21.53, + "country": "CN", + "price": 66, + "project": "logstash", + "state": "running", + "time": 1486969200000, + "username": "cpricekh", + "percent_uptime": 0.83 + }, + { + "age": 39, + "cost": 22.95, + "country": "PH", + "price": 45, + "project": "opbeat", + "state": "done", + "time": 1469948400000, + "username": "hyoungki", + "percent_uptime": 0.4 + }, + { + "age": 22, + "cost": 22.89, + "country": "EC", + "price": 59, + "project": "beats", + "state": "done", + "time": 1475737200000, + "username": "lsanderskj", + "percent_uptime": 0.69 + }, + { + "age": 49, + "cost": 22.96, + "country": "SE", + "price": 67, + "project": "logstash", + "state": "done", + "time": 1473836400000, + "username": "mfrazierkk", + "percent_uptime": 0.11 + }, + { + "age": 54, + "cost": 22.97, + "country": "AS", + "price": 60, + "project": "machine-learning", + "state": "done", + "time": 1466146800000, + "username": "sowenskl", + "percent_uptime": 0.28 + }, + { + "age": 68, + "cost": 22.21, + "country": "PA", + "price": 51, + "project": "machine-learning", + "state": "running", + "time": 1475391600000, + "username": "atuckerkm", + "percent_uptime": 0.69 + }, + { + "age": 74, + "cost": 21.47, + "country": "SE", + "price": 56, + "project": "opbeat", + "state": "start", + "time": 1475305200000, + "username": "cstanleykn", + "percent_uptime": 0.05 + }, + { + "age": 63, + "cost": 23.89, + "country": "FR", + "price": 55, + "project": "logstash", + "state": "start", + "time": 1484031600000, + "username": "jgrayko", + "percent_uptime": 0.92 + }, + { + "age": 57, + "cost": 23.97, + "country": "TT", + "price": 59, + "project": "beats", + "state": "start", + "time": 1472454000000, + "username": "ldeankp", + "percent_uptime": 0.51 + }, + { + "age": 43, + "cost": 21.55, + "country": "CN", + "price": 52, + "project": "beats", + "state": "running", + "time": 1463468400000, + "username": "rphillipskq", + "percent_uptime": 0.37 + }, + { + "age": 18, + "cost": 23.64, + "country": "RU", + "price": 62, + "project": "opbeat", + "state": "start", + "time": 1486882800000, + "username": "jnicholskr", + "percent_uptime": 0.65 + }, + { + "age": 54, + "cost": 22.83, + "country": "PT", + "price": 47, + "project": "machine-learning", + "state": "done", + "time": 1490684400000, + "username": "rthomasks", + "percent_uptime": 0.03 + }, + { + "age": 68, + "cost": 22.98, + "country": "JP", + "price": 52, + "project": "machine-learning", + "state": "done", + "time": 1476082800000, + "username": "wdaykt", + "percent_uptime": 0.42 + }, + { + "age": 62, + "cost": 23.17, + "country": "FR", + "price": 67, + "project": "x-pack", + "state": "done", + "time": 1491548400000, + "username": "kboydku", + "percent_uptime": 0.81 + }, + { + "age": 66, + "cost": 21.87, + "country": "NI", + "price": 62, + "project": "elasticsearch", + "state": "running", + "time": 1484550000000, + "username": "kmillskv", + "percent_uptime": 0.33 + }, + { + "age": 77, + "cost": 24.15, + "country": "FR", + "price": 63, + "project": "logstash", + "state": "start", + "time": 1465282800000, + "username": "dporterkw", + "percent_uptime": 0.48 + }, + { + "age": 36, + "cost": 23.24, + "country": "BD", + "price": 43, + "project": "beats", + "state": "done", + "time": 1479193200000, + "username": "rbradleykx", + "percent_uptime": 0.53 + }, + { + "age": 75, + "cost": 23.8, + "country": "CA", + "price": 50, + "project": "machine-learning", + "state": "start", + "time": 1464246000000, + "username": "kbradleyky", + "percent_uptime": 0.9 + }, + { + "age": 72, + "cost": 23.15, + "country": "MD", + "price": 62, + "project": "kibana", + "state": "done", + "time": 1465887600000, + "username": "sortizkz", + "percent_uptime": 0.83 + }, + { + "age": 27, + "cost": 22.38, + "country": "PL", + "price": 51, + "project": "x-pack", + "state": "running", + "time": 1475823600000, + "username": "mrodriguezl0", + "percent_uptime": 0.8 + }, + { + "age": 56, + "cost": 22.82, + "country": "AZ", + "price": 64, + "project": "logstash", + "state": "done", + "time": 1470639600000, + "username": "pwatkinsl1", + "percent_uptime": 0.81 + }, + { + "age": 57, + "cost": 23.17, + "country": "FR", + "price": 62, + "project": "beats", + "state": "done", + "time": 1471158000000, + "username": "jbrooksl2", + "percent_uptime": 0.66 + }, + { + "age": 76, + "cost": 22.55, + "country": "FR", + "price": 69, + "project": "x-pack", + "state": "done", + "time": 1472194800000, + "username": "rgardnerl3", + "percent_uptime": 0.3 + }, + { + "age": 21, + "cost": 23.76, + "country": "SE", + "price": 60, + "project": "logstash", + "state": "start", + "time": 1471935600000, + "username": "adeanl4", + "percent_uptime": 0.5 + }, + { + "age": 64, + "cost": 24.01, + "country": "PL", + "price": 60, + "project": "beats", + "state": "start", + "time": 1471935600000, + "username": "wwarrenl5", + "percent_uptime": 0.68 + }, + { + "age": 58, + "cost": 22.33, + "country": "RU", + "price": 55, + "project": "kibana", + "state": "running", + "time": 1470553200000, + "username": "mellisl6", + "percent_uptime": 0.41 + }, + { + "age": 71, + "cost": 22.93, + "country": "RU", + "price": 53, + "project": "beats", + "state": "done", + "time": 1475564400000, + "username": "kwhitel7", + "percent_uptime": 0.99 + }, + { + "age": 75, + "cost": 24.37, + "country": "EE", + "price": 69, + "project": "machine-learning", + "state": "start", + "time": 1484550000000, + "username": "jburnsl8", + "percent_uptime": 0.89 + }, + { + "age": 74, + "cost": 22.96, + "country": "GR", + "price": 58, + "project": "opbeat", + "state": "done", + "time": 1478156400000, + "username": "dwillisl9", + "percent_uptime": 0.6 + }, + { + "age": 56, + "cost": 24.64, + "country": "US", + "price": 56, + "project": "logstash", + "state": "running", + "time": 1468134000000, + "username": "lfoxla", + "percent_uptime": 0.62 + }, + { + "age": 20, + "cost": 23, + "country": "FR", + "price": 54, + "project": "x-pack", + "state": "done", + "time": 1478934000000, + "username": "mreedlb", + "percent_uptime": 0.2 + }, + { + "age": 32, + "cost": 23.91, + "country": "GR", + "price": 58, + "project": "opbeat", + "state": "start", + "time": 1462086000000, + "username": "cpiercelc", + "percent_uptime": 0.76 + }, + { + "age": 68, + "cost": 22.7, + "country": "CA", + "price": 42, + "project": "machine-learning", + "state": "done", + "time": 1472194800000, + "username": "rreynoldsld", + "percent_uptime": 0.44 + }, + { + "age": 56, + "cost": 23.64, + "country": "PH", + "price": 64, + "project": "logstash", + "state": "start", + "time": 1489906800000, + "username": "mwilsonle", + "percent_uptime": 0.12 + }, + { + "age": 29, + "cost": 24.34, + "country": "PE", + "price": 53, + "project": "beats", + "state": "start", + "time": 1477292400000, + "username": "msimmonslf", + "percent_uptime": 0.16 + }, + { + "age": 23, + "cost": 23.55, + "country": "RU", + "price": 63, + "project": "kibana", + "state": "start", + "time": 1476601200000, + "username": "smyerslg", + "percent_uptime": 0.97 + }, + { + "age": 27, + "cost": 22.07, + "country": "PT", + "price": 52, + "project": "x-pack", + "state": "running", + "time": 1483513200000, + "username": "jowenslh", + "percent_uptime": 0.94 + }, + { + "age": 79, + "cost": 22.69, + "country": "ID", + "price": 54, + "project": "kibana", + "state": "done", + "time": 1470380400000, + "username": "dadamsli", + "percent_uptime": 0.71 + }, + { + "age": 40, + "cost": 22.55, + "country": "UA", + "price": 60, + "project": "machine-learning", + "state": "done", + "time": 1467356400000, + "username": "sdavislj", + "percent_uptime": 0.1 + }, + { + "age": 38, + "cost": 22.83, + "country": "CN", + "price": 49, + "project": "elasticsearch", + "state": "done", + "time": 1491634800000, + "username": "anguyenlk", + "percent_uptime": 0.04 + }, + { + "age": 45, + "cost": 22.83, + "country": "CD", + "price": 55, + "project": "elasticsearch", + "state": "done", + "time": 1474786800000, + "username": "bgreenell", + "percent_uptime": 0.02 + }, + { + "age": 77, + "cost": 23.5, + "country": "BR", + "price": 47, + "project": "logstash", + "state": "start", + "time": 1467183600000, + "username": "jfullerlm", + "percent_uptime": 0.87 + }, + { + "age": 73, + "cost": 23.12, + "country": "CN", + "price": 63, + "project": "elasticsearch", + "state": "done", + "time": 1474527600000, + "username": "jhernandezln", + "percent_uptime": 0.39 + }, + { + "age": 66, + "cost": 21.12, + "country": "BR", + "price": 66, + "project": "elasticsearch", + "state": "start", + "time": 1463554800000, + "username": "lcruzlo", + "percent_uptime": 0.36 + }, + { + "age": 48, + "cost": 23, + "country": "IR", + "price": 44, + "project": "x-pack", + "state": "done", + "time": 1475996400000, + "username": "afloreslp", + "percent_uptime": 0.22 + }, + { + "age": 75, + "cost": 24.27, + "country": "SI", + "price": 57, + "project": "machine-learning", + "state": "start", + "time": 1470898800000, + "username": "trichardslq", + "percent_uptime": 0.94 + }, + { + "age": 49, + "cost": 24.58, + "country": "PH", + "price": 64, + "project": "logstash", + "state": "running", + "time": 1471676400000, + "username": "lweaverlr", + "percent_uptime": 0.45 + }, + { + "age": 76, + "cost": 22.8, + "country": "KN", + "price": 46, + "project": "x-pack", + "state": "done", + "time": 1481094000000, + "username": "hjohnstonls", + "percent_uptime": 0.18 + }, + { + "age": 73, + "cost": 24.34, + "country": "JO", + "price": 69, + "project": "elasticsearch", + "state": "start", + "time": 1485327600000, + "username": "roliverlt", + "percent_uptime": 0.3 + }, + { + "age": 63, + "cost": 23.63, + "country": "RU", + "price": 51, + "project": "logstash", + "state": "start", + "time": 1481180400000, + "username": "jfernandezlu", + "percent_uptime": 0.56 + }, + { + "age": 51, + "cost": 23.79, + "country": "PH", + "price": 67, + "project": "kibana", + "state": "start", + "time": 1470985200000, + "username": "rpattersonlv", + "percent_uptime": 0.64 + }, + { + "age": 27, + "cost": 24.02, + "country": "CN", + "price": 42, + "project": "x-pack", + "state": "start", + "time": 1474354800000, + "username": "rburtonlw", + "percent_uptime": 0.95 + }, + { + "age": 60, + "cost": 22.32, + "country": "CO", + "price": 63, + "project": "opbeat", + "state": "running", + "time": 1481094000000, + "username": "ehickslx", + "percent_uptime": 0.4 + }, + { + "age": 70, + "cost": 22.92, + "country": "MX", + "price": 59, + "project": "logstash", + "state": "done", + "time": 1487833200000, + "username": "mstevensly", + "percent_uptime": 0.62 + }, + { + "age": 37, + "cost": 21.53, + "country": "PH", + "price": 55, + "project": "kibana", + "state": "running", + "time": 1486969200000, + "username": "cbutlerlz", + "percent_uptime": 0.93 + }, + { + "age": 34, + "cost": 22.3, + "country": "FR", + "price": 54, + "project": "x-pack", + "state": "running", + "time": 1472281200000, + "username": "kbarnesm0", + "percent_uptime": 0.57 + }, + { + "age": 43, + "cost": 22.29, + "country": "SV", + "price": 58, + "project": "beats", + "state": "running", + "time": 1479625200000, + "username": "ajohnstonm1", + "percent_uptime": 0.6 + }, + { + "age": 58, + "cost": 22.92, + "country": "ID", + "price": 57, + "project": "kibana", + "state": "done", + "time": 1488438000000, + "username": "afieldsm2", + "percent_uptime": 0.75 + }, + { + "age": 69, + "cost": 24.44, + "country": "PT", + "price": 52, + "project": "x-pack", + "state": "start", + "time": 1463209200000, + "username": "jgilbertm3", + "percent_uptime": 0.87 + }, + { + "age": 43, + "cost": 23.54, + "country": "KZ", + "price": 62, + "project": "beats", + "state": "start", + "time": 1474354800000, + "username": "sgarrettm4", + "percent_uptime": 0.9 + }, + { + "age": 31, + "cost": 22.92, + "country": "RU", + "price": 54, + "project": "elasticsearch", + "state": "done", + "time": 1478847600000, + "username": "hsimsm5", + "percent_uptime": 0.98 + }, + { + "age": 23, + "cost": 23.61, + "country": "MG", + "price": 65, + "project": "kibana", + "state": "start", + "time": 1467529200000, + "username": "ehallm6", + "percent_uptime": 0.52 + }, + { + "age": 35, + "cost": 22.2, + "country": "RU", + "price": 48, + "project": "logstash", + "state": "running", + "time": 1482476400000, + "username": "msimsm7", + "percent_uptime": 0.08 + }, + { + "age": 33, + "cost": 23.94, + "country": "PT", + "price": 42, + "project": "machine-learning", + "state": "start", + "time": 1489215600000, + "username": "djamesm8", + "percent_uptime": 0.09 + }, + { + "age": 65, + "cost": 21.95, + "country": "RU", + "price": 61, + "project": "kibana", + "state": "running", + "time": 1465369200000, + "username": "ahansonm9", + "percent_uptime": 0.9 + }, + { + "age": 31, + "cost": 21.43, + "country": "CN", + "price": 65, + "project": "elasticsearch", + "state": "start", + "time": 1491634800000, + "username": "whunterma", + "percent_uptime": 0.95 + }, + { + "age": 36, + "cost": 23.01, + "country": "ET", + "price": 62, + "project": "beats", + "state": "done", + "time": 1462258800000, + "username": "jstanleymb", + "percent_uptime": 0.65 + }, + { + "age": 52, + "cost": 23.95, + "country": "ID", + "price": 50, + "project": "elasticsearch", + "state": "start", + "time": 1482217200000, + "username": "ngriffinmc", + "percent_uptime": 0.38 + }, + { + "age": 63, + "cost": 23.27, + "country": "SE", + "price": 66, + "project": "logstash", + "state": "done", + "time": 1474354800000, + "username": "talexandermd", + "percent_uptime": 0.64 + }, + { + "age": 68, + "cost": 24.56, + "country": "MX", + "price": 56, + "project": "machine-learning", + "state": "running", + "time": 1481266800000, + "username": "tgonzalezme", + "percent_uptime": 0.24 + }, + { + "age": 78, + "cost": 23.07, + "country": "RU", + "price": 61, + "project": "beats", + "state": "done", + "time": 1478761200000, + "username": "sfreemanmf", + "percent_uptime": 0.25 + }, + { + "age": 65, + "cost": 24.37, + "country": "CN", + "price": 54, + "project": "kibana", + "state": "start", + "time": 1481094000000, + "username": "hhuntmg", + "percent_uptime": 0.78 + }, + { + "age": 65, + "cost": 21.48, + "country": "CZ", + "price": 47, + "project": "kibana", + "state": "start", + "time": 1476342000000, + "username": "sdeanmh", + "percent_uptime": 0.48 + }, + { + "age": 21, + "cost": 23.25, + "country": "RU", + "price": 62, + "project": "logstash", + "state": "done", + "time": 1461567600000, + "username": "kellismi", + "percent_uptime": 0.62 + }, + { + "age": 76, + "cost": 23.03, + "country": "VN", + "price": 59, + "project": "x-pack", + "state": "done", + "time": 1487401200000, + "username": "emillermj", + "percent_uptime": 0.19 + }, + { + "age": 41, + "cost": 23.05, + "country": "PH", + "price": 63, + "project": "x-pack", + "state": "done", + "time": 1462518000000, + "username": "mbaileymk", + "percent_uptime": 0.84 + }, + { + "age": 50, + "cost": 23.57, + "country": "US", + "price": 56, + "project": "beats", + "state": "start", + "time": 1477724400000, + "username": "rfosterml", + "percent_uptime": 0.78 + }, + { + "age": 21, + "cost": 23.43, + "country": "UA", + "price": 69, + "project": "logstash", + "state": "done", + "time": 1486191600000, + "username": "praymm", + "percent_uptime": 0.76 + }, + { + "age": 25, + "cost": 22.65, + "country": "TH", + "price": 56, + "project": "opbeat", + "state": "done", + "time": 1475046000000, + "username": "shuntmn", + "percent_uptime": 0.61 + }, + { + "age": 69, + "cost": 22.23, + "country": "PH", + "price": 63, + "project": "x-pack", + "state": "running", + "time": 1468047600000, + "username": "aromeromo", + "percent_uptime": 0.01 + }, + { + "age": 28, + "cost": 24.8, + "country": "MY", + "price": 44, + "project": "logstash", + "state": "running", + "time": 1476428400000, + "username": "lmeyermp", + "percent_uptime": 0.97 + }, + { + "age": 72, + "cost": 22.49, + "country": "CZ", + "price": 46, + "project": "kibana", + "state": "running", + "time": 1482130800000, + "username": "jreynoldsmq", + "percent_uptime": 0.35 + }, + { + "age": 50, + "cost": 21.4, + "country": "MA", + "price": 38, + "project": "beats", + "state": "start", + "time": 1477119600000, + "username": "bfieldsmr", + "percent_uptime": 0.61 + }, + { + "age": 56, + "cost": 22.34, + "country": "GR", + "price": 53, + "project": "logstash", + "state": "running", + "time": 1461826800000, + "username": "jnguyenms", + "percent_uptime": 0.24 + }, + { + "age": 64, + "cost": 22.22, + "country": "CO", + "price": 62, + "project": "beats", + "state": "running", + "time": 1464678000000, + "username": "tchapmanmt", + "percent_uptime": 0.97 + }, + { + "age": 20, + "cost": 23.03, + "country": "CN", + "price": 61, + "project": "x-pack", + "state": "done", + "time": 1489042800000, + "username": "ajacobsmu", + "percent_uptime": 0.71 + }, + { + "age": 18, + "cost": 23.43, + "country": "CN", + "price": 54, + "project": "opbeat", + "state": "done", + "time": 1460271600000, + "username": "kphillipsmv", + "percent_uptime": 0.29 + }, + { + "age": 30, + "cost": 23.6, + "country": "CO", + "price": 67, + "project": "kibana", + "state": "start", + "time": 1467961200000, + "username": "glongmw", + "percent_uptime": 0.51 + }, + { + "age": 53, + "cost": 23.57, + "country": "PH", + "price": 52, + "project": "opbeat", + "state": "start", + "time": 1479625200000, + "username": "lmitchellmx", + "percent_uptime": 0.99 + }, + { + "age": 68, + "cost": 24.13, + "country": "PL", + "price": 53, + "project": "machine-learning", + "state": "start", + "time": 1486710000000, + "username": "jcarrollmy", + "percent_uptime": 0.14 + }, + { + "age": 55, + "cost": 21.96, + "country": "CN", + "price": 57, + "project": "x-pack", + "state": "running", + "time": 1490079600000, + "username": "wspencermz", + "percent_uptime": 0.48 + }, + { + "age": 35, + "cost": 21.84, + "country": "NO", + "price": 71, + "project": "logstash", + "state": "running", + "time": 1460271600000, + "username": "jfloresn0", + "percent_uptime": 0.8 + }, + { + "age": 34, + "cost": 23.2, + "country": "BR", + "price": 53, + "project": "x-pack", + "state": "done", + "time": 1486969200000, + "username": "jramirezn1", + "percent_uptime": 0.85 + }, + { + "age": 73, + "cost": 24.19, + "country": "CN", + "price": 52, + "project": "elasticsearch", + "state": "start", + "time": 1487919600000, + "username": "plarsonn2", + "percent_uptime": 0.69 + }, + { + "age": 58, + "cost": 23.32, + "country": "PH", + "price": 51, + "project": "kibana", + "state": "done", + "time": 1487055600000, + "username": "mreidn3", + "percent_uptime": 0.83 + }, + { + "age": 21, + "cost": 22.42, + "country": "CN", + "price": 49, + "project": "logstash", + "state": "running", + "time": 1463295600000, + "username": "sfraziern4", + "percent_uptime": 0.98 + }, + { + "age": 39, + "cost": 23.2, + "country": "IT", + "price": 52, + "project": "opbeat", + "state": "done", + "time": 1467442800000, + "username": "agarcian5", + "percent_uptime": 0.82 + }, + { + "age": 50, + "cost": 22.33, + "country": "PL", + "price": 52, + "project": "beats", + "state": "running", + "time": 1473145200000, + "username": "jryann6", + "percent_uptime": 0.92 + }, + { + "age": 43, + "cost": 23, + "country": "IR", + "price": 61, + "project": "beats", + "state": "done", + "time": 1475823600000, + "username": "wmyersn7", + "percent_uptime": 0.56 + }, + { + "age": 67, + "cost": 22.35, + "country": "ID", + "price": 55, + "project": "opbeat", + "state": "running", + "time": 1485327600000, + "username": "btuckern8", + "percent_uptime": 0.26 + }, + { + "age": 50, + "cost": 23.54, + "country": "FR", + "price": 60, + "project": "beats", + "state": "start", + "time": 1489474800000, + "username": "agarcian9", + "percent_uptime": 0.99 + }, + { + "age": 27, + "cost": 23.86, + "country": "RU", + "price": 44, + "project": "x-pack", + "state": "start", + "time": 1488783600000, + "username": "dcampbellna", + "percent_uptime": 0.88 + }, + { + "age": 27, + "cost": 23.1, + "country": "FR", + "price": 52, + "project": "x-pack", + "state": "done", + "time": 1477724400000, + "username": "nwarrennb", + "percent_uptime": 0.93 + }, + { + "age": 33, + "cost": 22.7, + "country": "HU", + "price": 51, + "project": "machine-learning", + "state": "done", + "time": 1474182000000, + "username": "ajenkinsnc", + "percent_uptime": 0.66 + }, + { + "age": 26, + "cost": 23.57, + "country": "PE", + "price": 47, + "project": "machine-learning", + "state": "start", + "time": 1487660400000, + "username": "crichardsnd", + "percent_uptime": 0.18 + }, + { + "age": 39, + "cost": 23.16, + "country": "CN", + "price": 62, + "project": "opbeat", + "state": "done", + "time": 1462431600000, + "username": "edavisne", + "percent_uptime": 0.66 + }, + { + "age": 43, + "cost": 22.96, + "country": "ID", + "price": 71, + "project": "beats", + "state": "done", + "time": 1468825200000, + "username": "cbaileynf", + "percent_uptime": 0.58 + }, + { + "age": 75, + "cost": 23.09, + "country": "PL", + "price": 58, + "project": "machine-learning", + "state": "done", + "time": 1481871600000, + "username": "cpetersng", + "percent_uptime": 0.73 + }, + { + "age": 38, + "cost": 23.48, + "country": "MA", + "price": 53, + "project": "elasticsearch", + "state": "done", + "time": 1462086000000, + "username": "jlanenh", + "percent_uptime": 0.69 + }, + { + "age": 67, + "cost": 23.05, + "country": "CO", + "price": 50, + "project": "opbeat", + "state": "done", + "time": 1476169200000, + "username": "dsimmonsni", + "percent_uptime": 0.05 + }, + { + "age": 47, + "cost": 24.1, + "country": "VN", + "price": 56, + "project": "machine-learning", + "state": "start", + "time": 1490770800000, + "username": "kwarrennj", + "percent_uptime": 0.05 + }, + { + "age": 39, + "cost": 22.49, + "country": "ID", + "price": 69, + "project": "opbeat", + "state": "running", + "time": 1476255600000, + "username": "ptorresnk", + "percent_uptime": 0.43 + }, + { + "age": 78, + "cost": 22.26, + "country": "IR", + "price": 71, + "project": "beats", + "state": "running", + "time": 1489647600000, + "username": "aramireznl", + "percent_uptime": 0.64 + }, + { + "age": 63, + "cost": 22.76, + "country": "AM", + "price": 57, + "project": "logstash", + "state": "done", + "time": 1466665200000, + "username": "jjenkinsnm", + "percent_uptime": 0.69 + }, + { + "age": 28, + "cost": 21.97, + "country": "BR", + "price": 51, + "project": "logstash", + "state": "running", + "time": 1466578800000, + "username": "swalkernn", + "percent_uptime": 0.17 + }, + { + "age": 65, + "cost": 24.83, + "country": "RU", + "price": 45, + "project": "kibana", + "state": "running", + "time": 1486882800000, + "username": "brobertsno", + "percent_uptime": 0.39 + }, + { + "age": 59, + "cost": 22.21, + "country": "CN", + "price": 69, + "project": "elasticsearch", + "state": "running", + "time": 1490943600000, + "username": "bberrynp", + "percent_uptime": 0.97 + }, + { + "age": 62, + "cost": 23.66, + "country": "CN", + "price": 60, + "project": "x-pack", + "state": "start", + "time": 1462777200000, + "username": "lrodrigueznq", + "percent_uptime": 0.3 + }, + { + "age": 77, + "cost": 23.61, + "country": "CN", + "price": 46, + "project": "logstash", + "state": "start", + "time": 1471244400000, + "username": "jreidnr", + "percent_uptime": 0.09 + }, + { + "age": 18, + "cost": 23.58, + "country": "TZ", + "price": 62, + "project": "opbeat", + "state": "start", + "time": 1475132400000, + "username": "jmurrayns", + "percent_uptime": 0.01 + }, + { + "age": 47, + "cost": 24.46, + "country": "VE", + "price": 67, + "project": "machine-learning", + "state": "start", + "time": 1468911600000, + "username": "gtaylornt", + "percent_uptime": 0.65 + }, + { + "age": 23, + "cost": 21.78, + "country": "ID", + "price": 63, + "project": "kibana", + "state": "running", + "time": 1486191600000, + "username": "rgriffinnu", + "percent_uptime": 0.51 + }, + { + "age": 35, + "cost": 23.07, + "country": "IL", + "price": 59, + "project": "logstash", + "state": "done", + "time": 1466838000000, + "username": "sfieldsnv", + "percent_uptime": 0.91 + }, + { + "age": 55, + "cost": 23.21, + "country": "CN", + "price": 69, + "project": "x-pack", + "state": "done", + "time": 1476601200000, + "username": "ereidnw", + "percent_uptime": 0.87 + }, + { + "age": 23, + "cost": 24.26, + "country": "PL", + "price": 45, + "project": "kibana", + "state": "start", + "time": 1464678000000, + "username": "bhawkinsnx", + "percent_uptime": 0.92 + }, + { + "age": 18, + "cost": 22.98, + "country": "CN", + "price": 65, + "project": "opbeat", + "state": "done", + "time": 1474441200000, + "username": "cgrayny", + "percent_uptime": 0.73 + }, + { + "age": 66, + "cost": 22.83, + "country": "MX", + "price": 47, + "project": "elasticsearch", + "state": "done", + "time": 1470466800000, + "username": "fhughesnz", + "percent_uptime": 0.14 + }, + { + "age": 57, + "cost": 22.92, + "country": "NG", + "price": 53, + "project": "beats", + "state": "done", + "time": 1470466800000, + "username": "lwelcho0", + "percent_uptime": 0.53 + }, + { + "age": 80, + "cost": 23.97, + "country": "SE", + "price": 61, + "project": "elasticsearch", + "state": "start", + "time": 1491375600000, + "username": "jwatkinso1", + "percent_uptime": 0.09 + }, + { + "age": 46, + "cost": 23.36, + "country": "JP", + "price": 59, + "project": "opbeat", + "state": "done", + "time": 1481353200000, + "username": "awoodo2", + "percent_uptime": 0.7 + }, + { + "age": 74, + "cost": 21.17, + "country": "CN", + "price": 65, + "project": "opbeat", + "state": "start", + "time": 1486969200000, + "username": "pmatthewso3", + "percent_uptime": 0.48 + }, + { + "age": 36, + "cost": 22.96, + "country": "CZ", + "price": 55, + "project": "beats", + "state": "done", + "time": 1474009200000, + "username": "rhudsono4", + "percent_uptime": 0.63 + }, + { + "age": 62, + "cost": 21.58, + "country": "SE", + "price": 57, + "project": "x-pack", + "state": "running", + "time": 1481094000000, + "username": "rwardo5", + "percent_uptime": 0.38 + }, + { + "age": 54, + "cost": 24.58, + "country": "CN", + "price": 65, + "project": "machine-learning", + "state": "running", + "time": 1486882800000, + "username": "cgomezo6", + "percent_uptime": 0.08 + }, + { + "age": 58, + "cost": 22.56, + "country": "FR", + "price": 52, + "project": "kibana", + "state": "done", + "time": 1468393200000, + "username": "jburtono7", + "percent_uptime": 0.8 + }, + { + "age": 47, + "cost": 23.38, + "country": "IE", + "price": 45, + "project": "machine-learning", + "state": "done", + "time": 1461567600000, + "username": "dcarpentero8", + "percent_uptime": 0.05 + }, + { + "age": 41, + "cost": 23.42, + "country": "ID", + "price": 46, + "project": "x-pack", + "state": "done", + "time": 1485154800000, + "username": "thunto9", + "percent_uptime": 0.09 + }, + { + "age": 47, + "cost": 23.2, + "country": "PL", + "price": 53, + "project": "machine-learning", + "state": "done", + "time": 1489647600000, + "username": "ssnyderoa", + "percent_uptime": 0.03 + }, + { + "age": 80, + "cost": 22.7, + "country": "US", + "price": 57, + "project": "elasticsearch", + "state": "done", + "time": 1465282800000, + "username": "mkimob", + "percent_uptime": 0.67 + }, + { + "age": 22, + "cost": 21.66, + "country": "PH", + "price": 43, + "project": "beats", + "state": "running", + "time": 1462086000000, + "username": "ehansonoc", + "percent_uptime": 0.31 + }, + { + "age": 37, + "cost": 22.29, + "country": "RU", + "price": 56, + "project": "kibana", + "state": "running", + "time": 1463036400000, + "username": "wspencerod", + "percent_uptime": 0.9 + }, + { + "age": 65, + "cost": 23.28, + "country": "ES", + "price": 61, + "project": "kibana", + "state": "done", + "time": 1478934000000, + "username": "khansenoe", + "percent_uptime": 0.02 + }, + { + "age": 64, + "cost": 24.75, + "country": "JP", + "price": 63, + "project": "beats", + "state": "running", + "time": 1473836400000, + "username": "jcruzof", + "percent_uptime": 0.04 + }, + { + "age": 51, + "cost": 22.73, + "country": "PE", + "price": 54, + "project": "kibana", + "state": "done", + "time": 1467097200000, + "username": "tkelleyog", + "percent_uptime": 0.53 + }, + { + "age": 76, + "cost": 23.04, + "country": "RU", + "price": 51, + "project": "x-pack", + "state": "done", + "time": 1468998000000, + "username": "jbrooksoh", + "percent_uptime": 0.2 + }, + { + "age": 31, + "cost": 23.49, + "country": "PH", + "price": 55, + "project": "elasticsearch", + "state": "done", + "time": 1465542000000, + "username": "ncooperoi", + "percent_uptime": 0.4 + }, + { + "age": 78, + "cost": 23.66, + "country": "JP", + "price": 59, + "project": "beats", + "state": "start", + "time": 1475478000000, + "username": "ddiazoj", + "percent_uptime": 0.93 + }, + { + "age": 64, + "cost": 24.02, + "country": "HN", + "price": 57, + "project": "beats", + "state": "start", + "time": 1462345200000, + "username": "kpowellok", + "percent_uptime": 0.9 + }, + { + "age": 72, + "cost": 24.54, + "country": "ID", + "price": 60, + "project": "kibana", + "state": "running", + "time": 1476514800000, + "username": "pporterol", + "percent_uptime": 0.27 + }, + { + "age": 57, + "cost": 21.5, + "country": "DE", + "price": 59, + "project": "beats", + "state": "running", + "time": 1481266800000, + "username": "hgarzaom", + "percent_uptime": 0.52 + }, + { + "age": 71, + "cost": 22.81, + "country": "ZA", + "price": 45, + "project": "beats", + "state": "done", + "time": 1480748400000, + "username": "wevanson", + "percent_uptime": 0.38 + }, + { + "age": 50, + "cost": 24.02, + "country": "GR", + "price": 70, + "project": "beats", + "state": "start", + "time": 1470985200000, + "username": "jlaneoo", + "percent_uptime": 0.51 + }, + { + "age": 23, + "cost": 21.49, + "country": "PH", + "price": 49, + "project": "kibana", + "state": "start", + "time": 1467270000000, + "username": "gfergusonop", + "percent_uptime": 0.91 + }, + { + "age": 23, + "cost": 22.64, + "country": "ID", + "price": 60, + "project": "kibana", + "state": "done", + "time": 1482303600000, + "username": "rwillisoq", + "percent_uptime": 0.26 + }, + { + "age": 80, + "cost": 23.37, + "country": "CN", + "price": 68, + "project": "elasticsearch", + "state": "done", + "time": 1490598000000, + "username": "nfulleror", + "percent_uptime": 0.86 + }, + { + "age": 65, + "cost": 23.47, + "country": "SE", + "price": 48, + "project": "kibana", + "state": "done", + "time": 1484463600000, + "username": "tellisos", + "percent_uptime": 0.92 + }, + { + "age": 38, + "cost": 24.55, + "country": "RS", + "price": 53, + "project": "elasticsearch", + "state": "running", + "time": 1461654000000, + "username": "mfosterot", + "percent_uptime": 0.55 + }, + { + "age": 70, + "cost": 21.01, + "country": "CN", + "price": 66, + "project": "logstash", + "state": "start", + "time": 1484895600000, + "username": "astevensou", + "percent_uptime": 0.08 + }, + { + "age": 65, + "cost": 23.49, + "country": "TH", + "price": 51, + "project": "kibana", + "state": "done", + "time": 1468911600000, + "username": "bdixonov", + "percent_uptime": 0.05 + }, + { + "age": 36, + "cost": 24.22, + "country": "ID", + "price": 45, + "project": "beats", + "state": "start", + "time": 1481785200000, + "username": "fbrooksow", + "percent_uptime": 0.06 + }, + { + "age": 61, + "cost": 23.65, + "country": "UA", + "price": 48, + "project": "machine-learning", + "state": "start", + "time": 1479798000000, + "username": "pbryantox", + "percent_uptime": 0.45 + }, + { + "age": 44, + "cost": 23.09, + "country": "CN", + "price": 53, + "project": "kibana", + "state": "done", + "time": 1471417200000, + "username": "jsullivanoy", + "percent_uptime": 0.45 + }, + { + "age": 27, + "cost": 23.29, + "country": "ID", + "price": 49, + "project": "x-pack", + "state": "done", + "time": 1491375600000, + "username": "revansoz", + "percent_uptime": 0.4 + }, + { + "age": 38, + "cost": 23.81, + "country": "LU", + "price": 56, + "project": "elasticsearch", + "state": "start", + "time": 1465887600000, + "username": "schavezp0", + "percent_uptime": 0.09 + }, + { + "age": 64, + "cost": 23.07, + "country": "CN", + "price": 56, + "project": "beats", + "state": "done", + "time": 1462518000000, + "username": "imorganp1", + "percent_uptime": 0.75 + }, + { + "age": 80, + "cost": 21.95, + "country": "MX", + "price": 49, + "project": "elasticsearch", + "state": "running", + "time": 1468998000000, + "username": "sfullerp2", + "percent_uptime": 0.25 + }, + { + "age": 36, + "cost": 21.16, + "country": "ID", + "price": 56, + "project": "beats", + "state": "start", + "time": 1491202800000, + "username": "hjonesp3", + "percent_uptime": 0.64 + }, + { + "age": 51, + "cost": 23.67, + "country": "SI", + "price": 56, + "project": "kibana", + "state": "start", + "time": 1472454000000, + "username": "abaileyp4", + "percent_uptime": 0.22 + }, + { + "age": 35, + "cost": 23.26, + "country": "IS", + "price": 69, + "project": "logstash", + "state": "done", + "time": 1472540400000, + "username": "chowardp5", + "percent_uptime": 0.4 + }, + { + "age": 72, + "cost": 22.88, + "country": "ZA", + "price": 50, + "project": "kibana", + "state": "done", + "time": 1474441200000, + "username": "jandersonp6", + "percent_uptime": 0.1 + }, + { + "age": 25, + "cost": 23.37, + "country": "RU", + "price": 61, + "project": "opbeat", + "state": "done", + "time": 1472022000000, + "username": "pclarkp7", + "percent_uptime": 0.23 + }, + { + "age": 58, + "cost": 23.99, + "country": "NG", + "price": 48, + "project": "kibana", + "state": "start", + "time": 1484722800000, + "username": "trichardsonp8", + "percent_uptime": 0.87 + }, + { + "age": 63, + "cost": 21.74, + "country": "MY", + "price": 50, + "project": "logstash", + "state": "running", + "time": 1467010800000, + "username": "jleep9", + "percent_uptime": 0.19 + }, + { + "age": 50, + "cost": 22.3, + "country": "SY", + "price": 63, + "project": "beats", + "state": "running", + "time": 1491116400000, + "username": "gbowmanpa", + "percent_uptime": 0.46 + }, + { + "age": 31, + "cost": 22.65, + "country": "CN", + "price": 52, + "project": "elasticsearch", + "state": "done", + "time": 1483686000000, + "username": "hburtonpb", + "percent_uptime": 0.44 + }, + { + "age": 61, + "cost": 22.95, + "country": "SI", + "price": 61, + "project": "machine-learning", + "state": "done", + "time": 1489129200000, + "username": "ewoodspc", + "percent_uptime": 0.04 + }, + { + "age": 61, + "cost": 23.15, + "country": "KE", + "price": 53, + "project": "machine-learning", + "state": "done", + "time": 1467529200000, + "username": "hhawkinspd", + "percent_uptime": 0.69 + }, + { + "age": 76, + "cost": 22.12, + "country": "CN", + "price": 65, + "project": "x-pack", + "state": "running", + "time": 1488178800000, + "username": "ebowmanpe", + "percent_uptime": 0.51 + }, + { + "age": 68, + "cost": 24.14, + "country": "LK", + "price": 57, + "project": "machine-learning", + "state": "start", + "time": 1463554800000, + "username": "bflorespf", + "percent_uptime": 0.16 + }, + { + "age": 33, + "cost": 22.67, + "country": "TH", + "price": 47, + "project": "machine-learning", + "state": "done", + "time": 1464246000000, + "username": "plawsonpg", + "percent_uptime": 0.89 + }, + { + "age": 27, + "cost": 20.8, + "country": "SE", + "price": 69, + "project": "x-pack", + "state": "start", + "time": 1490338800000, + "username": "hfullerph", + "percent_uptime": 0.04 + }, + { + "age": 32, + "cost": 21.8, + "country": "AM", + "price": 56, + "project": "opbeat", + "state": "running", + "time": 1471330800000, + "username": "tfranklinpi", + "percent_uptime": 0.2 + }, + { + "age": 42, + "cost": 23.23, + "country": "BR", + "price": 54, + "project": "logstash", + "state": "done", + "time": 1462086000000, + "username": "jwebbpj", + "percent_uptime": 0.29 + }, + { + "age": 49, + "cost": 24.36, + "country": "MK", + "price": 45, + "project": "logstash", + "state": "start", + "time": 1462345200000, + "username": "cwarrenpk", + "percent_uptime": 0.11 + }, + { + "age": 51, + "cost": 24.68, + "country": "PH", + "price": 54, + "project": "kibana", + "state": "running", + "time": 1463986800000, + "username": "dmurphypl", + "percent_uptime": 0.45 + }, + { + "age": 63, + "cost": 22.54, + "country": "RS", + "price": 62, + "project": "logstash", + "state": "done", + "time": 1472454000000, + "username": "bwestpm", + "percent_uptime": 0.48 + }, + { + "age": 50, + "cost": 24.51, + "country": "AU", + "price": 40, + "project": "beats", + "state": "running", + "time": 1470380400000, + "username": "bhernandezpn", + "percent_uptime": 0.7 + }, + { + "age": 51, + "cost": 23.23, + "country": "JP", + "price": 70, + "project": "kibana", + "state": "done", + "time": 1489474800000, + "username": "jalexanderpo", + "percent_uptime": 0.56 + }, + { + "age": 73, + "cost": 22.16, + "country": "AF", + "price": 63, + "project": "elasticsearch", + "state": "running", + "time": 1476946800000, + "username": "dmorganpp", + "percent_uptime": 0.73 + }, + { + "age": 78, + "cost": 22.69, + "country": "FI", + "price": 59, + "project": "beats", + "state": "done", + "time": 1482908400000, + "username": "lweaverpq", + "percent_uptime": 0.61 + }, + { + "age": 65, + "cost": 21.09, + "country": "BI", + "price": 58, + "project": "kibana", + "state": "start", + "time": 1460876400000, + "username": "jbaileypr", + "percent_uptime": 0.99 + }, + { + "age": 32, + "cost": 23.25, + "country": "RU", + "price": 50, + "project": "opbeat", + "state": "done", + "time": 1471244400000, + "username": "kreyesps", + "percent_uptime": 0.12 + }, + { + "age": 27, + "cost": 22.53, + "country": "PT", + "price": 61, + "project": "x-pack", + "state": "done", + "time": 1487919600000, + "username": "mlynchpt", + "percent_uptime": 0.84 + }, + { + "age": 59, + "cost": 23.47, + "country": "CO", + "price": 48, + "project": "elasticsearch", + "state": "done", + "time": 1465196400000, + "username": "tpiercepu", + "percent_uptime": 0.15 + }, + { + "age": 77, + "cost": 23.02, + "country": "SE", + "price": 47, + "project": "logstash", + "state": "done", + "time": 1480489200000, + "username": "ewebbpv", + "percent_uptime": 0.63 + }, + { + "age": 44, + "cost": 24.28, + "country": "RU", + "price": 64, + "project": "kibana", + "state": "start", + "time": 1480316400000, + "username": "drosspw", + "percent_uptime": 0.56 + }, + { + "age": 34, + "cost": 22.06, + "country": "IR", + "price": 58, + "project": "x-pack", + "state": "running", + "time": 1476601200000, + "username": "jmccoypx", + "percent_uptime": 0.21 + }, + { + "age": 60, + "cost": 21.06, + "country": "AR", + "price": 40, + "project": "opbeat", + "state": "start", + "time": 1467874800000, + "username": "bwhitepy", + "percent_uptime": 0.96 + }, + { + "age": 33, + "cost": 22.08, + "country": "BR", + "price": 44, + "project": "machine-learning", + "state": "running", + "time": 1480662000000, + "username": "jkellypz", + "percent_uptime": 0.55 + }, + { + "age": 59, + "cost": 23.5, + "country": "CZ", + "price": 54, + "project": "elasticsearch", + "state": "start", + "time": 1473231600000, + "username": "darmstrongq0", + "percent_uptime": 0.02 + }, + { + "age": 73, + "cost": 21.15, + "country": "GR", + "price": 52, + "project": "elasticsearch", + "state": "start", + "time": 1481612400000, + "username": "dperryq1", + "percent_uptime": 0.75 + }, + { + "age": 49, + "cost": 22.39, + "country": "TH", + "price": 54, + "project": "logstash", + "state": "running", + "time": 1488178800000, + "username": "dschmidtq2", + "percent_uptime": 0.67 + }, + { + "age": 65, + "cost": 24.42, + "country": "CZ", + "price": 54, + "project": "kibana", + "state": "start", + "time": 1468220400000, + "username": "aandrewsq3", + "percent_uptime": 0.35 + }, + { + "age": 49, + "cost": 21.22, + "country": "GH", + "price": 60, + "project": "logstash", + "state": "start", + "time": 1491030000000, + "username": "ameyerq4", + "percent_uptime": 0.9 + }, + { + "age": 39, + "cost": 23.53, + "country": "ID", + "price": 64, + "project": "opbeat", + "state": "start", + "time": 1484463600000, + "username": "dwoodsq5", + "percent_uptime": 0.96 + }, + { + "age": 19, + "cost": 23.49, + "country": "CN", + "price": 51, + "project": "machine-learning", + "state": "done", + "time": 1467183600000, + "username": "jmooreq6", + "percent_uptime": 0.25 + }, + { + "age": 27, + "cost": 23.14, + "country": "NG", + "price": 56, + "project": "x-pack", + "state": "done", + "time": 1482822000000, + "username": "sspencerq7", + "percent_uptime": 0.39 + }, + { + "age": 30, + "cost": 23.07, + "country": "MX", + "price": 66, + "project": "kibana", + "state": "done", + "time": 1481785200000, + "username": "jtorresq8", + "percent_uptime": 0.26 + }, + { + "age": 67, + "cost": 23.06, + "country": "DO", + "price": 49, + "project": "opbeat", + "state": "done", + "time": 1466924400000, + "username": "mwestq9", + "percent_uptime": 0.6 + }, + { + "age": 38, + "cost": 23.48, + "country": "CN", + "price": 61, + "project": "elasticsearch", + "state": "done", + "time": 1487487600000, + "username": "mnguyenqa", + "percent_uptime": 0.55 + }, + { + "age": 68, + "cost": 23.41, + "country": "MX", + "price": 52, + "project": "machine-learning", + "state": "done", + "time": 1476169200000, + "username": "mroseqb", + "percent_uptime": 0.85 + }, + { + "age": 25, + "cost": 22.11, + "country": "TH", + "price": 39, + "project": "opbeat", + "state": "running", + "time": 1477983600000, + "username": "mjacksonqc", + "percent_uptime": 0.58 + }, + { + "age": 20, + "cost": 22.46, + "country": "ID", + "price": 55, + "project": "x-pack", + "state": "running", + "time": 1487833200000, + "username": "cyoungqd", + "percent_uptime": 0.01 + }, + { + "age": 64, + "cost": 21.55, + "country": "ET", + "price": 60, + "project": "beats", + "state": "running", + "time": 1464850800000, + "username": "cjenkinsqe", + "percent_uptime": 0.68 + }, + { + "age": 25, + "cost": 22.36, + "country": "SE", + "price": 50, + "project": "opbeat", + "state": "running", + "time": 1482822000000, + "username": "jhartqf", + "percent_uptime": 0.18 + }, + { + "age": 45, + "cost": 23.73, + "country": "CN", + "price": 47, + "project": "elasticsearch", + "state": "start", + "time": 1465887600000, + "username": "cgutierrezqg", + "percent_uptime": 0.07 + }, + { + "age": 49, + "cost": 24.47, + "country": "CN", + "price": 63, + "project": "logstash", + "state": "start", + "time": 1487228400000, + "username": "pgarzaqh", + "percent_uptime": 0.49 + }, + { + "age": 72, + "cost": 21.43, + "country": "ID", + "price": 74, + "project": "kibana", + "state": "start", + "time": 1474959600000, + "username": "jbrownqi", + "percent_uptime": 0.92 + }, + { + "age": 48, + "cost": 22.55, + "country": "TH", + "price": 54, + "project": "x-pack", + "state": "done", + "time": 1462863600000, + "username": "jhartqj", + "percent_uptime": 0.18 + }, + { + "age": 80, + "cost": 23.91, + "country": "CN", + "price": 56, + "project": "elasticsearch", + "state": "start", + "time": 1488610800000, + "username": "dscottqk", + "percent_uptime": 0.37 + }, + { + "age": 54, + "cost": 23.68, + "country": "SE", + "price": 58, + "project": "machine-learning", + "state": "start", + "time": 1481785200000, + "username": "wlittleql", + "percent_uptime": 0.14 + }, + { + "age": 18, + "cost": 22.39, + "country": "PH", + "price": 49, + "project": "opbeat", + "state": "running", + "time": 1465974000000, + "username": "sfieldsqm", + "percent_uptime": 0.76 + }, + { + "age": 32, + "cost": 23.4, + "country": "CN", + "price": 66, + "project": "opbeat", + "state": "done", + "time": 1487833200000, + "username": "alarsonqn", + "percent_uptime": 0.42 + }, + { + "age": 71, + "cost": 22.45, + "country": "RU", + "price": 49, + "project": "beats", + "state": "running", + "time": 1487314800000, + "username": "dowensqo", + "percent_uptime": 0.62 + }, + { + "age": 68, + "cost": 22.67, + "country": "PE", + "price": 66, + "project": "machine-learning", + "state": "done", + "time": 1485673200000, + "username": "jolsonqp", + "percent_uptime": 0.73 + }, + { + "age": 45, + "cost": 21.87, + "country": "FR", + "price": 63, + "project": "elasticsearch", + "state": "running", + "time": 1483945200000, + "username": "galvarezqq", + "percent_uptime": 0.25 + }, + { + "age": 74, + "cost": 23.68, + "country": "BR", + "price": 51, + "project": "opbeat", + "state": "start", + "time": 1479279600000, + "username": "rcooperqr", + "percent_uptime": 0.14 + }, + { + "age": 21, + "cost": 22, + "country": "FR", + "price": 55, + "project": "logstash", + "state": "running", + "time": 1473922800000, + "username": "dclarkqs", + "percent_uptime": 0.67 + }, + { + "age": 48, + "cost": 21.99, + "country": "CN", + "price": 66, + "project": "x-pack", + "state": "running", + "time": 1463986800000, + "username": "rdunnqt", + "percent_uptime": 0.23 + }, + { + "age": 58, + "cost": 23.27, + "country": "CN", + "price": 63, + "project": "kibana", + "state": "done", + "time": 1470380400000, + "username": "jpetersqu", + "percent_uptime": 0.44 + }, + { + "age": 26, + "cost": 22.51, + "country": "CN", + "price": 59, + "project": "machine-learning", + "state": "done", + "time": 1476082800000, + "username": "nrobertsqv", + "percent_uptime": 0.4 + }, + { + "age": 29, + "cost": 23.92, + "country": "HT", + "price": 66, + "project": "beats", + "state": "start", + "time": 1490079600000, + "username": "jwestqw", + "percent_uptime": 0.28 + }, + { + "age": 69, + "cost": 23.67, + "country": "AR", + "price": 52, + "project": "x-pack", + "state": "start", + "time": 1475650800000, + "username": "awardqx", + "percent_uptime": 0.59 + }, + { + "age": 66, + "cost": 24.03, + "country": "US", + "price": 74, + "project": "elasticsearch", + "state": "start", + "time": 1479970800000, + "username": "tgilbertqy", + "percent_uptime": 1 + }, + { + "age": 30, + "cost": 24.41, + "country": "HN", + "price": 63, + "project": "kibana", + "state": "start", + "time": 1465455600000, + "username": "jstevensqz", + "percent_uptime": 0.71 + }, + { + "age": 43, + "cost": 22.71, + "country": "ID", + "price": 57, + "project": "beats", + "state": "done", + "time": 1489734000000, + "username": "kmeyerr0", + "percent_uptime": 0.96 + }, + { + "age": 19, + "cost": 23.65, + "country": "PL", + "price": 42, + "project": "machine-learning", + "state": "start", + "time": 1480143600000, + "username": "kpiercer1", + "percent_uptime": 0.76 + }, + { + "age": 48, + "cost": 24.15, + "country": "ID", + "price": 54, + "project": "x-pack", + "state": "start", + "time": 1481958000000, + "username": "dscottr2", + "percent_uptime": 0.76 + }, + { + "age": 19, + "cost": 22.23, + "country": "PT", + "price": 52, + "project": "machine-learning", + "state": "running", + "time": 1474700400000, + "username": "hstewartr3", + "percent_uptime": 0.14 + }, + { + "age": 22, + "cost": 22.95, + "country": "ID", + "price": 53, + "project": "beats", + "state": "done", + "time": 1482649200000, + "username": "ckimr4", + "percent_uptime": 0.09 + }, + { + "age": 26, + "cost": 24.6, + "country": "RU", + "price": 61, + "project": "machine-learning", + "state": "running", + "time": 1486278000000, + "username": "mgutierrezr5", + "percent_uptime": 0.62 + }, + { + "age": 22, + "cost": 25.56, + "country": "TH", + "price": 60, + "project": "beats", + "state": "done", + "time": 1460876400000, + "username": "hgrahamr6", + "percent_uptime": 0.77 + }, + { + "age": 57, + "cost": 21.5, + "country": "ID", + "price": 52, + "project": "beats", + "state": "running", + "time": 1461308400000, + "username": "dfosterr7", + "percent_uptime": 0.67 + }, + { + "age": 22, + "cost": 23.1, + "country": "CN", + "price": 39, + "project": "beats", + "state": "done", + "time": 1468911600000, + "username": "awebbr8", + "percent_uptime": 0.81 + }, + { + "age": 42, + "cost": 23.1, + "country": "GH", + "price": 62, + "project": "logstash", + "state": "done", + "time": 1488438000000, + "username": "lpetersr9", + "percent_uptime": 0.32 + }, + { + "age": 67, + "cost": 22.55, + "country": "ID", + "price": 54, + "project": "opbeat", + "state": "done", + "time": 1486450800000, + "username": "tpattersonra", + "percent_uptime": 0.65 + }, + { + "age": 76, + "cost": 21.94, + "country": "PL", + "price": 46, + "project": "x-pack", + "state": "running", + "time": 1476342000000, + "username": "rsimsrb", + "percent_uptime": 0.17 + }, + { + "age": 76, + "cost": 23.93, + "country": "VE", + "price": 52, + "project": "x-pack", + "state": "start", + "time": 1481612400000, + "username": "spetersonrc", + "percent_uptime": 0.8 + }, + { + "age": 61, + "cost": 22.17, + "country": "ID", + "price": 53, + "project": "machine-learning", + "state": "running", + "time": 1471330800000, + "username": "amontgomeryrd", + "percent_uptime": 0.91 + }, + { + "age": 60, + "cost": 22.7, + "country": "CN", + "price": 66, + "project": "opbeat", + "state": "done", + "time": 1465542000000, + "username": "swelchre", + "percent_uptime": 0.35 + }, + { + "age": 72, + "cost": 24.2, + "country": "FR", + "price": 59, + "project": "kibana", + "state": "start", + "time": 1467961200000, + "username": "cgordonrf", + "percent_uptime": 0.4 + }, + { + "age": 78, + "cost": 24.82, + "country": "NZ", + "price": 62, + "project": "beats", + "state": "running", + "time": 1462777200000, + "username": "dmartinezrg", + "percent_uptime": 0.85 + }, + { + "age": 62, + "cost": 22.55, + "country": "ID", + "price": 48, + "project": "x-pack", + "state": "done", + "time": 1490166000000, + "username": "cwashingtonrh", + "percent_uptime": 0.8 + }, + { + "age": 35, + "cost": 22.99, + "country": "ID", + "price": 60, + "project": "logstash", + "state": "done", + "time": 1475478000000, + "username": "cpayneri", + "percent_uptime": 0.02 + }, + { + "age": 68, + "cost": 22.32, + "country": "CN", + "price": 62, + "project": "machine-learning", + "state": "running", + "time": 1488092400000, + "username": "aperkinsrj", + "percent_uptime": 0.75 + }, + { + "age": 58, + "cost": 24.25, + "country": "RU", + "price": 57, + "project": "kibana", + "state": "start", + "time": 1463468400000, + "username": "swatkinsrk", + "percent_uptime": 0.14 + }, + { + "age": 77, + "cost": 23.67, + "country": "ID", + "price": 41, + "project": "logstash", + "state": "start", + "time": 1466146800000, + "username": "smoorerl", + "percent_uptime": 0.56 + }, + { + "age": 67, + "cost": 22.45, + "country": "ID", + "price": 52, + "project": "opbeat", + "state": "running", + "time": 1484895600000, + "username": "mlopezrm", + "percent_uptime": 0.93 + }, + { + "age": 49, + "cost": 24.46, + "country": "CN", + "price": 47, + "project": "logstash", + "state": "start", + "time": 1474959600000, + "username": "pshawrn", + "percent_uptime": 0.4 + }, + { + "age": 26, + "cost": 21.59, + "country": "CN", + "price": 45, + "project": "machine-learning", + "state": "running", + "time": 1482303600000, + "username": "rwagnerro", + "percent_uptime": 0.1 + }, + { + "age": 36, + "cost": 23.84, + "country": "BR", + "price": 44, + "project": "beats", + "state": "start", + "time": 1488006000000, + "username": "dmatthewsrp", + "percent_uptime": 0.56 + }, + { + "age": 46, + "cost": 23.65, + "country": "CN", + "price": 56, + "project": "opbeat", + "state": "start", + "time": 1476946800000, + "username": "btorresrq", + "percent_uptime": 0.48 + }, + { + "age": 49, + "cost": 22.57, + "country": "ID", + "price": 52, + "project": "logstash", + "state": "done", + "time": 1472367600000, + "username": "elawrencerr", + "percent_uptime": 0.9 + } +] diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/get_demo_rows.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/get_demo_rows.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/get_demo_rows.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/get_demo_rows.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js new file mode 100644 index 0000000000000..41507eaae8e7f --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/index.js @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { sortBy } from 'lodash'; +import { queryDatatable } from '../../../../../common/lib/datatable/query'; +import { getDemoRows } from './get_demo_rows'; + +export const demodata = () => ({ + name: 'demodata', + aliases: [], + type: 'datatable', + help: 'A mock data set that includes project CI times with usernames, countries and run phases', + context: { + types: ['filter'], + }, + args: { + type: { + types: ['string', 'null'], + aliases: ['_'], + help: 'The name of the demo data set to use', + default: 'ci', + options: ['ci', 'shirts'], + }, + }, + fn: (context, args) => { + const demoRows = getDemoRows(args.type); + + let set = {}; + if (args.type === 'ci') { + set = { + columns: [ + { name: 'time', type: 'date' }, + { name: 'cost', type: 'number' }, + { name: 'username', type: 'string' }, + { name: 'price', type: 'number' }, + { name: 'age', type: 'number' }, + { name: 'country', type: 'string' }, + { name: 'state', type: 'string' }, + { name: 'project', type: 'string' }, + { name: 'percent_uptime', type: 'number' }, + ], + rows: sortBy(demoRows, 'time'), + }; + } else if (args.type === 'shirts') { + set = { + columns: [ + { name: 'size', type: 'string' }, + { name: 'color', type: 'string' }, + { name: 'price', type: 'number' }, + { name: 'cut', type: 'string' }, + ], + rows: demoRows, + }; + } + + const { columns, rows } = set; + return queryDatatable( + { + type: 'datatable', + columns, + rows, + }, + context + ); + }, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/shirts.json b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/shirts.json similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/shirts.json rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/demodata/shirts.json diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/escount.js similarity index 94% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/escount.js index ab9926f91c687..674f60d5333dc 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/escount.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { buildESRequest } from '../../../server/lib/build_es_request'; +import { buildESRequest } from '../../../../server/lib/build_es_request'; export const escount = () => ({ name: 'escount', diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js new file mode 100644 index 0000000000000..725d5f30197f1 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/esdocs.js @@ -0,0 +1,106 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import squel from 'squel'; +import { map, zipObject } from 'lodash'; +import { buildBoolArray } from '../../../../server/lib/build_bool_array'; +import { normalizeType } from '../../../../server/lib/normalize_type'; +import { sanitizeName } from '../../../../server/lib/sanitize_name'; + +export const esdocs = () => ({ + name: 'esdocs', + type: 'datatable', + help: + 'Query elasticsearch and get back raw documents. We recommend you specify the fields you want, ' + + 'especially if you are going to ask for a lot of rows', + context: { + types: ['filter'], + }, + args: { + index: { + types: ['string', 'null'], + default: '_all', + help: 'Specify an index pattern. Eg "logstash-*"', + }, + query: { + types: ['string'], + aliases: ['_', 'q'], + help: 'A Lucene query string', + default: '-_index:.kibana', + }, + sort: { + types: ['string', 'null'], + help: 'Sort directions as "field, direction". Eg "@timestamp, desc" or "bytes, asc"', + }, + fields: { + help: 'Comma separated list of fields. Fewer fields will perform better', + types: ['string', 'null'], + }, + metaFields: { + help: 'Comma separated list of meta fields, eg "_index,_type"', + types: ['string', 'null'], + }, + count: { + types: ['number'], + default: 100, + help: 'The number of docs to pull back. Smaller numbers perform better', + }, + }, + fn: (context, args, handlers) => { + context.and = context.and.concat([ + { + type: 'luceneQueryString', + query: args.query, + }, + ]); + + let query = squel + .select({ + autoQuoteTableNames: true, + autoQuoteFieldNames: true, + autoQuoteAliasNames: true, + nameQuoteCharacter: '"', + }) + .from(args.index.toLowerCase()); + + if (args.fields) { + const fields = args.fields.split(',').map(field => field.trim()); + fields.forEach(field => (query = query.field(field))); + } + + if (args.sort) { + const [sortField, sortOrder] = args.sort.split(',').map(str => str.trim()); + if (sortField) query.order(`"${sortField}"`, sortOrder.toLowerCase() === 'asc'); + } + + return handlers + .elasticsearchClient('transport.request', { + path: '/_xpack/sql?format=json', + method: 'POST', + body: { + fetch_size: args.count, + query: query.toString(), + filter: { + bool: { + must: [{ match_all: {} }, ...buildBoolArray(context.and)], + }, + }, + }, + }) + .then(res => { + const columns = res.columns.map(({ name, type }) => { + return { name: sanitizeName(name), type: normalizeType(type) }; + }); + const columnNames = map(columns, 'name'); + const rows = res.rows.map(row => zipObject(columnNames, row)); + return { + type: 'datatable', + columns, + rows, + }; + }); + }, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/essql.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/essql.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/index.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/index.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/index.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/index.js new file mode 100644 index 0000000000000..e18d8cf1c5fda --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/index.js @@ -0,0 +1,177 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import uniqBy from 'lodash.uniqby'; +import { evaluate } from 'tinymath'; +import { groupBy, zipObject, omit, values } from 'lodash'; +import moment from 'moment'; +import { pivotObjectArray } from '../../../../../common/lib/pivot_object_array'; +import { unquoteString } from '../../../../../common/lib/unquote_string'; +import { isColumnReference } from './lib/is_column_reference'; +import { getExpressionType } from './lib/get_expression_type'; + +// TODO: pointseries performs poorly, that's why we run it on the server. + +const columnExists = (cols, colName) => cols.includes(unquoteString(colName)); + +export const pointseries = () => ({ + name: 'pointseries', + type: 'pointseries', + help: + 'Turn a datatable into a point series model. Currently we differentiate measure from dimensions by looking for a [TinyMath function](http://canvas.elastic.co/reference/tinymath.html). ' + + 'If you enter a TinyMath expression in your argument, we treat that argument as a measure, otherwise it is a dimension. Dimensions are combined to create unique ' + + 'keys. Measures are then deduplicated by those keys using the specified TinyMath function', + context: { + types: ['datatable'], + }, + args: { + x: { + types: ['string', 'null'], + help: 'The values along the X-axis', + }, + y: { + types: ['string', 'null'], + help: 'The values along the y-axis', + }, + color: { + types: ['string', 'null'], + help: "An expression to use in determining the mark's color", // If you need categorization, transform the field. + }, + size: { + types: ['string', 'null'], + help: 'For elements that support it, the size of the marks', + }, + text: { + types: ['string', 'null'], + help: 'For use in charts that support it, the text to show in the mark', + }, + // In the future it may make sense to add things like shape, or tooltip values, but I think what we have is good for now + // The way the function below is written you can add as many arbitrary named args as you want. + }, + fn: (context, args) => { + // Note: can't replace pivotObjectArray with datatableToMathContext, lose name of non-numeric columns + const columnNames = context.columns.map(col => col.name); + const mathScope = pivotObjectArray(context.rows, columnNames); + const autoQuoteColumn = col => { + if (!columnNames.includes(col)) return col; + return col.match(/\s/) ? `'${col}'` : col; + }; + + const measureNames = []; + const dimensions = []; + const columns = {}; + + // Separates args into dimensions and measures arrays + // by checking if arg is a column reference (dimension) + Object.keys(args).forEach(arg => { + const mathExp = autoQuoteColumn(args[arg]); + + if (mathExp != null && mathExp.trim() !== '') { + const col = { + type: '', + role: '', + expression: mathExp, + }; + + if (isColumnReference(mathExp)) { + // TODO: Do something better if the column does not exist + if (!columnExists(columnNames, mathExp)) return; + + dimensions.push({ + name: arg, + value: mathExp, + }); + col.type = getExpressionType(context.columns, mathExp); + col.role = 'dimension'; + } else { + measureNames.push(arg); + col.type = 'number'; + col.role = 'measure'; + } + + columns[arg] = col; + } + }); + + const PRIMARY_KEY = '%%CANVAS_POINTSERIES_PRIMARY_KEY%%'; + const rows = context.rows.map((row, i) => ({ ...row, [PRIMARY_KEY]: i })); + + function normalizeValue(expression, value) { + switch (getExpressionType(context.columns, expression)) { + case 'string': + return String(value); + case 'number': + return Number(value); + case 'date': + return moment(value).valueOf(); + default: + return value; + } + } + + // Dimensions + // Group rows by their dimension values, using the argument values and preserving the PRIMARY_KEY + // There's probably a better way to do this + const results = rows.reduce((acc, row, i) => { + const newRow = dimensions.reduce( + (acc, { name, value }) => { + try { + acc[name] = args[name] ? normalizeValue(value, evaluate(value, mathScope)[i]) : '_all'; + } catch (e) { + // TODO: handle invalid column names... + // Do nothing if column does not exist + // acc[dimension] = '_all'; + } + return acc; + }, + { [PRIMARY_KEY]: row[PRIMARY_KEY] } + ); + + return Object.assign(acc, { [row[PRIMARY_KEY]]: newRow }); + }, {}); + + // Measures + // First group up all of the distinct dimensioned bits. Each of these will be reduced to just 1 value + // for each measure + const measureKeys = groupBy(rows, row => + dimensions.map(({ name }) => (args[name] ? row[args[name]] : '_all')).join('::%BURLAP%::') + ); + + // Then compute that 1 value for each measure + values(measureKeys).forEach(rows => { + const subtable = { type: 'datatable', columns: context.columns, rows: rows }; + const subScope = pivotObjectArray(subtable.rows, subtable.columns.map(col => col.name)); + const measureValues = measureNames.map(measure => { + try { + const ev = evaluate(args[measure], subScope); + if (Array.isArray(ev)) + throw new Error('Expressions must be wrapped in a function such as sum()'); + + return ev; + } catch (e) { + // TODO: don't catch if eval to Array + return null; + } + }); + + rows.forEach(row => { + Object.assign(results[row[PRIMARY_KEY]], zipObject(measureNames, measureValues)); + }); + }); + + // It only makes sense to uniq the rows in a point series as 2 values can not exist in the exact same place at the same time. + const resultingRows = uniqBy( + values(results).map(row => omit(row, PRIMARY_KEY)), + JSON.stringify + ); + + return { + type: 'pointseries', + columns: columns, + rows: resultingRows, + }; + }, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/get_expression_type.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/get_expression_type.js new file mode 100644 index 0000000000000..4da10af4dd11b --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/get_expression_type.js @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { parse } from 'tinymath'; +import { getFieldType } from '../../../../../../common/lib/get_field_type'; +import { isColumnReference } from './is_column_reference'; +import { getFieldNames } from './get_field_names'; + +export function getExpressionType(columns, mathExpression) { + // if isColumnReference returns true, then mathExpression is just a string + // referencing a column in a datatable + if (isColumnReference(mathExpression)) return getFieldType(columns, mathExpression); + + const parsedMath = parse(mathExpression); + + if (parsedMath.args) { + const fieldNames = parsedMath.args.reduce(getFieldNames, []); + + if (fieldNames.length > 0) { + const fieldTypes = fieldNames.reduce((types, name) => { + const type = getFieldType(columns, name); + if (type !== 'null' && types.indexOf(type) === -1) return types.concat(type); + + return types; + }, []); + + return fieldTypes.length === 1 ? fieldTypes[0] : 'string'; + } + return 'number'; + } + + return typeof parsedMath; +} diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_field_names.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/get_field_names.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_field_names.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/get_field_names.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/is_column_reference.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/pointseries/lib/is_column_reference.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/server.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/server.js similarity index 100% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/server.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/server.js diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/timelion.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js similarity index 94% rename from x-pack/plugins/canvas/canvas_plugin_src/functions/server/timelion.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js index 58db763bdb690..2779f8e1e2c1d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/functions/server/timelion.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/src/timelion.js @@ -5,8 +5,8 @@ */ import { flatten } from 'lodash'; -import { fetch } from '../../../common/lib/fetch'; -import { buildBoolArray } from '../../../server/lib/build_bool_array'; +import { fetch } from '../../../../common/lib/fetch'; +import { buildBoolArray } from '../../../../server/lib/build_bool_array'; export const timelion = () => ({ name: 'timelion', @@ -42,7 +42,7 @@ export const timelion = () => ({ }, }, type: 'datatable', - help: 'Use timelion to extract one or more timeseries from many sources.', + help: 'Use timelion to extract one or more timeseries from many sources', fn: (context, args, handlers) => { // Timelion requires a time range. Use the time range from the timefilter element in the // workpad, if it exists. Otherwise fall back on the function args. diff --git a/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc deleted file mode 100644 index 2a22ef440bd44..0000000000000 --- a/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/.eslintrc +++ /dev/null @@ -1,2 +0,0 @@ -env: - jquery: true \ No newline at end of file diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js index 1b44045f44a70..4b628e5de93f6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.js @@ -10,7 +10,7 @@ import { AdvancedFilter } from './component'; export const advancedFilter = () => ({ name: 'advanced_filter', - displayName: 'Advanced Filter', + displayName: 'Advanced filter', help: 'Render a Canvas filter expression', reuseDomNode: true, height: 50, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js index caef38781bdb6..863fa41a90be5 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.js @@ -12,7 +12,7 @@ import { DropdownFilter } from './component'; export const dropdownFilter = () => ({ name: 'dropdown_filter', - displayName: 'Dropdown Filter', + displayName: 'Dropdown filter', help: 'A dropdown from which you can select values for an "exactly" filter', reuseDomNode: true, height: 50, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js index 23d4b28b89811..45d85f2e3dd6c 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js @@ -12,7 +12,7 @@ import { Popover } from '../../../public/components/popover'; export const error = () => ({ name: 'error', - displayName: 'Error Information', + displayName: 'Error information', help: 'Render error data in a way that is helpful to users', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/image.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/image.js index c4a6578c2edfd..8e851fc6fe9ad 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/image.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/image.js @@ -7,7 +7,7 @@ import ReactDOM from 'react-dom'; import React from 'react'; import { elasticLogo } from '../lib/elastic_logo'; -import { isValid } from '../../common/lib/url'; +import { isValidUrl } from '../../common/lib/url'; export const image = () => ({ name: 'image', @@ -15,7 +15,7 @@ export const image = () => ({ help: 'Render an image', reuseDomNode: true, render(domNode, config, handlers) { - const dataurl = isValid(config.dataurl) ? config.dataurl : elasticLogo; + const dataurl = isValidUrl(config.dataurl) ? config.dataurl : elasticLogo; const style = { height: '100%', diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js index dadabdfc6bca3..ec2e863669093 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js @@ -15,6 +15,7 @@ import { markdown } from './markdown'; import { metric } from './metric'; import { pie } from './pie'; import { plot } from './plot'; +import { progress } from './progress'; import { shape } from './shape'; import { table } from './table'; import { timeFilter } from './time_filter'; @@ -32,6 +33,7 @@ export const renderFunctions = [ metric, pie, plot, + progress, shape, table, timeFilter, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/index.js new file mode 100644 index 0000000000000..d7c1885f6388c --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/index.js @@ -0,0 +1,115 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { getId } from '../../../public/lib/get_id'; +import { shapes } from './shapes'; + +export const progress = () => ({ + name: 'progress', + displayName: 'Progress', + help: 'Reveal a percentage of an element', + reuseDomNode: true, + render(domNode, config, handlers) { + const { shape, value, max, valueColor, barColor, valueWeight, barWeight, label, font } = config; + const percent = value / max; + const shapeDef = shapes[shape]; + const offset = Math.max(valueWeight, barWeight); + + if (shapeDef) { + const parser = new DOMParser(); + const [shapeSvg] = parser + .parseFromString(shapes[shape], 'image/svg+xml') + .getElementsByTagName('svg'); + + const initialViewBox = shapeSvg + .getAttribute('viewBox') + .split(' ') + .map(v => parseInt(v, 10)); + let [minX, minY, width, height] = initialViewBox; + + if (shape !== 'horizontalBar') { + minX -= offset / 2; + width += offset; + } + + if (shape === 'semicircle') { + minY -= offset / 2; + height += offset / 2; + } else if (shape !== 'verticalBar') { + minY -= offset / 2; + height += offset; + } + + shapeSvg.setAttribute('className', 'canvasProgress'); + + const svgId = getId('svg'); + shapeSvg.id = svgId; + + const [bar] = shapeSvg.getElementsByTagName('path'); + bar.setAttribute('className', 'canvasProgress__background'); + bar.setAttribute('fill', 'none'); + bar.setAttribute('stroke', barColor); + bar.setAttribute('stroke-width', `${barWeight}px`); + + const value = bar.cloneNode(true); + value.setAttribute('className', 'canvasProgress__value'); + value.setAttribute('stroke', valueColor); + value.setAttribute('stroke-width', `${valueWeight}px`); + + const length = value.getTotalLength(); + const to = length * (1 - percent); + value.setAttribute('stroke-dasharray', length); + value.setAttribute('stroke-dashoffset', Math.max(0, to)); + + shapeSvg.appendChild(value); + + const [text] = shapeSvg.getElementsByTagName('text'); + + if (label && text) { + text.textContent = label; + text.setAttribute('className', 'canvasProgress__label'); + + if (shape === 'horizontalPill') + text.setAttribute('x', parseInt(text.getAttribute('x'), 10) + offset / 2); + if (shape === 'verticalPill') + text.setAttribute('y', parseInt(text.getAttribute('y'), 10) - offset / 2); + + Object.assign(text.style, font.spec); + shapeSvg.appendChild(text); + domNode.appendChild(shapeSvg); + + const { width: labelWidth, height: labelHeight } = text.getBBox(); + + if (shape === 'horizontalBar' || shape === 'horizontalPill') { + text.setAttribute('x', parseInt(text.getAttribute('x'), 10)); + width += labelWidth; + } + if (shape === 'verticalBar' || shape === 'verticalPill') { + if (labelWidth > width) { + minX = -labelWidth / 2; + width = labelWidth; + } + minY -= labelHeight; + height += labelHeight; + } + } + + shapeSvg.setAttribute('viewBox', [minX, minY, width, height].join(' ')); + shapeSvg.setAttribute('width', domNode.offsetWidth); + shapeSvg.setAttribute('height', domNode.offsetHeight); + + if (domNode.firstChild) domNode.removeChild(domNode.firstChild); + domNode.appendChild(shapeSvg); + + handlers.onResize(() => { + shapeSvg.setAttribute('width', domNode.offsetWidth); + shapeSvg.setAttribute('height', domNode.offsetHeight); + }); + } + + handlers.done(); + }, +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg new file mode 100644 index 0000000000000..1aa07d8c23d73 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg @@ -0,0 +1,4 @@ + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg new file mode 100644 index 0000000000000..63e5c8a28d774 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg @@ -0,0 +1,4 @@ + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg new file mode 100644 index 0000000000000..1dcb9e3816e6e --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js new file mode 100644 index 0000000000000..cf5a9ecebd2eb --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gauge from '!!raw-loader!./gauge.svg'; +import horizontalBar from '!!raw-loader!./horizontal_bar.svg'; +import horizontalPill from '!!raw-loader!./horizontal_pill.svg'; +import semicircle from '!!raw-loader!./semicircle.svg'; +import unicorn from '!!raw-loader!./unicorn.svg'; +import verticalBar from '!!raw-loader!./vertical_bar.svg'; +import verticalPill from '!!raw-loader!./vertical_pill.svg'; +import wheel from '!!raw-loader!./wheel.svg'; + +export const shapes = { + gauge, + horizontalBar, + horizontalPill, + semicircle, + unicorn, + verticalBar, + verticalPill, + wheel, +}; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg new file mode 100644 index 0000000000000..5538275825da7 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg @@ -0,0 +1,4 @@ + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg new file mode 100644 index 0000000000000..a6b2a91f3b5a0 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg new file mode 100644 index 0000000000000..9d9b20aa5198c --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg new file mode 100644 index 0000000000000..f87b8a06f2ddf --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg new file mode 100644 index 0000000000000..9d1f9ac0c2628 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg @@ -0,0 +1,4 @@ + + + + diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/register.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/register.js index 2b3c1ca5681bc..28a267505d047 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { renderFunctions } from './index'; renderFunctions.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js index dbc6338d8939c..780e5f8acbe8f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js @@ -7,18 +7,18 @@ import $ from 'jquery'; import { times } from 'lodash'; import { elasticOutline } from '../lib/elastic_outline'; -import { isValid } from '../../common/lib/url'; +import { isValidUrl } from '../../common/lib/url'; export const repeatImage = () => ({ name: 'repeatImage', - displayName: 'Image Repeat', + displayName: 'Image repeat', help: 'Repeat an image a given number of times', reuseDomNode: true, render(domNode, config, handlers) { const settings = { count: 10, ...config, - image: isValid(config.image) ? config.image : elasticOutline, + image: isValidUrl(config.image) ? config.image : elasticOutline, }; const container = $('
      '); @@ -39,7 +39,7 @@ export const repeatImage = () => ({ if (settings.max && settings.count > settings.max) settings.count = settings.max; times(settings.count, () => container.append(img.cloneNode(true))); - if (isValid(settings.emptyImage)) { + if (isValidUrl(settings.emptyImage)) { if (settings.max == null) throw new Error('max must be set if using an emptyImage'); const emptyImage = new Image(); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js index de43c1fff0da8..a74fc6f136437 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js @@ -5,12 +5,12 @@ */ import { elasticOutline } from '../../lib/elastic_outline'; -import { isValid } from '../../../common/lib/url'; +import { isValidUrl } from '../../../common/lib/url'; import './reveal_image.scss'; export const revealImage = () => ({ name: 'revealImage', - displayName: 'Image Reveal', + displayName: 'Image reveal', help: 'Reveal a percentage of an image to make a custom gauge-style chart', reuseDomNode: true, render(domNode, config, handlers) { @@ -29,13 +29,13 @@ export const revealImage = () => ({ img.className = 'revealImage__image'; img.style.clipPath = getClipPath(config.percent, config.origin); img.style['-webkit-clip-path'] = getClipPath(config.percent, config.origin); - img.src = isValid(config.image) ? config.image : elasticOutline; + img.src = isValidUrl(config.image) ? config.image : elasticOutline; handlers.onResize(img.onload); // set up the underlay, "empty" image aligner.className = 'revealImageAligner'; aligner.appendChild(img); - if (isValid(config.emptyImage)) { + if (isValidUrl(config.emptyImage)) { // only use empty image if one is provided aligner.style.backgroundImage = `url(${config.emptyImage})`; } diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/index.js index f31b39ff0c466..e778a022019f2 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/index.js @@ -22,7 +22,8 @@ export const shape = () => ({ if (fill) shapeContent.setAttribute('fill', fill); if (border) shapeContent.setAttribute('stroke', border); - if (borderWidth >= 0) shapeContent.setAttribute('stroke-width', borderWidth); + const strokeWidth = Math.max(borderWidth, 0); + shapeContent.setAttribute('stroke-width', strokeWidth); shapeContent.setAttribute('stroke-miterlimit', 999); shapeContent.setAttribute('vector-effect', 'non-scaling-stroke'); @@ -39,22 +40,28 @@ export const shape = () => ({ const height = domNode.offsetHeight; // adjust viewBox based on border width - let [minX, minY, maxX, maxY] = initialViewBox; + let [minX, minY, shapeWidth, shapeHeight] = initialViewBox; + const borderOffset = strokeWidth; - const xScale = (maxX - minX) / width; - const yScale = (maxY - minY) / height; - const borderOffset = borderWidth / 2; - const xOffset = borderOffset * xScale; - const yOffset = borderOffset * yScale; + if (width) { + const xOffset = (shapeWidth / width) * borderOffset; + minX -= xOffset; + shapeWidth += xOffset * 2; + } else { + shapeWidth = 0; + } - minX -= xOffset; // min-x - minY -= yOffset; // min-y - maxX += xOffset * 2; // width - maxY += yOffset * 2; // height + if (height) { + const yOffset = (shapeHeight / height) * borderOffset; + minY -= yOffset; + shapeHeight += yOffset * 2; + } else { + shapeHeight = 0; + } shapeSvg.setAttribute('width', width); shapeSvg.setAttribute('height', height); - shapeSvg.setAttribute('viewBox', [minX, minY, maxX, maxY].join(' ')); + shapeSvg.setAttribute('viewBox', [minX, minY, shapeWidth, shapeHeight].join(' ')); const oldShape = domNode.firstElementChild; if (oldShape) domNode.removeChild(oldShape); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js index 09950f743c9d9..3989a13c338fd 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js @@ -11,7 +11,7 @@ import { Datatable } from '../../public/components/datatable'; export const table = () => ({ name: 'table', - displayName: 'Data Table', + displayName: 'Data table', help: 'Render tabular data as HTML', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js index f5aa833f437d0..3a833fc0c8472 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js @@ -9,7 +9,7 @@ import React from 'react'; export const text = () => ({ name: 'text', - displayName: 'Plain Text', + displayName: 'Plain text', help: 'Render output as plain text', reuseDomNode: true, render(domNode, { text }, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss index ec38f0f9c21ee..b08644eaa15c9 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/datetime_calendar/datetime_calendar.scss @@ -4,4 +4,5 @@ display: inline-grid; height: 100%; border: $euiBorderThin; + grid-template-rows: $euiSizeXL 1fr; } diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js index d9d1ae3c2d754..cdc4f563e1340 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.js @@ -12,7 +12,7 @@ import { TimeFilter } from './components/time_filter'; export const timeFilter = () => ({ name: 'time_filter', - displayName: 'Time Filter', + displayName: 'Time filter', help: 'Set a time window', reuseDomNode: true, render(domNode, config, handlers) { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/types/register.js b/x-pack/plugins/canvas/canvas_plugin_src/types/register.js index d5c6e98288e89..e960dd0f6566a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/types/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/types/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { typeSpecs } from './index'; typeSpecs.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.js index c9729f3911f04..c40f17604f9ff 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.js @@ -65,11 +65,7 @@ export class ExtendedTemplate extends React.PureComponent { return ( - + ); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js index 31635bf2a5b1e..e8237ecc32314 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.js @@ -10,7 +10,7 @@ import { ExtendedTemplate } from './extended_template'; export const axisConfig = () => ({ name: 'axisConfig', - displayName: 'Axis Config', + displayName: 'Axis config', help: 'Visualization axis configuration', simpleTemplate: templateFromReactComponent(SimpleTemplate), template: templateFromReactComponent(ExtendedTemplate), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js index ded0600cdb3ff..0540a14603460 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js @@ -52,20 +52,23 @@ class DatacolumnArgInput extends Component { const valueNotSet = val => !val || val.length === 0; const updateFunctionValue = () => { + const fn = this.inputRefs.fn.value; + const column = this.inputRefs.column.value; + // if setting size, auto-select the first column if no column is already set - if (this.inputRefs.fn.value === 'size') { - const col = this.inputRefs.column.value || (columns[0] && columns[0].name); - if (col) return onValueChange(`${this.inputRefs.fn.value}(${maybeQuoteValue(col)})`); + if (fn === 'size') { + const col = column || (columns[0] && columns[0].name); + if (col) return onValueChange(`${fn}(${maybeQuoteValue(col)})`); } // this.inputRefs.column is the column selection, if there is no value, do nothing - if (valueNotSet(this.inputRefs.column.value)) return setMathFunction(this.inputRefs.fn.value); + if (valueNotSet(column)) return setMathFunction(fn); // this.inputRefs.fn is the math function to use, if it's not set, just use the value input - if (valueNotSet(this.inputRefs.fn.value)) return onValueChange(this.inputRefs.column.value); + if (valueNotSet(fn)) return onValueChange(column); // this.inputRefs.fn has a value, so use it as a math.js expression - onValueChange(`${this.inputRefs.fn.value}(${maybeQuoteValue(this.inputRefs.column.value)})`); + onValueChange(`${fn}(${maybeQuoteValue(column)})`); }; const column = columns.map(col => col.name).find(colName => colName === mathValue.column) || ''; @@ -92,7 +95,7 @@ class DatacolumnArgInput extends Component { (this.inputRefs.column = ref)} onChange={updateFunctionValue} /> diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js index 2af6a7a0d8445..3da639b3669ad 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js @@ -24,13 +24,7 @@ export const SimpleMathFunction = ({ onChange, value, inputRef, onlymath }) => { if (!onlymath) options.unshift({ text: 'Value', value: '' }); return ( - + ); }; @@ -40,3 +34,7 @@ SimpleMathFunction.propTypes = { inputRef: PropTypes.func, onlymath: PropTypes.bool, }; + +SimpleMathFunction.defaultProps = { + value: '', +}; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js index e955f38136cca..d5540d050227f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js @@ -7,6 +7,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { + EuiForm, EuiFlexGroup, EuiFlexItem, EuiImage, @@ -15,12 +16,15 @@ import { EuiButton, EuiFieldText, } from '@elastic/eui'; -import { Loading } from '../../../../public/components/loading'; + +// TODO: (clintandrewhall) This is a quick fix for #25342 -- we should figure out how to use the overall component. +import { Loading } from '../../../../public/components/loading/loading'; + import { FileUpload } from '../../../../public/components/file_upload'; import { elasticOutline } from '../../../lib/elastic_outline'; import { resolveFromArgs } from '../../../../common/lib/resolve_dataurl'; -import { isValid as isValidHttpUrl } from '../../../../common/lib/httpurl'; -import { encode, isValid as isValidDataUrl } from '../../../../common/lib/dataurl'; +import { isValidHttpUrl } from '../../../../common/lib/httpurl'; +import { encode, isValidDataUrl } from '../../../../common/lib/dataurl'; import { templateFromReactComponent } from '../../../../public/lib/template_from_react_component'; import './image_upload.scss'; @@ -47,13 +51,15 @@ class ImageUpload extends React.Component { }; } + componentDidMount() { + // keep track of whether or not the component is mounted, to prevent rogue setState calls + this._isMounted = true; + } + componentWillUnmount() { this._isMounted = false; } - // keep track of whether or not the component is mounted, to prevent rogue setState calls - _isMounted = true; - handleUpload = files => { const { onAssetAdd, onValueChange } = this.props; const [upload] = files; @@ -106,7 +112,7 @@ class ImageUpload extends React.Component { ); @@ -121,7 +127,7 @@ class ImageUpload extends React.Component { } const pasteImageUrl = urlTypeSrc ? ( -
      + + Set - + ) : null; const shouldPreview = @@ -166,7 +173,7 @@ class ImageUpload extends React.Component { export const imageUpload = () => ({ name: 'imageUpload', - displayName: 'Image Upload', + displayName: 'Image upload', help: 'Select or upload an image', resolveArgValue: true, template: templateFromReactComponent(ImageUpload), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js index 61c5208b108f5..e0f8e56df8b6f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js @@ -65,7 +65,7 @@ PaletteArgInput.propTypes = { export const palette = () => ({ name: 'palette', - displayName: 'Color Palette', + displayName: 'Color palette', help: 'Choose a color palette', default: '{palette #882E72 #B178A6 #D6C1DE #1965B0 #5289C7 #7BAFDE #4EB265 #90C987 #CAE0AB #F7EE55 #F6C141 #F1932D #E8601C #DC050C}', diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/register.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/register.js index 4d4585f4ffcf2..2f6708e00cd9c 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { args } from './index'; args.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/select.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/select.js index 7a65f33ef7780..39f0f4da35926 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/select.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/select.js @@ -19,13 +19,7 @@ const SelectArgInput = ({ typeInstance, onValueChange, argValue, argId }) => { }; return ( - + ); }; diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js index 2a71e9b42e480..79ef961275dd8 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js @@ -7,14 +7,17 @@ import React from 'react'; import PropTypes from 'prop-types'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -import { shapes } from '../../renderers/shape/shapes'; import { templateFromReactComponent } from '../../../public/lib/template_from_react_component'; import { ShapePickerMini } from '../../../public/components/shape_picker_mini/'; -const ShapeArgInput = ({ onValueChange, argValue }) => ( +const ShapeArgInput = ({ onValueChange, argValue, typeInstance }) => ( - + ); @@ -22,6 +25,9 @@ const ShapeArgInput = ({ onValueChange, argValue }) => ( ShapeArgInput.propTypes = { argValue: PropTypes.any.isRequired, onValueChange: PropTypes.func.isRequired, + typeInstance: PropTypes.shape({ + options: PropTypes.shape({ shapes: PropTypes.object.isRequired }).isRequired, + }).isRequired, }; export const shape = () => ({ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js index 013b0f19f6ca0..9c117e694a1fd 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js @@ -57,7 +57,7 @@ EnhancedStringArgInput.propTypes = { export const string = () => ({ name: 'string', - displayName: 'string', + displayName: 'String', help: 'Input short strings', simpleTemplate: templateFromReactComponent(EnhancedStringArgInput), }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js index d0dbfb22a5dd3..8a9593a15cac7 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js @@ -63,7 +63,7 @@ EnhancedTextAreaArgInput.propTypes = { export const textarea = () => ({ name: 'textarea', - displayName: 'textarea', + displayName: 'Textarea', help: 'Input long strings', template: templateFromReactComponent(EnhancedTextAreaArgInput), }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js index 15a9b8c7ce347..30092cd7bd56c 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js @@ -9,16 +9,17 @@ import PropTypes from 'prop-types'; import { EuiSwitch } from '@elastic/eui'; import { templateFromReactComponent } from '../../../public/lib/template_from_react_component'; -const ToggleArgInput = ({ onValueChange, argValue, argId }) => { +const ToggleArgInput = ({ onValueChange, argValue, argId, renderError }) => { const handleChange = () => onValueChange(!argValue); - + if (typeof argValue !== 'boolean') renderError(); return ; }; ToggleArgInput.propTypes = { onValueChange: PropTypes.func.isRequired, - argValue: PropTypes.bool.isRequired, + argValue: PropTypes.oneOfType([PropTypes.bool, PropTypes.string, PropTypes.object]).isRequired, argId: PropTypes.string.isRequired, + renderError: PropTypes.func.isRequired, }; export const toggle = () => ({ diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js index 66e18c8bf5392..32be8b79d8fc9 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js @@ -14,16 +14,16 @@ const DemodataDatasource = () => (

      This data source is connected to every Canvas element by default. Its purpose is to give you some playground data to get started. The demo set contains 4 strings, 3 numbers and a date. - Feel free to experiment and, when you're ready, click the Change Datasource{' '} - link below to connect to your own data. + Feel free to experiment and, when you're ready, click Change your data source{' '} + above to connect to your own data.

      ); export const demodata = () => ({ name: 'demodata', - displayName: 'Demo Data', - help: 'Mock data set with with usernames, prices, projects, countries and phases.', + displayName: 'Demo data', + help: 'Mock data set with usernames, prices, projects, countries, and phases', // Replace this with a better icon when we have time. image: 'logoElasticStack', template: templateFromReactComponent(DemodataDatasource), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js index 9acfa963c0dab..37c92226eab35 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js @@ -17,7 +17,7 @@ class EssqlDatasource extends PureComponent { else this.props.setInvalid(!query.trim()); } - defaultQuery = 'SELECT * FROM logstash*'; + defaultQuery = 'SELECT * FROM "logstash*"'; getQuery = () => getSimpleArg(this.getArgName(), this.props.args)[0]; @@ -71,7 +71,7 @@ EssqlDatasource.propTypes = { export const essql = () => ({ name: 'essql', displayName: 'Elasticsearch SQL', - help: 'Use Elasticsearch SQL to get a datatable', + help: 'Use Elasticsearch SQL to get a data table', // Replace this with a SQL logo when we have one in EUI image: 'logoElasticsearch', template: templateFromReactComponent(EssqlDatasource), diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/register.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/register.js index 4c6e949b92110..7d882d736df1a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { datasourceSpecs } from './index'; datasourceSpecs.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js index 386b8ce89214f..16f1a70f6763d 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js @@ -99,7 +99,7 @@ TimelionDatasource.propTypes = { export const timelion = () => ({ name: 'timelion', displayName: 'Timelion', - help: 'Use timelion syntax to retrieve a timeseries', + help: 'Use Timelion syntax to retrieve a timeseries', image: 'timelionApp', template: templateFromReactComponent(TimelionDatasource), }); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js index 60fe433ef60b3..ac5ee08d21349 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js @@ -9,7 +9,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const pointseries = () => ({ name: 'pointseries', - displayName: 'Dimensions & Measures', + displayName: 'Dimensions & measures', args: [ { name: 'x', @@ -20,7 +20,7 @@ export const pointseries = () => ({ { name: 'y', displayName: 'Y-axis', - help: 'Data along the vertical axis. Usually a number.', + help: 'Data along the vertical axis. Usually a number', argType: 'datacolumn', }, { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/models/register.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/register.js index 854d28be96048..ab2ef306f53ef 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/models/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { modelSpecs } from './index'; modelSpecs.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/register.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/register.js index de693d5c3d52c..6ac3422a018b5 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { transformSpecs } from './index'; transformSpecs.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js index ac19bafc27e5a..a864d4ff55763 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js @@ -9,11 +9,11 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const sort = () => ({ name: 'sort', - displayName: 'Datatable Sorting', + displayName: 'Datatable sorting', args: [ { name: '_', - displayName: 'Sort Field', + displayName: 'Sort field', argType: 'datacolumn', }, { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js index e88f8e8bba369..95370ce177782 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js @@ -9,12 +9,12 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const dropdownControl = () => ({ name: 'dropdownControl', - displayName: 'Dropdown Filter', + displayName: 'Dropdown filter', modelArgs: [], args: [ { name: 'valueColumn', - displayName: 'Values Column', + displayName: 'Values column', help: 'Column from which to extract values to make available in the dropdown', argType: 'string', options: { @@ -23,7 +23,7 @@ export const dropdownControl = () => ({ }, { name: 'filterColumn', - displayName: 'Filter Column ', + displayName: 'Filter column ', help: 'Column to which the value selected from the dropdown is applied', argType: 'string', options: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js index f356b74c7127e..2ceffe3efb9f6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js @@ -6,7 +6,7 @@ export const getCell = () => ({ name: 'getCell', - displayName: 'Get Cell', + displayName: 'Get cell', help: 'Grab the first row and first column', modelArgs: ['size'], requiresContext: true, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.js index 7215030a8a001..6e2685dcb9893 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.js @@ -5,12 +5,13 @@ */ import { dropdownControl } from './dropdownControl'; +import { getCell } from './getCell'; import { image } from './image'; import { markdown } from './markdown'; import { metric } from './metric'; import { pie } from './pie'; import { plot } from './plot'; -import { getCell } from './getCell'; +import { progress } from './progress'; import { repeatImage } from './repeatImage'; import { revealImage } from './revealImage'; import { render } from './render'; @@ -20,12 +21,13 @@ import { timefilterControl } from './timefilterControl'; export const viewSpecs = [ dropdownControl, + getCell, image, markdown, metric, pie, plot, - getCell, + progress, repeatImage, revealImage, render, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js index e03f4d5359a6b..15da536c56e46 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.js @@ -21,14 +21,14 @@ export const metric = () => ({ }, { name: 'metricFont', - displayName: 'Metric Text Settings', + displayName: 'Metric text settings', help: 'Fonts, alignment and color', argType: 'font', default: `{font size=48 family="${openSans.value}" color="#000000" align=center lHeight=48}`, }, { name: 'labelFont', - displayName: 'Label Text Settings', + displayName: 'Label text settings', help: 'Fonts, alignment and color', argType: 'font', default: `{font size=18 family="${openSans.value}" color="#000000" align=center}`, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js index 7c63b4cf559ad..1975aa8005d4f 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js @@ -10,7 +10,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const pie = () => ({ name: 'pie', - displayName: 'Chart Style', + displayName: 'Chart style', modelArgs: [['color', { label: 'Slice Labels' }], ['size', { label: 'Slice Angles' }]], args: [ { @@ -19,7 +19,7 @@ export const pie = () => ({ }, { name: 'hole', - displayName: 'Inner Radius', + displayName: 'Inner radius', help: 'Radius of the hole', argType: 'range', default: 50, @@ -37,7 +37,7 @@ export const pie = () => ({ }, { name: 'labelRadius', - displayName: 'Label Radius', + displayName: 'Label radius', help: 'Distance of the labels from the center of the pie', argType: 'range', default: 100, @@ -48,7 +48,7 @@ export const pie = () => ({ }, { name: 'legend', - displayName: 'Legend Position', + displayName: 'Legend position', help: 'Disable or position the legend', argType: 'select', default: 'ne', @@ -74,7 +74,7 @@ export const pie = () => ({ }, { name: 'tilt', - displayName: 'Tilt Angle', + displayName: 'Tilt angle', help: 'Percentage of tilt where 1 is fully vertical and 0 is completely flat', argType: 'percentage', default: 1, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js index e56e2bcfd08c4..1f609155a9cf6 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js @@ -12,7 +12,7 @@ const styleProps = ['lines', 'bars', 'points', 'fill', 'stack']; export const plot = () => ({ name: 'plot', - displayName: 'Chart Style', + displayName: 'Chart style', modelArgs: ['x', 'y', 'color', 'size', 'text'], args: [ { @@ -21,7 +21,7 @@ export const plot = () => ({ }, { name: 'legend', - displayName: 'Legend Position', + displayName: 'Legend position', help: 'Disable or position the legend', argType: 'select', default: 'ne', @@ -31,14 +31,14 @@ export const plot = () => ({ }, { name: 'xaxis', - displayName: 'X-Axis', + displayName: 'X-axis', help: 'Configure or disable the x-axis', argType: 'axisConfig', default: true, }, { name: 'yaxis', - displayName: 'Y-Axis', + displayName: 'Y-axis', help: 'Configure or disable the Y-axis', argType: 'axisConfig', default: true, @@ -50,7 +50,7 @@ export const plot = () => ({ { name: 'defaultStyle', displayName: 'Default style', - help: 'Set the style to be used by default by every series, unless overridden.', + help: 'Set the style to be used by default by every series, unless overridden', argType: 'seriesStyle', default: '{seriesStyle points=5}', options: { diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js new file mode 100644 index 0000000000000..bd929a32232d4 --- /dev/null +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { openSans } from '../../../common/lib/fonts'; +import { shapes } from '../../renderers/progress/shapes'; + +export const progress = () => ({ + name: 'progress', + displayName: 'Progress', + modelArgs: [['_', { label: 'Value' }]], + requiresContext: false, + args: [ + { + name: 'shape', + argType: 'select', + options: { + choices: Object.keys(shapes).map(key => ({ + value: key, + //turns camel into title case + name: key[0].toUpperCase() + key.slice(1).replace(/([A-Z])/g, ' $1'), + })), + }, + }, + { + name: 'max', + displayName: 'Maximum value', + help: 'Maximum value of the progress element', + argType: 'number', + default: '1', + }, + { + name: 'valueColor', + displayName: 'Progress color', + help: 'Color of the progress bar', + argType: 'color', + default: `#1785b0`, + }, + { + name: 'valueWeight', + displayName: 'Progress weight', + help: 'Thickness of the progress bar', + argType: 'number', + default: '20', + }, + { + name: 'barColor', + displayName: 'Background color', + help: 'Color of the background bar', + argType: 'color', + default: `#f0f0f0`, + }, + { + name: 'barWeight', + displayName: 'Background weight', + help: 'Thickness of the background bar', + argType: 'number', + default: '20', + }, + { + name: 'label', + displayName: 'Label', + help: `Set true/false to show/hide label or provide a string to display as the label`, + argType: 'toggle', + default: 'true', + }, + { + name: 'font', + displayName: 'Label settings', + help: 'Font settings for the label. Technically, you can add other styles as well', + argType: 'font', + default: `{font size=24 family="${openSans.value}" color="#000000" align=center}`, + }, + ], +}); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/register.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/register.js index 9240a4259ea04..b94b31e8bacba 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/register.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/register.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import 'babel-polyfill'; import { viewSpecs } from './index'; viewSpecs.forEach(canvas.register); diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js index 8a9d51e5bc005..95a5c54f8307a 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js @@ -6,7 +6,7 @@ export const repeatImage = () => ({ name: 'repeatImage', - displayName: 'Repeating Image', + displayName: 'Repeating image', help: '', modelArgs: [['_', { label: 'Value' }]], args: [ @@ -18,7 +18,7 @@ export const repeatImage = () => ({ }, { name: 'emptyImage', - displayName: 'Empty Image', + displayName: 'Empty image', help: 'An image to fill up the difference between the value and the max count', argType: 'imageUpload', }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js index 58af27ba0ce92..f5369f572c817 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js @@ -6,7 +6,7 @@ export const revealImage = () => ({ name: 'revealImage', - displayName: 'Reveal Image', + displayName: 'Reveal image', help: '', modelArgs: [['_', { label: 'Value' }]], args: [ @@ -18,7 +18,7 @@ export const revealImage = () => ({ }, { name: 'emptyImage', - displayName: 'Background Image', + displayName: 'Background image', help: 'A background image. Eg, an empty glass', argType: 'imageUpload', }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js index 70dd12aa0f4b4..3de5bd3d9d63e 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js @@ -14,14 +14,10 @@ export const shape = () => ({ args: [ { name: '_', - displayName: 'Select a Shape', + displayName: 'Select a shape', argType: 'shape', - help: 'A basic shape', options: { - choices: Object.keys(shapes).map(shape => ({ - value: shape, - name: shape, - })), + shapes, }, }, { @@ -38,13 +34,13 @@ export const shape = () => ({ }, { name: 'borderWidth', - displayName: 'Border Width', + displayName: 'Border width', argType: 'number', help: 'Border width', }, { name: 'maintainAspect', - displayName: 'Maintain Aspect Ratio', + displayName: 'Maintain aspect ratio', argType: 'toggle', help: `Select 'true' to maintain aspect ratio`, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js index 59c2d8dbdbef4..cee6b44705682 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js @@ -6,7 +6,7 @@ export const table = () => ({ name: 'table', - displayName: 'Table Style', + displayName: 'Table style', help: 'Set styling for a Table element', modelArgs: [], args: [ @@ -17,7 +17,7 @@ export const table = () => ({ { name: 'perPage', displayName: 'Rows per page', - help: 'Number of rows to display per table page.', + help: 'Number of rows to display per table page', argType: 'select', default: 10, options: { @@ -27,14 +27,14 @@ export const table = () => ({ { name: 'paginate', displayName: 'Pagination', - help: 'Show or hide pagination controls. If disabled only the first page will be shown.', + help: 'Show or hide pagination controls. If disabled only the first page will be shown', argType: 'toggle', default: true, }, { name: 'showHeader', displayName: 'Header', - help: 'Show or hide the header row with titles for each column.', + help: 'Show or hide the header row with titles for each column', argType: 'toggle', default: true, }, diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js index 288de400b17f0..d368e933b88df 100644 --- a/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js +++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js @@ -9,7 +9,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg'; export const timefilterControl = () => ({ name: 'timefilterControl', - displayName: 'Time Filter', + displayName: 'Time filter', modelArgs: [], args: [ { diff --git a/x-pack/plugins/canvas/common/functions/to.js b/x-pack/plugins/canvas/common/functions/to.js index 142ffe490ca38..6f15569c27a11 100644 --- a/x-pack/plugins/canvas/common/functions/to.js +++ b/x-pack/plugins/canvas/common/functions/to.js @@ -9,7 +9,7 @@ import { castProvider } from '../interpreter/cast'; export const to = () => ({ name: 'to', aliases: [], - help: 'Explicitly cast from one type to another.', + help: 'Explicitly cast from one type to another', context: {}, args: { type: { diff --git a/x-pack/plugins/canvas/common/interpreter/create_error.js b/x-pack/plugins/canvas/common/interpreter/create_error.js new file mode 100644 index 0000000000000..5de9819330dbd --- /dev/null +++ b/x-pack/plugins/canvas/common/interpreter/create_error.js @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const createError = err => ({ + type: 'error', + error: { + stack: process.env.NODE_ENV === 'production' ? undefined : err.stack, + message: typeof err === 'string' ? err : err.message, + }, +}); diff --git a/x-pack/plugins/canvas/common/interpreter/interpret.js b/x-pack/plugins/canvas/common/interpreter/interpret.js index 2777e9d0b80ea..ff7a2547f236f 100644 --- a/x-pack/plugins/canvas/common/interpreter/interpret.js +++ b/x-pack/plugins/canvas/common/interpreter/interpret.js @@ -11,19 +11,7 @@ import { fromExpression } from '../lib/ast'; import { getByAlias } from '../lib/get_by_alias'; import { typesRegistry } from '../lib/types_registry'; import { castProvider } from './cast'; - -const createError = (err, { name, context, args }) => ({ - type: 'error', - error: { - stack: err.stack, - message: typeof err === 'string' ? err : err.message, - }, - info: { - context, - args, - functionName: name, - }, -}); +import { createError } from './create_error'; export function interpretProvider(config) { const { functions, onFunctionNotFound, types } = config; @@ -32,7 +20,7 @@ export function interpretProvider(config) { return interpret; - function interpret(node, context = null) { + async function interpret(node, context = null) { switch (getType(node)) { case 'expression': return invokeChain(node.chain, context); @@ -58,7 +46,11 @@ export function interpretProvider(config) { // in this case, it will try to execute the function in another context if (!fnDef) { chain.unshift(link); - return onFunctionNotFound({ type: 'expression', chain: chain }, context); + try { + return await onFunctionNotFound({ type: 'expression', chain: chain }, context); + } catch (e) { + return createError(e); + } } try { @@ -69,16 +61,15 @@ export function interpretProvider(config) { const newContext = await invokeFunction(fnDef, context, resolvedArgs); // if something failed, just return the failure - if (getType(newContext) === 'error') { - console.log('newContext error', newContext); - return newContext; - } + if (getType(newContext) === 'error') return newContext; // Continue re-invoking chain until it's empty return await invokeChain(chain, newContext); - } catch (err) { - console.error(`common/interpret ${fnName}: invokeChain rejected`, err); - return createError(err, { name: fnName, context, args: fnArgs }); + } catch (e) { + // Everything that throws from a function will hit this + // The interpreter should *never* fail. It should always return a `{type: error}` on failure + e.message = `[${fnName}] > ${e.message}`; + return createError(e); } } @@ -165,6 +156,7 @@ export function interpretProvider(config) { return argAsts.map(argAst => { return async (ctx = context) => { const newContext = await interpret(argAst, ctx); + // This is why when any sub-expression errors, the entire thing errors if (getType(newContext) === 'error') throw newContext.error; return cast(newContext, argDefs[argName].types); }; diff --git a/x-pack/plugins/canvas/common/interpreter/socket_interpret.js b/x-pack/plugins/canvas/common/interpreter/socket_interpret.js index a9ddb8c19c3f9..c8d5acf4fdd52 100644 --- a/x-pack/plugins/canvas/common/interpreter/socket_interpret.js +++ b/x-pack/plugins/canvas/common/interpreter/socket_interpret.js @@ -46,19 +46,14 @@ export function socketInterpreterProvider({ // set a unique message ID so the code knows what response to process const id = uuid(); - return new Promise((resolve, reject) => { + return new Promise(resolve => { const { serialize, deserialize } = serializeProvider(types); - const listener = resp => { - if (resp.error) { - // cast error strings back into error instances - const err = resp.error instanceof Error ? resp.error : new Error(resp.error); - if (resp.stack) err.stack = resp.stack; - reject(err); - } else { - resolve(deserialize(resp.value)); - } - }; + // This will receive {type: [msgSuccess || msgError] value: foo} + // However it doesn't currently do anything with it. Which means `value`, regardless + // of failure or success, needs to be something the interpreters would logically return + // er, a primative or a {type: foo} object + const listener = resp => resolve(deserialize(resp.value)); socket.once(`resp:${id}`, listener); diff --git a/x-pack/plugins/canvas/common/lib/__tests__/autocomplete.js b/x-pack/plugins/canvas/common/lib/__tests__/autocomplete.js new file mode 100644 index 0000000000000..72d79adf2a030 --- /dev/null +++ b/x-pack/plugins/canvas/common/lib/__tests__/autocomplete.js @@ -0,0 +1,187 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from 'expect.js'; +import { functionSpecs } from '../../../__tests__/fixtures/function_specs'; +import { getAutocompleteSuggestions } from '../autocomplete'; + +describe('getAutocompleteSuggestions', () => { + it('should suggest functions', () => { + const suggestions = getAutocompleteSuggestions(functionSpecs, '', 0); + expect(suggestions.length).to.be(functionSpecs.length); + expect(suggestions[0].start).to.be(0); + expect(suggestions[0].end).to.be(0); + }); + + it('should suggest functions filtered by text', () => { + const expression = 'pl'; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, 0); + const nonmatching = suggestions.map(s => s.text).filter(text => !text.includes(expression)); + expect(nonmatching.length).to.be(0); + expect(suggestions[0].start).to.be(0); + expect(suggestions[0].end).to.be(expression.length); + }); + + it('should suggest arguments', () => { + const expression = 'plot '; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const plotFn = functionSpecs.find(spec => spec.name === 'plot'); + expect(suggestions.length).to.be(Object.keys(plotFn.args).length); + expect(suggestions[0].start).to.be(expression.length); + expect(suggestions[0].end).to.be(expression.length); + }); + + it('should suggest arguments filtered by text', () => { + const expression = 'plot axis'; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const plotFn = functionSpecs.find(spec => spec.name === 'plot'); + const matchingArgs = Object.keys(plotFn.args).filter(key => key.includes('axis')); + expect(suggestions.length).to.be(matchingArgs.length); + expect(suggestions[0].start).to.be('plot '.length); + expect(suggestions[0].end).to.be('plot axis'.length); + }); + + it('should suggest values', () => { + const expression = 'shape shape='; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const shapeFn = functionSpecs.find(spec => spec.name === 'shape'); + expect(suggestions.length).to.be(shapeFn.args.shape.options.length); + expect(suggestions[0].start).to.be(expression.length); + expect(suggestions[0].end).to.be(expression.length); + }); + + it('should suggest values filtered by text', () => { + const expression = 'shape shape=ar'; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const shapeFn = functionSpecs.find(spec => spec.name === 'shape'); + const matchingValues = shapeFn.args.shape.options.filter(key => key.includes('ar')); + expect(suggestions.length).to.be(matchingValues.length); + expect(suggestions[0].start).to.be(expression.length - 'ar'.length); + expect(suggestions[0].end).to.be(expression.length); + }); + + it('should suggest functions inside an expression', () => { + const expression = 'if {}'; + const suggestions = getAutocompleteSuggestions( + functionSpecs, + expression, + expression.length - 1 + ); + expect(suggestions.length).to.be(functionSpecs.length); + expect(suggestions[0].start).to.be(expression.length - 1); + expect(suggestions[0].end).to.be(expression.length - 1); + }); + + it('should suggest arguments inside an expression', () => { + const expression = 'if {lt }'; + const suggestions = getAutocompleteSuggestions( + functionSpecs, + expression, + expression.length - 1 + ); + const ltFn = functionSpecs.find(spec => spec.name === 'lt'); + expect(suggestions.length).to.be(Object.keys(ltFn.args).length); + expect(suggestions[0].start).to.be(expression.length - 1); + expect(suggestions[0].end).to.be(expression.length - 1); + }); + + it('should suggest values inside an expression', () => { + const expression = 'if {shape shape=}'; + const suggestions = getAutocompleteSuggestions( + functionSpecs, + expression, + expression.length - 1 + ); + const shapeFn = functionSpecs.find(spec => spec.name === 'shape'); + expect(suggestions.length).to.be(shapeFn.args.shape.options.length); + expect(suggestions[0].start).to.be(expression.length - 1); + expect(suggestions[0].end).to.be(expression.length - 1); + }); + + it('should suggest values inside quotes', () => { + const expression = 'shape shape="ar"'; + const suggestions = getAutocompleteSuggestions( + functionSpecs, + expression, + expression.length - 1 + ); + const shapeFn = functionSpecs.find(spec => spec.name === 'shape'); + const matchingValues = shapeFn.args.shape.options.filter(key => key.includes('ar')); + expect(suggestions.length).to.be(matchingValues.length); + expect(suggestions[0].start).to.be(expression.length - '"ar"'.length); + expect(suggestions[0].end).to.be(expression.length); + }); + + it('should prioritize functions that start with text', () => { + const expression = 't'; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const tableIndex = suggestions.findIndex(suggestion => suggestion.text.includes('table')); + const fontIndex = suggestions.findIndex(suggestion => suggestion.text.includes('font')); + expect(tableIndex).to.be.lessThan(fontIndex); + }); + + it('should prioritize functions that match the previous function type', () => { + const expression = 'plot | '; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const renderIndex = suggestions.findIndex(suggestion => suggestion.text.includes('render')); + const anyIndex = suggestions.findIndex(suggestion => suggestion.text.includes('any')); + expect(renderIndex).to.be.lessThan(anyIndex); + }); + + it('should alphabetize functions', () => { + const expression = ''; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const metricIndex = suggestions.findIndex(suggestion => suggestion.text.includes('metric')); + const anyIndex = suggestions.findIndex(suggestion => suggestion.text.includes('any')); + expect(anyIndex).to.be.lessThan(metricIndex); + }); + + it('should prioritize arguments that start with text', () => { + const expression = 'plot y'; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const yaxisIndex = suggestions.findIndex(suggestion => suggestion.text.includes('yaxis')); + const defaultStyleIndex = suggestions.findIndex(suggestion => + suggestion.text.includes('defaultStyle') + ); + expect(yaxisIndex).to.be.lessThan(defaultStyleIndex); + }); + + it('should prioritize unnamed arguments', () => { + const expression = 'case '; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const whenIndex = suggestions.findIndex(suggestion => suggestion.text.includes('when')); + const thenIndex = suggestions.findIndex(suggestion => suggestion.text.includes('then')); + expect(whenIndex).to.be.lessThan(thenIndex); + }); + + it('should alphabetize arguments', () => { + const expression = 'plot '; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + const yaxisIndex = suggestions.findIndex(suggestion => suggestion.text.includes('yaxis')); + const defaultStyleIndex = suggestions.findIndex(suggestion => + suggestion.text.includes('defaultStyle') + ); + expect(defaultStyleIndex).to.be.lessThan(yaxisIndex); + }); + + it('should quote string values', () => { + const expression = 'shape shape='; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + expect(suggestions[0].text.trim()).to.match(/^".*"$/); + }); + + it('should not quote sub expression value suggestions', () => { + const expression = 'plot font='; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + expect(suggestions[0].text.trim()).to.be('{font}'); + }); + + it('should not quote booleans', () => { + const expression = 'font underline=true'; + const suggestions = getAutocompleteSuggestions(functionSpecs, expression, expression.length); + expect(suggestions[0].text.trim()).to.be('true'); + }); +}); diff --git a/x-pack/plugins/canvas/common/lib/__tests__/get_by_alias.js b/x-pack/plugins/canvas/common/lib/__tests__/get_by_alias.js index f00092d573d68..eaeeeade4cc59 100644 --- a/x-pack/plugins/canvas/common/lib/__tests__/get_by_alias.js +++ b/x-pack/plugins/canvas/common/lib/__tests__/get_by_alias.js @@ -8,46 +8,67 @@ import expect from 'expect.js'; import { getByAlias } from '../get_by_alias'; describe('getByAlias', () => { - const fns = { - foo: { aliases: ['f'] }, - bar: { aliases: ['b'] }, + const fnsObject = { + foo: { name: 'foo', aliases: ['f'] }, + bar: { name: 'bar', aliases: ['b'] }, }; + const fnsArray = [{ name: 'foo', aliases: ['f'] }, { name: 'bar', aliases: ['b'] }]; + it('returns the function by name', () => { - expect(getByAlias(fns, 'foo')).to.be(fns.foo); - expect(getByAlias(fns, 'bar')).to.be(fns.bar); + expect(getByAlias(fnsObject, 'foo')).to.be(fnsObject.foo); + expect(getByAlias(fnsObject, 'bar')).to.be(fnsObject.bar); + expect(getByAlias(fnsArray, 'foo')).to.be(fnsArray[0]); + expect(getByAlias(fnsArray, 'bar')).to.be(fnsArray[1]); }); it('returns the function by alias', () => { - expect(getByAlias(fns, 'f')).to.be(fns.foo); - expect(getByAlias(fns, 'b')).to.be(fns.bar); + expect(getByAlias(fnsObject, 'f')).to.be(fnsObject.foo); + expect(getByAlias(fnsObject, 'b')).to.be(fnsObject.bar); + expect(getByAlias(fnsArray, 'f')).to.be(fnsArray[0]); + expect(getByAlias(fnsArray, 'b')).to.be(fnsArray[1]); }); it('returns the function by case-insensitive name', () => { - expect(getByAlias(fns, 'FOO')).to.be(fns.foo); - expect(getByAlias(fns, 'BAR')).to.be(fns.bar); + expect(getByAlias(fnsObject, 'FOO')).to.be(fnsObject.foo); + expect(getByAlias(fnsObject, 'BAR')).to.be(fnsObject.bar); + expect(getByAlias(fnsArray, 'FOO')).to.be(fnsArray[0]); + expect(getByAlias(fnsArray, 'BAR')).to.be(fnsArray[1]); }); it('returns the function by case-insensitive alias', () => { - expect(getByAlias(fns, 'F')).to.be(fns.foo); - expect(getByAlias(fns, 'B')).to.be(fns.bar); + expect(getByAlias(fnsObject, 'F')).to.be(fnsObject.foo); + expect(getByAlias(fnsObject, 'B')).to.be(fnsObject.bar); + expect(getByAlias(fnsArray, 'F')).to.be(fnsArray[0]); + expect(getByAlias(fnsArray, 'B')).to.be(fnsArray[1]); }); it('handles empty strings', () => { - const emptyStringFns = { '': {} }; - const emptyStringAliasFns = { foo: { aliases: [''] } }; - expect(getByAlias(emptyStringFns, '')).to.be(emptyStringFns['']); - expect(getByAlias(emptyStringAliasFns, '')).to.be(emptyStringAliasFns.foo); + const emptyStringFnsObject = { '': { name: '' } }; + const emptyStringAliasFnsObject = { foo: { name: 'foo', aliases: [''] } }; + expect(getByAlias(emptyStringFnsObject, '')).to.be(emptyStringFnsObject['']); + expect(getByAlias(emptyStringAliasFnsObject, '')).to.be(emptyStringAliasFnsObject.foo); + + const emptyStringFnsArray = [{ name: '' }]; + const emptyStringAliasFnsArray = [{ name: 'foo', aliases: [''] }]; + expect(getByAlias(emptyStringFnsArray, '')).to.be(emptyStringFnsArray[0]); + expect(getByAlias(emptyStringAliasFnsArray, '')).to.be(emptyStringAliasFnsArray[0]); }); it('handles "undefined" strings', () => { - const emptyStringFns = { undefined: {} }; - const emptyStringAliasFns = { foo: { aliases: ['undefined'] } }; - expect(getByAlias(emptyStringFns, 'undefined')).to.be(emptyStringFns.undefined); - expect(getByAlias(emptyStringAliasFns, 'undefined')).to.be(emptyStringAliasFns.foo); + const undefinedFnsObject = { undefined: { name: 'undefined' } }; + const undefinedAliasFnsObject = { foo: { name: 'undefined', aliases: ['undefined'] } }; + expect(getByAlias(undefinedFnsObject, 'undefined')).to.be(undefinedFnsObject.undefined); + expect(getByAlias(undefinedAliasFnsObject, 'undefined')).to.be(undefinedAliasFnsObject.foo); + + const emptyStringFnsArray = [{ name: 'undefined' }]; + const emptyStringAliasFnsArray = [{ name: 'foo', aliases: ['undefined'] }]; + expect(getByAlias(emptyStringFnsArray, 'undefined')).to.be(emptyStringFnsArray[0]); + expect(getByAlias(emptyStringAliasFnsArray, 'undefined')).to.be(emptyStringAliasFnsArray[0]); }); it('returns undefined if not found', () => { - expect(getByAlias(fns, 'baz')).to.be(undefined); + expect(getByAlias(fnsObject, 'baz')).to.be(undefined); + expect(getByAlias(fnsArray, 'baz')).to.be(undefined); }); }); diff --git a/x-pack/plugins/canvas/common/lib/__tests__/httpurl.js b/x-pack/plugins/canvas/common/lib/__tests__/httpurl.js index 52ff4ead36a56..5d7397ed87a50 100644 --- a/x-pack/plugins/canvas/common/lib/__tests__/httpurl.js +++ b/x-pack/plugins/canvas/common/lib/__tests__/httpurl.js @@ -5,27 +5,27 @@ */ import expect from 'expect.js'; -import { isValid } from '../httpurl'; +import { isValidHttpUrl } from '../httpurl'; -describe('httpurl.isValid', () => { +describe('httpurl.isValidHttpUrl', () => { it('matches HTTP URLs', () => { - expect(isValid('http://server.com/veggie/hamburger.jpg')).to.be(true); - expect(isValid('https://server.com:4443/veggie/hamburger.jpg')).to.be(true); - expect(isValid('http://user:password@server.com:4443/veggie/hamburger.jpg')).to.be(true); - expect(isValid('http://virtual-machine/veggiehamburger.jpg')).to.be(true); - expect(isValid('https://virtual-machine:44330/veggie.jpg?hamburger')).to.be(true); - expect(isValid('http://192.168.1.50/veggie/hamburger.jpg')).to.be(true); - expect(isValid('https://2600::/veggie/hamburger.jpg')).to.be(true); // ipv6 - expect(isValid('http://2001:4860:4860::8844/veggie/hamburger.jpg')).to.be(true); // ipv6 + expect(isValidHttpUrl('http://server.com/veggie/hamburger.jpg')).to.be(true); + expect(isValidHttpUrl('https://server.com:4443/veggie/hamburger.jpg')).to.be(true); + expect(isValidHttpUrl('http://user:password@server.com:4443/veggie/hamburger.jpg')).to.be(true); + expect(isValidHttpUrl('http://virtual-machine/veggiehamburger.jpg')).to.be(true); + expect(isValidHttpUrl('https://virtual-machine:44330/veggie.jpg?hamburger')).to.be(true); + expect(isValidHttpUrl('http://192.168.1.50/veggie/hamburger.jpg')).to.be(true); + expect(isValidHttpUrl('https://2600::/veggie/hamburger.jpg')).to.be(true); // ipv6 + expect(isValidHttpUrl('http://2001:4860:4860::8844/veggie/hamburger.jpg')).to.be(true); // ipv6 }); it('rejects non-HTTP URLs', () => { - expect(isValid('')).to.be(false); - expect(isValid('http://server.com')).to.be(false); - expect(isValid('file:///Users/programmer/Pictures/hamburger.jpeg')).to.be(false); - expect(isValid('ftp://hostz.com:1111/path/to/image.png')).to.be(false); - expect(isValid('ftp://user:password@host:1111/path/to/image.png')).to.be(false); + expect(isValidHttpUrl('')).to.be(false); + expect(isValidHttpUrl('http://server.com')).to.be(false); + expect(isValidHttpUrl('file:///Users/programmer/Pictures/hamburger.jpeg')).to.be(false); + expect(isValidHttpUrl('ftp://hostz.com:1111/path/to/image.png')).to.be(false); + expect(isValidHttpUrl('ftp://user:password@host:1111/path/to/image.png')).to.be(false); expect( - isValid('data:image/gif;base64,R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+...') + isValidHttpUrl('data:image/gif;base64,R0lGODlhPQBEAPeoAJosM//AwO/AwHVYZ/z595kzAP/s7P+...') ).to.be(false); }); }); diff --git a/x-pack/plugins/canvas/common/lib/arg.js b/x-pack/plugins/canvas/common/lib/arg.js index d220e30d23237..7713fcb342bc2 100644 --- a/x-pack/plugins/canvas/common/lib/arg.js +++ b/x-pack/plugins/canvas/common/lib/arg.js @@ -10,12 +10,13 @@ export function Arg(config) { if (config.name === '_') throw Error('Arg names must not be _. Use it in aliases instead.'); this.name = config.name; this.required = config.required || false; - this.help = config.help; + this.help = config.help || ''; this.types = config.types || []; this.default = config.default; this.aliases = config.aliases || []; this.multi = config.multi == null ? false : config.multi; this.resolve = config.resolve == null ? true : config.resolve; + this.options = config.options || []; this.accepts = type => { if (!this.types.length) return true; return includes(config.types, type); diff --git a/x-pack/plugins/canvas/common/lib/autocomplete.js b/x-pack/plugins/canvas/common/lib/autocomplete.js new file mode 100644 index 0000000000000..d87e199de4671 --- /dev/null +++ b/x-pack/plugins/canvas/common/lib/autocomplete.js @@ -0,0 +1,209 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { uniq } from 'lodash'; +import { parse } from './grammar'; +import { getByAlias } from './get_by_alias'; + +const MARKER = 'CANVAS_SUGGESTION_MARKER'; + +/** + * Generates the AST with the given expression and then returns the function and argument definitions + * at the given position in the expression, if there are any. + */ +export function getFnArgDefAtPosition(specs, expression, position) { + const text = expression.substr(0, position) + MARKER + expression.substr(position); + try { + const ast = parse(text, { addMeta: true }); + const { ast: newAst, fnIndex, argName } = getFnArgAtPosition(ast, position); + const fn = newAst.node.chain[fnIndex].node; + + const fnDef = getByAlias(specs, fn.function.replace(MARKER, '')); + if (fnDef && argName) { + const argDef = getByAlias(fnDef.args, argName); + return { fnDef, argDef }; + } + return { fnDef }; + } catch (e) { + // Fail silently + } + return []; +} + +/** + * Gets a list of suggestions for the given expression at the given position. It does this by + * inserting a marker at the given position, then parsing the resulting expression. This way we can + * see what the marker would turn into, which tells us what sorts of things to suggest. For + * example, if the marker turns into a function name, then we suggest functions. If it turns into + * an unnamed argument, we suggest argument names. If it turns into a value, we suggest values. + */ +export function getAutocompleteSuggestions(specs, expression, position) { + const text = expression.substr(0, position) + MARKER + expression.substr(position); + try { + const ast = parse(text, { addMeta: true }); + const { ast: newAst, fnIndex, argName, argIndex } = getFnArgAtPosition(ast, position); + const fn = newAst.node.chain[fnIndex].node; + + if (fn.function.includes(MARKER)) return getFnNameSuggestions(specs, newAst, fnIndex); + + if (argName === '_') return getArgNameSuggestions(specs, newAst, fnIndex, argName, argIndex); + + if (argName) return getArgValueSuggestions(specs, newAst, fnIndex, argName, argIndex); + } catch (e) { + // Fail silently + } + return []; +} + +/** + * Get the function and argument (if there is one) at the given position. + */ +function getFnArgAtPosition(ast, position) { + const fnIndex = ast.node.chain.findIndex(fn => fn.start <= position && position <= fn.end); + const fn = ast.node.chain[fnIndex]; + for (const [argName, argValues] of Object.entries(fn.node.arguments)) { + for (let argIndex = 0; argIndex < argValues.length; argIndex++) { + const value = argValues[argIndex]; + if (value.start <= position && position <= value.end) { + if (value.node !== null && value.node.type === 'expression') + return getFnArgAtPosition(value, position); + return { ast, fnIndex, argName, argIndex }; + } + } + } + return { ast, fnIndex }; +} + +function getFnNameSuggestions(specs, ast, fnIndex) { + // Filter the list of functions by the text at the marker + const { start, end, node: fn } = ast.node.chain[fnIndex]; + const query = fn.function.replace(MARKER, ''); + const matchingFnDefs = specs.filter(({ name }) => textMatches(name, query)); + + // Sort by whether or not the function expects the previous function's return type, then by + // whether or not the function name starts with the text at the marker, then alphabetically + const prevFn = ast.node.chain[fnIndex - 1]; + const prevFnDef = prevFn && getByAlias(specs, prevFn.node.function); + const prevFnType = prevFnDef && prevFnDef.type; + const comparator = combinedComparator( + prevFnTypeComparator(prevFnType), + invokeWithProp(startsWithComparator(query), 'name'), + invokeWithProp(alphanumericalComparator, 'name') + ); + const fnDefs = matchingFnDefs.sort(comparator); + + return fnDefs.map(fnDef => { + return { type: 'function', text: fnDef.name + ' ', start, end: end - MARKER.length, fnDef }; + }); +} + +function getArgNameSuggestions(specs, ast, fnIndex, argName, argIndex) { + // Get the list of args from the function definition + const fn = ast.node.chain[fnIndex].node; + const fnDef = getByAlias(specs, fn.function); + if (!fnDef) return []; + + // We use the exact text instead of the value because it is always a string and might be quoted + const { text, start, end } = fn.arguments[argName][argIndex]; + + // Filter the list of args by the text at the marker + const query = text.replace(MARKER, ''); + const matchingArgDefs = Object.values(fnDef.args).filter(({ name }) => textMatches(name, query)); + + // Filter the list of args by those which aren't already present (unless they allow multi) + const argEntries = Object.entries(fn.arguments).map(([name, values]) => { + return [name, values.filter(value => !value.text.includes(MARKER))]; + }); + const unusedArgDefs = matchingArgDefs.filter(argDef => { + if (argDef.multi) return true; + return !argEntries.some(([name, values]) => { + return values.length && (name === argDef.name || argDef.aliases.includes(name)); + }); + }); + + // Sort by whether or not the arg is also the unnamed, then by whether or not the arg name starts + // with the text at the marker, then alphabetically + const comparator = combinedComparator( + unnamedArgComparator, + invokeWithProp(startsWithComparator(query), 'name'), + invokeWithProp(alphanumericalComparator, 'name') + ); + const argDefs = unusedArgDefs.sort(comparator); + + return argDefs.map(argDef => { + return { type: 'argument', text: argDef.name + '=', start, end: end - MARKER.length, argDef }; + }); +} + +function getArgValueSuggestions(specs, ast, fnIndex, argName, argIndex) { + // Get the list of values from the argument definition + const fn = ast.node.chain[fnIndex].node; + const fnDef = getByAlias(specs, fn.function); + if (!fnDef) return []; + const argDef = getByAlias(fnDef.args, argName); + if (!argDef) return []; + + // Get suggestions from the argument definition, including the default + const { start, end, node } = fn.arguments[argName][argIndex]; + const query = node.replace(MARKER, ''); + const suggestions = uniq(argDef.options.concat(argDef.default || [])); + + // Filter the list of suggestions by the text at the marker + const filtered = suggestions.filter(option => textMatches(String(option), query)); + + // Sort by whether or not the value starts with the text at the marker, then alphabetically + const comparator = combinedComparator(startsWithComparator(query), alphanumericalComparator); + const sorted = filtered.sort(comparator); + + return sorted.map(value => { + const text = maybeQuote(value) + ' '; + return { start, end: end - MARKER.length, type: 'value', text }; + }); +} + +function textMatches(text, query) { + return text.toLowerCase().includes(query.toLowerCase().trim()); +} + +function maybeQuote(value) { + if (typeof value === 'string') { + if (value.match(/^\{.*\}$/)) return value; + return `"${value.replace(/"/g, '\\"')}"`; + } + return value; +} + +function prevFnTypeComparator(prevFnType) { + return (a, b) => + Boolean(b.context.types && b.context.types.includes(prevFnType)) - + Boolean(a.context.types && a.context.types.includes(prevFnType)); +} + +function unnamedArgComparator(a, b) { + return b.aliases.includes('_') - a.aliases.includes('_'); +} + +function alphanumericalComparator(a, b) { + if (a < b) return -1; + if (a > b) return 1; + return 0; +} + +function startsWithComparator(query) { + return (a, b) => String(b).startsWith(query) - String(a).startsWith(query); +} + +function combinedComparator(...comparators) { + return (a, b) => + comparators.reduce((acc, comparator) => { + if (acc !== 0) return acc; + return comparator(a, b); + }, 0); +} + +function invokeWithProp(fn, prop) { + return (...args) => fn(...args.map(arg => arg[prop])); +} diff --git a/x-pack/plugins/canvas/common/lib/constants.js b/x-pack/plugins/canvas/common/lib/constants.js index 1e15dff2da8f8..e20f4b4f166d0 100644 --- a/x-pack/plugins/canvas/common/lib/constants.js +++ b/x-pack/plugins/canvas/common/lib/constants.js @@ -13,3 +13,4 @@ export const API_ROUTE_WORKPAD = `${API_ROUTE}/workpad`; export const LOCALSTORAGE_LASTPAGE = 'canvas:lastpage'; export const FETCH_TIMEOUT = 30000; // 30 seconds export const CANVAS_USAGE_TYPE = 'canvas'; +export const SECURITY_AUTH_MESSAGE = 'Authentication failed'; diff --git a/x-pack/plugins/canvas/common/lib/datatable/index.js b/x-pack/plugins/canvas/common/lib/datatable/index.js new file mode 100644 index 0000000000000..4f5acf61eb119 --- /dev/null +++ b/x-pack/plugins/canvas/common/lib/datatable/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './query'; diff --git a/x-pack/plugins/canvas/common/lib/dataurl.js b/x-pack/plugins/canvas/common/lib/dataurl.js index d8d995e148d2e..72eca8cc7f5b1 100644 --- a/x-pack/plugins/canvas/common/lib/dataurl.js +++ b/x-pack/plugins/canvas/common/lib/dataurl.js @@ -11,7 +11,7 @@ const dataurlRegex = /^data:([a-z]+\/[a-z0-9-+.]+)(;[a-z-]+=[a-z0-9-]+)?(;([a-z0 export const imageTypes = ['image/svg+xml', 'image/jpeg', 'image/png', 'image/gif']; -export function parse(str, withData = false) { +export function parseDataUrl(str, withData = false) { if (typeof str !== 'string') return; const matches = str.match(dataurlRegex); @@ -34,7 +34,7 @@ export function parse(str, withData = false) { }; } -export function isValid(str) { +export function isValidDataUrl(str) { return dataurlRegex.test(str); } diff --git a/x-pack/plugins/canvas/common/lib/get_by_alias.js b/x-pack/plugins/canvas/common/lib/get_by_alias.js index ff705f07af516..c9986a5024008 100644 --- a/x-pack/plugins/canvas/common/lib/get_by_alias.js +++ b/x-pack/plugins/canvas/common/lib/get_by_alias.js @@ -6,16 +6,15 @@ /** * This is used for looking up function/argument definitions. It looks through - * the given object for a case-insensitive match, which could be either the - * name of the key itself, or something under the `aliases` property. + * the given object/array for a case-insensitive match, which could be either the + * `name` itself, or something under the `aliases` property. */ export function getByAlias(specs, name) { const lowerCaseName = name.toLowerCase(); - const key = Object.keys(specs).find(key => { - if (key.toLowerCase() === lowerCaseName) return true; - return (specs[key].aliases || []).some(alias => { + return Object.values(specs).find(({ name, aliases }) => { + if (name.toLowerCase() === lowerCaseName) return true; + return (aliases || []).some(alias => { return alias.toLowerCase() === lowerCaseName; }); }); - if (typeof key !== undefined) return specs[key]; } diff --git a/x-pack/plugins/canvas/common/lib/grammar.js b/x-pack/plugins/canvas/common/lib/grammar.js index c72312321af60..2e87b52d68f22 100644 --- a/x-pack/plugins/canvas/common/lib/grammar.js +++ b/x-pack/plugins/canvas/common/lib/grammar.js @@ -145,18 +145,18 @@ function peg$parse(input, options) { peg$c1 = peg$literalExpectation("|", false), peg$c2 = function(first, fn) { return fn; }, peg$c3 = function(first, rest) { - return { + return addMeta({ type: 'expression', chain: [first].concat(rest) - }; + }, text(), location()); }, peg$c4 = peg$otherExpectation("function"), peg$c5 = function(name, arg_list) { - return { + return addMeta({ type: 'function', function: name, arguments: arg_list - }; + }, text(), location()); }, peg$c6 = "=", peg$c7 = peg$literalExpectation("=", false), @@ -173,25 +173,28 @@ function peg$parse(input, options) { peg$c14 = "}", peg$c15 = peg$literalExpectation("}", false), peg$c16 = function(expression) { return expression; }, - peg$c17 = function(arg) { return arg; }, - peg$c18 = function(args) { + peg$c17 = function(value) { + return addMeta(value, text(), location()); + }, + peg$c18 = function(arg) { return arg; }, + peg$c19 = function(args) { return args.reduce((accumulator, { name, value }) => ({ ...accumulator, [name]: (accumulator[name] || []).concat(value) }), {}); }, - peg$c19 = /^[a-zA-Z0-9_\-]/, - peg$c20 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false), - peg$c21 = function(name) { + peg$c20 = /^[a-zA-Z0-9_\-]/, + peg$c21 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false), + peg$c22 = function(name) { return name.join(''); }, - peg$c22 = peg$otherExpectation("literal"), - peg$c23 = "\"", - peg$c24 = peg$literalExpectation("\"", false), - peg$c25 = function(chars) { return chars.join(''); }, - peg$c26 = "'", - peg$c27 = peg$literalExpectation("'", false), - peg$c28 = function(string) { // this also matches nulls, booleans, and numbers + peg$c23 = peg$otherExpectation("literal"), + peg$c24 = "\"", + peg$c25 = peg$literalExpectation("\"", false), + peg$c26 = function(chars) { return chars.join(''); }, + peg$c27 = "'", + peg$c28 = peg$literalExpectation("'", false), + peg$c29 = function(string) { // this also matches nulls, booleans, and numbers var result = string.join(''); // Sort of hacky, but PEG doesn't have backtracking so // a null/boolean/number rule is hard to read, and performs worse @@ -201,19 +204,19 @@ function peg$parse(input, options) { if (isNaN(Number(result))) return result; // 5bears return Number(result); }, - peg$c29 = /^[ \t\r\n]/, - peg$c30 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false), - peg$c31 = "\\", - peg$c32 = peg$literalExpectation("\\", false), - peg$c33 = /^["'(){}<>[\]$`|= \t\n\r]/, - peg$c34 = peg$classExpectation(["\"", "'", "(", ")", "{", "}", "<", ">", "[", "]", "$", "`", "|", "=", " ", "\t", "\n", "\r"], false, false), - peg$c35 = function(sequence) { return sequence; }, - peg$c36 = /^[^"'(){}<>[\]$`|= \t\n\r]/, - peg$c37 = peg$classExpectation(["\"", "'", "(", ")", "{", "}", "<", ">", "[", "]", "$", "`", "|", "=", " ", "\t", "\n", "\r"], true, false), - peg$c38 = /^[^"]/, - peg$c39 = peg$classExpectation(["\""], true, false), - peg$c40 = /^[^']/, - peg$c41 = peg$classExpectation(["'"], true, false), + peg$c30 = /^[ \t\r\n]/, + peg$c31 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false), + peg$c32 = "\\", + peg$c33 = peg$literalExpectation("\\", false), + peg$c34 = /^["'(){}<>[\]$`|= \t\n\r]/, + peg$c35 = peg$classExpectation(["\"", "'", "(", ")", "{", "}", "<", ">", "[", "]", "$", "`", "|", "=", " ", "\t", "\n", "\r"], false, false), + peg$c36 = function(sequence) { return sequence; }, + peg$c37 = /^[^"'(){}<>[\]$`|= \t\n\r]/, + peg$c38 = peg$classExpectation(["\"", "'", "(", ")", "{", "}", "<", ">", "[", "]", "$", "`", "|", "=", " ", "\t", "\n", "\r"], true, false), + peg$c39 = /^[^"]/, + peg$c40 = peg$classExpectation(["\""], true, false), + peg$c41 = /^[^']/, + peg$c42 = peg$classExpectation(["'"], true, false), peg$currPos = 0, peg$savedPos = 0, @@ -352,63 +355,90 @@ function peg$parse(input, options) { } function peg$parseexpression() { - var s0, s1, s2, s3, s4, s5; + var s0, s1, s2, s3, s4, s5, s6, s7; s0 = peg$currPos; - s1 = peg$parsefunction(); + s1 = peg$parsespace(); + if (s1 === peg$FAILED) { + s1 = null; + } if (s1 !== peg$FAILED) { - s2 = []; - s3 = peg$currPos; - if (input.charCodeAt(peg$currPos) === 124) { - s4 = peg$c0; - peg$currPos++; - } else { - s4 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c1); } - } - if (s4 !== peg$FAILED) { - s5 = peg$parsefunction(); - if (s5 !== peg$FAILED) { - peg$savedPos = s3; - s4 = peg$c2(s1, s5); - s3 = s4; - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - } else { - peg$currPos = s3; - s3 = peg$FAILED; - } - while (s3 !== peg$FAILED) { - s2.push(s3); - s3 = peg$currPos; + s2 = peg$parsefunction(); + if (s2 !== peg$FAILED) { + s3 = []; + s4 = peg$currPos; if (input.charCodeAt(peg$currPos) === 124) { - s4 = peg$c0; + s5 = peg$c0; peg$currPos++; } else { - s4 = peg$FAILED; + s5 = peg$FAILED; if (peg$silentFails === 0) { peg$fail(peg$c1); } } - if (s4 !== peg$FAILED) { - s5 = peg$parsefunction(); + if (s5 !== peg$FAILED) { + s6 = peg$parsespace(); + if (s6 === peg$FAILED) { + s6 = null; + } + if (s6 !== peg$FAILED) { + s7 = peg$parsefunction(); + if (s7 !== peg$FAILED) { + peg$savedPos = s4; + s5 = peg$c2(s2, s7); + s4 = s5; + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + while (s4 !== peg$FAILED) { + s3.push(s4); + s4 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 124) { + s5 = peg$c0; + peg$currPos++; + } else { + s5 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c1); } + } if (s5 !== peg$FAILED) { - peg$savedPos = s3; - s4 = peg$c2(s1, s5); - s3 = s4; + s6 = peg$parsespace(); + if (s6 === peg$FAILED) { + s6 = null; + } + if (s6 !== peg$FAILED) { + s7 = peg$parsefunction(); + if (s7 !== peg$FAILED) { + peg$savedPos = s4; + s5 = peg$c2(s2, s7); + s4 = s5; + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } + } else { + peg$currPos = s4; + s4 = peg$FAILED; + } } else { - peg$currPos = s3; - s3 = peg$FAILED; + peg$currPos = s4; + s4 = peg$FAILED; } + } + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c3(s2, s3); + s0 = s1; } else { - peg$currPos = s3; - s3 = peg$FAILED; + peg$currPos = s0; + s0 = peg$FAILED; } - } - if (s2 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c3(s1, s2); - s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -422,26 +452,17 @@ function peg$parse(input, options) { } function peg$parsefunction() { - var s0, s1, s2, s3; + var s0, s1, s2; peg$silentFails++; s0 = peg$currPos; - s1 = peg$parsespace(); - if (s1 === peg$FAILED) { - s1 = null; - } + s1 = peg$parseidentifier(); if (s1 !== peg$FAILED) { - s2 = peg$parseidentifier(); + s2 = peg$parsearg_list(); if (s2 !== peg$FAILED) { - s3 = peg$parsearg_list(); - if (s3 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c5(s2, s3); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s1 = peg$c5(s1, s2); + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -522,7 +543,7 @@ function peg$parse(input, options) { } function peg$parseargument() { - var s0, s1, s2, s3, s4, s5, s6; + var s0, s1, s2, s3, s4; s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 36) { @@ -544,37 +565,19 @@ function peg$parse(input, options) { if (peg$silentFails === 0) { peg$fail(peg$c13); } } if (s2 !== peg$FAILED) { - s3 = peg$parsespace(); - if (s3 === peg$FAILED) { - s3 = null; - } + s3 = peg$parseexpression(); if (s3 !== peg$FAILED) { - s4 = peg$parseexpression(); + if (input.charCodeAt(peg$currPos) === 125) { + s4 = peg$c14; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$c15); } + } if (s4 !== peg$FAILED) { - s5 = peg$parsespace(); - if (s5 === peg$FAILED) { - s5 = null; - } - if (s5 !== peg$FAILED) { - if (input.charCodeAt(peg$currPos) === 125) { - s6 = peg$c14; - peg$currPos++; - } else { - s6 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c15); } - } - if (s6 !== peg$FAILED) { - peg$savedPos = s0; - s1 = peg$c16(s4); - s0 = s1; - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } - } else { - peg$currPos = s0; - s0 = peg$FAILED; - } + peg$savedPos = s0; + s1 = peg$c16(s3); + s0 = s1; } else { peg$currPos = s0; s0 = peg$FAILED; @@ -592,7 +595,13 @@ function peg$parse(input, options) { s0 = peg$FAILED; } if (s0 === peg$FAILED) { - s0 = peg$parseliteral(); + s0 = peg$currPos; + s1 = peg$parseliteral(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$c17(s1); + } + s0 = s1; } return s0; @@ -609,7 +618,7 @@ function peg$parse(input, options) { s4 = peg$parseargument_assignment(); if (s4 !== peg$FAILED) { peg$savedPos = s2; - s3 = peg$c17(s4); + s3 = peg$c18(s4); s2 = s3; } else { peg$currPos = s2; @@ -627,7 +636,7 @@ function peg$parse(input, options) { s4 = peg$parseargument_assignment(); if (s4 !== peg$FAILED) { peg$savedPos = s2; - s3 = peg$c17(s4); + s3 = peg$c18(s4); s2 = s3; } else { peg$currPos = s2; @@ -645,7 +654,7 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c18(s1); + s1 = peg$c19(s1); s0 = s1; } else { peg$currPos = s0; @@ -664,22 +673,22 @@ function peg$parse(input, options) { s0 = peg$currPos; s1 = []; - if (peg$c19.test(input.charAt(peg$currPos))) { + if (peg$c20.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c20); } + if (peg$silentFails === 0) { peg$fail(peg$c21); } } if (s2 !== peg$FAILED) { while (s2 !== peg$FAILED) { s1.push(s2); - if (peg$c19.test(input.charAt(peg$currPos))) { + if (peg$c20.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c20); } + if (peg$silentFails === 0) { peg$fail(peg$c21); } } } } else { @@ -687,7 +696,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c21(s1); + s1 = peg$c22(s1); } s0 = s1; @@ -705,7 +714,7 @@ function peg$parse(input, options) { peg$silentFails--; if (s0 === peg$FAILED) { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c22); } + if (peg$silentFails === 0) { peg$fail(peg$c23); } } return s0; @@ -716,11 +725,11 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 34) { - s1 = peg$c23; + s1 = peg$c24; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c24); } + if (peg$silentFails === 0) { peg$fail(peg$c25); } } if (s1 !== peg$FAILED) { s2 = []; @@ -731,15 +740,15 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s3 = peg$c23; + s3 = peg$c24; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c24); } + if (peg$silentFails === 0) { peg$fail(peg$c25); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c25(s2); + s1 = peg$c26(s2); s0 = s1; } else { peg$currPos = s0; @@ -756,11 +765,11 @@ function peg$parse(input, options) { if (s0 === peg$FAILED) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 39) { - s1 = peg$c26; + s1 = peg$c27; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c27); } + if (peg$silentFails === 0) { peg$fail(peg$c28); } } if (s1 !== peg$FAILED) { s2 = []; @@ -771,15 +780,15 @@ function peg$parse(input, options) { } if (s2 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 39) { - s3 = peg$c26; + s3 = peg$c27; peg$currPos++; } else { s3 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c27); } + if (peg$silentFails === 0) { peg$fail(peg$c28); } } if (s3 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c25(s2); + s1 = peg$c26(s2); s0 = s1; } else { peg$currPos = s0; @@ -814,7 +823,7 @@ function peg$parse(input, options) { } if (s1 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c28(s1); + s1 = peg$c29(s1); } s0 = s1; @@ -825,22 +834,22 @@ function peg$parse(input, options) { var s0, s1; s0 = []; - if (peg$c29.test(input.charAt(peg$currPos))) { + if (peg$c30.test(input.charAt(peg$currPos))) { s1 = input.charAt(peg$currPos); peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c30); } + if (peg$silentFails === 0) { peg$fail(peg$c31); } } if (s1 !== peg$FAILED) { while (s1 !== peg$FAILED) { s0.push(s1); - if (peg$c29.test(input.charAt(peg$currPos))) { + if (peg$c30.test(input.charAt(peg$currPos))) { s1 = input.charAt(peg$currPos); peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c30); } + if (peg$silentFails === 0) { peg$fail(peg$c31); } } } } else { @@ -855,32 +864,32 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c31; + s1 = peg$c32; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } if (s1 !== peg$FAILED) { - if (peg$c33.test(input.charAt(peg$currPos))) { + if (peg$c34.test(input.charAt(peg$currPos))) { s2 = input.charAt(peg$currPos); peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c34); } + if (peg$silentFails === 0) { peg$fail(peg$c35); } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 92) { - s2 = peg$c31; + s2 = peg$c32; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c35(s2); + s1 = peg$c36(s2); s0 = s1; } else { peg$currPos = s0; @@ -891,12 +900,12 @@ function peg$parse(input, options) { s0 = peg$FAILED; } if (s0 === peg$FAILED) { - if (peg$c36.test(input.charAt(peg$currPos))) { + if (peg$c37.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c37); } + if (peg$silentFails === 0) { peg$fail(peg$c38); } } } @@ -908,32 +917,32 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c31; + s1 = peg$c32; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 34) { - s2 = peg$c23; + s2 = peg$c24; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c24); } + if (peg$silentFails === 0) { peg$fail(peg$c25); } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 92) { - s2 = peg$c31; + s2 = peg$c32; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c35(s2); + s1 = peg$c36(s2); s0 = s1; } else { peg$currPos = s0; @@ -944,12 +953,12 @@ function peg$parse(input, options) { s0 = peg$FAILED; } if (s0 === peg$FAILED) { - if (peg$c38.test(input.charAt(peg$currPos))) { + if (peg$c39.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c39); } + if (peg$silentFails === 0) { peg$fail(peg$c40); } } } @@ -961,32 +970,32 @@ function peg$parse(input, options) { s0 = peg$currPos; if (input.charCodeAt(peg$currPos) === 92) { - s1 = peg$c31; + s1 = peg$c32; peg$currPos++; } else { s1 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } if (s1 !== peg$FAILED) { if (input.charCodeAt(peg$currPos) === 39) { - s2 = peg$c26; + s2 = peg$c27; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c27); } + if (peg$silentFails === 0) { peg$fail(peg$c28); } } if (s2 === peg$FAILED) { if (input.charCodeAt(peg$currPos) === 92) { - s2 = peg$c31; + s2 = peg$c32; peg$currPos++; } else { s2 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c32); } + if (peg$silentFails === 0) { peg$fail(peg$c33); } } } if (s2 !== peg$FAILED) { peg$savedPos = s0; - s1 = peg$c35(s2); + s1 = peg$c36(s2); s0 = s1; } else { peg$currPos = s0; @@ -997,18 +1006,25 @@ function peg$parse(input, options) { s0 = peg$FAILED; } if (s0 === peg$FAILED) { - if (peg$c40.test(input.charAt(peg$currPos))) { + if (peg$c41.test(input.charAt(peg$currPos))) { s0 = input.charAt(peg$currPos); peg$currPos++; } else { s0 = peg$FAILED; - if (peg$silentFails === 0) { peg$fail(peg$c41); } + if (peg$silentFails === 0) { peg$fail(peg$c42); } } } return s0; } + + function addMeta(node, text, { start: { offset: start }, end: { offset: end } }) { + if (!options.addMeta) return node; + return { node, text, start, end }; + } + + peg$result = peg$startRuleFunction(); if (peg$result !== peg$FAILED && peg$currPos === input.length) { diff --git a/x-pack/plugins/canvas/common/lib/grammar.peg b/x-pack/plugins/canvas/common/lib/grammar.peg index 9701bec23e2b8..fea9564b67a27 100644 --- a/x-pack/plugins/canvas/common/lib/grammar.peg +++ b/x-pack/plugins/canvas/common/lib/grammar.peg @@ -7,28 +7,35 @@ * You shouldn't be futzing around in the grammar very often anyway. */ +{ + function addMeta(node, text, { start: { offset: start }, end: { offset: end } }) { + if (!options.addMeta) return node; + return { node, text, start, end }; + } +} + /* ----- Expressions ----- */ start = expression expression - = first:function rest:('|' fn:function { return fn; })* { - return { + = space? first:function rest:('|' space? fn:function { return fn; })* { + return addMeta({ type: 'expression', chain: [first].concat(rest) - }; + }, text(), location()); } /* ----- Functions ----- */ function "function" - = space? name:identifier arg_list:arg_list { - return { + = name:identifier arg_list:arg_list { + return addMeta({ type: 'function', function: name, arguments: arg_list - }; + }, text(), location()); } /* ----- Arguments ----- */ @@ -42,8 +49,10 @@ argument_assignment } argument - = '$'? '{' space? expression:expression space? '}' { return expression; } - / literal + = '$'? '{' expression:expression '}' { return expression; } + / value:literal { + return addMeta(value, text(), location()); + } arg_list = args:(space arg:argument_assignment { return arg; })* space? { diff --git a/x-pack/plugins/canvas/common/lib/hex_to_rgb.js b/x-pack/plugins/canvas/common/lib/hex_to_rgb.js new file mode 100644 index 0000000000000..1bb0acfd45cab --- /dev/null +++ b/x-pack/plugins/canvas/common/lib/hex_to_rgb.js @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const hexToRgb = hex => { + const shorthandHexColor = /^#?([a-f\d]{1})([a-f\d]{1})([a-f\d]{1})$/i; + const hexColor = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i; + + const shorthandMatches = shorthandHexColor.exec(hex); + if (shorthandMatches) return shorthandMatches.slice(1, 4).map(hex => parseInt(hex + hex, 16)); + + const hexMatches = hexColor.exec(hex); + if (hexMatches) return hexMatches.slice(1, 4).map(hex => parseInt(hex, 16)); + + return null; +}; diff --git a/x-pack/plugins/canvas/common/lib/httpurl.js b/x-pack/plugins/canvas/common/lib/httpurl.js index 524a4caaecf51..3902395fec3d6 100644 --- a/x-pack/plugins/canvas/common/lib/httpurl.js +++ b/x-pack/plugins/canvas/common/lib/httpurl.js @@ -7,6 +7,6 @@ // A cheap regex to distinguish an HTTP URL string from a data URL string const httpurlRegex = /^https?:\/\/\S+(?:[0-9]+)?\/\S{1,}/; -export function isValid(str) { +export function isValidHttpUrl(str) { return httpurlRegex.test(str); } diff --git a/x-pack/plugins/canvas/common/lib/index.js b/x-pack/plugins/canvas/common/lib/index.js new file mode 100644 index 0000000000000..5d56a5026590d --- /dev/null +++ b/x-pack/plugins/canvas/common/lib/index.js @@ -0,0 +1,39 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './datatable'; +export * from './arg'; +export * from './ast'; +export * from './autocomplete'; +export * from './constants'; +export * from './dataurl'; +export * from './errors'; +export * from './expression_form_handlers'; +export * from './fetch'; +export * from './find_in_object'; +export * from './fn'; +export * from './fonts'; +export * from './functions_registry'; +export * from './get_by_alias'; +export * from './get_colors_from_palette'; +export * from './get_field_type'; +export * from './get_legend_config'; +export * from './get_type'; +export * from './grammar'; +export * from './handlebars'; +export * from './hex_to_rgb'; +export * from './httpurl'; +export * from './latest_change'; +export * from './missing_asset'; +export * from './palettes'; +export * from './pivot_object_array'; +export * from './registry'; +export * from './resolve_dataurl'; +export * from './serialize'; +export * from './type'; +export * from './types_registry'; +export * from './unquote_string'; +export * from './url'; diff --git a/x-pack/plugins/canvas/common/lib/resolve_dataurl.js b/x-pack/plugins/canvas/common/lib/resolve_dataurl.js index c292fc7deb2c7..ef33a09e004f8 100644 --- a/x-pack/plugins/canvas/common/lib/resolve_dataurl.js +++ b/x-pack/plugins/canvas/common/lib/resolve_dataurl.js @@ -5,7 +5,7 @@ */ import { get } from 'lodash'; -import { isValid } from '../../common/lib/url'; +import { isValidUrl } from '../../common/lib/url'; import { missingImage } from '../../common/lib/missing_asset'; /* @@ -15,11 +15,11 @@ import { missingImage } from '../../common/lib/missing_asset'; */ export const resolveFromArgs = (args, defaultDataurl = null) => { const dataurl = get(args, 'dataurl.0', null); - return isValid(dataurl) ? dataurl : defaultDataurl; + return isValidUrl(dataurl) ? dataurl : defaultDataurl; }; export const resolveWithMissingImage = (img, alt = null) => { - if (isValid(img)) return img; + if (isValidUrl(img)) return img; if (img === null) return alt; return missingImage; }; diff --git a/x-pack/plugins/canvas/common/lib/url.js b/x-pack/plugins/canvas/common/lib/url.js index b5efb09f8711d..bed5e30cbff3b 100644 --- a/x-pack/plugins/canvas/common/lib/url.js +++ b/x-pack/plugins/canvas/common/lib/url.js @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { isValid as isValidDataUrl } from '../../common/lib/dataurl'; -import { isValid as isValidHttpUrl } from '../../common/lib/httpurl'; +import { isValidDataUrl } from '../../common/lib/dataurl'; +import { isValidHttpUrl } from '../../common/lib/httpurl'; -export function isValid(url) { +export function isValidUrl(url) { return isValidDataUrl(url) || isValidHttpUrl(url); } diff --git a/x-pack/plugins/canvas/index.js b/x-pack/plugins/canvas/index.js index 8f702ed972e16..b92e29341a14b 100644 --- a/x-pack/plugins/canvas/index.js +++ b/x-pack/plugins/canvas/index.js @@ -20,17 +20,15 @@ export function canvas(kibana) { title: 'Canvas', description: 'Data driven workpads', icon: 'plugins/canvas/icon.svg', + euiIconType: 'canvasApp', main: 'plugins/canvas/app', }, styleSheetPaths: `${__dirname}/public/style/index.scss`, hacks: [ // window.onerror override 'plugins/canvas/lib/window_error_handler.js', - - // Client side plugins go here - 'plugins/canvas/lib/load_expression_types.js', - 'plugins/canvas/lib/load_transitions.js', ], + home: ['plugins/canvas/register_feature'], mappings, }, diff --git a/x-pack/plugins/canvas/init.js b/x-pack/plugins/canvas/init.js index bc41ff43c8ebb..1ef56fac4e97c 100644 --- a/x-pack/plugins/canvas/init.js +++ b/x-pack/plugins/canvas/init.js @@ -5,12 +5,13 @@ */ import { routes } from './server/routes'; -import { functionsRegistry } from './common/lib/functions_registry'; +import { functionsRegistry } from './common/lib'; import { commonFunctions } from './common/functions'; -import { loadServerPlugins } from './server/lib/load_server_plugins'; +import { populateServerRegistries } from './server/lib/server_registries'; import { registerCanvasUsageCollector } from './server/usage'; +import { loadSampleData } from './server/sample_data'; -export default function(server /*options*/) { +export default async function(server /*options*/) { server.injectUiAppVars('canvas', () => { const config = server.config(); const basePath = config.get('server.basePath'); @@ -29,6 +30,10 @@ export default function(server /*options*/) { // There are some common functions that use private APIs, load them here commonFunctions.forEach(func => functionsRegistry.register(func)); - loadServerPlugins().then(() => routes(server)); registerCanvasUsageCollector(server); + loadSampleData(server); + + // Do not initialize the app until the registries are populated + await populateServerRegistries(['serverFunctions', 'types']); + routes(server); } diff --git a/x-pack/plugins/canvas/package.json b/x-pack/plugins/canvas/package.json deleted file mode 100644 index f6b55e0340779..0000000000000 --- a/x-pack/plugins/canvas/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "canvas", - "version": "7.0.0-alpha1", - "description": "Data driven workpads for kibana", - "main": "index.js", - "kibana": { - "version": "kibana" - }, - "scripts": { - "kbn": "node ../../../scripts/kbn", - "start": "../../node_modules/.bin/gulp canvas:dev", - "lint": "node ../../../scripts/eslint '*.js' '__tests__/**/*.js' 'tasks/**/*.js' 'server/**/*.js' 'common/**/*.js' 'public/**/*.{js,jsx}' 'canvas_plugin_src/**/*.{js,jsx}' --ignore-pattern 'canvas_plugin_src/lib/flot-charts/**/*' --ignore-pattern 'common/lib/grammar.js' --ignore-pattern 'canvas_plugin/**/*'", - "test": "../../node_modules/.bin/gulp canvas:test", - "test:common": "../../node_modules/.bin/gulp canvas:test:common", - "test:server": "../../node_modules/.bin/gulp canvas:test:server", - "test:browser": "../../node_modules/.bin/gulp canvas:test:browser", - "test:plugins": "../../node_modules/.bin/gulp canvas:test:plugins", - "test:dev": "../../node_modules/.bin/gulp canvas:test:dev", - "peg:build": "../../node_modules/.bin/gulp canvas:peg:build", - "peg:dev": "../../node_modules/.bin/gulp canvas:peg:dev", - "build": "echo Run build from x-pack root; exit 1", - "build:plugins": "../../node_modules/.bin/gulp canvas:plugins:build" - } -} diff --git a/x-pack/plugins/canvas/public/.eslintrc b/x-pack/plugins/canvas/public/.eslintrc deleted file mode 100644 index 5c9fc4c255341..0000000000000 --- a/x-pack/plugins/canvas/public/.eslintrc +++ /dev/null @@ -1,2 +0,0 @@ -env: - browser: true diff --git a/x-pack/plugins/canvas/public/angular/services/index.js b/x-pack/plugins/canvas/public/angular/services/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/canvas/public/angular/services/store.js b/x-pack/plugins/canvas/public/angular/services/store.js index 181f9bf75cbb0..d008a9af9b174 100644 --- a/x-pack/plugins/canvas/public/angular/services/store.js +++ b/x-pack/plugins/canvas/public/angular/services/store.js @@ -5,17 +5,11 @@ */ import { uiModules } from 'ui/modules'; -import uniqBy from 'lodash.uniqby'; import { createStore } from '../../state/store'; import { getInitialState } from '../../state/initial_state'; -import { functionsRegistry } from '../../../common/lib/functions_registry'; const app = uiModules.get('apps/canvas'); app.service('canvasStore', (kbnVersion, basePath, reportingBrowserType, serverFunctions) => { - // this is effectively what happens to serverFunctions - const clientFunctionsPOJO = JSON.parse(JSON.stringify(functionsRegistry.toArray())); - const functionDefinitions = uniqBy(serverFunctions.concat(clientFunctionsPOJO), 'name'); - const initialState = getInitialState(); // Set the defaults from Kibana plugin @@ -23,7 +17,7 @@ app.service('canvasStore', (kbnVersion, basePath, reportingBrowserType, serverFu kbnVersion, basePath, reportingBrowserType, - functionDefinitions, + serverFunctions, ready: false, }; diff --git a/x-pack/plugins/canvas/public/app.js b/x-pack/plugins/canvas/public/app.js index 0880e01e4a523..9a6fbbb26b7eb 100644 --- a/x-pack/plugins/canvas/public/app.js +++ b/x-pack/plugins/canvas/public/app.js @@ -19,5 +19,9 @@ import 'uiExports/savedObjectTypes'; import 'uiExports/spyModes'; import 'uiExports/fieldFormats'; +// load application code +import './lib/load_expression_types'; +import './lib/load_transitions'; + // load the application chrome.setRootController('canvas', CanvasRootController); diff --git a/x-pack/plugins/canvas/public/apps/home/home_app.js b/x-pack/plugins/canvas/public/apps/home/home_app.js index b2d1e1810c52a..74080e5c7e217 100644 --- a/x-pack/plugins/canvas/public/apps/home/home_app.js +++ b/x-pack/plugins/canvas/public/apps/home/home_app.js @@ -7,13 +7,17 @@ import React from 'react'; import { EuiPage, EuiPageBody, EuiPageContent } from '@elastic/eui'; import { WorkpadLoader } from '../../components/workpad_loader'; +import { setDocTitle } from '../../lib/doc_title'; -export const HomeApp = () => ( - - - - {}} /> - - - -); +export const HomeApp = () => { + setDocTitle('Canvas'); + return ( + + + + {}} /> + + + + ); +}; diff --git a/x-pack/plugins/canvas/public/apps/workpad/routes.js b/x-pack/plugins/canvas/public/apps/workpad/routes.js index 98607304ba1ab..1efe744f36889 100644 --- a/x-pack/plugins/canvas/public/apps/workpad/routes.js +++ b/x-pack/plugins/canvas/public/apps/workpad/routes.js @@ -11,6 +11,7 @@ import { setWorkpad } from '../../state/actions/workpad'; import { setAssets, resetAssets } from '../../state/actions/assets'; import { gotoPage } from '../../state/actions/pages'; import { getWorkpad } from '../../state/selectors/workpad'; +import { setCanUserWrite } from '../../state/actions/transient'; import { WorkpadApp } from './workpad_app'; export const routes = [ @@ -29,6 +30,10 @@ export const routes = [ router.redirectTo('loadWorkpad', { id: newWorkpad.id, page: 1 }); } catch (err) { notify.error(err, { title: `Couldn't create workpad` }); + // TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced + // https://github.com/elastic/kibana/issues/20277 + if (err.response.status === 403) dispatch(setCanUserWrite(false)); + router.redirectTo('home'); } }, meta: { @@ -48,6 +53,13 @@ export const routes = [ const { assets, ...workpad } = fetchedWorkpad; dispatch(setWorkpad(workpad)); dispatch(setAssets(assets)); + + // tests if user has permissions to write to workpads + // TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced + // https://github.com/elastic/kibana/issues/20277 + workpadService.update(params.id, fetchedWorkpad).catch(err => { + if (err.response.status === 403) dispatch(setCanUserWrite(false)); + }); } catch (err) { notify.error(err, { title: `Couldn't load workpad with ID` }); return router.redirectTo('home'); diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js index 90db6af85154e..119c071e3866d 100644 --- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js +++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js @@ -8,8 +8,8 @@ import { connect } from 'react-redux'; import { compose, branch, renderComponent } from 'recompose'; import { initializeWorkpad } from '../../../state/actions/workpad'; import { selectElement } from '../../../state/actions/transient'; -import { getEditing, getAppReady } from '../../../state/selectors/app'; -import { getWorkpad } from '../../../state/selectors/workpad'; +import { canUserWrite, getAppReady } from '../../../state/selectors/app'; +import { getWorkpad, isWriteable } from '../../../state/selectors/workpad'; import { LoadWorkpad } from './load_workpad'; import { WorkpadApp as Component } from './workpad_app'; @@ -17,7 +17,7 @@ const mapStateToProps = state => { const appReady = getAppReady(state); return { - editing: getEditing(state), + isWriteable: isWriteable(state) && canUserWrite(state), appReady: typeof appReady === 'object' ? appReady : { ready: appReady }, workpad: getWorkpad(state), }; diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js index 1d5dcc5d20553..49ef7ed97e07f 100644 --- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js +++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js @@ -13,7 +13,7 @@ import { WorkpadHeader } from '../../../components/workpad_header'; export class WorkpadApp extends React.PureComponent { static propTypes = { - editing: PropTypes.bool, + isWriteable: PropTypes.bool.isRequired, deselectElement: PropTypes.func, initializeWorkpad: PropTypes.func.isRequired, }; @@ -23,7 +23,7 @@ export class WorkpadApp extends React.PureComponent { } render() { - const { editing, deselectElement } = this.props; + const { isWriteable, deselectElement } = this.props; return (
      @@ -42,18 +42,16 @@ export class WorkpadApp extends React.PureComponent {
      - {editing && ( + {isWriteable && (
      )} - {editing ? ( -
      - -
      - ) : null} +
      + +
      ); diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss index f0e62358b3405..9b289151ee6dd 100644 --- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss +++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss @@ -56,6 +56,7 @@ width: 350px; background: darken($euiColorLightestShade, 2%); display: flex; + position: relative; .euiPanel { margin-bottom: $euiSizeS; diff --git a/x-pack/plugins/canvas/public/components/app/app.js b/x-pack/plugins/canvas/public/components/app/app.js index 10c7e9dd1b111..0f933ace4b6e2 100644 --- a/x-pack/plugins/canvas/public/components/app/app.js +++ b/x-pack/plugins/canvas/public/components/app/app.js @@ -8,6 +8,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { routes } from '../../apps'; import { shortcutManager } from '../../lib/shortcut_manager'; +import { getWindow } from '../../lib/get_window'; import { Router } from '../router'; export class App extends React.PureComponent { @@ -26,6 +27,16 @@ export class App extends React.PureComponent { return { shortcuts: shortcutManager }; } + componentDidMount() { + const win = getWindow(); + win.canvasInitErrorHandler && win.canvasInitErrorHandler(); + } + + componentWillUnmount() { + const win = getWindow(); + win.canvasRestoreErrorHandler && win.canvasRestoreErrorHandler(); + } + renderError = () => { console.error(this.props.appState); diff --git a/x-pack/plugins/canvas/public/components/app/index.js b/x-pack/plugins/canvas/public/components/app/index.js index 60b77f3e749c4..5f633169604d6 100644 --- a/x-pack/plugins/canvas/public/components/app/index.js +++ b/x-pack/plugins/canvas/public/components/app/index.js @@ -6,7 +6,10 @@ import { connect } from 'react-redux'; import { compose, withProps } from 'recompose'; -import { getAppReady } from '../../state/selectors/app'; +import { createSocket } from '../../socket'; +import { initialize as initializeInterpreter } from '../../lib/interpreter'; +import { populateBrowserRegistries } from '../../lib/browser_registries'; +import { getAppReady, getBasePath } from '../../state/selectors/app'; import { appReady, appError } from '../../state/actions/app'; import { trackRouteChange } from './track_route_change'; import { App as Component } from './app'; @@ -17,18 +20,42 @@ const mapStateToProps = state => { return { appState: typeof appState === 'object' ? appState : { ready: appState }, + basePath: getBasePath(state), }; }; -const mapDispatchToProps = { - setAppReady: appReady, - setAppError: appError, +const mapDispatchToProps = dispatch => ({ + // TODO: the correct socket path should come from upstream, using the constant here is not ideal + setAppReady: basePath => async () => { + try { + // initialize the socket and interpreter + await createSocket(basePath); + await populateBrowserRegistries(); + await initializeInterpreter(); + + // set app state to ready + dispatch(appReady()); + } catch (e) { + dispatch(appError(e)); + } + }, + setAppError: payload => dispatch(appError(payload)), +}); + +const mergeProps = (stateProps, dispatchProps, ownProps) => { + return { + ...ownProps, + ...stateProps, + ...dispatchProps, + setAppReady: dispatchProps.setAppReady(stateProps.basePath), + }; }; export const App = compose( connect( mapStateToProps, - mapDispatchToProps + mapDispatchToProps, + mergeProps ), withProps(() => ({ onRouteChange: trackRouteChange, diff --git a/x-pack/plugins/canvas/public/components/arg_form/arg_form.js b/x-pack/plugins/canvas/public/components/arg_form/arg_form.js index c7b4582d6c766..594875ed3cbdc 100644 --- a/x-pack/plugins/canvas/public/components/arg_form/arg_form.js +++ b/x-pack/plugins/canvas/public/components/arg_form/arg_form.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import React from 'react'; +import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import { compose, branch, renderComponent } from 'recompose'; import { ErrorBoundary } from '../enhance/error_boundary'; @@ -29,101 +29,112 @@ const branches = [ ]; // This is what is being generated by render() from the Arg class. It is called in FunctionForm -const ArgFormComponent = props => { - const { - argId, - argTypeInstance, - templateProps, - valueMissing, - label, - setLabel, - onValueRemove, - workpad, - renderError, - setRenderError, - resolvedArgValue, - } = props; - - return ( - - {({ error, resetErrorState }) => { - const { template, simpleTemplate } = argTypeInstance.argType; - const hasError = Boolean(error) || renderError; - - const argumentProps = { - ...templateProps, - resolvedArgValue, - defaultValue: argTypeInstance.default, - - renderError: () => { - // TODO: don't do this - // It's an ugly hack to avoid React's render cycle and ensure the error happens on the next tick - // This is important; Otherwise we end up updating state in the middle of a render cycle - Promise.resolve().then(() => { - // Provide templates with a renderError method, and wrap the error in a known error type - // to stop Kibana's window.error from being called - // see window_error_handler.js for details, - setRenderError(true); - }); - }, - error: hasError, - setLabel, - resetErrorState: () => { - resetErrorState(); - setRenderError(false); - }, - label, - workpad, - argId, - }; - - const expandableLabel = Boolean(hasError || template); - - const simpleArg = ( - - - - ); - - const extendedArg = ( -
      - -
      - ); - - return ( -
      - + {({ error, resetErrorState }) => { + const { template, simpleTemplate } = argTypeInstance.argType; + const hasError = Boolean(error) || renderError; + + const argumentProps = { + ...templateProps, + resolvedArgValue, + defaultValue: argTypeInstance.default, + + renderError: () => { + // TODO: don't do this + // It's an ugly hack to avoid React's render cycle and ensure the error happens on the next tick + // This is important; Otherwise we end up updating state in the middle of a render cycle + Promise.resolve().then(() => { + // Provide templates with a renderError method, and wrap the error in a known error type + // to stop Kibana's window.error from being called + // see window_error_handler.js for details, + this._isMounted && setRenderError(true); + }); + }, + error: hasError, + setLabel: label => this._isMounted && setLabel(label), + resetErrorState: () => { + resetErrorState(); + this._isMounted && setRenderError(false); + }, + label, + workpad, + argId, + }; + + const expandableLabel = Boolean(hasError || template); + + const simpleArg = ( + - {extendedArg} - -
      - ); - }} -
      - ); -}; + + + ); + + const extendedArg = ( +
      + +
      + ); + + return ( +
      + + {extendedArg} + +
      + ); + }} + + ); + } +} ArgFormComponent.propTypes = { argId: PropTypes.string.isRequired, diff --git a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.js b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.js index 0c97e048659d2..30281d27e1b9b 100644 --- a/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.js +++ b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.js @@ -125,7 +125,11 @@ export class AssetManager extends React.PureComponent { const assetModal = isModalVisible ? ( - + Manage workpad assets @@ -153,7 +157,7 @@ export class AssetManager extends React.PureComponent { cannot be determined at this time.

      - + {this.props.assets.map(this.renderAsset)} diff --git a/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.js b/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.js new file mode 100644 index 0000000000000..439556334c3e4 --- /dev/null +++ b/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.js @@ -0,0 +1,249 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/*disabling eslint because of these jsx-a11y errors(https://www.npmjs.com/package/eslint-plugin-jsx-a11y): +181:7 error Elements with the 'combobox' interactive role must be focusable jsx-a11y/interactive-supports-focus + 187:9 error Elements with the ARIA role "combobox" must have the following attributes defined: aria-controls,aria-expanded jsx-a11y/role-has-required-aria-props + 209:23 error Elements with the 'option' interactive role must be focusable jsx-a11y/interactive-supports-focus + 218:25 error Elements with the ARIA role "option" must have the following attributes defined: aria-selected jsx-a11y/role-has-required-aria-props +*/ +/* eslint-disable jsx-a11y/interactive-supports-focus */ +/* eslint-disable jsx-a11y/role-has-required-aria-props */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { EuiFlexGroup, EuiFlexItem, EuiPanel, keyCodes } from '@elastic/eui'; + +/** + * An autocomplete component. Currently this is only used for the expression editor but in theory + * it could be extended to any autocomplete-related component. It expects these props: + * + * header: The header node + * items: The list of items for autocompletion + * onSelect: The function to invoke when an item is selected (passing in the item) + * children: Any child nodes, which should include the text input itself + * reference: A function that is passed the selected item which generates a reference node + */ +export class Autocomplete extends React.Component { + static propTypes = { + header: PropTypes.node, + items: PropTypes.array, + onSelect: PropTypes.func, + children: PropTypes.node, + reference: PropTypes.func, + }; + + constructor() { + super(); + this.state = { + isOpen: false, + isFocused: false, + isMousedOver: false, + selectedIndex: -1, + }; + + // These are used for automatically scrolling items into view when selected + this.containerRef = null; + this.itemRefs = []; + } + + componentDidUpdate(prevProps, prevState) { + if ( + this.props.items && + prevProps.items !== this.props.items && + this.props.items.length === 1 && + this.state.selectedIndex !== 0 + ) + this.selectFirst(); + + if (prevState.selectedIndex !== this.state.selectedIndex) this.scrollIntoView(); + } + + selectFirst() { + this.setState({ selectedIndex: 0 }); + } + + isVisible() { + const { isOpen, isFocused, isMousedOver } = this.state; + const { items, reference } = this.props; + + // We have to check isMousedOver because the blur event fires before the click event, which + // means if we didn't keep track of isMousedOver, we wouldn't even get the click event + const visible = isOpen && (isFocused || isMousedOver); + const hasItems = items && items.length; + const hasReference = reference(this.getSelectedItem()); + + return visible && (hasItems || hasReference); + } + + getSelectedItem() { + return this.props.items && this.props.items[this.state.selectedIndex]; + } + + selectPrevious() { + const { items } = this.props; + const { selectedIndex } = this.state; + if (selectedIndex > 0) this.setState({ selectedIndex: selectedIndex - 1 }); + else this.setState({ selectedIndex: items.length - 1 }); + } + + selectNext() { + const { items } = this.props; + const { selectedIndex } = this.state; + if (selectedIndex >= 0 && selectedIndex < items.length - 1) + this.setState({ selectedIndex: selectedIndex + 1 }); + else this.setState({ selectedIndex: 0 }); + } + + scrollIntoView() { + const { + containerRef, + itemRefs, + state: { selectedIndex }, + } = this; + const itemRef = itemRefs[selectedIndex]; + if (!containerRef || !itemRef) return; + containerRef.scrollTop = Math.max( + Math.min(containerRef.scrollTop, itemRef.offsetTop), + itemRef.offsetTop + itemRef.offsetHeight - containerRef.offsetHeight + ); + } + + onSubmit = () => { + const { selectedIndex } = this.state; + const { items, onSelect } = this.props; + onSelect(items[selectedIndex]); + this.setState({ selectedIndex: -1 }); + }; + + /** + * Handle key down events for the menu, including selecting the previous and next items, making + * the item selection, closing the menu, etc. + */ + onKeyDown = e => { + const { ESCAPE, TAB, ENTER, UP, DOWN, LEFT, RIGHT } = keyCodes; + const { keyCode } = e; + const { items } = this.props; + const { isOpen, selectedIndex } = this.state; + + if ([ESCAPE, LEFT, RIGHT].includes(keyCode)) this.setState({ isOpen: false }); + + if ([TAB, ENTER].includes(keyCode) && isOpen && selectedIndex >= 0) { + e.preventDefault(); + this.onSubmit(); + } else if (keyCode === UP && items.length > 0 && isOpen) { + e.preventDefault(); + this.selectPrevious(); + } else if (keyCode === DOWN && items.length > 0 && isOpen) { + e.preventDefault(); + this.selectNext(); + } else if (e.key === 'Backspace') { + this.setState({ isOpen: true }); + } else if (!['Shift', 'Control', 'Alt', 'Meta'].includes(e.key)) { + this.setState({ selectedIndex: -1 }); + } + }; + + /** + * On key press (character keys), show the menu. We don't want to willy nilly show the menu + * whenever ANY key down event happens (like arrow keys) cuz that would be just downright + * annoying. + */ + onKeyPress = () => { + this.setState({ isOpen: true }); + }; + + onFocus = () => { + this.setState({ + isFocused: true, + }); + }; + + onBlur = () => { + this.setState({ + isFocused: false, + }); + }; + + onMouseDown = () => { + this.setState({ + isOpen: false, + }); + }; + + onMouseEnter = () => { + this.setState({ + isMousedOver: true, + }); + }; + + onMouseLeave = () => { + this.setState({ isMousedOver: false }); + }; + + render() { + const { header, items, reference } = this.props; + return ( +
      + {this.isVisible() ? ( + + + {items && items.length ? ( + +
      (this.containerRef = ref)} + role="listbox" + > + {header} + {items.map((item, i) => ( +
      (this.itemRefs[i] = ref)} + className={ + 'autocompleteItem' + + (this.state.selectedIndex === i ? ' autocompleteItem--isActive' : '') + } + onMouseEnter={() => this.setState({ selectedIndex: i })} + onClick={this.onSubmit} + role="option" + > + {item.text} +
      + ))} +
      +
      + ) : ( + '' + )} + +
      {reference(this.getSelectedItem())}
      +
      +
      +
      + ) : ( + '' + )} +
      {this.props.children}
      +
      + ); + } +} diff --git a/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.scss b/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.scss new file mode 100644 index 0000000000000..c9da34d87d0a1 --- /dev/null +++ b/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.scss @@ -0,0 +1,51 @@ +.autocomplete { + position: relative; +} + +.autocompletePopup { + position: absolute; + top: -262px; + height: 260px; + width: 100%; +} + +.autocompleteItems { + border-right: $euiBorderThin; +} + +.autocompleteItems, .autocompleteReference { + height: 258px; + overflow: auto; + @include euiScrollBar; +} + +.autocompleteReference { + padding: $euiSizeS $euiSizeM; + background-color: tintOrShade($euiColorLightestShade, 65%, 20%); +} + +.autocompleteItem { + padding: $euiSizeS $euiSizeM; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-family: $euiCodeFontFamily; + font-weight: $euiFontWeightRegular; +} + +.autocompleteItem--isActive { + color: $euiColorPrimary; + background-color: $euiFocusBackgroundColor; +} + +.autocompleteType { + padding: $euiSizeS; +} + +.autocompleteTable .euiTable { + background-color: transparent; +} + +.autocompleteDescList .euiDescriptionList__description { + margin-right: $euiSizeS; +} \ No newline at end of file diff --git a/x-pack/plugins/canvas/public/components/autocomplete/index.js b/x-pack/plugins/canvas/public/components/autocomplete/index.js new file mode 100644 index 0000000000000..d897737e6f686 --- /dev/null +++ b/x-pack/plugins/canvas/public/components/autocomplete/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { Autocomplete } from './autocomplete'; diff --git a/x-pack/plugins/canvas/public/components/border_connection/border_connection.scss b/x-pack/plugins/canvas/public/components/border_connection/border_connection.scss index 3171a25182110..aa5d9ad1e0f41 100644 --- a/x-pack/plugins/canvas/public/components/border_connection/border_connection.scss +++ b/x-pack/plugins/canvas/public/components/border_connection/border_connection.scss @@ -7,5 +7,6 @@ //box-shadow: inset 0 0 1px 2px $euiColorPrimary; border-top: $euiBorderThin; border-left: $euiBorderThin; + border-style: dashed; border-color: #d9d9d9; } diff --git a/x-pack/plugins/canvas/public/components/context_menu/context_menu.js b/x-pack/plugins/canvas/public/components/context_menu/context_menu.js deleted file mode 100644 index 43bbb9288940d..0000000000000 --- a/x-pack/plugins/canvas/public/components/context_menu/context_menu.js +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import PropTypes from 'prop-types'; - -export const ContextMenu = ({ - items, - onSelect, - itemsStyle, - itemComponent, - children, - isOpen, - selectedIndex, - setSelectedIndex, - onKeyDown, - onKeyPress, -}) => ( -
      - {children} - {isOpen && items.length ? ( -
      - {items.map((item, i) => ( -
      onSelect(item)} - onMouseOver={() => setSelectedIndex(i)} - > - {itemComponent({ item })} -
      - ))} -
      - ) : ( - '' - )} -
      -); - -ContextMenu.propTypes = { - items: PropTypes.array, - onSelect: PropTypes.func, - itemsStyle: PropTypes.object, - itemComponent: PropTypes.func, - children: PropTypes.node, - isOpen: PropTypes.bool, - selectedIndex: PropTypes.number, - setSelectedIndex: PropTypes.func, - onKeyDown: PropTypes.func, - onKeyPress: PropTypes.func, -}; diff --git a/x-pack/plugins/canvas/public/components/context_menu/context_menu.scss b/x-pack/plugins/canvas/public/components/context_menu/context_menu.scss deleted file mode 100644 index f982f8b3deedd..0000000000000 --- a/x-pack/plugins/canvas/public/components/context_menu/context_menu.scss +++ /dev/null @@ -1,28 +0,0 @@ -.contextMenu { - position: relative; - - .contextMenu__items { - position: absolute; - z-index: 1; - width: 100%; - display: flex; - flex-direction: column; - background: $euiColorEmptyShade; - border: $euiBorderThin; - - .contextMenu__item { - padding: $euiSizeS; - background-color: $euiColorEmptyShade; - border: $euiBorderThin; - color: $euiTextColor; - display: flex; - align-self: flex-start; - width: 100%; - - &-isActive { - background-color: $euiColorDarkShade; - color: $euiColorGhost; - } - } - } -} diff --git a/x-pack/plugins/canvas/public/components/context_menu/index.js b/x-pack/plugins/canvas/public/components/context_menu/index.js deleted file mode 100644 index d58137cf03c5e..0000000000000 --- a/x-pack/plugins/canvas/public/components/context_menu/index.js +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { compose, withState, withHandlers } from 'recompose'; -import { ContextMenu as Component } from './context_menu'; -import { onKeyDownProvider, onKeyPressProvider } from './key_handlers'; - -export const ContextMenu = compose( - withState('isOpen', 'setIsOpen', true), - withState('selectedIndex', 'setSelectedIndex', -1), - withHandlers({ - onKeyDown: onKeyDownProvider, - onKeyPress: onKeyPressProvider, - }) -)(Component); diff --git a/x-pack/plugins/canvas/public/components/context_menu/key_handlers.js b/x-pack/plugins/canvas/public/components/context_menu/key_handlers.js deleted file mode 100644 index 5b40f9920a409..0000000000000 --- a/x-pack/plugins/canvas/public/components/context_menu/key_handlers.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -/** - * Handle key down events for the menu, including selecting the previous and - * next items, making the item selection, closing the menu, etc. - */ -export const onKeyDownProvider = ({ - items, - onSelect, - isOpen, - setIsOpen, - selectedIndex, - setSelectedIndex, -}) => e => { - if (!isOpen || !items.length) return; - const { key } = e; - if (key === 'ArrowUp') { - e.preventDefault(); - setSelectedIndex((selectedIndex - 1 + items.length) % items.length); - } else if (key === 'ArrowDown') { - e.preventDefault(); - setSelectedIndex((selectedIndex + 1) % items.length); - } else if (['Enter', 'Tab'].includes(key) && selectedIndex >= 0) { - e.preventDefault(); - onSelect(items[selectedIndex]); - setSelectedIndex(-1); - } else if (key === 'Escape') { - setIsOpen(false); - } -}; - -/** - * On key press (character keys), show the menu. We don't want to willy nilly - * show the menu whenever ANY key down event happens (like arrow keys) cuz that - * would be just downright annoying. - */ -export const onKeyPressProvider = ({ setIsOpen, setSelectedIndex }) => () => { - setIsOpen(true); - setSelectedIndex(-1); -}; diff --git a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss index d26c2a9bb50ea..da26e82f78f58 100644 --- a/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss +++ b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss @@ -1,5 +1,5 @@ .canvasDatasourcePreview { - max-width: 80vw; + max-width: 1000px; max-height: 60vh; height: 100%; diff --git a/x-pack/plugins/canvas/public/components/datasource/index.js b/x-pack/plugins/canvas/public/components/datasource/index.js index c86f9914f3b69..1b516449c79fa 100644 --- a/x-pack/plugins/canvas/public/components/datasource/index.js +++ b/x-pack/plugins/canvas/public/components/datasource/index.js @@ -9,15 +9,15 @@ import { connect } from 'react-redux'; import { withState, withHandlers, compose } from 'recompose'; import { get } from 'lodash'; import { datasourceRegistry } from '../../expression_types'; +import { getServerFunctions } from '../../state/selectors/app'; import { getSelectedElement, getSelectedPage } from '../../state/selectors/workpad'; -import { getFunctionDefinitions } from '../../state/selectors/app'; import { setArgumentAtIndex, setAstAtIndex, flushContext } from '../../state/actions/elements'; import { Datasource as Component } from './datasource'; const mapStateToProps = state => ({ element: getSelectedElement(state), pageId: getSelectedPage(state), - functionDefinitions: getFunctionDefinitions(state), + functionDefinitions: getServerFunctions(state), }); const mapDispatchToProps = dispatch => ({ diff --git a/x-pack/plugins/canvas/public/components/dom_preview/dom_preview.js b/x-pack/plugins/canvas/public/components/dom_preview/dom_preview.js index 754a67482ee6a..6cadc77109e46 100644 --- a/x-pack/plugins/canvas/public/components/dom_preview/dom_preview.js +++ b/x-pack/plugins/canvas/public/components/dom_preview/dom_preview.js @@ -38,6 +38,8 @@ export class DomPreview extends React.Component { } update = original => () => { + if (!this.content || !this.container) return; + const thumb = original.cloneNode(true); const originalStyle = window.getComputedStyle(original, null); @@ -48,10 +50,11 @@ export class DomPreview extends React.Component { const scale = thumbHeight / originalHeight; const thumbWidth = originalWidth * scale; - if (this.content) { - if (this.content.hasChildNodes()) this.content.removeChild(this.content.firstChild); - this.content.appendChild(thumb); - } + if (this.content.hasChildNodes()) this.content.removeChild(this.content.firstChild); + this.content.appendChild(thumb); + + this.content.style.cssText = `transform: scale(${scale}); transform-origin: top left;`; + this.container.style.cssText = `width: ${thumbWidth}px; height: ${thumbHeight}px;`; // Copy canvas data const originalCanvas = original.querySelectorAll('canvas'); @@ -63,9 +66,6 @@ export class DomPreview extends React.Component { thumbCanvas[i].getContext('2d').drawImage(img, 0, 0) ); } - - this.container.style.cssText = `width: ${thumbWidth}px; height: ${thumbHeight}px;`; - this.content.style.cssText = `transform: scale(${scale}); transform-origin: top left;`; }; render() { diff --git a/x-pack/plugins/canvas/public/components/download/download.js b/x-pack/plugins/canvas/public/components/download/download.js index 29b33f20e2105..e2b39f15d48d1 100644 --- a/x-pack/plugins/canvas/public/components/download/download.js +++ b/x-pack/plugins/canvas/public/components/download/download.js @@ -8,7 +8,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import fileSaver from 'file-saver'; import { toByteArray } from 'base64-js'; -import { parse } from '../../../common/lib/dataurl'; +import { parseDataUrl } from '../../../common/lib/dataurl'; export class Download extends React.PureComponent { static propTypes = { @@ -20,7 +20,7 @@ export class Download extends React.PureComponent { onClick = () => { const { fileName, content } = this.props; - const asset = parse(content, true); + const asset = parseDataUrl(content, true); const assetBlob = new Blob([toByteArray(asset.data)], { type: asset.mimetype }); const ext = asset.extension ? `.${asset.extension}` : ''; fileSaver.saveAs(assetBlob, `canvas-${fileName}${ext}`); diff --git a/x-pack/plugins/canvas/public/components/element_content/invalid_element_type.js b/x-pack/plugins/canvas/public/components/element_content/invalid_element_type.js index 08d8a5294e9a4..33b12ea9b9399 100644 --- a/x-pack/plugins/canvas/public/components/element_content/invalid_element_type.js +++ b/x-pack/plugins/canvas/public/components/element_content/invalid_element_type.js @@ -3,6 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ +/* Disabling eslint because of this jsx-a11y error(https://www.npmjs.com/package/eslint-plugin-jsx-a11y): +11:3 error Non-interactive elements should not be assigned mouse or keyboard event listeners jsx-a11y/no-noninteractive-element-interactions +*/ +/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */ import React from 'react'; import PropTypes from 'prop-types'; diff --git a/x-pack/plugins/canvas/public/components/element_content/invalid_expression.js b/x-pack/plugins/canvas/public/components/element_content/invalid_expression.js index 0c17f9ac51732..0dcfd92b637cb 100644 --- a/x-pack/plugins/canvas/public/components/element_content/invalid_expression.js +++ b/x-pack/plugins/canvas/public/components/element_content/invalid_expression.js @@ -4,6 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ +/* Disabling eslint because of this jsx-a11y error(https://www.npmjs.com/package/eslint-plugin-jsx-a11y): + 11:3 error Non-interactive elements should not be assigned mouse or keyboard event listeners jsx-a11y/no-noninteractive-element-interactions + */ +/* eslint-disable jsx-a11y/no-noninteractive-element-interactions */ + import React from 'react'; import PropTypes from 'prop-types'; diff --git a/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js b/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js index be52438f635fe..e2afd9e2e0459 100644 --- a/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js +++ b/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js @@ -22,12 +22,11 @@ export class ElementShareContainer extends React.PureComponent { componentDidMount() { const { functionName, onComplete } = this.props; const isDevelopment = process.env.NODE_ENV !== 'production'; - let t; // check that the done event is called within a certain time if (isDevelopment) { const timeout = 15; // timeout, in seconds - t = setTimeout(() => { + this.timeout = setTimeout(() => { // TODO: show this message in a proper notification console.warn( `done handler not called in render function after ${timeout} seconds: ${functionName}` @@ -37,9 +36,9 @@ export class ElementShareContainer extends React.PureComponent { // dispatches a custom DOM event on the container when the element is complete onComplete(() => { - clearTimeout(t); + clearTimeout(this.timeout); if (!this.sharedItemRef) return; // without this, crazy fast forward/backward paging leads to an error - const ev = new Event('renderComplete'); + const ev = new CustomEvent('renderComplete'); this.sharedItemRef.dispatchEvent(ev); // if the element is finished before reporting is listening for then @@ -52,6 +51,10 @@ export class ElementShareContainer extends React.PureComponent { }); } + componentWillUnmount() { + clearTimeout(this.timeout); + } + render() { // NOTE: the data-shared-item and data-render-complete attributes are used for reporting return ( diff --git a/x-pack/plugins/canvas/public/components/element_types/element_types.js b/x-pack/plugins/canvas/public/components/element_types/element_types.js index dde2d5c51f56f..074ffcaa8cee7 100644 --- a/x-pack/plugins/canvas/public/components/element_types/element_types.js +++ b/x-pack/plugins/canvas/public/components/element_types/element_types.js @@ -34,6 +34,7 @@ export const ElementTypes = ({ elements, onClick, search, setSearch }) => { title={displayName} description={help} onClick={whenClicked} + className="canvasCard" /> ); @@ -51,6 +52,7 @@ export const ElementTypes = ({ elements, onClick, search, setSearch }) => { setSearch(e.target.value)} value={search} diff --git a/x-pack/plugins/canvas/public/components/element_types/element_types.scss b/x-pack/plugins/canvas/public/components/element_types/element_types.scss new file mode 100644 index 0000000000000..bb58a60515c70 --- /dev/null +++ b/x-pack/plugins/canvas/public/components/element_types/element_types.scss @@ -0,0 +1,17 @@ +.canvasCard { + + .euiCard__top { + text-align: center; + width: calc(100% + #{$euiSize}*2); + height: 85px; + margin: calc(-1 * #{$euiSize}) calc(-1 * #{$euiSize}) 0; + } + + .euiCard__image { + max-height: 100%; + max-width: 100%; + width: auto; + left: 0; + top: 0; + } +} \ No newline at end of file diff --git a/x-pack/plugins/canvas/public/components/element_wrapper/index.js b/x-pack/plugins/canvas/public/components/element_wrapper/index.js index b932b3495db98..cbea3b487a4ab 100644 --- a/x-pack/plugins/canvas/public/components/element_wrapper/index.js +++ b/x-pack/plugins/canvas/public/components/element_wrapper/index.js @@ -6,14 +6,13 @@ import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { getEditing } from '../../state/selectors/app'; -import { getResolvedArgs, getSelectedPage } from '../../state/selectors/workpad'; +import { getResolvedArgs, getSelectedPage, isWriteable } from '../../state/selectors/workpad'; import { getState, getValue, getError } from '../../lib/resolved_arg'; import { ElementWrapper as Component } from './element_wrapper'; import { createHandlers as createHandlersWithDispatch } from './lib/handlers'; const mapStateToProps = (state, { element }) => ({ - isEditing: getEditing(state), + isWriteable: isWriteable(state), resolvedArg: getResolvedArgs(state, element.id, 'expressionRenderable'), selectedPage: getSelectedPage(state), }); diff --git a/x-pack/plugins/canvas/public/components/error/error.js b/x-pack/plugins/canvas/public/components/error/error.js index c37780657ba29..1db25835b77cb 100644 --- a/x-pack/plugins/canvas/public/components/error/error.js +++ b/x-pack/plugins/canvas/public/components/error/error.js @@ -11,7 +11,6 @@ import { get } from 'lodash'; import { ShowDebugging } from './show_debugging'; export const Error = ({ payload }) => { - const functionName = get(payload, 'info.functionName'); const message = get(payload, 'error.message'); return ( @@ -21,10 +20,7 @@ export const Error = ({ payload }) => { iconType="cross" title="Whoops! Expression failed" > -

      - The function "{functionName}" failed - {message ? ' with the following message:' : '.'} -

      +

      {message ? 'Expression failed with the message:' : ''}

      {message &&

      {message}

      } @@ -33,8 +29,5 @@ export const Error = ({ payload }) => { }; Error.propTypes = { - payload: PropTypes.shape({ - info: PropTypes.object.isRequired, - error: PropTypes.object.isRequired, - }).isRequired, + payload: PropTypes.object.isRequired, }; diff --git a/x-pack/plugins/canvas/public/components/es_field_select/es_field_select.js b/x-pack/plugins/canvas/public/components/es_field_select/es_field_select.js index 3f936b3aca637..b5c1c233da33a 100644 --- a/x-pack/plugins/canvas/public/components/es_field_select/es_field_select.js +++ b/x-pack/plugins/canvas/public/components/es_field_select/es_field_select.js @@ -24,7 +24,7 @@ export const ESFieldSelect = ({ value, fields = [], onChange, onFocus, onBlur }) }} onFocus={onFocus} onBlur={onBlur} - singleSelection + singleSelection={{ asPlainText: true }} isClearable={false} /> ); diff --git a/x-pack/plugins/canvas/public/components/es_index_select/es_index_select.js b/x-pack/plugins/canvas/public/components/es_index_select/es_index_select.js index d871ba1b7d9b1..035cae6fbba06 100644 --- a/x-pack/plugins/canvas/public/components/es_index_select/es_index_select.js +++ b/x-pack/plugins/canvas/public/components/es_index_select/es_index_select.js @@ -27,7 +27,7 @@ export const ESIndexSelect = ({ value, loading, indices, onChange, onFocus, onBl onFocus={onFocus} disabled={loading} options={options} - singleSelection + singleSelection={{ asPlainText: true }} isClearable={false} onCreateOption={input => onChange(input || defaultIndex)} /> diff --git a/x-pack/plugins/canvas/public/components/expression/expression.js b/x-pack/plugins/canvas/public/components/expression/expression.js index d901529616abc..1ee8a5211eb3d 100644 --- a/x-pack/plugins/canvas/public/components/expression/expression.js +++ b/x-pack/plugins/canvas/public/components/expression/expression.js @@ -12,30 +12,53 @@ import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, - EuiSpacer, + EuiSwitch, } from '@elastic/eui'; import { ExpressionInput } from '../expression_input'; -export const Expression = ({ formState, updateValue, setExpression, done, error }) => { +export const Expression = ({ + functionDefinitions, + formState, + updateValue, + setExpression, + done, + error, + isAutocompleteEnabled, + toggleAutocompleteEnabled, +}) => { return ( - - - - + + + - - {formState.dirty ? 'Cancel' : 'Close'} - + - - setExpression(formState.expression)} - size="s" - > - Run - + + + + {formState.dirty ? 'Cancel' : 'Close'} + + setExpression(formState.expression)} + size="s" + > + Run + + @@ -43,9 +66,12 @@ export const Expression = ({ formState, updateValue, setExpression, done, error }; Expression.propTypes = { + functionDefinitions: PropTypes.array, formState: PropTypes.object, updateValue: PropTypes.func, setExpression: PropTypes.func, done: PropTypes.func, error: PropTypes.string, + isAutocompleteEnabled: PropTypes.bool, + toggleAutocompleteEnabled: PropTypes.func, }; diff --git a/x-pack/plugins/canvas/public/components/expression/index.js b/x-pack/plugins/canvas/public/components/expression/index.js index d5f706765380f..18690529d4e80 100644 --- a/x-pack/plugins/canvas/public/components/expression/index.js +++ b/x-pack/plugins/canvas/public/components/expression/index.js @@ -4,6 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ +import { Storage } from 'ui/storage'; import { connect } from 'react-redux'; import { compose, @@ -17,12 +18,17 @@ import { import { getSelectedPage, getSelectedElement } from '../../state/selectors/workpad'; import { setExpression, flushContext } from '../../state/actions/elements'; import { fromExpression } from '../../../common/lib/ast'; +import { getFunctionDefinitions } from '../../lib/function_definitions'; +import { getWindow } from '../../lib/get_window'; import { ElementNotSelected } from './element_not_selected'; import { Expression as Component } from './expression'; +const storage = new Storage(getWindow().localStorage); + const mapStateToProps = state => ({ pageId: getSelectedPage(state), element: getSelectedElement(state), + functionDefinitionsPromise: getFunctionDefinitions(state), }); const mapDispatchToProps = dispatch => ({ @@ -59,6 +65,10 @@ const expressionLifecycle = lifecycle({ }); } }, + componentDidMount() { + const { functionDefinitionsPromise, setFunctionDefinitions } = this.props; + functionDefinitionsPromise.then(defs => setFunctionDefinitions(defs)); + }, }); export const Expression = compose( @@ -67,11 +77,20 @@ export const Expression = compose( mapDispatchToProps, mergeProps ), + withState('functionDefinitions', 'setFunctionDefinitions', []), withState('formState', 'setFormState', ({ expression }) => ({ expression, dirty: false, })), + withState('isAutocompleteEnabled', 'setIsAutocompleteEnabled', () => { + const setting = storage.get('kibana.canvas.isAutocompleteEnabled'); + return setting === null ? true : setting; + }), withHandlers({ + toggleAutocompleteEnabled: ({ isAutocompleteEnabled, setIsAutocompleteEnabled }) => () => { + storage.set('kibana.canvas.isAutocompleteEnabled', !isAutocompleteEnabled); + setIsAutocompleteEnabled(!isAutocompleteEnabled); + }, updateValue: ({ setFormState }) => expression => { setFormState({ expression, diff --git a/x-pack/plugins/canvas/public/components/expression_input/argument_reference.js b/x-pack/plugins/canvas/public/components/expression_input/argument_reference.js new file mode 100644 index 0000000000000..dd72f0080024b --- /dev/null +++ b/x-pack/plugins/canvas/public/components/expression_input/argument_reference.js @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import Markdown from 'markdown-it'; +import { EuiTitle, EuiText, EuiSpacer, EuiDescriptionList } from '@elastic/eui'; + +const md = new Markdown(); + +export const ArgumentReference = ({ argDef }) => ( +
      + +

      {argDef.name}

      +
      + + + + + + +
      +); + +function getHelp(argDef) { + return { __html: md.render(argDef.help) }; +} + +function getArgListItems(argDef) { + const { aliases, types, default: def, required } = argDef; + const items = []; + if (aliases.length) items.push({ title: 'Aliases', description: aliases.join(', ') }); + if (types.length) items.push({ title: 'Types', description: types.join(', ') }); + if (def != null) items.push({ title: 'Default', description: def }); + items.push({ title: 'Required', description: String(Boolean(required)) }); + return items; +} + +ArgumentReference.propTypes = { + argDef: PropTypes.object, +}; diff --git a/x-pack/plugins/canvas/public/components/expression_input/expression_input.js b/x-pack/plugins/canvas/public/components/expression_input/expression_input.js index 1f9a8a9c71453..7ea1aa8f6f698 100644 --- a/x-pack/plugins/canvas/public/components/expression_input/expression_input.js +++ b/x-pack/plugins/canvas/public/components/expression_input/expression_input.js @@ -6,14 +6,23 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { EuiTextArea, EuiFormRow } from '@elastic/eui'; -import { ContextMenu } from '../context_menu'; -import { matchPairsProvider } from './match_pairs'; -import { Suggestion } from './suggestion'; +import { EuiTextArea, EuiFormRow, EuiTitle } from '@elastic/eui'; +import { debounce, startCase } from 'lodash'; +import { Autocomplete } from '../autocomplete'; +import { + getAutocompleteSuggestions, + getFnArgDefAtPosition, +} from '../../../common/lib/autocomplete'; +import { FunctionReference } from './function_reference'; +import { ArgumentReference } from './argument_reference'; export class ExpressionInput extends React.Component { - constructor({ value, onChange }) { + constructor({ value }) { super(); + + this.undoHistory = []; + this.redoHistory = []; + this.state = { selection: { start: value.length, @@ -21,11 +30,6 @@ export class ExpressionInput extends React.Component { }, suggestions: [], }; - - this.matchPairs = matchPairsProvider({ - setValue: onChange, - setSelection: selection => this.setState({ selection }), - }); } componentDidUpdate() { @@ -35,6 +39,53 @@ export class ExpressionInput extends React.Component { this.ref.setSelectionRange(start, end); } + undo() { + if (!this.undoHistory.length) return; + const value = this.undoHistory.pop(); + this.redoHistory.push(this.props.value); + this.props.onChange(value); + } + + redo() { + if (!this.redoHistory.length) return; + const value = this.redoHistory.pop(); + this.undoHistory.push(this.props.value); + this.props.onChange(value); + } + + stash = debounce( + value => { + this.undoHistory.push(value); + this.redoHistory = []; + }, + 500, + { leading: true, trailing: false } + ); + + onKeyDown = e => { + if (e.ctrlKey || e.metaKey) { + if (e.key === 'z') { + e.preventDefault(); + if (e.shiftKey) this.redo(); + else this.undo(); + } + if (e.key === 'y') { + e.preventDefault(); + this.redo(); + } + } + }; + + onSuggestionSelect = item => { + const { text, start, end } = item; + const value = this.props.value.substr(0, start) + text + this.props.value.substr(end); + const selection = { start: start + text.length, end: start + text.length }; + this.updateState({ value, selection }); + + // This is needed for when the suggestion was selected by clicking on it + this.ref.focus(); + }; + onChange = e => { const { target } = e; const { value, selectionStart, selectionEnd } = target; @@ -45,40 +96,46 @@ export class ExpressionInput extends React.Component { this.updateState({ value, selection }); }; - onSuggestionSelect = suggestion => { - const value = - this.props.value.substr(0, suggestion.location.start) + - suggestion.value + - this.props.value.substr(suggestion.location.end); - const selection = { - start: suggestion.location.start + suggestion.value.length, - end: suggestion.location.start + suggestion.value.length, - }; - this.updateState({ value, selection }); - }; - updateState = ({ value, selection }) => { - const suggestions = []; + this.stash(this.props.value); + const suggestions = getAutocompleteSuggestions( + this.props.functionDefinitions, + value, + selection.start + ); this.props.onChange(value); this.setState({ selection, suggestions }); }; - // TODO: Use a hidden div and measure it rather than using hardcoded values - getContextMenuItemsStyle = () => { - const { value } = this.props; - const { - selection: { end }, - } = this.state; - const numberOfNewlines = value.substr(0, end).split('\n').length; - const padding = 12; - const lineHeight = 22; - const textareaHeight = 200; - const top = Math.min(padding + numberOfNewlines * lineHeight, textareaHeight) + 'px'; - return { top }; + getHeader = () => { + const { suggestions } = this.state; + if (!suggestions.length) return ''; + return ( + +

      {startCase(suggestions[0].type)}

      +
      + ); + }; + + getReference = selectedItem => { + const { fnDef, argDef } = selectedItem || {}; + if (argDef) return ; + if (fnDef) return ; + + const { fnDef: fnDefAtPosition, argDef: argDefAtPosition } = getFnArgDefAtPosition( + this.props.functionDefinitions, + this.props.value, + this.state.selection.start + ); + + if (argDefAtPosition) return ; + if (fnDefAtPosition) return ; + + return ''; }; render() { - const { value, error } = this.props; + const { value, error, isAutocompleteEnabled } = this.props; const { suggestions } = this.state; const helpText = error @@ -86,29 +143,43 @@ export class ExpressionInput extends React.Component { : 'This is the coded expression that backs this element. You better know what you are doing here.'; return (
      - - + + {isAutocompleteEnabled ? ( + + (this.ref = ref)} + spellCheck="false" + /> + + ) : ( (this.ref = ref)} + spellCheck="false" /> - - + )} +
      ); } } ExpressionInput.propTypes = { + functionDefinitions: PropTypes.array, value: PropTypes.string, onChange: PropTypes.func, error: PropTypes.string, + isAutocompleteEnabled: PropTypes.bool, }; diff --git a/x-pack/plugins/canvas/public/components/expression_input/function_reference.js b/x-pack/plugins/canvas/public/components/expression_input/function_reference.js new file mode 100644 index 0000000000000..0f9076b7613a8 --- /dev/null +++ b/x-pack/plugins/canvas/public/components/expression_input/function_reference.js @@ -0,0 +1,74 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import Markdown from 'markdown-it'; +import { EuiTitle, EuiText, EuiSpacer, EuiBasicTable, EuiDescriptionList } from '@elastic/eui'; +import { startCase } from 'lodash'; + +const md = new Markdown(); + +export const FunctionReference = ({ fnDef }) => ( +
      + +

      {fnDef.name}

      +
      + + + + + + + + + +
      +); + +function getHelp(fnDef) { + return { __html: md.render(fnDef.help) }; +} + +function getFnListItems(fnDef) { + const { aliases, context, type } = fnDef; + const items = []; + if (aliases.length) items.push({ title: 'Aliases', description: aliases.join(', ') }); + if (context.types) items.push({ title: 'Accepts', description: context.types.join(', ') }); + if (type) items.push({ title: 'Returns', description: type }); + return items; +} + +function getArgItems(args) { + return Object.entries(args).map(([name, argDef]) => ({ + argument: name + (argDef.required ? '*' : ''), + aliases: (argDef.aliases || []).join(', '), + types: (argDef.types || []).join(', '), + default: argDef.default || '', + description: argDef.help || '', + })); +} + +function getArgColumns() { + return ['argument', 'aliases', 'types', 'default', 'description'].map(field => { + const column = { field, name: startCase(field), truncateText: field !== 'description' }; + if (field === 'description') column.width = '50%'; + return column; + }); +} + +FunctionReference.propTypes = { + fnDef: PropTypes.object, +}; diff --git a/x-pack/plugins/canvas/public/components/expression_input/match_pairs.js b/x-pack/plugins/canvas/public/components/expression_input/match_pairs.js deleted file mode 100644 index 01d96f7304b75..0000000000000 --- a/x-pack/plugins/canvas/public/components/expression_input/match_pairs.js +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -/** - * Provides an `onKeyDown` handler that automatically inserts matching pairs. - * Specifically, it does the following: - * - * 1. If we don't have a multi-character selection, and the key is a closer, - * and the character in front of the cursor is the same, simply move the - * cursor forward. - * 2. If the key is an opener, insert the opener at the beginning of the - * selection, and the closer at the end of the selection, and move the - * selection forward. - * 3. If we don't have a multi-character selection, and the backspace is hit, - * and the characters before and after the cursor correspond to a pair, - * remove both characters and move the cursor backward. - */ -export const matchPairsProvider = ({ - pairs = ['()', '[]', '{}', `''`, '""'], - setValue, - setSelection, -}) => { - const openers = pairs.map(pair => pair[0]); - const closers = pairs.map(pair => pair[1]); - return e => { - const { target, key } = e; - const { value, selectionStart, selectionEnd } = target; - if ( - selectionStart === selectionEnd && - closers.includes(key) && - value.charAt(selectionEnd) === key - ) { - // 1. (See above) - e.preventDefault(); - setSelection({ start: selectionStart + 1, end: selectionEnd + 1 }); - } else if (openers.includes(key)) { - // 2. (See above) - e.preventDefault(); - setValue( - value.substr(0, selectionStart) + - key + - value.substring(selectionStart, selectionEnd) + - closers[openers.indexOf(key)] + - value.substr(selectionEnd) - ); - setSelection({ start: selectionStart + 1, end: selectionEnd + 1 }); - } else if ( - selectionStart === selectionEnd && - key === 'Backspace' && - !e.metaKey && - pairs.includes(value.substr(selectionEnd - 1, 2)) - ) { - // 3. (See above) - e.preventDefault(); - setValue(value.substr(0, selectionEnd - 1) + value.substr(selectionEnd + 1)); - setSelection({ start: selectionStart - 1, end: selectionEnd - 1 }); - } - }; -}; diff --git a/x-pack/plugins/canvas/public/components/expression_input/suggestion.js b/x-pack/plugins/canvas/public/components/expression_input/suggestion.js deleted file mode 100644 index ec8b6467a6ad9..0000000000000 --- a/x-pack/plugins/canvas/public/components/expression_input/suggestion.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import PropTypes from 'prop-types'; - -export const Suggestion = ({ item }) => ( -
      -
      {item.name}
      -
      {item.description}
      -
      -); - -Suggestion.propTypes = { - item: PropTypes.object, -}; diff --git a/x-pack/plugins/canvas/public/components/expression_input/suggestion.scss b/x-pack/plugins/canvas/public/components/expression_input/suggestion.scss deleted file mode 100644 index f1748578d1ffa..0000000000000 --- a/x-pack/plugins/canvas/public/components/expression_input/suggestion.scss +++ /dev/null @@ -1,12 +0,0 @@ -.canvasExpressionSuggestion { - display: flex; - - .canvasExpressionSuggestion__name { - width: 120px; - font-weight: bold; - } - - .canvasExpressionSuggestion__desc { - width: calc(100% - 120px); - } -} diff --git a/x-pack/plugins/canvas/public/components/faux_select/faux_select.js b/x-pack/plugins/canvas/public/components/faux_select/faux_select.js deleted file mode 100644 index 87b7f3fddb27e..0000000000000 --- a/x-pack/plugins/canvas/public/components/faux_select/faux_select.js +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import React from 'react'; -import { PropTypes } from 'prop-types'; -import { EuiIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; - -//TODO: remove this when EUI has a better select component -export const FauxSelect = ({ handleClick, children }) => ( - - {children} - - - - -); - -FauxSelect.propTypes = { - handleClick: PropTypes.func, - children: PropTypes.node, -}; diff --git a/x-pack/plugins/canvas/public/components/faux_select/index.js b/x-pack/plugins/canvas/public/components/faux_select/index.js deleted file mode 100644 index a4c41927ec423..0000000000000 --- a/x-pack/plugins/canvas/public/components/faux_select/index.js +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { pure } from 'recompose'; -import { FauxSelect as Component } from './faux_select'; - -export const FauxSelect = pure(Component); diff --git a/x-pack/plugins/canvas/public/components/font_picker/font_picker.js b/x-pack/plugins/canvas/public/components/font_picker/font_picker.js index ac49383f466ef..20f921b8f606c 100644 --- a/x-pack/plugins/canvas/public/components/font_picker/font_picker.js +++ b/x-pack/plugins/canvas/public/components/font_picker/font_picker.js @@ -6,50 +6,30 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { EuiLink } from '@elastic/eui'; +import { EuiSuperSelect } from '@elastic/eui'; import { fonts } from '../../../common/lib/fonts'; -import { Popover } from '../popover'; -import { FauxSelect } from '../faux_select'; -export const FontPicker = ({ onSelect, value, anchorPosition }) => { - const selected = fonts.find(font => font.value === value) || { label: value, value }; - - // TODO: replace faux select with better EUI custom select or dropdown when it becomes available - const popoverButton = handleClick => ( - -
      {selected.label}
      -
      - ); +export const FontPicker = ({ onSelect, value }) => { + if (value && !fonts.find(font => font.value === value)) { + const label = (value.indexOf(',') >= 0 ? value.split(',')[0] : value).replace(/['"]/g, ''); + fonts.push({ value, label }); + fonts.sort((a, b) => a.label.localeCompare(b.label)); + } return ( - - {() => ( -
      - {fonts.map(font => ( - onSelect(font.value)} - > - {font.label} - - ))} -
      - )} -
      + ({ + value, + inputDisplay:
      {label}
      , + }))} + valueOfSelected={value} + onChange={value => onSelect(value)} + /> ); }; FontPicker.propTypes = { value: PropTypes.string, onSelect: PropTypes.func, - anchorPosition: PropTypes.string, }; diff --git a/x-pack/plugins/canvas/public/components/font_picker/font_picker.scss b/x-pack/plugins/canvas/public/components/font_picker/font_picker.scss deleted file mode 100644 index a777f74217f89..0000000000000 --- a/x-pack/plugins/canvas/public/components/font_picker/font_picker.scss +++ /dev/null @@ -1,20 +0,0 @@ -.canvasFontPicker__wrapper { - // hacky fix until we can use EUI super select - > .euiPopover__anchor { - width: 100%; - } -} - -.canvasFontPicker { - @include euiScrollBar; - - height: 200px; - overflow-y: scroll; - - .canvasFontPicker__font { - display: block; - width: 100%; - padding: $euiSizeXS $euiSize; - color: black; - } -} diff --git a/x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss b/x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss index dfc392163cb6a..0cfdcd29ecf94 100644 --- a/x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss +++ b/x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss @@ -11,7 +11,8 @@ body.canvas-isFullscreen { } // hide all the interface parts - nav.global-nav, + nav.global-nav, // K6 global side nav + .header-global-wrapper, // K7 global top nav .canvasLayout__stageHeader, .canvasLayout__sidebar, .canvasLayout__footer, @@ -19,7 +20,13 @@ body.canvas-isFullscreen { display: none; } + // remove space for K7 global top nav + .header-global-wrapper + .app-wrapper { + top: 0; + } + .canvasLayout__stageContentOverflow { + display: block; // fixes center alignment for Safari overflow: visible; position: static; top: auto; diff --git a/x-pack/plugins/canvas/public/components/loading/__tests__/loading.js b/x-pack/plugins/canvas/public/components/loading/__tests__/loading.js index 6393730a277d0..bae592801f537 100644 --- a/x-pack/plugins/canvas/public/components/loading/__tests__/loading.js +++ b/x-pack/plugins/canvas/public/components/loading/__tests__/loading.js @@ -8,7 +8,7 @@ import React from 'react'; import expect from 'expect.js'; import { shallow } from 'enzyme'; import { EuiLoadingSpinner, EuiIcon } from '@elastic/eui'; -import { Loading } from '../'; +import { Loading } from '../loading'; describe('', () => { it('uses EuiIcon by default', () => { diff --git a/x-pack/plugins/canvas/public/components/loading/index.js b/x-pack/plugins/canvas/public/components/loading/index.js index 81fedf3287184..9216cb55d83c2 100644 --- a/x-pack/plugins/canvas/public/components/loading/index.js +++ b/x-pack/plugins/canvas/public/components/loading/index.js @@ -4,7 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { pure } from 'recompose'; +import { connect } from 'react-redux'; +import { getSelectedPage, getPageById } from '../../state/selectors/workpad'; import { Loading as Component } from './loading'; -export const Loading = pure(Component); +const mapStateToProps = state => ({ + backgroundColor: getPageById(state, getSelectedPage(state)).style.background, +}); + +export const Loading = connect(mapStateToProps)(Component); diff --git a/x-pack/plugins/canvas/public/components/loading/loading.js b/x-pack/plugins/canvas/public/components/loading/loading.js index d18766244d1a1..6b108a7606e8a 100644 --- a/x-pack/plugins/canvas/public/components/loading/loading.js +++ b/x-pack/plugins/canvas/public/components/loading/loading.js @@ -6,9 +6,10 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { EuiLoadingSpinner, EuiIcon } from '@elastic/eui'; +import { EuiLoadingSpinner, EuiIcon, isColorDark } from '@elastic/eui'; +import { hexToRgb } from '../../../common/lib/hex_to_rgb'; -export const Loading = ({ animated, text }) => { +export const Loading = ({ animated, text, backgroundColor }) => { if (animated) { return (
      @@ -23,6 +24,8 @@ export const Loading = ({ animated, text }) => { ); } + const rgb = hexToRgb(backgroundColor); + return (
      {text && ( @@ -31,7 +34,7 @@ export const Loading = ({ animated, text }) => {   )} - +
      ); }; @@ -39,6 +42,7 @@ export const Loading = ({ animated, text }) => { Loading.propTypes = { animated: PropTypes.bool, text: PropTypes.string, + backgroundColor: PropTypes.string, }; Loading.defaultProps = { diff --git a/x-pack/plugins/canvas/public/components/page_config/page_config.js b/x-pack/plugins/canvas/public/components/page_config/page_config.js index cbd6cf556ef97..c5b1aee46be07 100644 --- a/x-pack/plugins/canvas/public/components/page_config/page_config.js +++ b/x-pack/plugins/canvas/public/components/page_config/page_config.js @@ -31,9 +31,9 @@ export const PageConfig = ({ page, we use the second page's transition) */} {pageIndex > 0 ? (
      - + setTransition(e.target.value)} /> diff --git a/x-pack/plugins/canvas/public/components/page_manager/index.js b/x-pack/plugins/canvas/public/components/page_manager/index.js index f4f7cad4431c7..7fd393d4d4068 100644 --- a/x-pack/plugins/canvas/public/components/page_manager/index.js +++ b/x-pack/plugins/canvas/public/components/page_manager/index.js @@ -7,10 +7,12 @@ import { connect } from 'react-redux'; import { compose, withState } from 'recompose'; import * as pageActions from '../../state/actions/pages'; -import { getSelectedPage, getWorkpad, getPages } from '../../state/selectors/workpad'; +import { canUserWrite } from '../../state/selectors/app'; +import { getSelectedPage, getWorkpad, getPages, isWriteable } from '../../state/selectors/workpad'; import { PageManager as Component } from './page_manager'; const mapStateToProps = state => ({ + isWriteable: isWriteable(state) && canUserWrite(state), pages: getPages(state), selectedPage: getSelectedPage(state), workpadId: getWorkpad(state).id, diff --git a/x-pack/plugins/canvas/public/components/page_manager/page_manager.js b/x-pack/plugins/canvas/public/components/page_manager/page_manager.js index aabf086fa0023..d15fa26cce0cb 100644 --- a/x-pack/plugins/canvas/public/components/page_manager/page_manager.js +++ b/x-pack/plugins/canvas/public/components/page_manager/page_manager.js @@ -14,6 +14,7 @@ import { PagePreview } from '../page_preview'; export class PageManager extends React.PureComponent { static propTypes = { + isWriteable: PropTypes.bool.isRequired, pages: PropTypes.array.isRequired, workpadId: PropTypes.string.isRequired, addPage: PropTypes.func.isRequired, @@ -31,10 +32,13 @@ export class PageManager extends React.PureComponent { }; componentDidMount() { + // keep track of whether or not the component is mounted, to prevent rogue setState calls + this._isMounted = true; + // gives the tray pop animation time to finish setTimeout(() => { this.scrollToActivePage(); - this.setState({ showTrayPop: false }); + this._isMounted && this.setState({ showTrayPop: false }); }, 1000); } @@ -43,8 +47,16 @@ export class PageManager extends React.PureComponent { if (prevProps.selectedPage !== this.props.selectedPage) setTimeout(this.scrollToActivePage, 0); } + componentWillUnmount() { + this._isMounted = false; + } + scrollToActivePage = () => { if (this.activePageRef && this.pageListRef) { + // not all target browsers support element.scrollTo + // TODO: replace this with something more cross-browser, maybe scrollIntoView + if (!this.pageListRef.scrollTo) return; + const pageOffset = this.activePageRef.offsetLeft; const { left: pageLeft, @@ -73,10 +85,10 @@ export class PageManager extends React.PureComponent { }; confirmDelete = pageId => { - this.props.setDeleteId(pageId); + this._isMounted && this.props.setDeleteId(pageId); }; - resetDelete = () => this.props.setDeleteId(null); + resetDelete = () => this._isMounted && this.props.setDeleteId(null); doDelete = () => { const { previousPage, removePage, deleteId, selectedPage } = this.props; @@ -95,11 +107,11 @@ export class PageManager extends React.PureComponent { }; renderPage = (page, i) => { - const { selectedPage, workpadId, movePage, duplicatePage } = this.props; + const { isWriteable, selectedPage, workpadId, movePage, duplicatePage } = this.props; const pageNumber = i + 1; return ( - + {provided => (
      - - - - - + {isWriteable && ( + + + + + + )} div { @@ -26,6 +19,18 @@ } } + .canvasPageManager__pageList { + @include euiScrollBar; + display: flex; + overflow-x: auto; + overflow-y: hidden; + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + } + .canvasPageManager__addPage { width: $euiSizeXXL + $euiSize; background: $euiColorSecondary; @@ -33,7 +38,6 @@ opacity: 0; animation: buttonPop $euiAnimSpeedNormal $euiAnimSlightResistance; animation-fill-mode: forwards; - height: 144px; } .canvasPageManager__addPageTip { @@ -88,6 +92,7 @@ @include euiBottomShadowSmall; position: relative; overflow: hidden; + color: $euiTextColor; .canvasPositionable { position: absolute; diff --git a/x-pack/plugins/canvas/public/components/page_preview/page_preview.js b/x-pack/plugins/canvas/public/components/page_preview/page_preview.js index dfcbc31c54fa2..a69e25e115c33 100644 --- a/x-pack/plugins/canvas/public/components/page_preview/page_preview.js +++ b/x-pack/plugins/canvas/public/components/page_preview/page_preview.js @@ -9,22 +9,32 @@ import PropTypes from 'prop-types'; import { DomPreview } from '../dom_preview'; import { PageControls } from './page_controls'; -export const PagePreview = ({ page, pageNumber, height, duplicatePage, confirmDelete }) => ( +export const PagePreview = ({ + isWriteable, + page, + pageNumber, + height, + duplicatePage, + confirmDelete, +}) => (
      - + {isWriteable && ( + + )}
      ); PagePreview.propTypes = { + isWriteable: PropTypes.bool.isRequired, page: PropTypes.shape({ id: PropTypes.string.isRequired, style: PropTypes.shape({ diff --git a/x-pack/plugins/canvas/public/components/popover/popover.js b/x-pack/plugins/canvas/public/components/popover/popover.js index 19d90de50478b..89de57aa845d9 100644 --- a/x-pack/plugins/canvas/public/components/popover/popover.js +++ b/x-pack/plugins/canvas/public/components/popover/popover.js @@ -62,12 +62,15 @@ export class Popover extends Component { return button(handleClick); }; + const appWrapper = document.querySelector('.app-wrapper'); + return ( {children({ closePopover: this.closePopover })} diff --git a/x-pack/plugins/canvas/public/components/refresh_control/auto_refresh_controls.js b/x-pack/plugins/canvas/public/components/refresh_control/auto_refresh_controls.js index 98e2c9c1f7d16..71ddb93e7d387 100644 --- a/x-pack/plugins/canvas/public/components/refresh_control/auto_refresh_controls.js +++ b/x-pack/plugins/canvas/public/components/refresh_control/auto_refresh_controls.js @@ -26,6 +26,7 @@ import { timeDurationString } from '../../lib/time_duration'; export class AutoRefreshControls extends Component { static propTypes = { + inFlight: PropTypes.bool.isRequired, refreshInterval: PropTypes.number, setRefresh: PropTypes.func.isRequired, disableInterval: PropTypes.func.isRequired, @@ -35,7 +36,7 @@ export class AutoRefreshControls extends Component { refreshInput = null; render() { - const { refreshInterval, setRefresh, doRefresh, disableInterval } = this.props; + const { inFlight, refreshInterval, setRefresh, doRefresh, disableInterval } = this.props; return (
      @@ -60,7 +61,7 @@ export class AutoRefreshControls extends Component { - + Refresh diff --git a/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js b/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js index bcf66c46db4a4..cdc41e123d89d 100644 --- a/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js +++ b/x-pack/plugins/canvas/public/components/refresh_control/refresh_control.js @@ -4,9 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import React from 'react'; +import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { EuiButtonEmpty } from '@elastic/eui'; +import { EuiButtonEmpty, EuiLoadingSpinner } from '@elastic/eui'; import { Popover } from '../popover'; import { AutoRefreshControls } from './auto_refresh_controls'; @@ -36,8 +36,15 @@ export const RefreshControl = ({ inFlight, setRefreshInterval, refreshInterval, const setRefresh = val => setRefreshInterval(getRefreshInterval(val)); const popoverButton = handleClick => ( - - Refresh + +
      + {inFlight && ( + +   + + )} + Refresh +
      ); @@ -50,6 +57,7 @@ export const RefreshControl = ({ inFlight, setRefreshInterval, refreshInterval, {({ closePopover }) => (
      { setRefresh(val); diff --git a/x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.scss b/x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.scss index 0f71565666f90..cd52e29e4f411 100644 --- a/x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.scss +++ b/x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.scss @@ -7,7 +7,7 @@ width: 0; margin-left: -1px; margin-top: -12px; - border: 1px solid #d9d9d9; + border: 1px dashed #d9d9d9; } .canvasRotationHandle--handle { diff --git a/x-pack/plugins/canvas/public/components/router/router.js b/x-pack/plugins/canvas/public/components/router/router.js index bedae7cc56c53..800c01079fcec 100644 --- a/x-pack/plugins/canvas/public/components/router/router.js +++ b/x-pack/plugins/canvas/public/components/router/router.js @@ -5,6 +5,7 @@ */ import React from 'react'; +import { isClassComponent } from 'recompose'; import PropTypes from 'prop-types'; import { routerProvider } from '../../lib/router_provider'; import { CanvasLoading } from './canvas_loading'; @@ -23,7 +24,7 @@ export class Router extends React.PureComponent { onRouteChange: PropTypes.func, }; - static state = { + state = { router: {}, activeComponent: CanvasLoading, }; @@ -37,11 +38,11 @@ export class Router extends React.PureComponent { // routerProvider is a singleton, and will only ever return one instance const { routes, onRouteChange, onLoad, onError } = this.props; const router = routerProvider(routes); + let firstLoad = true; // when the component in the route changes, render it router.onPathChange(route => { const { pathname } = route.location; - const firstLoad = !this.state; const { component } = route.meta; if (!component) { @@ -54,6 +55,7 @@ export class Router extends React.PureComponent { // if this is the first load, execute the route if (firstLoad) { + firstLoad = false; router .execute() .then(() => onLoad()) @@ -70,9 +72,13 @@ export class Router extends React.PureComponent { } render() { + // show loading if (this.props.showLoading) return React.createElement(CanvasLoading, { msg: this.props.loadingMessage }); - return React.createElement(this.state.activeComponent, {}); + // show the activeComponent + return isClassComponent(this.state.activeComponent) + ? React.createElement(this.state.activeComponent, {}) + : this.state.activeComponent({}); } } diff --git a/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.js b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.js index e9c4f1ef66df5..1b3111d99b4f0 100644 --- a/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.js +++ b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.js @@ -7,10 +7,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { EuiFlexGrid, EuiFlexItem, EuiLink } from '@elastic/eui'; -import { shapes } from '../../../canvas_plugin_src/renderers/shape/shapes'; import { ShapePreview } from '../shape_preview'; -export const ShapePicker = ({ onChange }) => { +export const ShapePicker = ({ shapes, onChange }) => { return ( {Object.keys(shapes) @@ -18,7 +17,7 @@ export const ShapePicker = ({ onChange }) => { .map(shapeKey => ( onChange(shapeKey)}> - + ))} @@ -27,6 +26,6 @@ export const ShapePicker = ({ onChange }) => { }; ShapePicker.propTypes = { - value: PropTypes.string, + shapes: PropTypes.object.isRequired, onChange: PropTypes.func, }; diff --git a/x-pack/plugins/canvas/public/components/shape_picker_mini/shape_picker_mini.js b/x-pack/plugins/canvas/public/components/shape_picker_mini/shape_picker_mini.js index cf9c34adc1fe6..721be28b78efb 100644 --- a/x-pack/plugins/canvas/public/components/shape_picker_mini/shape_picker_mini.js +++ b/x-pack/plugins/canvas/public/components/shape_picker_mini/shape_picker_mini.js @@ -11,10 +11,10 @@ import { Popover } from '../popover'; import { ShapePicker } from '../shape_picker/'; import { ShapePreview } from '../shape_preview'; -export const ShapePickerMini = ({ onChange, value, anchorPosition }) => { +export const ShapePickerMini = ({ shapes, onChange, value, anchorPosition }) => { const button = handleClick => ( - + ); @@ -24,12 +24,13 @@ export const ShapePickerMini = ({ onChange, value, anchorPosition }) => { button={button} anchorPosition={anchorPosition} > - {() => } + {() => } ); }; ShapePickerMini.propTypes = { + shapes: PropTypes.object.isRequired, value: PropTypes.string, onChange: PropTypes.func, anchorPosition: PropTypes.string, diff --git a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.js b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.js index ed8ede5d4bac2..f4812f215b5cf 100644 --- a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.js +++ b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.js @@ -6,13 +6,32 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { shapes } from '../../../canvas_plugin_src/renderers/shape/shapes'; -export const ShapePreview = ({ value }) => { - // eslint-disable-next-line react/no-danger - return
      ; +export const ShapePreview = ({ shape }) => { + const weight = 5; + const parser = new DOMParser(); + const [shapeSvg] = parser.parseFromString(shape, 'image/svg+xml').getElementsByTagName('svg'); + shapeSvg.setAttribute('fill', 'none'); + shapeSvg.setAttribute('stroke', 'black'); + + const initialViewBox = shapeSvg + .getAttribute('viewBox') + .split(' ') + .map(v => parseInt(v, 10)); + + let [minX, minY, width, height] = initialViewBox; + minX -= weight / 2; + minY -= weight / 2; + width += weight; + height += weight; + shapeSvg.setAttribute('viewBox', [minX, minY, width, height].join(' ')); + + return ( + // eslint-disable-next-line react/no-danger +
      + ); }; ShapePreview.propTypes = { - value: PropTypes.string, + shape: PropTypes.string, }; diff --git a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.scss b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.scss index 1e39827d657a2..e2ce2bbdcd358 100644 --- a/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.scss +++ b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.scss @@ -3,7 +3,6 @@ height: $euiSizeXXL; svg { - fill: black; width: 100%; height: 100%; } diff --git a/x-pack/plugins/canvas/public/components/sidebar/sidebar.scss b/x-pack/plugins/canvas/public/components/sidebar/sidebar.scss index bc31e945cc887..9f42fc5132038 100644 --- a/x-pack/plugins/canvas/public/components/sidebar/sidebar.scss +++ b/x-pack/plugins/canvas/public/components/sidebar/sidebar.scss @@ -6,6 +6,9 @@ max-height: 100vh; overflow-y: auto; overflow-x: hidden; + position: absolute; + top: 0; + bottom: 0; } .canvasSidebar__pop { diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.js b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.js index 38d34a48d7532..206bb27be2cf4 100644 --- a/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.js +++ b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.js @@ -100,7 +100,7 @@ export const TextStylePicker = ({ doChange('size', Number(e.target.value))} options={fontSizes.map(size => ({ text: String(size), value: size }))} /> @@ -156,4 +156,5 @@ TextStylePicker.propTypes = { TextStylePicker.defaultProps = { align: 'left', + size: 14, }; diff --git a/x-pack/plugins/canvas/public/components/toolbar/index.js b/x-pack/plugins/canvas/public/components/toolbar/index.js index a533e032ff765..bc873b6f2854c 100644 --- a/x-pack/plugins/canvas/public/components/toolbar/index.js +++ b/x-pack/plugins/canvas/public/components/toolbar/index.js @@ -7,7 +7,6 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import { compose, withState, getContext, withHandlers } from 'recompose'; -import { getEditing } from '../../state/selectors/app'; import { getWorkpad, @@ -19,7 +18,6 @@ import { import { Toolbar as Component } from './toolbar'; const mapStateToProps = state => ({ - editing: getEditing(state), workpadName: getWorkpadName(state), workpadId: getWorkpad(state).id, totalPages: getWorkpad(state).pages.length, diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.js b/x-pack/plugins/canvas/public/components/toolbar/toolbar.js index 0427016a47a85..e742cbdc53ffb 100644 --- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.js +++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.js @@ -24,7 +24,6 @@ import { Tray } from './tray'; export const Toolbar = props => { const { - editing, selectedElement, tray, setTray, @@ -63,7 +62,7 @@ export const Toolbar = props => { expression: !elementIsSelected ? null : , }; - return !editing ? null : ( + return (
      {trays[tray] && {trays[tray]}} @@ -122,7 +121,6 @@ export const Toolbar = props => { Toolbar.propTypes = { workpadName: PropTypes.string, - editing: PropTypes.bool, tray: PropTypes.node, setTray: PropTypes.func.isRequired, nextPage: PropTypes.func.isRequired, diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss b/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss index 1219a8d1dce5f..f625bff0e4b54 100644 --- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss +++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss @@ -1,3 +1,25 @@ +.canvasToolbar { + position: relative; +} + +.canvasTray__toggle { + position: absolute; + top: $euiSize * -1.25; + left: 50%; + background-color: $euiColorLightestShade; + margin: 0; + border-radius: $euiBorderRadius $euiBorderRadius 0 0; + + > .euiFlexItem { + margin: 0; + } + + button { + padding: $euiSizeXS $euiSizeM; + box-shadow: 0 -2px 1px rgba($euiColorFullShade, .10) + } +} + .canvasToolbar__controls { padding: $euiSizeM; height: 100%; diff --git a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.js b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.js index 07cb732f04691..bc8aa5e0dadec 100644 --- a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.js +++ b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.js @@ -11,7 +11,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiButtonIcon } from '@elastic/eui'; export const Tray = ({ children, done }) => { return ( - + diff --git a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss index 9d8b6d13dde94..beba97760253e 100644 --- a/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss +++ b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss @@ -3,3 +3,8 @@ flex-direction: column; @include euiBottomShadowFlat; } + +.canvasTray__panel { + background-color: $euiColorLightestShade; + border-radius: 0; +} diff --git a/x-pack/plugins/canvas/public/components/workpad/index.js b/x-pack/plugins/canvas/public/components/workpad/index.js index cc6c3ff124615..f99af9679c4b0 100644 --- a/x-pack/plugins/canvas/public/components/workpad/index.js +++ b/x-pack/plugins/canvas/public/components/workpad/index.js @@ -10,7 +10,7 @@ import { compose, withState, withProps, getContext, withHandlers } from 'recompo import { transitionsRegistry } from '../../lib/transitions_registry'; import { undoHistory, redoHistory } from '../../state/actions/history'; import { fetchAllRenderables } from '../../state/actions/elements'; -import { getFullscreen, getEditing } from '../../state/selectors/app'; +import { getFullscreen } from '../../state/selectors/app'; import { getSelectedPageIndex, getAllElements, @@ -25,7 +25,6 @@ const mapStateToProps = state => ({ totalElementCount: getAllElements(state).length, workpad: getWorkpad(state), isFullscreen: getFullscreen(state), - isEditing: getEditing(state), }); const mapDispatchToProps = { diff --git a/x-pack/plugins/canvas/public/components/workpad/workpad.js b/x-pack/plugins/canvas/public/components/workpad/workpad.js index fde969340e1e4..5b761ef377cf2 100644 --- a/x-pack/plugins/canvas/public/components/workpad/workpad.js +++ b/x-pack/plugins/canvas/public/components/workpad/workpad.js @@ -9,6 +9,7 @@ import PropTypes from 'prop-types'; import { Shortcuts } from 'react-shortcuts'; import { WorkpadPage } from '../workpad_page'; import { Fullscreen } from '../fullscreen'; +import { setDocTitle } from '../../lib/doc_title'; export const Workpad = props => { const { @@ -49,6 +50,8 @@ export const Workpad = props => { if (action === 'NEXT') return nextPage(); }; + setDocTitle(workpad.name); + return (
      diff --git a/x-pack/plugins/canvas/public/components/workpad_export/index.js b/x-pack/plugins/canvas/public/components/workpad_export/index.js index 1ef7438f520d5..3e1a1dce70558 100644 --- a/x-pack/plugins/canvas/public/components/workpad_export/index.js +++ b/x-pack/plugins/canvas/public/components/workpad_export/index.js @@ -6,7 +6,7 @@ /* eslint import/no-unresolved: 1 */ // TODO: remove eslint rule when updating to use the linked kibana resolve package -import { jobCompletionNotifications } from 'plugins/reporting/services/job_completion_notifications'; +import { jobCompletionNotifications } from 'plugins/reporting/lib/job_completion_notifications'; import { connect } from 'react-redux'; import { compose, withProps } from 'recompose'; import { getWorkpad, getPages } from '../../state/selectors/workpad'; diff --git a/x-pack/plugins/canvas/public/components/workpad_header/index.js b/x-pack/plugins/canvas/public/components/workpad_header/index.js index 1941fc4bcf3fc..fec9c874744f3 100644 --- a/x-pack/plugins/canvas/public/components/workpad_header/index.js +++ b/x-pack/plugins/canvas/public/components/workpad_header/index.js @@ -6,22 +6,23 @@ import { compose, withState } from 'recompose'; import { connect } from 'react-redux'; -import { getEditing } from '../../state/selectors/app'; -import { getWorkpadName, getSelectedPage } from '../../state/selectors/workpad'; -import { setEditing } from '../../state/actions/transient'; +import { canUserWrite } from '../../state/selectors/app'; +import { getWorkpadName, getSelectedPage, isWriteable } from '../../state/selectors/workpad'; +import { setWriteable } from '../../state/actions/workpad'; import { getAssets } from '../../state/selectors/assets'; import { addElement } from '../../state/actions/elements'; import { WorkpadHeader as Component } from './workpad_header'; const mapStateToProps = state => ({ - editing: getEditing(state), + isWriteable: isWriteable(state) && canUserWrite(state), + canUserWrite: canUserWrite(state), workpadName: getWorkpadName(state), selectedPage: getSelectedPage(state), hasAssets: Object.keys(getAssets(state)).length ? true : false, }); const mapDispatchToProps = dispatch => ({ - setEditing: editing => dispatch(setEditing(editing)), + setWriteable: isWriteable => dispatch(setWriteable(isWriteable)), addElement: pageId => partialElement => dispatch(addElement(pageId, partialElement)), }); @@ -30,7 +31,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => ({ ...dispatchProps, ...ownProps, addElement: dispatchProps.addElement(stateProps.selectedPage), - toggleEditing: () => dispatchProps.setEditing(!stateProps.editing), + toggleWriteable: () => dispatchProps.setWriteable(!stateProps.isWriteable), }); export const WorkpadHeader = compose( diff --git a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js index c4c75aa09f6db..bae28b72416d9 100644 --- a/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js +++ b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.js @@ -24,15 +24,16 @@ import { FullscreenControl } from '../fullscreen_control'; import { RefreshControl } from '../refresh_control'; export const WorkpadHeader = ({ - editing, - toggleEditing, + isWriteable, + canUserWrite, + toggleWriteable, hasAssets, addElement, setShowElementModal, showElementModal, }) => { const keyHandler = action => { - if (action === 'EDITING') toggleEditing(); + if (action === 'EDITING') toggleWriteable(); }; const elementAdd = ( @@ -41,6 +42,7 @@ export const WorkpadHeader = ({ onClose={() => setShowElementModal(false)} className="canvasModal--fixedSize" maxWidth="1000px" + initialFocus=".canvasElements__filter" > { @@ -57,6 +59,11 @@ export const WorkpadHeader = ({ ); + let readOnlyToolTip = ''; + + if (!canUserWrite) readOnlyToolTip = "You don't have permission to edit this workpad"; + else readOnlyToolTip = isWriteable ? 'Hide editing controls' : 'Show editing controls'; + return (
      {showElementModal ? elementAdd : null} @@ -83,24 +90,24 @@ export const WorkpadHeader = ({ - - + {!canUserWrite && ( + + )} + { - toggleEditing(); + toggleWriteable(); }} size="s" - aria-label={editing ? 'Hide editing controls' : 'Show editing controls'} + aria-label={readOnlyToolTip} + isDisabled={!canUserWrite} /> - {editing ? ( + {isWriteable ? ( {hasAssets && ( @@ -127,8 +134,8 @@ export const WorkpadHeader = ({ }; WorkpadHeader.propTypes = { - editing: PropTypes.bool, - toggleEditing: PropTypes.func, + isWriteable: PropTypes.bool, + toggleWriteable: PropTypes.func, hasAssets: PropTypes.bool, addElement: PropTypes.func.isRequired, showElementModal: PropTypes.bool, diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/index.js b/x-pack/plugins/canvas/public/components/workpad_loader/index.js index 8eee65d70df02..6229fd340813a 100644 --- a/x-pack/plugins/canvas/public/components/workpad_loader/index.js +++ b/x-pack/plugins/canvas/public/components/workpad_loader/index.js @@ -10,19 +10,29 @@ import { compose, withState, getContext, withHandlers } from 'recompose'; import fileSaver from 'file-saver'; import * as workpadService from '../../lib/workpad_service'; import { notify } from '../../lib/notify'; +import { canUserWrite } from '../../state/selectors/app'; import { getWorkpad } from '../../state/selectors/workpad'; import { getId } from '../../lib/get_id'; +import { setCanUserWrite } from '../../state/actions/transient'; import { WorkpadLoader as Component } from './workpad_loader'; const mapStateToProps = state => ({ workpadId: getWorkpad(state).id, + canUserWrite: canUserWrite(state), +}); + +const mapDispatchToProps = dispatch => ({ + setCanUserWrite: canUserWrite => dispatch(setCanUserWrite(canUserWrite)), }); export const WorkpadLoader = compose( getContext({ router: PropTypes.object, }), - connect(mapStateToProps), + connect( + mapStateToProps, + mapDispatchToProps + ), withState('workpads', 'setWorkpads', null), withHandlers({ // Workpad creation via navigation @@ -34,6 +44,9 @@ export const WorkpadLoader = compose( props.router.navigateTo('loadWorkpad', { id: workpad.id, page: 1 }); } catch (err) { notify.error(err, { title: `Couldn't upload workpad` }); + // TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced + // https://github.com/elastic/kibana/issues/20277 + if (err.response.status === 403) props.setCanUserWrite(false); } return; } @@ -72,6 +85,9 @@ export const WorkpadLoader = compose( props.router.navigateTo('loadWorkpad', { id: workpad.id, page: 1 }); } catch (err) { notify.error(err, { title: `Couldn't clone workpad` }); + // TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced + // https://github.com/elastic/kibana/issues/20277 + if (err.response.status === 403) props.setCanUserWrite(false); } }, @@ -96,8 +112,14 @@ export const WorkpadLoader = compose( ([passes, errors], result) => { if (result.id === loadedWorkpad && !result.err) redirectHome = true; - if (result.err) errors.push(result.id); - else passes.push(result.id); + if (result.err) { + errors.push(result.id); + // TODO: remove this and switch to checking user privileges when canvas loads when granular app privileges are introduced + // https://github.com/elastic/kibana/issues/20277 + if (result.err.response.status === 403) props.setCanUserWrite(false); + } else { + passes.push(result.id); + } return [passes, errors]; }, diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js b/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js new file mode 100644 index 0000000000000..c09ea63280cef --- /dev/null +++ b/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { get } from 'lodash'; +import { getId } from '../../lib/get_id'; +import { notify } from '../../lib/notify'; + +export const uploadWorkpad = (file, onUpload) => { + if (!file) return; + + if (get(file, 'type') !== 'application/json') { + return notify.warning('Only JSON files are accepted', { + title: `Couldn't upload '${file.name || 'file'}'`, + }); + } + // TODO: Clean up this file, this loading stuff can, and should be, abstracted + const reader = new FileReader(); + + // handle reading the uploaded file + reader.onload = () => { + try { + const workpad = JSON.parse(reader.result); + workpad.id = getId('workpad'); + + // sanity check for workpad object + if (!Array.isArray(workpad.pages) || workpad.pages.length === 0 || !workpad.assets) { + throw new Error( + `Some properties required for a Canvas workpad are missing. Edit your JSON file to provide the correct property values and try again.` + ); + } + + onUpload(workpad); + } catch (e) { + notify.error(e, { title: `Couldn't upload '${file.name || 'file'}'` }); + } + }; + + // read the uploaded file + reader.readAsText(file); +}; diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_create.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_create.js index 3caf4d553cca2..77f22a8252dab 100644 --- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_create.js +++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_create.js @@ -8,8 +8,15 @@ import React from 'react'; import PropTypes from 'prop-types'; import { EuiButton } from '@elastic/eui'; -export const WorkpadCreate = ({ createPending, onCreate }) => ( - +export const WorkpadCreate = ({ createPending, onCreate, ...rest }) => ( + Create workpad ); diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js index f2cce0118c6ed..f2ac90a948a0f 100644 --- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js +++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js @@ -5,38 +5,18 @@ */ import PropTypes from 'prop-types'; -import { compose, withState, withHandlers } from 'recompose'; -import { getId } from '../../../lib/get_id'; +import { compose, withHandlers } from 'recompose'; import { notify } from '../../../lib/notify'; +import { uploadWorkpad } from '../upload_workpad'; import { WorkpadDropzone as Component } from './workpad_dropzone'; export const WorkpadDropzone = compose( - withState('isDropping', 'setDropping', false), withHandlers({ - onDropAccepted: ({ onUpload, setDropping }) => ([file]) => { - // TODO: Clean up this file, this loading stuff can, and should be, abstracted - const reader = new FileReader(); - - // handle reading the uploaded file - reader.onload = () => { - try { - const workpad = JSON.parse(reader.result); - workpad.id = getId('workpad'); - onUpload(workpad); - } catch (e) { - notify.error(e, { title: `Couldn't upload '${file.name || 'file'}'` }); - } - }; - - // read the uploaded file - reader.readAsText(file); - setDropping(false); - }, - onDropRejected: ({ setDropping }) => ([file]) => { + onDropAccepted: ({ onUpload }) => ([file]) => uploadWorkpad(file, onUpload), + onDropRejected: () => ([file]) => { notify.warning('Only JSON files are accepted', { title: `Couldn't upload '${file.name || 'file'}'`, }); - setDropping(false); }, }) )(Component); diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js index 274c8ef2cc9b8..8a616964623db 100644 --- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js +++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js @@ -8,14 +8,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import Dropzone from 'react-dropzone'; -export const WorkpadDropzone = ({ setDropping, onDropAccepted, onDropRejected, children }) => ( +export const WorkpadDropzone = ({ onDropAccepted, onDropRejected, disabled, children }) => ( setDropping(true)} - onDragLeave={() => setDropping(false)} disableClick + disabled={disabled} className="canvasWorkpad__dropzone" activeClassName="canvasWorkpad__dropzone--active" > @@ -24,9 +23,8 @@ export const WorkpadDropzone = ({ setDropping, onDropAccepted, onDropRejected, c ); WorkpadDropzone.propTypes = { - isDropping: PropTypes.bool.isRequired, - setDropping: PropTypes.func.isRequired, onDropAccepted: PropTypes.func.isRequired, onDropRejected: PropTypes.func.isRequired, + disabled: PropTypes.bool.isRequired, children: PropTypes.node.isRequired, }; diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js index 8987eead96486..af69558f1d7ed 100644 --- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js +++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js @@ -10,7 +10,9 @@ import { EuiFlexGroup, EuiFlexItem, EuiBasicTable, + EuiBetaBadge, EuiButtonIcon, + EuiLink, EuiPagination, EuiSpacer, EuiButton, @@ -35,6 +37,7 @@ const formatDate = date => date && moment(date).format('MMM D, YYYY @ h:mma'); export class WorkpadLoader extends React.PureComponent { static propTypes = { workpadId: PropTypes.string.isRequired, + canUserWrite: PropTypes.bool.isRequired, createWorkpad: PropTypes.func.isRequired, findWorkpads: PropTypes.func.isRequired, downloadWorkpad: PropTypes.func.isRequired, @@ -45,8 +48,8 @@ export class WorkpadLoader extends React.PureComponent { }; state = { - deletingWorkpad: false, createPending: false, + deletingWorkpad: false, sortField: '@timestamp', sortDirection: 'desc', selectedWorkpads: [], @@ -56,6 +59,9 @@ export class WorkpadLoader extends React.PureComponent { async componentDidMount() { // on component load, kick off the workpad search this.props.findWorkpads(); + + // keep track of whether or not the component is mounted, to prevent rogue setState calls + this._isMounted = true; } componentWillReceiveProps(newProps) { @@ -64,25 +70,29 @@ export class WorkpadLoader extends React.PureComponent { if (workpadId !== newProps.workpadId) onClose(); } + componentWillUnmount() { + this._isMounted = false; + } + // create new empty workpad createWorkpad = async () => { this.setState({ createPending: true }); await this.props.createWorkpad(); - this.setState({ createPending: false }); + this._isMounted && this.setState({ createPending: false }); }; // create new workpad from uploaded JSON uploadWorkpad = async workpad => { this.setState({ createPending: true }); await this.props.createWorkpad(workpad); - this.setState({ createPending: false }); + this._isMounted && this.setState({ createPending: false }); }; // clone existing workpad cloneWorkpad = async workpad => { this.setState({ createPending: true }); await this.props.cloneWorkpad(workpad.id); - this.setState({ createPending: false }); + this._isMounted && this.setState({ createPending: false }); }; // Workpad remove methods @@ -92,16 +102,18 @@ export class WorkpadLoader extends React.PureComponent { removeWorkpads = () => { const { selectedWorkpads } = this.state; + this.props.removeWorkpads(selectedWorkpads.map(({ id }) => id)).then(remainingIds => { const remainingWorkpads = remainingIds.length > 0 ? selectedWorkpads.filter(({ id }) => remainingIds.includes(id)) : []; - this.setState({ - deletingWorkpad: false, - selectedWorkpads: remainingWorkpads, - }); + this._isMounted && + this.setState({ + deletingWorkpad: false, + selectedWorkpads: remainingWorkpads, + }); }); }; @@ -124,6 +136,7 @@ export class WorkpadLoader extends React.PureComponent { renderWorkpadTable = ({ rows, pageNumber, totalPages, setPage }) => { const { sortField, sortDirection } = this.state; + const { canUserWrite, createPending } = this.props; const actions = [ { @@ -139,11 +152,14 @@ export class WorkpadLoader extends React.PureComponent { - + this.cloneWorkpad(workpad)} aria-label="Clone Workpad" + disabled={!canUserWrite} /> @@ -218,7 +234,7 @@ export class WorkpadLoader extends React.PureComponent { return ( - + + ); + + let deleteButton = ( + + {`Delete (${selectedWorkpads.length})`} + + ); + + const downloadButton = ( + + {`Download (${selectedWorkpads.length})`} + + ); + + let uploadButton = ( + + ); + + if (!canUserWrite) { + createButton = ( + + {createButton} + + ); + deleteButton = ( + + {deleteButton} + + ); + uploadButton = ( + + {uploadButton} + + ); + } + const modalTitle = selectedWorkpads.length === 1 ? `Delete workpad '${selectedWorkpads[0].name}'?` @@ -280,33 +346,30 @@ export class WorkpadLoader extends React.PureComponent {
      - Canvas workpads + + + Canvas workpads + + + + + + + Docs + + + {selectedWorkpads.length > 0 && ( - - - {`Download (${selectedWorkpads.length})`} - - - - - {`Delete (${selectedWorkpads.length})`} - - + {downloadButton} + {deleteButton} )} @@ -320,19 +383,9 @@ export class WorkpadLoader extends React.PureComponent { - - - - - - - + + {uploadButton} + {createButton} diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_upload.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_upload.js index d2be98bada119..56a837d53d08f 100644 --- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_upload.js +++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_upload.js @@ -7,37 +7,14 @@ import React from 'react'; import PropTypes from 'prop-types'; import { EuiFilePicker } from '@elastic/eui'; -import { get } from 'lodash'; -import { getId } from '../../lib/get_id'; -import { notify } from '../../lib/notify'; +import { uploadWorkpad } from './upload_workpad'; -export const WorkpadUpload = ({ onUpload }) => ( +export const WorkpadUpload = ({ onUpload, ...rest }) => ( { - if (get(file, 'type') !== 'application/json') { - return notify.warning('Only JSON files are accepted', { - title: `Couldn't upload '${file.name || 'file'}'`, - }); - } - // TODO: Clean up this file, this loading stuff can, and should be, abstracted - const reader = new FileReader(); - - // handle reading the uploaded file - reader.onload = () => { - try { - const workpad = JSON.parse(reader.result); - workpad.id = getId('workpad'); - onUpload(workpad); - } catch (e) { - notify.error(e, { title: `Couldn't upload '${file.name || 'file'}'` }); - } - }; - - // read the uploaded file - reader.readAsText(file); - }} + onChange={([file]) => uploadWorkpad(file, onUpload)} /> ); diff --git a/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js b/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js index c95395d91734c..b6aa9c8da6328 100644 --- a/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js +++ b/x-pack/plugins/canvas/public/components/workpad_page/event_handlers.js @@ -126,4 +126,5 @@ export const withEventHandlers = withHandlers({ onMouseMove: props => e => handleMouseMove(props.commit, e, props.isEditable), onKeyDown: props => e => handleKeyDown(props.commit, e, props.isEditable, props.remove), onKeyUp: props => e => handleKeyUp(props.commit, e, props.isEditable), + resetHandler: () => () => resetHandler(), }); diff --git a/x-pack/plugins/canvas/public/components/workpad_page/index.js b/x-pack/plugins/canvas/public/components/workpad_page/index.js index bf3e220ddfbbb..6d7d13f155a7e 100644 --- a/x-pack/plugins/canvas/public/components/workpad_page/index.js +++ b/x-pack/plugins/canvas/public/components/workpad_page/index.js @@ -9,14 +9,14 @@ import PropTypes from 'prop-types'; import { compose, withState, withProps } from 'recompose'; import { aeroelastic } from '../../lib/aeroelastic_kibana'; import { removeElements } from '../../state/actions/elements'; -import { getFullscreen, getEditing } from '../../state/selectors/app'; -import { getElements } from '../../state/selectors/workpad'; +import { getFullscreen, canUserWrite } from '../../state/selectors/app'; +import { getElements, isWriteable } from '../../state/selectors/workpad'; import { withEventHandlers } from './event_handlers'; import { WorkpadPage as Component } from './workpad_page'; const mapStateToProps = (state, ownProps) => { return { - isEditable: !getFullscreen(state) && getEditing(state), + isEditable: !getFullscreen(state) && isWriteable(state) && canUserWrite(state), elements: getElements(state, ownProps.page.id), }; }; diff --git a/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js index b94c5b8c2a45f..fc46820aca56f 100644 --- a/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js +++ b/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import React from 'react'; +import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; import { ElementWrapper } from '../element_wrapper'; import { AlignmentGuide } from '../alignment_guide'; @@ -14,105 +14,114 @@ import { BorderConnection } from '../border_connection'; import { BorderResizeHandle } from '../border_resize_handle'; // NOTE: the data-shared-* attributes here are used for reporting -export const WorkpadPage = ({ - page, - className, - animationStyle, - elements, - cursor = 'auto', - height, - width, - isEditable, - onDoubleClick, - onKeyDown, - onKeyUp, - onMouseDown, - onMouseMove, - onMouseUp, - onAnimationEnd, -}) => { - return ( -
      - {elements - .map(element => { - if (element.type === 'annotation') { - if (!isEditable) return; - const props = { - key: element.id, - type: element.type, - transformMatrix: element.transformMatrix, - width: element.width, - height: element.height, - }; +export class WorkpadPage extends PureComponent { + static propTypes = { + page: PropTypes.shape({ + id: PropTypes.string.isRequired, + style: PropTypes.object, + }).isRequired, + className: PropTypes.string.isRequired, + animationStyle: PropTypes.object.isRequired, + elements: PropTypes.arrayOf( + PropTypes.shape({ + id: PropTypes.string.isRequired, + transformMatrix: PropTypes.arrayOf(PropTypes.number).isRequired, + width: PropTypes.number.isRequired, + height: PropTypes.number.isRequired, + type: PropTypes.string, + }) + ).isRequired, + cursor: PropTypes.string, + height: PropTypes.number.isRequired, + width: PropTypes.number.isRequired, + isEditable: PropTypes.bool.isRequired, + onDoubleClick: PropTypes.func, + onKeyDown: PropTypes.func, + onKeyUp: PropTypes.func, + onMouseDown: PropTypes.func, + onMouseMove: PropTypes.func, + onMouseUp: PropTypes.func, + onAnimationEnd: PropTypes.func, + resetHandler: PropTypes.func, + }; - switch (element.subtype) { - case 'alignmentGuide': - return ; - case 'hoverAnnotation': - return ; - case 'rotationHandle': - return ; - case 'resizeHandle': - return ; - case 'resizeConnector': - return ; - default: - return []; - } - } else if (element.subtype !== 'adHocGroup') { - return ; - } - }) - .filter(element => !!element)} -
      - ); -}; + componentWillUnmount() { + this.props.resetHandler(); + } -WorkpadPage.propTypes = { - page: PropTypes.shape({ - id: PropTypes.string.isRequired, - style: PropTypes.object, - }).isRequired, - className: PropTypes.string.isRequired, - animationStyle: PropTypes.object.isRequired, - elements: PropTypes.arrayOf( - PropTypes.shape({ - id: PropTypes.string.isRequired, - transformMatrix: PropTypes.arrayOf(PropTypes.number).isRequired, - width: PropTypes.number.isRequired, - height: PropTypes.number.isRequired, - type: PropTypes.string, - }) - ).isRequired, - cursor: PropTypes.string, - height: PropTypes.number.isRequired, - width: PropTypes.number.isRequired, - isEditable: PropTypes.bool.isRequired, - onDoubleClick: PropTypes.func, - onKeyDown: PropTypes.func, - onKeyUp: PropTypes.func, - onMouseDown: PropTypes.func, - onMouseMove: PropTypes.func, - onMouseUp: PropTypes.func, - onAnimationEnd: PropTypes.func, -}; + render() { + const { + page, + className, + animationStyle, + elements, + cursor = 'auto', + height, + width, + isEditable, + onDoubleClick, + onKeyDown, + onKeyUp, + onMouseDown, + onMouseMove, + onMouseUp, + onAnimationEnd, + } = this.props; + + return ( +
      + {elements + .map(element => { + if (element.type === 'annotation') { + if (!isEditable) return; + const props = { + key: element.id, + type: element.type, + transformMatrix: element.transformMatrix, + width: element.width, + height: element.height, + }; + + switch (element.subtype) { + case 'alignmentGuide': + return ; + case 'hoverAnnotation': + return ; + case 'rotationHandle': + return ; + case 'resizeHandle': + return ; + case 'resizeConnector': + return ; + default: + return []; + } + } else if (element.subtype !== 'adHocGroup') { + return ; + } + }) + .filter(element => !!element)} +
      + ); + } +} diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js index 0a400bd03aef3..0ef8cef2a50bc 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.js @@ -37,16 +37,12 @@ export const AppearanceForm = ({ padding, opacity, overflow, onChange }) => { - + - + @@ -59,3 +55,8 @@ AppearanceForm.propTypes = { overflow: PropTypes.oneOf(['hidden', 'visible']), onChange: PropTypes.func.isRequired, }; + +AppearanceForm.defaultProps = { + opacity: 1, + overflow: 'hidden', +}; diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js index 05807741956c9..7884640831ffe 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.js @@ -6,13 +6,26 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { EuiFlexGroup, EuiFormRow, EuiFlexItem, EuiFieldNumber, EuiSelect } from '@elastic/eui'; +import { + EuiFlexGroup, + EuiFormRow, + EuiFlexItem, + EuiFieldNumber, + EuiSuperSelect, +} from '@elastic/eui'; import { ColorPickerMini } from '../../../components/color_picker_mini'; -const styles = ['solid', 'dotted', 'dashed', 'double', 'groove', 'ridge', 'inset', 'outset']; - -const options = [{ value: '', text: '--' }]; -styles.forEach(val => options.push({ value: val, text: val })); +const styles = [ + 'none', + 'solid', + 'dotted', + 'dashed', + 'double', + 'groove', + 'ridge', + 'inset', + 'outset', +]; export const BorderForm = ({ value, radius, onChange, colors }) => { const border = value || ''; @@ -20,9 +33,7 @@ export const BorderForm = ({ value, radius, onChange, colors }) => { const borderWidthVal = borderWidth ? borderWidth.replace('px', '') : ''; const radiusVal = radius ? radius.replace('px', '') : ''; - const namedChange = name => ev => { - const val = ev.target.value; - + const namedChange = name => val => { if (name === 'borderWidth') return onChange('border', `${val}px ${borderStyle} ${borderColor}`); if (name === 'borderStyle') { if (val === '') return onChange('border', `0px`); @@ -30,7 +41,7 @@ export const BorderForm = ({ value, radius, onChange, colors }) => { } if (name === 'borderRadius') return onChange('borderRadius', `${val}px`); - onChange(name, ev.target.value); + onChange(name, val); }; const borderColorChange = color => onChange('border', `${borderWidth} ${borderStyle} ${color}`); @@ -38,16 +49,22 @@ export const BorderForm = ({ value, radius, onChange, colors }) => { return ( - - + + namedChange('borderWidth')(e.target.value)} + /> - ({ + value: style, + inputDisplay:
      , + }))} onChange={namedChange('borderStyle')} /> @@ -55,7 +72,10 @@ export const BorderForm = ({ value, radius, onChange, colors }) => { - + namedChange('borderRadius')(e.target.value)} + /> diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.js b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.js index 1183b7cbe24b7..bfe0522476f8b 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.js @@ -31,6 +31,7 @@ export const ExtendedTemplate = ({ getArgValue, setArgValue, workpad }) => (
      Border
      + export const containerStyle = () => ({ name: 'containerStyle', - displayName: 'Container Style', + displayName: 'Container style', help: 'Tweak the appearance of the element container', default: '{containerStyle}', simpleTemplate: templateFromReactComponent(wrap(SimpleTemplate)), diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/font.js b/x-pack/plugins/canvas/public/expression_types/arg_types/font.js index fc64c9c3a668c..ed1bf29e2514f 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/font.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/font.js @@ -53,7 +53,7 @@ FontArgInput.displayName = 'FontArgInput'; export const font = () => ({ name: 'font', - displayName: 'Text Settings', + displayName: 'Text settings', help: 'Set the font, size and color', template: templateFromReactComponent(FontArgInput), default: `{font size=14 family="${openSans.value}" color="#000000" align=left}`, diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.js b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.js index 2e0c4ede6cc53..8a28f00cfba89 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.js @@ -45,7 +45,7 @@ export const ExtendedTemplate = props => { {name !== 'defaultStyle' && ( handleChange('label', ev)} /> @@ -57,7 +57,7 @@ export const ExtendedTemplate = props => { handleChange('lines', ev)} /> @@ -68,7 +68,7 @@ export const ExtendedTemplate = props => { handleChange('bars', ev)} /> @@ -79,7 +79,7 @@ export const ExtendedTemplate = props => { handleChange('points', ev)} /> diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js index 829804e2bf88a..8661413c0b1e4 100644 --- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js +++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.js @@ -35,7 +35,7 @@ EnhancedExtendedTemplate.propTypes = { export const seriesStyle = () => ({ name: 'seriesStyle', - displayName: 'Series Style', + displayName: 'Series style', help: 'Set the style for a selected named series', template: templateFromReactComponent(EnhancedExtendedTemplate), simpleTemplate: templateFromReactComponent(SimpleTemplate), diff --git a/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js b/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js index b2675777d3bf1..a2436f0e92681 100644 --- a/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js +++ b/x-pack/plugins/canvas/public/expression_types/datasources/esdocs.js @@ -115,7 +115,7 @@ EsdocsDatasource.propTypes = { export const esdocs = () => ({ name: 'esdocs', - displayName: 'Elasticsearch Raw Documents', + displayName: 'Elasticsearch raw documents', help: 'Pull back raw documents from elasticsearch', image: 'logoElasticsearch', template: templateFromReactComponent(EsdocsDatasource), diff --git a/x-pack/plugins/canvas/public/functions/asset.js b/x-pack/plugins/canvas/public/functions/asset.js index 4ec4889fc344e..52c9d45e9fd09 100644 --- a/x-pack/plugins/canvas/public/functions/asset.js +++ b/x-pack/plugins/canvas/public/functions/asset.js @@ -14,7 +14,7 @@ export const asset = () => ({ types: ['null'], }, type: 'string', - help: 'Use Canvas workpad asset objects to provide argument values. Usually images.', + help: 'Use Canvas workpad asset objects to provide argument values. Usually images', args: { id: { aliases: ['_'], diff --git a/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js b/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js index bedc4c64fa1f7..c9f89763435d1 100644 --- a/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js +++ b/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js @@ -11,7 +11,6 @@ import { historyProvider } from '../history_provider'; function createState() { return { transient: { - editing: false, selectedPage: 'page-f3ce-4bb7-86c8-0417606d6592', selectedElement: 'element-d88c-4bbd-9453-db22e949b92e', resolvedArgs: {}, @@ -23,7 +22,7 @@ function createState() { }; } -describe('historyProvider', () => { +describe.skip('historyProvider', () => { let history; let state; @@ -169,7 +168,9 @@ describe('historyProvider', () => { }); describe('resetOnChange', () => { - it('removes listeners', () => { + // the history onChange handler was made async and now there's no way to know when the handler was called + // TODO: restore these tests. + it.skip('removes listeners', () => { const createHandler = () => { let callCount = 0; diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/config.js b/x-pack/plugins/canvas/public/lib/aeroelastic/config.js index a9fc4072683fa..3abc805099d50 100644 --- a/x-pack/plugins/canvas/public/lib/aeroelastic/config.js +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/config.js @@ -14,7 +14,7 @@ const atopZ = 1000; const depthSelect = true; const devColor = 'magenta'; const groupName = 'group'; -const groupResize = false; +const groupResize = true; const guideDistance = 3; const hoverAnnotationName = 'hoverAnnotation'; const intraGroupManipulation = false; diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js b/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js index 4f8967503337a..d7ad63032c8a8 100644 --- a/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js @@ -79,7 +79,11 @@ const not = fun => (...args) => !fun(...args); const removeDuplicates = (idFun, a) => a.filter((d, i) => a.findIndex(s => idFun(s) === idFun(d)) === i); +const epsilon = 1 / 1000; +const applyTolerance = d => Math.round(d / epsilon) * epsilon; + module.exports = { + applyTolerance, disjunctiveUnion, flatten, identity, diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js index 06cef83699154..91df7d4ab9138 100644 --- a/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js @@ -28,6 +28,7 @@ const matrix2d = require('./matrix2d'); const config = require('./config'); const { + applyTolerance, disjunctiveUnion, identity, flatten, @@ -904,19 +905,31 @@ function resizeAnnotation(shapes, selectedShapes, shape) { // fixme left active: snap wobble. right active: opposite side wobble. const a = snappedA(properShape); const b = snappedB(properShape); - const resizeVertices = - config.groupResize || properShape.type !== 'group' // todo remove the limitation of no group resize - ? [ - [-1, -1, 315], - [1, -1, 45], - [1, 1, 135], - [-1, 1, 225], // corners - [0, -1, 0], - [1, 0, 90], - [0, 1, 180], - [-1, 0, 270], // edge midpoints - ] - : []; + const groupedShape = shape => + shape.parent === properShape.id && + shape.type !== 'annotation' && + shape.subtype !== config.adHocGroupName; + // fixme broaden resizableChild to other multiples of 90 degrees + const resizableChild = shape => + shallowEqual( + matrix.compositeComponent(shape.localTransformMatrix).map(applyTolerance), + matrix.UNITMATRIX + ); + const allowResize = + properShape.type !== 'group' || + (config.groupResize && shapes.filter(groupedShape).every(resizableChild)); + const resizeVertices = allowResize + ? [ + [-1, -1, 315], + [1, -1, 45], + [1, 1, 135], + [-1, 1, 225], // corners + [0, -1, 0], + [1, 0, 90], + [0, 1, 180], + [-1, 0, 270], // edge midpoints + ] + : []; const resizePoints = resizeVertices.map(resizePointAnnotations(shape.id, a, b)); const connectors = connectorVertices.map(resizeEdgeAnnotations(shape.id, a, b)); return [...resizePoints, ...connectors]; @@ -1160,43 +1173,47 @@ const axisAlignedBoundingBoxShape = shapesToBox => { return aabbShape; }; -const resizeGroup = (shapes, selectedShapes) => { - const extending = shape => { - const children = shapes.filter(s => s.parent === shape.id && s.type !== 'annotation'); - const axisAlignedBoundingBox = getAABB(children); - const { a, b, localTransformMatrix, rigTransform } = projectAABB(axisAlignedBoundingBox); - return { - ...shape, - localTransformMatrix, - a, - b, - rigTransform, - deltaLocalTransformMatrix: matrix.multiply( - shape.localTransformMatrix, - matrix.invert(localTransformMatrix) - ), - }; - }; - const extender = (shapes, shape) => { - if (!shape.parent) return shape; - const parent = shapes.find(s => s.id === shape.parent); +const resizeGroup = (shapes, selectedShapes, elements) => { + if (!elements.length) return { shapes, selectedShapes }; + const e = elements[0]; + if (e.subtype !== 'adHocGroup') return { shapes, selectedShapes }; + if (!e.baseAB) { return { - ...shape, - localTransformMatrix: matrix.multiply( - shape.localTransformMatrix, - parent.deltaLocalTransformMatrix - ), + shapes: shapes.map(s => ({ ...s, childBaseAB: null, baseLocalTransformMatrix: null })), + selectedShapes, }; - }; - const extendingIfNeeded = shape => (isAdHocGroup(shape) ? extending(shape) : shape); - const extenderIfNeeded = (shape, i, shapes) => - isAdHocGroup(shape) || shape.type === 'annotation' ? shape : extender(shapes, shape); - const extendingShapes = shapes.map(extendingIfNeeded); + } + const groupScaleX = e.a / e.baseAB[0]; + const groupScaleY = e.b / e.baseAB[1]; + const groupScale = matrix.scale(groupScaleX, groupScaleY, 1); return { - shapes: extendingShapes.map(extenderIfNeeded), - selectedShapes: selectedShapes - .map(extendingIfNeeded) - .map(d => extenderIfNeeded(d, undefined, extendingShapes)), + shapes: shapes.map(s => { + if (s.parent !== e.id || s.type === 'annotation') return s; + const childBaseAB = s.childBaseAB || [s.a, s.b]; + const impliedScale = matrix.scale(...childBaseAB, 1); + const inverseImpliedScale = matrix.invert(impliedScale); + const baseLocalTransformMatrix = s.baseLocalTransformMatrix || s.localTransformMatrix; + const normalizedBaseLocalTransformMatrix = matrix.multiply( + baseLocalTransformMatrix, + impliedScale + ); + const T = matrix.multiply(groupScale, normalizedBaseLocalTransformMatrix); + const backScaler = groupScale.map(d => Math.abs(d)); + const transformShit = matrix.invert(backScaler); + const abTuple = matrix.mvMultiply(matrix.multiply(backScaler, impliedScale), [1, 1, 1, 1]); + return { + ...s, + localTransformMatrix: matrix.multiply( + T, + matrix.multiply(inverseImpliedScale, transformShit) + ), + a: abTuple[0], + b: abTuple[1], + childBaseAB, + baseLocalTransformMatrix, + }; + }), + selectedShapes, }; }; @@ -1212,8 +1229,10 @@ const getLeafs = (descendCondition, allShapes, shapes) => const grouping = select((shapes, selectedShapes) => { const preexistingAdHocGroups = shapes.filter(isAdHocGroup); - const freshSelectedShapes = shapes.filter(idsMatch(selectedShapes)); - const freshNonSelectedShapes = shapes.filter(not(idsMatch(selectedShapes))); + const matcher = idsMatch(selectedShapes); + const selectedFn = shape => matcher(shape) && shape.type !== 'annotation'; + const freshSelectedShapes = shapes.filter(selectedFn); + const freshNonSelectedShapes = shapes.filter(not(selectedFn)); const someSelectedShapesAreGrouped = selectedShapes.some(isOrBelongsToAdHocGroup); const selectionOutsideGroup = !someSelectedShapesAreGrouped; @@ -1228,16 +1247,16 @@ const grouping = select((shapes, selectedShapes) => { } // preserve the current selection if the sole ad hoc group is being manipulated - if ( - selectedShapes.length === 1 && - contentShapes(shapes, selectedShapes)[0].subtype === 'adHocGroup' - ) - return { shapes, selectedShapes }; - + const elements = contentShapes(shapes, selectedShapes); + if (selectedShapes.length === 1 && elements[0].subtype === 'adHocGroup') { + return config.groupResize + ? resizeGroup(shapes, selectedShapes, elements) + : { shapes, selectedShapes }; + } // group items or extend group bounding box (if enabled) if (selectedShapes.length < 2) { // resize the group if needed (ad-hoc group resize is manipulated) - return config.groupResize ? resizeGroup(shapes, selectedShapes) : { shapes, selectedShapes }; + return { shapes, selectedShapes }; } else { // group together the multiple items const group = axisAlignedBoundingBoxShape(freshSelectedShapes); @@ -1351,9 +1370,9 @@ const nextScene = select( const selectedLeafShapes = getLeafs( shape => shape.subtype === config.adHocGroupName, shapes, - selectionState.shapes.map( - s => (s.type === 'annotation' ? shapes.find(ss => ss.id === s.parent) : s) - ) + selectionState.shapes + .map(s => (s.type === 'annotation' ? shapes.find(ss => ss.id === s.parent) : s)) + .filter(identity) ) .filter(shape => shape.type !== 'annotation') .map(s => s.id); diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js b/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js index 3760f4fbf906f..53c5652c02497 100644 --- a/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.js @@ -4,6 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ +/*eslint no-unused-vars: ["error", { "argsIgnorePattern": "^_" }]*/ + /** * transpose * @@ -231,9 +233,9 @@ const invert = ([a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p]) => { } }; -const translateComponent = a => [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, a[12], a[13], a[14], a[15]]; +const translateComponent = a => [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, a[12], a[13], a[14], 1]; -const compositeComponent = ([a, b, c, d, e, f, g, h, i, j, k, l]) => [ +const compositeComponent = ([a, b, c, d, e, f, g, h, i, j, k, l, _m, _n, _o, p]) => [ a, b, c, @@ -249,7 +251,7 @@ const compositeComponent = ([a, b, c, d, e, f, g, h, i, j, k, l]) => [ 0, 0, 0, - 1, + p, ]; const add = ( diff --git a/x-pack/plugins/canvas/public/lib/browser_registries.js b/x-pack/plugins/canvas/public/lib/browser_registries.js new file mode 100644 index 0000000000000..efceec04d6dce --- /dev/null +++ b/x-pack/plugins/canvas/public/lib/browser_registries.js @@ -0,0 +1,74 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import chrome from 'ui/chrome'; +import $script from 'scriptjs'; +import { typesRegistry } from '../../common/lib/types_registry'; +import { + argTypeRegistry, + datasourceRegistry, + transformRegistry, + modelRegistry, + viewRegistry, +} from '../expression_types'; +import { elementsRegistry } from './elements_registry'; +import { renderFunctionsRegistry } from './render_functions_registry'; +import { functionsRegistry as browserFunctions } from './functions_registry'; +import { loadPrivateBrowserFunctions } from './load_private_browser_functions'; + +const registries = { + browserFunctions: browserFunctions, + commonFunctions: browserFunctions, + elements: elementsRegistry, + types: typesRegistry, + renderers: renderFunctionsRegistry, + transformUIs: transformRegistry, + datasourceUIs: datasourceRegistry, + modelUIs: modelRegistry, + viewUIs: viewRegistry, + argumentUIs: argTypeRegistry, +}; + +let resolve = null; +let called = false; + +const populatePromise = new Promise(_resolve => { + resolve = _resolve; +}); + +export const getBrowserRegistries = () => { + return populatePromise; +}; + +export const populateBrowserRegistries = () => { + if (called) throw new Error('function should only be called once per process'); + called = true; + + // loadPrivateBrowserFunctions is sync. No biggie. + loadPrivateBrowserFunctions(); + + const remainingTypes = Object.keys(registries); + const populatedTypes = {}; + + function loadType() { + const type = remainingTypes.pop(); + window.canvas = window.canvas || {}; + window.canvas.register = d => registries[type].register(d); + + // Load plugins one at a time because each needs a different loader function + // $script will only load each of these once, we so can call this as many times as we need? + const pluginPath = chrome.addBasePath(`/api/canvas/plugins?type=${type}`); + $script(pluginPath, () => { + populatedTypes[type] = registries[type]; + + if (remainingTypes.length) loadType(); + else resolve(populatedTypes); + }); + } + + if (remainingTypes.length) loadType(); + return populatePromise; +}; diff --git a/x-pack/plugins/canvas/public/lib/doc_title.js b/x-pack/plugins/canvas/public/lib/doc_title.js new file mode 100644 index 0000000000000..3f75d18df14d2 --- /dev/null +++ b/x-pack/plugins/canvas/public/lib/doc_title.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const setDocTitle = title => (document.title = `${title} - Kibana`); diff --git a/x-pack/plugins/canvas/public/lib/function_definitions.js b/x-pack/plugins/canvas/public/lib/function_definitions.js new file mode 100644 index 0000000000000..c4bc16a4c94c3 --- /dev/null +++ b/x-pack/plugins/canvas/public/lib/function_definitions.js @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import uniqBy from 'lodash.uniqby'; +import { getServerFunctions } from '../state/selectors/app'; +import { getBrowserRegistries } from './browser_registries'; + +export async function getFunctionDefinitions(state) { + const { browserFunctions } = await getBrowserRegistries(); + const serverFunctions = getServerFunctions(state); + return uniqBy(serverFunctions.concat(browserFunctions.toArray()), 'name'); +} diff --git a/x-pack/plugins/canvas/public/lib/interpreter.js b/x-pack/plugins/canvas/public/lib/interpreter.js index 48491be48ef67..36878871b8b15 100644 --- a/x-pack/plugins/canvas/public/lib/interpreter.js +++ b/x-pack/plugins/canvas/public/lib/interpreter.js @@ -6,20 +6,38 @@ import { socketInterpreterProvider } from '../../common/interpreter/socket_interpret'; import { serializeProvider } from '../../common/lib/serialize'; -import { socket } from '../socket'; +import { getSocket } from '../socket'; import { typesRegistry } from '../../common/lib/types_registry'; import { createHandlers } from './create_handlers'; import { functionsRegistry } from './functions_registry'; -import { loadBrowserPlugins } from './load_browser_plugins'; +import { getBrowserRegistries } from './browser_registries'; -// Create the function list -socket.emit('getFunctionList'); -export const getServerFunctions = new Promise(resolve => socket.once('functionList', resolve)); +let socket; +let resolve; +const functionList = new Promise(_resolve => (resolve = _resolve)); + +export async function initialize() { + socket = getSocket(); + + // Listen for interpreter runs + socket.on('run', ({ ast, context, id }) => { + const types = typesRegistry.toJS(); + const { serialize, deserialize } = serializeProvider(types); + interpretAst(ast, deserialize(context)).then(value => { + socket.emit(`resp:${id}`, { value: serialize(value) }); + }); + }); + + // Create the function list + socket.emit('getFunctionList'); + socket.once('functionList', resolve); + return functionList; +} // Use the above promise to seed the interpreter with the functions it can defer to -export function interpretAst(ast, context) { +export async function interpretAst(ast, context) { // Load plugins before attempting to get functions, otherwise this gets racey - return Promise.all([getServerFunctions, loadBrowserPlugins()]) + return Promise.all([functionList, getBrowserRegistries()]) .then(([serverFunctionList]) => { return socketInterpreterProvider({ types: typesRegistry.toJS(), @@ -31,11 +49,3 @@ export function interpretAst(ast, context) { }) .then(interpretFn => interpretFn(ast, context)); } - -socket.on('run', ({ ast, context, id }) => { - const types = typesRegistry.toJS(); - const { serialize, deserialize } = serializeProvider(types); - interpretAst(ast, deserialize(context)).then(value => { - socket.emit(`resp:${id}`, { value: serialize(value) }); - }); -}); diff --git a/x-pack/plugins/canvas/public/lib/load_browser_plugins.js b/x-pack/plugins/canvas/public/lib/load_browser_plugins.js deleted file mode 100644 index 8f1f5b2e90894..0000000000000 --- a/x-pack/plugins/canvas/public/lib/load_browser_plugins.js +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import chrome from 'ui/chrome'; -import $script from 'scriptjs'; -import { typesRegistry } from '../../common/lib/types_registry'; -import { - argTypeRegistry, - datasourceRegistry, - transformRegistry, - modelRegistry, - viewRegistry, -} from '../expression_types'; -import { elementsRegistry } from './elements_registry'; -import { renderFunctionsRegistry } from './render_functions_registry'; -import { functionsRegistry as browserFunctions } from './functions_registry'; -import { loadPrivateBrowserFunctions } from './load_private_browser_functions'; - -const types = { - browserFunctions: browserFunctions, - commonFunctions: browserFunctions, - elements: elementsRegistry, - types: typesRegistry, - renderers: renderFunctionsRegistry, - transformUIs: transformRegistry, - datasourceUIs: datasourceRegistry, - modelUIs: modelRegistry, - viewUIs: viewRegistry, - argumentUIs: argTypeRegistry, -}; - -export const loadBrowserPlugins = () => - new Promise(resolve => { - loadPrivateBrowserFunctions(); - const remainingTypes = Object.keys(types); - function loadType() { - const type = remainingTypes.pop(); - window.canvas = window.canvas || {}; - window.canvas.register = d => types[type].register(d); - // Load plugins one at a time because each needs a different loader function - // $script will only load each of these once, we so can call this as many times as we need? - const pluginPath = chrome.addBasePath(`/api/canvas/plugins?type=${type}`); - $script(pluginPath, () => { - if (remainingTypes.length) loadType(); - else resolve(true); - }); - } - - loadType(); - }); diff --git a/x-pack/plugins/canvas/public/lib/router_provider.js b/x-pack/plugins/canvas/public/lib/router_provider.js index c62f020ac0151..eac87fd51a2a7 100644 --- a/x-pack/plugins/canvas/public/lib/router_provider.js +++ b/x-pack/plugins/canvas/public/lib/router_provider.js @@ -26,6 +26,15 @@ export function routerProvider(routes) { return state || history.getLocation().state; }; + const updateLocation = (name, params, state, replace = false) => { + const currentState = getState(name, params, state); + const method = replace ? 'replace' : 'push'; + + // given a path, go there directly + if (isPath(name)) return history[method](currentState, name); + history[method](currentState, baseRouter.create(name, params)); + }; + // our router is an extended version of the imported router // which mixes in history methods for navigation router = { @@ -36,16 +45,10 @@ export function routerProvider(routes) { getPath: history.getPath, getFullPath: history.getFullPath, navigateTo(name, params, state) { - const currentState = getState(name, params, state); - // given a path, go there directly - if (isPath(name)) return history.push(currentState, name); - history.push(currentState, this.create(name, params)); + updateLocation(name, params, state); }, redirectTo(name, params, state) { - const currentState = getState(name, params, state); - // given a path, go there directly, assuming params is state - if (isPath(name)) return history.replace(currentState, name); - history.replace(currentState, this.create(name, params)); + updateLocation(name, params, state, true); }, onPathChange(fn) { if (componentListener != null) diff --git a/x-pack/plugins/canvas/public/lib/window_error_handler.js b/x-pack/plugins/canvas/public/lib/window_error_handler.js index 0a96f9305bf14..b0b1c14a336d6 100644 --- a/x-pack/plugins/canvas/public/lib/window_error_handler.js +++ b/x-pack/plugins/canvas/public/lib/window_error_handler.js @@ -41,36 +41,42 @@ function showError(err) { body.appendChild(notice); } -// React will delegate to window.onerror, even when errors are caught with componentWillCatch, -// so check for a known custom error type and skip the default error handling when we find one -window.onerror = (...args) => { - const [message, , , , err] = args; +window.canvasInitErrorHandler = () => { + // React will delegate to window.onerror, even when errors are caught with componentWillCatch, + // so check for a known custom error type and skip the default error handling when we find one + window.onerror = (...args) => { + const [message, , , , err] = args; - const isKnownError = Object.keys(knownErrors).find(errorName => { - return err.constructor.name === errorName || message.indexOf(errorName) >= 0; - }); - if (isKnownError) return; + const isKnownError = Object.keys(knownErrors).find(errorName => { + return err.constructor.name === errorName || message.indexOf(errorName) >= 0; + }); + if (isKnownError) return; - // uncaught errors are silenced in dev mode - // NOTE: react provides no way I can tell to distingish that an error came from react, it just - // throws generic Errors. In development mode, it throws those errors even if you catch them in - // an error boundary. This uses in the stack trace to try to detect it, but that stack changes - // between development and production modes. Fortunately, beginWork exists in both, so it uses - // a mix of the runtime mode and checking for another react method (renderRoot) for development - // TODO: this is *super* fragile. If the React method names ever change, which seems kind of likely, - // this check will break. - const isProduction = process.env.NODE_ENV === 'production'; - if (!isProduction) { - // TODO: we should do something here to let the user know something failed, - // but we don't currently have an error logging service - console.error(err); - console.warn(`*** Uncaught error swallowed in dev mode *** + // uncaught errors are silenced in dev mode + // NOTE: react provides no way I can tell to distingish that an error came from react, it just + // throws generic Errors. In development mode, it throws those errors even if you catch them in + // an error boundary. This uses in the stack trace to try to detect it, but that stack changes + // between development and production modes. Fortunately, beginWork exists in both, so it uses + // a mix of the runtime mode and checking for another react method (renderRoot) for development + // TODO: this is *super* fragile. If the React method names ever change, which seems kind of likely, + // this check will break. + const isProduction = process.env.NODE_ENV === 'production'; + if (!isProduction) { + // TODO: we should do something here to let the user know something failed, + // but we don't currently have an error logging service + console.error(err); + console.warn(`*** Uncaught error swallowed in dev mode *** -Check and fix the above error. This will blow up Kibana when run in production mode!`); - showError(err); - return; - } + Check and fix the above error. This will blow up Kibana when run in production mode!`); + showError(err); + return; + } + + // fall back to the default kibana uncaught error handler + oldHandler(...args); + }; +}; - // fall back to the default kibana uncaught error handler - oldHandler(...args); +window.canvasRestoreErrorHandler = () => { + window.onerror = oldHandler; }; diff --git a/x-pack/plugins/canvas/public/register_feature.js b/x-pack/plugins/canvas/public/register_feature.js new file mode 100644 index 0000000000000..658896d104bbd --- /dev/null +++ b/x-pack/plugins/canvas/public/register_feature.js @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import { + FeatureCatalogueRegistryProvider, + FeatureCatalogueCategory, +} from 'ui/registry/feature_catalogue'; + +FeatureCatalogueRegistryProvider.register(() => { + return { + id: 'canvas', + title: 'Canvas', + description: 'Showcase your data in a pixel-perfect way.', + icon: 'canvasApp', + path: '/app/canvas', + showOnHomePage: true, + category: FeatureCatalogueCategory.DATA, + }; +}); diff --git a/x-pack/plugins/canvas/public/socket.js b/x-pack/plugins/canvas/public/socket.js index eb381f17d1f9b..92deedd488c06 100644 --- a/x-pack/plugins/canvas/public/socket.js +++ b/x-pack/plugins/canvas/public/socket.js @@ -4,16 +4,59 @@ * you may not use this file except in compliance with the Elastic License. */ -import chrome from 'ui/chrome'; import io from 'socket.io-client'; import { functionsRegistry } from '../common/lib/functions_registry'; -import { loadBrowserPlugins } from './lib/load_browser_plugins'; +import { getBrowserRegistries } from './lib/browser_registries'; -const basePath = chrome.getBasePath(); -export const socket = io(undefined, { path: `${basePath}/socket.io` }); +const SOCKET_CONNECTION_TIMEOUT = 5000; // timeout in ms +let socket; -socket.on('getFunctionList', () => { - const pluginsLoaded = loadBrowserPlugins(); +export async function createSocket(basePath) { + if (socket != null) return socket; - pluginsLoaded.then(() => socket.emit('functionList', functionsRegistry.toJS())); -}); + return new Promise((resolve, rej) => { + const reject = p => { + socket = null; // reset the socket on errors + rej(p); + }; + + socket = io({ + path: `${basePath}/socket.io`, + transports: ['polling', 'websocket'], + transportOptions: { + polling: { + extraHeaders: { + 'kbn-xsrf': 'professionally-crafted-string-of-text', + }, + }, + }, + timeout: SOCKET_CONNECTION_TIMEOUT, + // ensure socket.io always tries polling first, otherwise auth will fail + rememberUpgrade: false, + }); + + socket.on('getFunctionList', () => { + const pluginsLoaded = getBrowserRegistries(); + pluginsLoaded.then(() => socket.emit('functionList', functionsRegistry.toJS())); + }); + + socket.on('connect', () => { + resolve(); + }); + + function errorHandler(err) { + // 'connectionFailed' returns an object with a reason prop + // other error cases provide their own error + reject(err.reason ? new Error(err.reason) : err); + } + + socket.on('connectionFailed', errorHandler); + socket.on('connect_error', errorHandler); + socket.on('connect_timeout', errorHandler); + }); +} + +export function getSocket() { + if (!socket) throw new Error('getSocket failed, socket has not been created'); + return socket; +} diff --git a/x-pack/plugins/canvas/public/state/actions/transient.js b/x-pack/plugins/canvas/public/state/actions/transient.js index 19d9a76b6a497..93464a23bf500 100644 --- a/x-pack/plugins/canvas/public/state/actions/transient.js +++ b/x-pack/plugins/canvas/public/state/actions/transient.js @@ -6,6 +6,6 @@ import { createAction } from 'redux-actions'; -export const setEditing = createAction('setEditing'); +export const setCanUserWrite = createAction('setCanUserWrite'); export const setFullscreen = createAction('setFullscreen'); export const selectElement = createAction('selectElement'); diff --git a/x-pack/plugins/canvas/public/state/actions/workpad.js b/x-pack/plugins/canvas/public/state/actions/workpad.js index 5f326176999ea..6e41ac36db19c 100644 --- a/x-pack/plugins/canvas/public/state/actions/workpad.js +++ b/x-pack/plugins/canvas/public/state/actions/workpad.js @@ -12,6 +12,7 @@ import { fetchAllRenderables } from './elements'; export const sizeWorkpad = createAction('sizeWorkpad'); export const setName = createAction('setName'); +export const setWriteable = createAction('setWriteable'); export const setColors = createAction('setColors'); export const setRefreshInterval = createAction('setRefreshInterval'); diff --git a/x-pack/plugins/canvas/public/state/defaults.js b/x-pack/plugins/canvas/public/state/defaults.js index 41f79ca60490c..d932bc80a93e0 100644 --- a/x-pack/plugins/canvas/public/state/defaults.js +++ b/x-pack/plugins/canvas/public/state/defaults.js @@ -77,5 +77,6 @@ export const getDefaultWorkpad = () => { '#FFFFFF', 'rgba(255,255,255,0)', // 'transparent' ], + isWriteable: true, }; }; diff --git a/x-pack/plugins/canvas/public/state/initial_state.js b/x-pack/plugins/canvas/public/state/initial_state.js index c9bf04185bd17..e2e553946b308 100644 --- a/x-pack/plugins/canvas/public/state/initial_state.js +++ b/x-pack/plugins/canvas/public/state/initial_state.js @@ -10,8 +10,9 @@ import { getDefaultWorkpad } from './defaults'; export const getInitialState = path => { const state = { app: {}, // Kibana stuff in here + assets: {}, // assets end up here transient: { - editing: true, + canUserWrite: true, fullscreen: false, selectedElement: null, resolvedArgs: {}, diff --git a/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js b/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js index ea9f76550bc32..f2ddac33feff5 100644 --- a/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js +++ b/x-pack/plugins/canvas/public/state/middleware/aeroelastic.js @@ -87,6 +87,8 @@ const updateGlobalPositions = (setPosition, { shapes, gestureEnd }, elems) => { angle: Math.round(matrixToAngle(shape.transformMatrix)), }; + if (1 / newProps.angle === -Infinity) newProps.angle = 0; // recompose.shallowEqual discerns between 0 and -0 + if (!shallowEqual(oldProps, newProps)) setPosition(shape.id, newProps); } }); @@ -161,6 +163,11 @@ export const aeroelastic = ({ dispatch, getState }) => { pages.map(p => p.id).forEach(createStore); } + if (action.type === restoreHistory.toString()) { + aero.clearStores(); + action.payload.workpad.pages.map(p => p.id).forEach(createStore); + } + if (action.type === appReady.toString()) { const pages = getPages(getState()); aero.clearStores(); diff --git a/x-pack/plugins/canvas/public/state/middleware/es_persist.js b/x-pack/plugins/canvas/public/state/middleware/es_persist.js index e36f5d3586f20..52e23a5d6195e 100644 --- a/x-pack/plugins/canvas/public/state/middleware/es_persist.js +++ b/x-pack/plugins/canvas/public/state/middleware/es_persist.js @@ -13,6 +13,7 @@ import * as transientActions from '../actions/transient'; import * as resolvedArgsActions from '../actions/resolved_args'; import { update } from '../../lib/workpad_service'; import { notify } from '../../lib/notify'; +import { canUserWrite } from '../selectors/app'; const workpadChanged = (before, after) => { const workpad = getWorkpad(before); @@ -43,6 +44,9 @@ export const esPersistMiddleware = ({ getState }) => { next(action); const newState = getState(); + // skips the update request if user doesn't have write permissions + if (!canUserWrite(newState)) return; + // if the workpad changed, save it to elasticsearch if (workpadChanged(curState, newState) || assetsChanged(curState, newState)) { const persistedWorkpad = getWorkpadPersisted(getState()); diff --git a/x-pack/plugins/canvas/public/state/middleware/history.js b/x-pack/plugins/canvas/public/state/middleware/history.js index 659b8a640c99c..2bb089a706e5f 100644 --- a/x-pack/plugins/canvas/public/state/middleware/history.js +++ b/x-pack/plugins/canvas/public/state/middleware/history.js @@ -8,9 +8,17 @@ import { isEqual } from 'lodash'; import { routes } from '../../apps'; import { historyProvider } from '../../lib/history_provider'; import { routerProvider } from '../../lib/router_provider'; +import { get as fetchWorkpad } from '../../lib/workpad_service'; import { restoreHistory, undoHistory, redoHistory } from '../actions/history'; import { initializeWorkpad } from '../actions/workpad'; +import { setAssets } from '../actions/assets'; import { isAppReady } from '../selectors/app'; +import { getWorkpad } from '../selectors/workpad'; + +function getHistoryState(state) { + // this is what gets written to browser history + return state.persistent; +} export const historyMiddleware = ({ dispatch, getState }) => { // iterate over routes, injecting redux to action handlers @@ -52,7 +60,19 @@ export const historyMiddleware = ({ dispatch, getState }) => { // only restore the history on popState events with state // this only happens when using back/forward with popState objects - if (isBrowserNav) return dispatch(restoreHistory(historyState)); + if (isBrowserNav) { + // TODO: oof, this sucks. we can't just shove assets into history state because + // firefox is limited to 640k (wat!). so, when we see that the workpad id is changing, + // we instead just restore the assets, which ensures the overall state is correct. + // there must be a better way to handle history though... + const currentWorkpadId = getWorkpad(getState()).id; + if (currentWorkpadId !== historyState.workpad.id) { + const newWorkpad = await fetchWorkpad(historyState.workpad.id); + dispatch(setAssets(newWorkpad.assets)); + } + + return dispatch(restoreHistory(historyState)); + } // execute route action on pushState and popState events if (isUrlChange) return await router.parse(pathname); @@ -99,14 +119,17 @@ export const historyMiddleware = ({ dispatch, getState }) => { // if app switched from not ready to ready, replace current state // this allows the back button to work correctly all the way to first page load if (!isAppReady(oldState) && isAppReady(newState)) { - history.replace(newState.persistent); + history.replace(getHistoryState(newState)); return; } // if the persistent state changed, push it into the history - if (!isEqual(newState.persistent, oldState.persistent)) { + const oldHistoryState = getHistoryState(oldState); + const historyState = getHistoryState(newState); + if (!isEqual(historyState, oldHistoryState)) { + // if there are pending route changes, just replace current route (to avoid extra back/forth history entries) const useReplaceState = handlerState.pendingCount !== 0; - useReplaceState ? history.replace(newState.persistent) : history.push(newState.persistent); + useReplaceState ? history.replace(historyState) : history.push(historyState); } }; }; diff --git a/x-pack/plugins/canvas/public/state/reducers/transient.js b/x-pack/plugins/canvas/public/state/reducers/transient.js index 6c2983fd850e3..a99d85b399c7e 100644 --- a/x-pack/plugins/canvas/public/state/reducers/transient.js +++ b/x-pack/plugins/canvas/public/state/reducers/transient.js @@ -28,8 +28,8 @@ export const transientReducer = handleActions( ); }, - [actions.setEditing]: (transientState, { payload }) => { - return set(transientState, 'editing', Boolean(payload)); + [actions.setCanUserWrite]: (transientState, { payload }) => { + return set(transientState, 'canUserWrite', Boolean(payload)); }, [actions.setFullscreen]: (transientState, { payload }) => { diff --git a/x-pack/plugins/canvas/public/state/reducers/workpad.js b/x-pack/plugins/canvas/public/state/reducers/workpad.js index 799444864fa41..892c541e5f348 100644 --- a/x-pack/plugins/canvas/public/state/reducers/workpad.js +++ b/x-pack/plugins/canvas/public/state/reducers/workpad.js @@ -6,7 +6,7 @@ import { recentlyAccessed } from 'ui/persisted_log'; import { handleActions } from 'redux-actions'; -import { setWorkpad, sizeWorkpad, setColors, setName } from '../actions/workpad'; +import { setWorkpad, sizeWorkpad, setColors, setName, setWriteable } from '../actions/workpad'; import { APP_ROUTE_WORKPAD } from '../../../common/lib/constants'; export const workpadReducer = handleActions( @@ -28,6 +28,10 @@ export const workpadReducer = handleActions( recentlyAccessed.add(`${APP_ROUTE_WORKPAD}/${workpadState.id}`, payload, workpadState.id); return { ...workpadState, name: payload }; }, + + [setWriteable]: (workpadState, { payload }) => { + return { ...workpadState, isWriteable: Boolean(payload) }; + }, }, {} ); diff --git a/x-pack/plugins/canvas/public/state/selectors/__tests__/workpad.js b/x-pack/plugins/canvas/public/state/selectors/__tests__/workpad.js index 0c459fc3faa84..f1ff31874935b 100644 --- a/x-pack/plugins/canvas/public/state/selectors/__tests__/workpad.js +++ b/x-pack/plugins/canvas/public/state/selectors/__tests__/workpad.js @@ -71,6 +71,7 @@ describe('workpad selectors', () => { ], }, ], + isWriteable: false, }, }, }; @@ -85,6 +86,7 @@ describe('workpad selectors', () => { expect(selector.getElementById({}, 'element-1')).to.be(undefined); expect(selector.getResolvedArgs({}, 'element-1')).to.be(undefined); expect(selector.getSelectedResolvedArgs({})).to.be(undefined); + expect(selector.isWriteable({})).to.be(true); }); }); @@ -195,4 +197,10 @@ describe('workpad selectors', () => { expect(arg).to.be(true); }); }); + + describe('isWriteable', () => { + it('returns boolean for if the workpad is writeable', () => { + expect(selector.isWriteable(state)).to.equal(false); + }); + }); }); diff --git a/x-pack/plugins/canvas/public/state/selectors/app.js b/x-pack/plugins/canvas/public/state/selectors/app.js index 3114cb2063440..0f13df85a0353 100644 --- a/x-pack/plugins/canvas/public/state/selectors/app.js +++ b/x-pack/plugins/canvas/public/state/selectors/app.js @@ -7,16 +7,16 @@ import { get } from 'lodash'; // page getters -export function getEditing(state) { - return get(state, 'transient.editing', false); +export function canUserWrite(state) { + return get(state, 'transient.canUserWrite', true); } export function getFullscreen(state) { return get(state, 'transient.fullscreen', false); } -export function getFunctionDefinitions(state) { - return get(state, 'app.functionDefinitions'); +export function getServerFunctions(state) { + return get(state, 'app.serverFunctions'); } export function getAppReady(state) { diff --git a/x-pack/plugins/canvas/public/state/selectors/workpad.js b/x-pack/plugins/canvas/public/state/selectors/workpad.js index 4dff29be51c01..1db0128abab07 100644 --- a/x-pack/plugins/canvas/public/state/selectors/workpad.js +++ b/x-pack/plugins/canvas/public/state/selectors/workpad.js @@ -27,10 +27,15 @@ export function getWorkpadPersisted(state) { assets: getAssets(state), }; } + export function getWorkpadInfo(state) { return omit(getWorkpad(state), ['pages']); } +export function isWriteable(state) { + return get(state, append(workpadRoot, 'isWriteable'), true); +} + // page getters export function getSelectedPageIndex(state) { return get(state, append(workpadRoot, 'page')); diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss index c41b5fee9b86b..bf69fba54feb4 100644 --- a/x-pack/plugins/canvas/public/style/index.scss +++ b/x-pack/plugins/canvas/public/style/index.scss @@ -20,20 +20,19 @@ @import '../components/arg_add_popover/arg_add_popover'; @import '../components/arg_form/arg_form'; @import '../components/asset_manager/asset_manager'; +@import '../components/autocomplete/autocomplete'; @import '../components/border_connection/border_connection'; @import '../components/border_resize_handle/border_resize_handle'; @import '../components/color_dot/color_dot'; @import '../components/color_palette/color_palette'; @import '../components/color_picker_mini/color_picker_mini'; -@import '../components/context_menu/context_menu'; @import '../components/datasource/datasource'; @import '../components/datasource/datasource_preview/datasource_preview'; @import '../components/datatable/datatable'; @import '../components/debug/debug'; @import '../components/dom_preview/dom_preview'; @import '../components/element_content/element_content'; -@import '../components/expression_input/suggestion'; -@import '../components/font_picker/font_picker'; +@import '../components/element_types/element_types'; @import '../components/fullscreen/fullscreen'; @import '../components/function_form/function_form'; @import '../components/hover_annotation/hover_annotation'; diff --git a/x-pack/plugins/canvas/public/style/main.scss b/x-pack/plugins/canvas/public/style/main.scss index d3e0b00894c6b..1e9af8278eee0 100644 --- a/x-pack/plugins/canvas/public/style/main.scss +++ b/x-pack/plugins/canvas/public/style/main.scss @@ -24,15 +24,14 @@ .canvasTextArea--code { @include euiScrollBar; font-size: $euiFontSize; - font-family: monospace; + font-family: $euiCodeFontFamily; width: 100%; max-width: 100%; } -#canvas-app body { +#canvas-app { overflow-y: hidden; - // Todo: replace this with EuiToast .window-error { position: absolute; bottom: 10px; diff --git a/x-pack/plugins/canvas/scripts/_helpers.js b/x-pack/plugins/canvas/scripts/_helpers.js new file mode 100644 index 0000000000000..222b38c7eb4e5 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/_helpers.js @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +const { resolve } = require('path'); + +exports.runGulpTask = function(name) { + process.chdir(resolve(__dirname, '../../..')); + process.argv.splice(1, 1, require.resolve('gulp/bin/gulp'), name); + require('gulp/bin/gulp'); +}; + +exports.runKibanaScript = function(name, args = []) { + process.chdir(resolve(__dirname, '../../../..')); + process.argv.splice(2, 0, ...args); + require('../../../../scripts/' + name); +}; diff --git a/x-pack/plugins/canvas/scripts/build_plugins.js b/x-pack/plugins/canvas/scripts/build_plugins.js new file mode 100644 index 0000000000000..0c910fc8f0147 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/build_plugins.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:plugins:build'); diff --git a/x-pack/plugins/canvas/scripts/kbn.js b/x-pack/plugins/canvas/scripts/kbn.js new file mode 100644 index 0000000000000..ad7442de4c57b --- /dev/null +++ b/x-pack/plugins/canvas/scripts/kbn.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runKibanaScript('kbn'); diff --git a/x-pack/plugins/canvas/scripts/lint.js b/x-pack/plugins/canvas/scripts/lint.js new file mode 100644 index 0000000000000..336c8be96a231 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/lint.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runKibanaScript('eslint', ['x-pack/plugins/canvas/**/*.{js,jsx}']); diff --git a/x-pack/plugins/canvas/scripts/peg_build.js b/x-pack/plugins/canvas/scripts/peg_build.js new file mode 100644 index 0000000000000..7b880c83b89a1 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/peg_build.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:peg:build'); diff --git a/x-pack/plugins/canvas/scripts/peg_dev.js b/x-pack/plugins/canvas/scripts/peg_dev.js new file mode 100644 index 0000000000000..e14a5216d6ec1 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/peg_dev.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:peg:dev'); diff --git a/x-pack/plugins/canvas/scripts/start.js b/x-pack/plugins/canvas/scripts/start.js new file mode 100644 index 0000000000000..e5cb84a61df4e --- /dev/null +++ b/x-pack/plugins/canvas/scripts/start.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:dev'); diff --git a/x-pack/plugins/canvas/scripts/test.js b/x-pack/plugins/canvas/scripts/test.js new file mode 100644 index 0000000000000..5f036b79e34ff --- /dev/null +++ b/x-pack/plugins/canvas/scripts/test.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:test'); diff --git a/x-pack/plugins/canvas/scripts/test_browser.js b/x-pack/plugins/canvas/scripts/test_browser.js new file mode 100644 index 0000000000000..971a04d9d97c2 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/test_browser.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:test:browser'); diff --git a/x-pack/plugins/canvas/scripts/test_common.js b/x-pack/plugins/canvas/scripts/test_common.js new file mode 100644 index 0000000000000..0bd478c107b7a --- /dev/null +++ b/x-pack/plugins/canvas/scripts/test_common.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:test:common'); diff --git a/x-pack/plugins/canvas/scripts/test_dev.js b/x-pack/plugins/canvas/scripts/test_dev.js new file mode 100644 index 0000000000000..656168b23af4b --- /dev/null +++ b/x-pack/plugins/canvas/scripts/test_dev.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:test:dev'); diff --git a/x-pack/plugins/canvas/scripts/test_plugins.js b/x-pack/plugins/canvas/scripts/test_plugins.js new file mode 100644 index 0000000000000..930b8587975b8 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/test_plugins.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:test:plugins'); diff --git a/x-pack/plugins/canvas/scripts/test_server.js b/x-pack/plugins/canvas/scripts/test_server.js new file mode 100644 index 0000000000000..a05994c4d8606 --- /dev/null +++ b/x-pack/plugins/canvas/scripts/test_server.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('./_helpers').runGulpTask('canvas:test:server'); diff --git a/x-pack/plugins/canvas/server/lib/__tests__/create_handlers.js b/x-pack/plugins/canvas/server/lib/__tests__/create_handlers.js new file mode 100644 index 0000000000000..9dbe0e413a1af --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/__tests__/create_handlers.js @@ -0,0 +1,152 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import expect from 'expect.js'; +import { createHandlers } from '../create_handlers'; +import { SECURITY_AUTH_MESSAGE } from '../../../common/lib/constants'; + +let securityMode = 'pass'; +let isSecurityAvailable = true; +let isSecurityEnabled = true; +const authError = new Error('auth error'); + +const mockRequest = { + headers: 'i can haz headers', +}; + +const mockServer = { + plugins: { + security: { + authenticate: () => ({ + succeeded: () => (securityMode === 'pass' ? true : false), + error: securityMode === 'pass' ? null : authError, + }), + }, + elasticsearch: { + getCluster: () => ({ + callWithRequest: (...args) => Promise.resolve(args), + }), + }, + // TODO: remove this when we use the method exposed by security https://github.com/elastic/kibana/pull/24616 + xpack_main: { + info: { + feature: () => ({ + isAvailable: () => isSecurityAvailable, + isEnabled: () => isSecurityEnabled, + }), + }, + }, + }, + config: () => ({ + has: () => false, + get: val => val, + }), + info: { + uri: 'serveruri', + }, +}; + +describe('server createHandlers', () => { + let handlers; + + beforeEach(() => { + securityMode = 'pass'; + isSecurityEnabled = true; + isSecurityAvailable = true; + handlers = createHandlers(mockRequest, mockServer); + }); + + it('provides helper methods and properties', () => { + expect(handlers).to.have.property('environment', 'server'); + expect(handlers).to.have.property('serverUri'); + expect(handlers).to.have.property('httpHeaders', mockRequest.headers); + expect(handlers).to.have.property('elasticsearchClient'); + }); + + describe('elasticsearchClient', () => { + it('executes callWithRequest', async () => { + const [request, endpoint, payload] = await handlers.elasticsearchClient( + 'endpoint', + 'payload' + ); + expect(request).to.equal(mockRequest); + expect(endpoint).to.equal('endpoint'); + expect(payload).to.equal('payload'); + }); + + it('rejects when authentication check fails', () => { + securityMode = 'fail'; + return handlers + .elasticsearchClient('endpoint', 'payload') + .then(() => { + throw new Error('elasticsearchClient should fail when authentication fails'); + }) + .catch(err => { + expect(err.message).to.be.equal(SECURITY_AUTH_MESSAGE); + }); + }); + + it('works without security plugin in kibana', async () => { + // create server without security plugin + const mockServerClone = { + ...mockServer, + plugins: { ...mockServer.plugins }, + }; + delete mockServerClone.plugins.security; + expect(mockServer.plugins).to.have.property('security'); // confirm original server object + expect(mockServerClone.plugins).to.not.have.property('security'); + + // this shouldn't do anything + securityMode = 'fail'; + + // make sure the method still works + handlers = createHandlers(mockRequest, mockServerClone); + const [request, endpoint, payload] = await handlers.elasticsearchClient( + 'endpoint', + 'payload' + ); + expect(request).to.equal(mockRequest); + expect(endpoint).to.equal('endpoint'); + expect(payload).to.equal('payload'); + }); + + it('works without security available', async () => { + // create server with security unavailable (i.e. when user is on a basic license) + isSecurityAvailable = false; + + // this shouldn't do anything + securityMode = 'fail'; + + // make sure the method still works + handlers = createHandlers(mockRequest, mockServer); + const [request, endpoint, payload] = await handlers.elasticsearchClient( + 'endpoint', + 'payload' + ); + expect(request).to.equal(mockRequest); + expect(endpoint).to.equal('endpoint'); + expect(payload).to.equal('payload'); + }); + + it('works with security disabled in elasticsearch', async () => { + // create server with security disabled + isSecurityEnabled = false; + + // this shouldn't do anything + securityMode = 'fail'; + + // make sure the method still works + handlers = createHandlers(mockRequest, mockServer); + const [request, endpoint, payload] = await handlers.elasticsearchClient( + 'endpoint', + 'payload' + ); + expect(request).to.equal(mockRequest); + expect(endpoint).to.equal('endpoint'); + expect(payload).to.equal('payload'); + }); + }); +}); diff --git a/x-pack/plugins/canvas/server/lib/create_handlers.js b/x-pack/plugins/canvas/server/lib/create_handlers.js index 0825804960dbb..f42f8fbe1a59d 100644 --- a/x-pack/plugins/canvas/server/lib/create_handlers.js +++ b/x-pack/plugins/canvas/server/lib/create_handlers.js @@ -4,7 +4,9 @@ * you may not use this file except in compliance with the Elastic License. */ -import { partial } from 'lodash'; +import boom from 'boom'; +import { SECURITY_AUTH_MESSAGE } from '../../common/lib/constants'; +import { isSecurityEnabled } from './feature_check'; export const createHandlers = (request, server) => { const { callWithRequest } = server.plugins.elasticsearch.getCluster('data'); @@ -17,6 +19,26 @@ export const createHandlers = (request, server) => { ? `${server.info.uri}${config.get('server.basePath')}` : server.info.uri, httpHeaders: request.headers, - elasticsearchClient: partial(callWithRequest, request), + elasticsearchClient: async (...args) => { + // check if the session is valid because continuing to use it + if (isSecurityEnabled(server)) { + try { + const authenticationResult = await server.plugins.security.authenticate(request); + if (!authenticationResult.succeeded()) + throw boom.unauthorized(authenticationResult.error); + } catch (e) { + // if authenticate throws, show error in development + if (process.env.NODE_ENV !== 'production') { + e.message = `elasticsearchClient failed: ${e.message}`; + console.error(e); + } + + // hide all failure information from the user + throw boom.unauthorized(SECURITY_AUTH_MESSAGE); + } + } + + return callWithRequest(request, ...args); + }, }; }; diff --git a/x-pack/plugins/canvas/server/lib/feature_check.js b/x-pack/plugins/canvas/server/lib/feature_check.js new file mode 100644 index 0000000000000..e9cec02923582 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/feature_check.js @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// TODO: replace this when we use the method exposed by security https://github.com/elastic/kibana/pull/24616 +export const isSecurityEnabled = server => { + const kibanaSecurity = server.plugins.security; + const esSecurity = server.plugins.xpack_main.info.feature('security'); + + return kibanaSecurity && esSecurity.isAvailable() && esSecurity.isEnabled(); +}; diff --git a/x-pack/plugins/canvas/server/lib/get_plugin_paths.js b/x-pack/plugins/canvas/server/lib/get_plugin_paths.js index 6ebb5574e57d5..02582e5f749cc 100644 --- a/x-pack/plugins/canvas/server/lib/get_plugin_paths.js +++ b/x-pack/plugins/canvas/server/lib/get_plugin_paths.js @@ -13,31 +13,63 @@ import { pluginPaths } from './plugin_paths'; const lstat = promisify(fs.lstat); const readdir = promisify(fs.readdir); -const kibanaPluginPath = path.resolve(__dirname, '..', '..', '..'); const canvasPluginDirectoryName = 'canvas_plugin'; +const isDirectory = path => + lstat(path) + .then(stat => stat.isDirectory()) + .catch(() => false); + +const isDirname = (p, name) => path.basename(p) === name; + +const getKibanaPluginsPath = () => { + const basePluginPath = path.resolve(__dirname, '..', '..', '..', '..', '..'); + + // find the kibana path in dev mode + if (isDirname(basePluginPath, 'kibana')) return path.join(basePluginPath, 'plugins'); + + // find the kibana path in the build, which lives in node_modules and requires going 1 path up + const buildPluginPath = path.join(basePluginPath, '..'); + if (isDirname(basePluginPath, 'node_modules')) { + const pluginPath = path.join(buildPluginPath, 'plugins'); + return isDirectory(pluginPath) && pluginPath; + } + + return false; +}; + +// These must all exist +const paths = [ + path.resolve(__dirname, '..', '..', '..'), // Canvas core plugins + getKibanaPluginsPath(), // Kibana plugin directory +].filter(Boolean); + export const getPluginPaths = type => { const typePath = pluginPaths[type]; if (!typePath) throw new Error(`Unknown type: ${type}`); - return readdir(kibanaPluginPath) // Get names of everything in Kibana plugin path - .then(names => names.filter(name => name[0] !== '.')) // Filter out names that start with . - .then(names => { - // Get full paths to stuff that might have a canvas plugin of the provided type - return names.map(name => - path.resolve(kibanaPluginPath, name, canvasPluginDirectoryName, ...typePath) - ); - }) + async function findPlugins(directory) { + const isDir = await isDirectory(directory); + if (!isDir) return; + + const names = await readdir(directory); // Get names of everything in the directory + return names + .filter(name => name[0] !== '.') + .map(name => path.resolve(directory, name, canvasPluginDirectoryName, ...typePath)); + } + + return Promise.all(paths.map(findPlugins)) + .then(dirs => + dirs.reduce((list, dir) => { + if (!dir) return list; + return list.concat(dir); + }, []) + ) .then(possibleCanvasPlugins => { // Check how many are directories. If lstat fails it doesn't exist anyway. return Promise.all( // An array - possibleCanvasPlugins.map( - pluginPath => - lstat(pluginPath) - .then(stat => stat.isDirectory()) // Exists and is a directory - .catch(() => false) // I guess it doesn't exist, so whaevs - ) + possibleCanvasPlugins.map(pluginPath => isDirectory(pluginPath)) ).then(isDirectory => possibleCanvasPlugins.filter((pluginPath, i) => isDirectory[i])); }) .then(canvasPluginDirectories => { diff --git a/x-pack/plugins/canvas/server/lib/get_plugin_stream.js b/x-pack/plugins/canvas/server/lib/get_plugin_stream.js index 51f3d234afdb1..6a08e2beeff8e 100644 --- a/x-pack/plugins/canvas/server/lib/get_plugin_stream.js +++ b/x-pack/plugins/canvas/server/lib/get_plugin_stream.js @@ -9,7 +9,9 @@ import ss from 'stream-stream'; import { getPluginPaths } from './get_plugin_paths'; export const getPluginStream = type => { - const stream = ss(); + const stream = ss({ + separator: '\n', + }); getPluginPaths(type).then(files => { files.forEach(file => { diff --git a/x-pack/plugins/canvas/server/lib/get_request.js b/x-pack/plugins/canvas/server/lib/get_request.js new file mode 100644 index 0000000000000..d55421e437fc4 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/get_request.js @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import boom from 'boom'; +import { API_ROUTE } from '../../common/lib/constants'; + +export function getRequest(server, { headers }) { + const url = `${API_ROUTE}/ping`; + + return server + .inject({ + method: 'POST', + url, + headers, + }) + .then(res => { + if (res.statusCode !== 200) { + if (process.env.NODE_ENV !== 'production') { + console.error( + new Error(`Auth request failed: [${res.statusCode}] ${res.result.message}`) + ); + } + throw boom.unauthorized('Failed to authenticate socket connection'); + } + + return res.request; + }); +} diff --git a/x-pack/plugins/canvas/server/lib/load_server_plugins.js b/x-pack/plugins/canvas/server/lib/load_server_plugins.js deleted file mode 100644 index 0373261e96067..0000000000000 --- a/x-pack/plugins/canvas/server/lib/load_server_plugins.js +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { typesRegistry } from '../../common/lib/types_registry'; -import { functionsRegistry as serverFunctions } from '../../common/lib/functions_registry'; -import { getPluginPaths } from './get_plugin_paths'; - -const types = { - serverFunctions: serverFunctions, - commonFunctions: serverFunctions, - types: typesRegistry, -}; - -const loaded = new Promise(resolve => { - const remainingTypes = Object.keys(types); - - const loadType = () => { - const type = remainingTypes.pop(); - getPluginPaths(type).then(paths => { - global.canvas = global.canvas || {}; - global.canvas.register = d => types[type].register(d); - - paths.forEach(path => { - require(path); - }); - - global.canvas = undefined; - if (remainingTypes.length) loadType(); - else resolve(true); - }); - }; - - loadType(); -}); - -export const loadServerPlugins = () => loaded; diff --git a/x-pack/plugins/canvas/server/lib/route_expression/browser.js b/x-pack/plugins/canvas/server/lib/route_expression/browser.js new file mode 100644 index 0000000000000..feae107873ac6 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/browser.js @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import uuid from 'uuid/v4'; + +export const browser = ({ socket, serialize, deserialize }) => { + // Note that we need to be careful about how many times routeExpressionProvider is called, because of the socket.once below. + // It's too bad we can't get a list of browser plugins on the server + const getClientFunctions = new Promise(resolve => { + socket.emit('getFunctionList'); + socket.once('functionList', resolve); + }); + + return getClientFunctions.then(functions => { + return { + interpret: (ast, context) => { + return new Promise((resolve, reject) => { + const id = uuid(); + const listener = resp => { + if (resp.type === 'msgError') { + const { value } = resp; + // cast error strings back into error instances + const err = value instanceof Error ? value : new Error(value); + if (value.stack) err.stack = value.stack; + // Reject's with a legit error. Check! Environments should always reject with an error when something bad happens + reject(err); + } else { + resolve(deserialize(resp.value)); + } + }; + + // {type: msgSuccess or msgError, value: foo}. Doesn't matter if it's success or error, we do the same thing for now + socket.once(`resp:${id}`, listener); + + socket.emit('run', { ast, context: serialize(context), id }); + }); + }, + getFunctions: () => Object.keys(functions), + }; + }); +}; diff --git a/x-pack/plugins/canvas/server/lib/route_expression/index.js b/x-pack/plugins/canvas/server/lib/route_expression/index.js new file mode 100644 index 0000000000000..3533b55687246 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/index.js @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { createError } from '../../../common/interpreter/create_error'; + +export const routeExpressionProvider = environments => { + async function routeExpression(ast, context = null) { + // List of environments in order of preference + + return Promise.all(environments).then(environments => { + const environmentFunctions = environments.map(env => env.getFunctions()); + + // Grab name of the first function in the chain + const fnName = ast.chain[0].function.toLowerCase(); + + // Check each environment for that function + for (let i = 0; i < environmentFunctions.length; i++) { + if (environmentFunctions[i].includes(fnName)) { + // If we find it, run in that environment, and only that environment + return environments[i].interpret(ast, context).catch(e => createError(e)); + } + } + + // If the function isn't found in any environment, give up + throw new Error(`Function not found: [${fnName}]`); + }); + } + + return routeExpression; +}; diff --git a/x-pack/plugins/canvas/server/lib/route_expression/server.js b/x-pack/plugins/canvas/server/lib/route_expression/server.js new file mode 100644 index 0000000000000..b24e4cb7e5e41 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/server.js @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { getServerRegistries } from '../server_registries'; +import { interpretProvider } from '../../../common/interpreter/interpret'; +import { createHandlers } from '../create_handlers'; + +export const server = async ({ onFunctionNotFound, server, request }) => { + const { serverFunctions, types } = await getServerRegistries(['serverFunctions', 'types']); + + return { + interpret: (ast, context) => { + const interpret = interpretProvider({ + types: types.toJS(), + functions: serverFunctions.toJS(), + handlers: createHandlers(request, server), + onFunctionNotFound, + }); + + return interpret(ast, context); + }, + getFunctions: () => Object.keys(serverFunctions.toJS()), + }; +}; diff --git a/x-pack/plugins/canvas/server/lib/route_expression/thread/babeled.js b/x-pack/plugins/canvas/server/lib/route_expression/thread/babeled.js new file mode 100644 index 0000000000000..b7c1e83beb7c7 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/thread/babeled.js @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +require('babel-register')({ + ignore: [ + // stolen from kibana/src/setup_node_env/babel_register/register.js + // ignore paths matching `/node_modules/{a}/{b}`, unless `a` + // is `x-pack` and `b` is not `node_modules` + /\/node_modules\/(?!x-pack\/(?!node_modules)([^\/]+))([^\/]+\/[^\/]+)/, + ], + babelrc: false, + presets: [require.resolve('@kbn/babel-preset/node_preset')], +}); + +require('./polyfill'); +require('./worker'); diff --git a/x-pack/plugins/canvas/server/lib/route_expression/thread/index.js b/x-pack/plugins/canvas/server/lib/route_expression/thread/index.js new file mode 100644 index 0000000000000..d3748db02f65c --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/thread/index.js @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { fork } from 'child_process'; +import { resolve } from 'path'; +import uuid from 'uuid/v4'; + +// If the worker doesn't response in 10s, kill it. +const WORKER_TIMEOUT = 20000; +const workerPath = resolve(__dirname, 'babeled.js'); +const heap = {}; +let worker = null; + +export function getWorker() { + if (worker) return worker; + worker = fork(workerPath, {}); + + // 'exit' happens whether we kill the worker or it just dies. + // No need to look for 'error', our worker is intended to be long lived so it isn't running, it's an issue + worker.on('exit', () => { + // Heads up: there is no worker.off + worker = null; + // Restart immediately on exit since node takes a couple seconds to spin up + worker = getWorker(); + }); + + worker.on('message', msg => { + const { type, value, id } = msg; + if (type === 'run') { + const { threadId } = msg; + const { ast, context } = value; + heap[threadId] + .onFunctionNotFound(ast, context) + .then(value => { + worker.send({ type: 'msgSuccess', id, value: value }); + }) + .catch(e => heap[threadId].reject(e)); + } + + if (type === 'msgSuccess' && heap[id]) heap[id].resolve(value); + + // TODO: I don't think it is even possible to hit this + if (type === 'msgError' && heap[id]) heap[id].reject(new Error(value)); + }); + + return worker; +} + +// All serialize/deserialize must occur in here. We should not return serialized stuff to the expressionRouter +export const thread = ({ onFunctionNotFound, serialize, deserialize }) => { + const getWorkerFunctions = new Promise(resolve => { + const worker = getWorker(); + worker.send({ type: 'getFunctions' }); + worker.on('message', msg => { + if (msg.type === 'functionList') resolve(msg.value); + }); + }); + + return getWorkerFunctions.then(functions => { + return { + interpret: (ast, context) => { + const worker = getWorker(); + const id = uuid(); + worker.send({ type: 'run', id, value: { ast, context: serialize(context) } }); + + return new Promise((resolve, reject) => { + heap[id] = { + time: new Date().getTime(), + resolve: value => { + delete heap[id]; + resolve(deserialize(value)); + }, + reject: e => { + delete heap[id]; + reject(e); + }, + onFunctionNotFound: (ast, context) => + onFunctionNotFound(ast, deserialize(context)).then(serialize), + }; + + // + setTimeout(() => { + if (!heap[id]) return; // Looks like this has already been cleared from the heap. + if (worker) worker.kill(); + + // The heap will be cleared because the reject on heap will delete its own id + heap[id].reject(new Error('Request timed out')); + }, WORKER_TIMEOUT); + }); + }, + + getFunctions: () => functions, + }; + }); +}; diff --git a/x-pack/plugins/canvas/server/lib/route_expression/thread/polyfill.js b/x-pack/plugins/canvas/server/lib/route_expression/thread/polyfill.js new file mode 100644 index 0000000000000..be4983e9a37e8 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/thread/polyfill.js @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// taken from kibana/src/setup_node_env/babel_register/polyfill.js +// ... +// `babel-preset-env` looks for and rewrites the following import +// statement into a list of import statements based on the polyfills +// necessary for our target environment (the current version of node) +// but since it does that during compilation, `import 'babel-polyfill'` +// must be in a file that is loaded with `require()` AFTER `babel-register` +// is configured. +// +// This is why we have this single statement in it's own file and require +// it from ./babeled.js +import 'babel-polyfill'; diff --git a/x-pack/plugins/canvas/server/lib/route_expression/thread/worker.js b/x-pack/plugins/canvas/server/lib/route_expression/thread/worker.js new file mode 100644 index 0000000000000..d81df410f7af7 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/route_expression/thread/worker.js @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import uuid from 'uuid/v4'; +import { populateServerRegistries } from '../../server_registries'; +import { interpretProvider } from '../../../../common/interpreter/interpret'; +import { serializeProvider } from '../../../../common/lib/serialize'; + +// We actually DO need populateServerRegistries here since this is a different node process +const pluginsReady = populateServerRegistries(['commonFunctions', 'types']); +const heap = {}; + +process.on('message', msg => { + const { type, id, value } = msg; + const threadId = id; + + pluginsReady.then(({ commonFunctions, types }) => { + types = types.toJS(); + const { serialize, deserialize } = serializeProvider(types); + const interpret = interpretProvider({ + types, + functions: commonFunctions.toJS(), + handlers: { environment: 'serverThreaded' }, + onFunctionNotFound: (ast, context) => { + const id = uuid(); + // This needs to send a message to the main thread, and receive a response. Uhg. + process.send({ + type: 'run', + threadId, + id, + value: { + ast, + context: serialize(context), + }, + }); + + // Note that there is no facility to reject here. That's because this would only occur as the result of something that happens in the main thread, and we reject there + return new Promise(resolve => { + heap[id] = { resolve }; + }); + }, + }); + + if (type === 'getFunctions') + process.send({ type: 'functionList', value: Object.keys(commonFunctions.toJS()) }); + + if (type === 'msgSuccess') { + heap[id].resolve(deserialize(value)); + delete heap[id]; + } + + if (type === 'run') { + const { ast, context } = msg.value; + + interpret(ast, deserialize(context)) + .then(value => { + process.send({ type: 'msgSuccess', value: serialize(value), id }); + }) + // TODO: I don't think it is even possible to hit this + .catch(value => { + process.send({ type: 'msgError', value, id }); + }); + } + }); +}); diff --git a/x-pack/plugins/canvas/server/lib/server_registries.js b/x-pack/plugins/canvas/server/lib/server_registries.js new file mode 100644 index 0000000000000..cff63a1138ea3 --- /dev/null +++ b/x-pack/plugins/canvas/server/lib/server_registries.js @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { typesRegistry } from '../../common/lib/types_registry'; +import { functionsRegistry as serverFunctions } from '../../common/lib/functions_registry'; +import { getPluginPaths } from './get_plugin_paths'; + +const registries = { + serverFunctions: serverFunctions, + commonFunctions: serverFunctions, + types: typesRegistry, +}; + +let resolve = null; +let called = false; + +const populatePromise = new Promise(_resolve => { + resolve = _resolve; +}); + +export const getServerRegistries = () => { + return populatePromise; +}; + +export const populateServerRegistries = types => { + if (called) throw new Error('function should only be called once per process'); + called = true; + if (!types || !types.length) throw new Error('types is required'); + + const remainingTypes = types; + const populatedTypes = {}; + + const loadType = () => { + const type = remainingTypes.pop(); + getPluginPaths(type).then(paths => { + global.canvas = global.canvas || {}; + global.canvas.register = d => registries[type].register(d); + + paths.forEach(path => { + require(path); + }); + + global.canvas = undefined; + populatedTypes[type] = registries[type]; + if (remainingTypes.length) loadType(); + else resolve(populatedTypes); + }); + }; + + if (remainingTypes.length) loadType(); + return populatePromise; +}; diff --git a/x-pack/plugins/canvas/server/routes/es_fields/index.js b/x-pack/plugins/canvas/server/routes/es_fields/index.js index 9ceca324cc017..8c6b53fb2610b 100644 --- a/x-pack/plugins/canvas/server/routes/es_fields/index.js +++ b/x-pack/plugins/canvas/server/routes/es_fields/index.js @@ -14,11 +14,11 @@ export function esFields(server) { server.route({ method: 'GET', path: '/api/canvas/es_fields', - handler: function(request, reply) { + handler: function(request, h) { const { index, fields } = request.query; - if (!index) return reply({ error: '"index" query is required' }).code(400); + if (!index) return h.response({ error: '"index" query is required' }).code(400); - reply(getESFieldTypes(index, fields, partial(callWithRequest, request))); + return getESFieldTypes(index, fields, partial(callWithRequest, request)); }, }); } diff --git a/x-pack/plugins/canvas/server/routes/es_indices/index.js b/x-pack/plugins/canvas/server/routes/es_indices/index.js index 67a92fa72aecd..71ce1122b0c83 100644 --- a/x-pack/plugins/canvas/server/routes/es_indices/index.js +++ b/x-pack/plugins/canvas/server/routes/es_indices/index.js @@ -16,8 +16,8 @@ export function esIndices(server) { server.route({ method: 'GET', path: '/api/canvas/es_indices', - handler: function(request, reply) { - reply(getESIndices(kbnIndex, partial(callWithRequest, request))); + handler: function(request) { + return getESIndices(kbnIndex, partial(callWithRequest, request)); }, }); } diff --git a/x-pack/plugins/canvas/server/routes/get_auth/get_auth_header.js b/x-pack/plugins/canvas/server/routes/get_auth/get_auth_header.js deleted file mode 100644 index 466c601d02204..0000000000000 --- a/x-pack/plugins/canvas/server/routes/get_auth/get_auth_header.js +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { insecureAuthRoute } from './insecure_auth_route'; - -// TODO: OMG. No. Need a better way of setting to this than our wacky route thing. -export function getAuthHeader(request, server) { - const basePath = server.config().get('server.basePath') || ''; - const fullPath = `${basePath}${insecureAuthRoute}`; - - return server - .inject({ - method: 'GET', - url: fullPath, - headers: request.headers, - }) - .then(res => res.result); -} diff --git a/x-pack/plugins/canvas/server/routes/get_auth/index.js b/x-pack/plugins/canvas/server/routes/get_auth/index.js deleted file mode 100644 index bdc8e596f6f8b..0000000000000 --- a/x-pack/plugins/canvas/server/routes/get_auth/index.js +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { insecureAuthRoute } from './insecure_auth_route'; - -// TODO: Fix this first. This route returns decrypts the cookie and returns the basic auth header. It is used because -// the pre-route hapi hook doesn't work on the socket and there are no exposed methods for doing the conversion from cookie -// to auth header. We will need to add that to x-pack security -// In theory this is pretty difficult to exploit, but not impossible. -// -export function getAuth(server) { - server.route({ - method: 'GET', - path: insecureAuthRoute, - handler: function(request, reply) { - reply(request.headers.authorization); - }, - }); -} diff --git a/x-pack/plugins/canvas/server/routes/get_auth/insecure_auth_route.js b/x-pack/plugins/canvas/server/routes/get_auth/insecure_auth_route.js deleted file mode 100644 index 62d78e4eab4a7..0000000000000 --- a/x-pack/plugins/canvas/server/routes/get_auth/insecure_auth_route.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import uuid from 'uuid/v4'; - -export const insecureAuthRoute = `/api/canvas/ar-${uuid()}`; diff --git a/x-pack/plugins/canvas/server/routes/index.js b/x-pack/plugins/canvas/server/routes/index.js index 6d8cc6aefd839..7ca2610d67c5f 100644 --- a/x-pack/plugins/canvas/server/routes/index.js +++ b/x-pack/plugins/canvas/server/routes/index.js @@ -9,7 +9,6 @@ import { socketApi } from './socket'; import { translate } from './translate'; import { esFields } from './es_fields'; import { esIndices } from './es_indices'; -import { getAuth } from './get_auth'; import { plugins } from './plugins'; export function routes(server) { @@ -18,6 +17,5 @@ export function routes(server) { translate(server); esFields(server); esIndices(server); - getAuth(server); plugins(server); } diff --git a/x-pack/plugins/canvas/server/routes/plugins.js b/x-pack/plugins/canvas/server/routes/plugins.js index 66e73c71876a3..be94ef52ac9e4 100644 --- a/x-pack/plugins/canvas/server/routes/plugins.js +++ b/x-pack/plugins/canvas/server/routes/plugins.js @@ -11,12 +11,12 @@ export function plugins(server) { server.route({ method: 'GET', path: '/api/canvas/plugins', - handler: function(request, reply) { + handler: function(request, h) { const { type } = request.query; - if (!pluginPaths[type]) return reply({ error: 'Invalid type' }).code(400); + if (!pluginPaths[type]) return h.response({ error: 'Invalid type' }).code(400); - reply(getPluginStream(type)); + return getPluginStream(type); }, config: { auth: false, diff --git a/x-pack/plugins/canvas/server/routes/socket.js b/x-pack/plugins/canvas/server/routes/socket.js index bc94da8232835..8e06c25769d4c 100644 --- a/x-pack/plugins/canvas/server/routes/socket.js +++ b/x-pack/plugins/canvas/server/routes/socket.js @@ -5,63 +5,76 @@ */ import socket from 'socket.io'; -import { createHandlers } from '../lib/create_handlers'; -import { socketInterpreterProvider } from '../../common/interpreter/socket_interpret'; import { serializeProvider } from '../../common/lib/serialize'; -import { functionsRegistry } from '../../common/lib/functions_registry'; import { typesRegistry } from '../../common/lib/types_registry'; -import { loadServerPlugins } from '../lib/load_server_plugins'; -import { getAuthHeader } from './get_auth/get_auth_header'; +import { getServerRegistries } from '../lib/server_registries'; +import { routeExpressionProvider } from '../lib/route_expression'; +import { browser } from '../lib/route_expression/browser'; +import { thread } from '../lib/route_expression/thread'; +import { server as serverEnv } from '../lib/route_expression/server'; +import { getRequest } from '../lib/get_request'; +import { API_ROUTE } from '../../common/lib/constants'; + +async function getModifiedRequest(server, socket) { + try { + return await getRequest(server, socket.handshake); + } catch (err) { + // on errors, notify the client and close the connection + socket.emit('connectionFailed', { reason: err.message || 'Socket connection failed' }); + socket.disconnect(true); + return false; + } +} export function socketApi(server) { + // add a POST ping route for `getRequest` to use + // TODO: remove this once we have upstream socket support + server.route({ + method: 'POST', + path: `${API_ROUTE}/ping`, + handler: () => 'pong', + }); + const io = socket(server.listener, { path: '/socket.io' }); - io.on('connection', socket => { - console.log('User connected, attaching handlers'); + io.on('connection', async socket => { + // 'request' is the modified hapi request object + const request = await getModifiedRequest(server, socket); + if (!request) return; // do nothing without the request object - // This is the HAPI request object - const request = socket.handshake; + const types = typesRegistry.toJS(); + const { serialize, deserialize } = serializeProvider(types); - const authHeader = getAuthHeader(request, server); + // I'd love to find a way to generalize all of these, but they each need a different set of things + // Note that ORDER MATTERS here. The environments will be tried in this order. Do not reorder this array. + const routeExpression = routeExpressionProvider([ + thread({ onFunctionNotFound, serialize, deserialize }), + serverEnv({ onFunctionNotFound, request, server }), + browser({ onFunctionNotFound, socket, serialize, deserialize }), + ]); - // Create the function list - socket.emit('getFunctionList'); - const getClientFunctions = new Promise(resolve => socket.once('functionList', resolve)); + function onFunctionNotFound(ast, context) { + return routeExpression(ast, context); + } socket.on('getFunctionList', () => { - loadServerPlugins().then(() => socket.emit('functionList', functionsRegistry.toJS())); + getServerRegistries().then(({ serverFunctions }) => + socket.emit('functionList', serverFunctions.toJS()) + ); }); - const handler = ({ ast, context, id }) => { - Promise.all([getClientFunctions, authHeader]).then(([clientFunctions, authHeader]) => { - if (server.plugins.security) request.headers.authorization = authHeader; - - const types = typesRegistry.toJS(); - const interpret = socketInterpreterProvider({ - types, - functions: functionsRegistry.toJS(), - handlers: createHandlers(request, server), - referableFunctions: clientFunctions, - socket: socket, - }); - - const { serialize, deserialize } = serializeProvider(types); - return interpret(ast, deserialize(context)) - .then(value => { - socket.emit(`resp:${id}`, { value: serialize(value) }); - }) - .catch(e => { - socket.emit(`resp:${id}`, { - error: e.message, - stack: e.stack, - }); - }); - }); + const handler = async ({ ast, context, id }) => { + try { + const value = await routeExpression(ast, deserialize(context)); + socket.emit(`resp:${id}`, { type: 'msgSuccess', value: serialize(value) }); + } catch (err) { + // TODO: I don't think it is possible to hit this right now? Maybe ever? + socket.emit(`resp:${id}`, { type: 'msgError', value: err }); + } }; socket.on('run', handler); socket.on('disconnect', () => { - console.log('User disconnected, removing handlers.'); socket.removeListener('run', handler); }); }); diff --git a/x-pack/plugins/canvas/server/routes/translate.js b/x-pack/plugins/canvas/server/routes/translate.js index f2b412c37e9b9..6125898a7dab9 100644 --- a/x-pack/plugins/canvas/server/routes/translate.js +++ b/x-pack/plugins/canvas/server/routes/translate.js @@ -13,22 +13,21 @@ export function translate(server) { server.route({ method: 'GET', path: '/api/canvas/ast', - handler: function(request, reply) { + handler: function(request, h) { if (!request.query.expression) - return reply({ error: '"expression" query is required' }).code(400); - reply(fromExpression(request.query.expression)); + return h.response({ error: '"expression" query is required' }).code(400); + return fromExpression(request.query.expression); }, }); server.route({ method: 'POST', path: '/api/canvas/expression', - handler: function(request, reply) { + handler: function(request, h) { try { - const exp = toExpression(request.payload); - reply(exp); + return toExpression(request.payload); } catch (e) { - reply({ error: e.message }).code(400); + return h.response({ error: e.message }).code(400); } }, }); diff --git a/x-pack/plugins/canvas/server/routes/workpad.js b/x-pack/plugins/canvas/server/routes/workpad.js index b1d2cfa63477b..e873f99efa74f 100644 --- a/x-pack/plugins/canvas/server/routes/workpad.js +++ b/x-pack/plugins/canvas/server/routes/workpad.js @@ -13,21 +13,19 @@ export function workpad(server) { const { errors: esErrors } = server.plugins.elasticsearch.getCluster('data'); const routePrefix = API_ROUTE_WORKPAD; - function formatResponse(reply, returnResponse = false) { - return resp => { - if (resp.isBoom) return reply(resp); // can't wrap it if it's already a boom error + function formatResponse(resp) { + if (resp.isBoom) return resp; // can't wrap it if it's already a boom error - if (resp instanceof esErrors['400']) return reply(boom.badRequest(resp)); + if (resp instanceof esErrors['400']) return boom.badRequest(resp); - if (resp instanceof esErrors['401']) return reply(boom.unauthorized()); + if (resp instanceof esErrors['401']) return boom.unauthorized(); - if (resp instanceof esErrors['403']) - return reply(boom.forbidden("Sorry, you don't have access to that")); + if (resp instanceof esErrors['403']) + return boom.forbidden("Sorry, you don't have access to that"); - if (resp instanceof esErrors['404']) return reply(boom.wrap(resp, 404)); + if (resp instanceof esErrors['404']) return boom.boomify(resp, { statusCode: 404 }); - return returnResponse ? resp : reply(resp); - }; + return resp; } function createWorkpad(req, id) { @@ -94,15 +92,15 @@ export function workpad(server) { server.route({ method: 'GET', path: `${routePrefix}/{id}`, - handler: function(req, reply) { + handler: function(req) { const savedObjectsClient = req.getSavedObjectsClient(); const { id } = req.params; return savedObjectsClient .get(CANVAS_TYPE, id) .then(obj => obj.attributes) - .then(formatResponse(reply)) - .catch(formatResponse(reply)); + .then(formatResponse) + .catch(formatResponse); }, }); @@ -111,10 +109,10 @@ export function workpad(server) { method: 'POST', path: routePrefix, config: { payload: { allow: 'application/json', maxBytes: 26214400 } }, // 25MB payload limit - handler: function(request, reply) { - createWorkpad(request) - .then(() => reply({ ok: true })) - .catch(formatResponse(reply)); + handler: function(request) { + return createWorkpad(request) + .then(() => ({ ok: true })) + .catch(formatResponse); }, }); @@ -123,10 +121,10 @@ export function workpad(server) { method: 'PUT', path: `${routePrefix}/{id}`, config: { payload: { allow: 'application/json', maxBytes: 26214400 } }, // 25MB payload limit - handler: function(request, reply) { - updateWorkpad(request) - .then(() => reply({ ok: true })) - .catch(formatResponse(reply)); + handler: function(request) { + return updateWorkpad(request) + .then(() => ({ ok: true })) + .catch(formatResponse); }, }); @@ -134,10 +132,10 @@ export function workpad(server) { server.route({ method: 'DELETE', path: `${routePrefix}/{id}`, - handler: function(request, reply) { - deleteWorkpad(request) - .then(() => reply({ ok: true })) - .catch(formatResponse(reply)); + handler: function(request) { + return deleteWorkpad(request) + .then(() => ({ ok: true })) + .catch(formatResponse); }, }); @@ -145,20 +143,20 @@ export function workpad(server) { server.route({ method: 'GET', path: `${routePrefix}/find`, - handler: function(request, reply) { - findWorkpad(request) - .then(formatResponse(reply, true)) + handler: function(request) { + return findWorkpad(request) + .then(formatResponse) .then(resp => { - reply({ + return { total: resp.total, workpads: resp.saved_objects.map(hit => hit.attributes), - }); + }; }) .catch(() => { - reply({ + return { total: 0, workpads: [], - }); + }; }); }, }); diff --git a/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json b/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json new file mode 100644 index 0000000000000..d9e7f51215547 --- /dev/null +++ b/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json @@ -0,0 +1,1218 @@ +[ + { + "id": "workpad-e08b9bdb-ec14-4339-94c4-063bddfd610e", + "type": "canvas-workpad", + "updated_at": "2018-10-22T15:19:02.081Z", + "version": 1, + "attributes": { + "name": "[eCommerce] Revenue Tracking", + "id": "workpad-e08b9bdb-ec14-4339-94c4-063bddfd610e", + "width": 1080, + "height": 720, + "page": 0, + "pages": [ + { + "id": "page-21cffafb-9eda-47f9-b35a-67a92e605abe", + "style": { + "background": "#fff" + }, + "elements": [ + { + "id": "element-3a220f56-0729-4464-b4fd-7975a8396d24", + "position": { + "left": 641, + "top": 97, + "width": 175, + "height": 510, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" \n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"sum(maleCount) / count(maleCount)\" \n| revealImage origin=\"bottom\" image={asset \"asset-aaa14d64-2c1c-47f2-95c0-21306ee18cba\"} emptyImage={asset \"asset-960c8c6e-da72-412d-9d04-34a98cdb5760\"}" + }, + { + "id": "element-4a3fef74-5d8c-4bbe-8f3f-fe55afdd4b60", + "position": { + "left": 627.5, + "top": 82.5, + "width": 197, + "height": 521, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-8ae4b612-43a3-4846-8f0d-abb9785e95c3\"}" + }, + { + "id": "element-fb2761a1-df28-411a-8614-dbee0f437cfe", + "position": { + "left": 446, + "top": 93, + "width": 238, + "height": 520, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\"\n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0}\n| math \"sum(maleCount) / count(maleCount)\"\n| revealImage origin=\"bottom\" image={asset \"asset-2f64bd10-953d-4163-90e9-a55e9ca4c52a\"} emptyImage={asset \"asset-3a26727a-b756-44be-a82c-273dd85bda09\"}", + "filter": null + }, + { + "id": "element-46b2f8df-f7db-4502-9cd0-b33c1c70b8b1", + "position": { + "left": 275, + "top": 306, + "width": 105, + "height": 102, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"65\" labels=false palette={palette \"#ede9e7\" \"#eb6c66\" gradient=false}" + }, + { + "id": "element-eaa7f9a9-54ca-4c7c-9d27-62312d92a264", + "position": { + "left": 275, + "top": 157, + "width": 105, + "height": 102, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Accessories\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"65\" labels=false palette={palette \"#ede9e7\" \"#eb6c66\" gradient=false}" + }, + { + "id": "element-58dfc1e8-a470-447f-8107-62bebe955475", + "position": { + "left": 275, + "top": 450, + "width": 106, + "height": 102, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"65\" labels=false palette={palette \"#ede9e7\" \"#eb6c66\" gradient=false}" + }, + { + "id": "element-c0a5f8d9-f52f-4e0f-a8a4-08c1b7984bb2", + "position": { + "left": 893.5, + "top": 157, + "width": 105, + "height": 102, + "angle": 0 + }, + "expression": "essql \"SELECT category, COUNT(category) AS count FROM \\\"kibana_sample_data_ecommerce\\\" GROUP BY category\" \n| mapColumn \"category\" fn={if {getCell \"category\" | eq \"Men's Accessories\"} then={getCell \"category\"} else=\"Other\"} \n| ply by=\"category\" fn={math \"sum(count)\" | as \"count\"} | staticColumn \"total\" value={math \"sum(count)\"} \n| mapColumn \"percentage\" fn={math \"round(count/total * 100, 2)\"} \n| pointseries color=\"category\" size=\"percentage\" \n| pie hole=\"65\" labels=false palette={palette \"#f8bd4a\" \"#ede9e7\" gradient=false}" + }, + { + "id": "element-060eb797-c583-4c8f-b0e1-3ab9b58c4cf5", + "position": { + "left": 894, + "top": 305, + "width": 105, + "height": 102, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"65\" labels=false palette={palette \"#f8bd4a\" \"#ede9e7\" gradient=false}" + }, + { + "id": "element-8f811cd0-e4b2-48b3-a96f-b8384179bbfb", + "position": { + "left": 894, + "top": 451, + "width": 105, + "height": 102, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"65\" labels=false palette={palette \"#f8bd4a\" \"#ede9e7\" gradient=false}" + }, + { + "id": "element-c0595f68-81c5-43e7-9ecf-808e8cfe48c0", + "position": { + "left": 298, + "top": 517, + "width": 93, + "height": 44, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-66a89124-fc39-4109-8acd-e1ac7f382e04\"} | render" + }, + { + "id": "element-0a14f255-6445-4860-b41d-d1c0b7ca9c36", + "position": { + "left": 890, + "top": 516, + "width": 102, + "height": 54, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-4acbecf1-e514-4e3b-bce4-61920335941e\"} | render" + }, + { + "id": "element-6aeefa4f-6b4f-4a6c-99ff-2cca052f5be6", + "position": { + "top": 291, + "left": 960, + "height": 121, + "width": 95, + "angle": 12.8 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-ae290f99-dd16-41a4-8191-7dd7be154be6\"} | render" + }, + { + "id": "element-68d9cb72-7a0e-4cac-996a-0ec8356f0df8", + "position": { + "left": 245, + "top": 291, + "width": 62, + "height": 139, + "angle": -1 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-565cd264-9196-4ebd-9d6e-f413f1db734d\"} | render" + }, + { + "id": "element-9bac6c19-517c-46e6-8d71-9273910366d1", + "position": { + "left": 322, + "top": 230, + "width": 60, + "height": 27, + "angle": 10 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-6222f3e0-1dab-4aa9-a06c-63d7732cc5f4\"} | render" + }, + { + "id": "element-a58f99d3-8ea4-474e-9aba-e7ed3e91a178", + "position": { + "left": 892, + "top": 235, + "width": 64, + "height": 24, + "angle": 7 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-f8ac482e-0c7a-4cac-8bcf-6f4f55300081\"} | render" + }, + { + "id": "element-84dec4fd-ee5d-49c0-9600-41b951033e09", + "position": { + "left": 394, + "top": 393.0200895724113, + "width": 94, + "height": 56, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"FEMALE\"}} \n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-9e0b6230-2bc9-4995-8207-043e3063faeb", + "position": { + "left": 794, + "top": 369, + "width": 94, + "height": 56, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"MALE\"}} \n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-2185edff-ac50-4162-b583-3bfd6469e925", + "position": { + "left": -3, + "top": -1, + "width": 214, + "height": 721, + "angle": 0 + }, + "expression": "filters | demodata | markdown \"\" | render containerStyle={containerStyle backgroundColor=\"#ede9e7\"}" + }, + { + "id": "element-71b63f54-0961-4ed2-a85d-45584b48a631", + "position": { + "left": 8, + "top": 35, + "width": 122, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"TOTAL SALES\" font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=18 align=\"left\" color=\"#777\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-61fdb4ce-5dea-4699-b958-6c40e2a2b61a", + "position": { + "left": 398, + "top": 381.5200895724113, + "width": 78, + "height": 23, + "angle": 0 + }, + "expression": "markdown \"WOMEN\" font={font family=\"Avenir\" size=18 align=\"left\" color=\"#999\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-157ab7a7-e3ef-477f-8c97-84c67f7ab28e", + "position": { + "left": 840, + "top": 352, + "width": 46, + "height": 23, + "angle": 0 + }, + "expression": "markdown \"MEN\" font={font family=\"Avenir\" size=18 align=\"left\" color=\"#999\" weight=\"normal\" underline=false italic=false} | render" + }, + { + "id": "element-bfa6f8bc-c083-4817-a682-91eb50fc214d", + "position": { + "left": 299, + "top": 344, + "width": 60, + "height": 34, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Women's Clothing\"}}\n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=24 align=\"center\" color=\"#000\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-73e918d2-14d0-4ed6-9cfe-204ad4eaff24", + "position": { + "left": 300, + "top": 488, + "width": 59, + "height": 30, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Women's Shoes\"}}\n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=24 align=\"center\" color=\"#000\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-d9dd8a8e-3af7-4e59-9115-3fd13c312d39", + "position": { + "left": 297, + "top": 194, + "width": 62, + "height": 37, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Accessories\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Women's Accessories\"}}\n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=24 align=\"center\" color=\"#000\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-af25bb55-818c-4c69-b2ae-45245af131e6", + "position": { + "left": 923, + "top": 194, + "width": 51, + "height": 34, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Accessories\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Men's Accessories\"}}\n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=24 align=\"center\" color=\"#000\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-9e02f39b-14b2-42a4-ae32-a4c292ece6ba", + "position": { + "left": 924, + "top": 343, + "width": 50, + "height": 33, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Men's Clothing\"}}\n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=24 align=\"center\" color=\"#000\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-b5f950b0-bb0f-462d-a92f-35bc3f1f4c39", + "position": { + "left": 921, + "top": 489, + "width": 50, + "height": 33, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Men's Shoes\"}}\n| markdown {getCell \"percentage\"} \"%\" font={font family=\"Avenir\" size=24 align=\"center\" color=\"#000\" weight=\"normal\" underline=false italic=false}" + }, + { + "id": "element-a4d410df-83b8-40dc-987f-e2c1380874a6", + "position": { + "left": -135.50000000000006, + "top": 330.5, + "width": 500, + "height": 217, + "angle": 90 + }, + "expression": "timelion \n \".es(index=kibana_sample_data_ecommerce, metric=sum:taxless_total_price, timefield=order_date)\" interval=\"1d\" from={essql \"SELECT order_date as min FROM kibana_sample_data_ecommerce order by order_date limit 1\" | getCell min} to={essql \"SELECT order_date as max FROM kibana_sample_data_ecommerce order by order_date DESC limit 1\" | getCell max}\n| pointseries x=\"@timestamp\" y=\"value\"\n| plot yaxis=false defaultStyle={seriesStyle points=\"0\" bars=\"50000000\" lines=\"0\" color=\"#62bb96\"} font={font size=12 family=\"Avenir\" color=\"#999\" align=\"left\"}", + "filter": null + }, + { + "id": "element-ccbb192a-725b-4479-a34b-9d70b0fa1a8a", + "position": { + "left": 441, + "top": 93, + "width": 242, + "height": 520, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-93e415d8-82c6-47d4-8c55-e38df329b88b\"}" + }, + { + "id": "element-18fc190c-e46a-408b-a220-8e1745eb77e6", + "position": { + "left": 394, + "top": 451, + "width": 115, + "height": 2, + "angle": 0 + }, + "expression": "markdown \"\" | render containerStyle={containerStyle backgroundColor=\"#000000\"}", + "filter": null + }, + { + "id": "element-1eb4fcd1-f8dd-4bd9-98a6-c5cbd4bcc8dc", + "position": { + "left": 767, + "top": 431, + "width": 119, + "height": 2, + "angle": 0 + }, + "expression": "markdown \"\" | render containerStyle={containerStyle backgroundColor=\"#000000\"}", + "filter": null + }, + { + "id": "element-2f976ef1-abc7-4bd2-82cb-cc114431eaea", + "position": { + "left": 744.5, + "top": 410, + "width": 35, + "height": 50, + "angle": 0 + }, + "expression": "markdown \"## ○\" font={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=14 align=\"center\" color=\"#000000\" weight=\"normal\" underline=false italic=false} | render containerStyle={containerStyle}" + }, + { + "id": "element-532638f8-758e-4cf4-86f0-c4d896e4477d", + "position": { + "left": 497, + "top": 429.4483902138134, + "width": 35, + "height": 50, + "angle": 0 + }, + "expression": "markdown \"## ○\" font={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=14 align=\"center\" color=\"#000000\" weight=\"normal\" underline=false italic=false} | render containerStyle={containerStyle}", + "filter": null + }, + { + "id": "element-62bf98c1-bd0c-40dd-ae44-abbcc50c0ae1", + "position": { + "left": -47, + "top": 410, + "width": 477, + "height": 63, + "angle": 90 + }, + "expression": "timelion \n \".es(index=kibana_sample_data_ecommerce, metric=sum:taxless_total_price, timefield=order_date)\" interval=\"1w\"\n| mapColumn \"value\" fn={math \"round(value,0)\"}\n| staticColumn \"mean\" value={math \"round(mean(value),0)\"}\n| mapColumn \"mean\" \"as\" \"rnd\" fn={math \"round(random(0.9,1.1),2)\"}\n| mapColumn \"value\" \"as\" \"final\" fn={math \"round(multiply(rnd,mean),2)\"}\n| pointseries x=\"@timestamp\" y=\"final\"\n| plot xaxis=false yaxis=false defaultStyle={seriesStyle points=\"0\" bars=\"0\" lines=\"3\" color=\"#eb6c66\"}\n| render containerStyle={containerStyle opacity=\"0.5\"}", + "filter": null + }, + { + "id": "element-e1b5a809-aed3-42e0-8806-46b0e462a9d4", + "position": { + "left": 488, + "top": 661, + "width": 279, + "height": 38, + "angle": 0 + }, + "expression": "markdown \"REVENUE BY CATEGORY\" font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=24 align=\"left\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-50ea8d53-383d-4582-9497-0692a81d9df8", + "position": { + "left": -7, + "top": 673, + "width": 219, + "height": 22, + "angle": 0 + }, + "expression": "markdown \"REVENUE BY DAY\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=14 align=\"center\" color=\"#62bb96\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-de932ce1-1c99-448b-bfb4-a98f91add877", + "position": { + "left": -7, + "top": 689, + "width": 219, + "height": 22, + "angle": 0 + }, + "expression": "markdown \"SALES PREDICTION\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-f5f539dd-1abe-42a9-bb2a-1d2a07ff108c", + "position": { + "left": 286, + "top": 263, + "width": 76, + "height": 16, + "angle": 0 + }, + "expression": "markdown \"ACCESSORIES\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-1eb8a1d1-beff-4d42-8b82-cddc28075bb0", + "position": { + "left": 911, + "top": 262, + "width": 76, + "height": 16, + "angle": 0 + }, + "expression": "markdown \"ACCESSORIES\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-d36fd045-500a-494c-8d1f-281c03a9720d", + "position": { + "left": 909, + "top": 409, + "width": 76, + "height": 16, + "angle": 0 + }, + "expression": "markdown \"CLOTHING\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-3388ba84-9109-4f1e-bb3b-8e7e4247b99e", + "position": { + "left": 291, + "top": 411, + "width": 76, + "height": 16, + "angle": 0 + }, + "expression": "markdown \"CLOTHING\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-4fe5f99e-ffea-4d21-9718-dbfbbd161a64", + "position": { + "left": 910, + "top": 570, + "width": 76, + "height": 16, + "angle": 0 + }, + "expression": "markdown \"SHOES\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-a6b5a208-6a75-42ad-8a1c-aa50359ecd44", + "position": { + "left": 293, + "top": 562, + "width": 76, + "height": 16, + "angle": 0 + }, + "expression": "markdown \"SHOES\" \n font={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=10 align=\"center\" color=\"#999\" weight=\"normal\" underline=false italic=false}", + "filter": null + }, + { + "id": "element-45310e03-f6dd-4283-aa04-8d27a4501665", + "position": { + "left": 5.999999999999915, + "top": 76.5, + "width": 201.00000000000009, + "height": 68.5, + "angle": 0 + }, + "expression": "essql \n query=\"SELECT sum(taxless_total_price) AS sum_total_price FROM \\\"kibana_sample_data_ecommerce\\\"\"\n| math \"sum_total_price\"\n| formatNumber \"$0a\"\n| metric \n metricFont={font family=\"'Avenir', Helvetica, Arial, sans-serif\" size=72 align=\"left\" color=\"#000000\" weight=\"normal\" underline=false italic=false}\n| render" + } + ] + }, + { + "id": "page-f704531f-3a72-4f29-a199-7e00d0c1ffef", + "style": { + "background": "#FAF0DD" + }, + "elements": [ + { + "id": "element-2c7e18fa-480f-4e3b-b4df-f649687229c6", + "position": { + "left": 788, + "top": 112.12093494719988, + "width": 204, + "height": 202, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" \n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"sum(maleCount) / count(maleCount)\" \n| revealImage origin=\"bottom\" image={asset \"asset-803ec373-2608-4f6f-8cf9-0dbb2f6437ce\"} emptyImage={asset \"asset-18070a2a-cd01-410a-ba89-a4505e2fbc5b\"}" + }, + { + "id": "element-2379c3ca-2c31-4948-8412-d14115500efc", + "position": { + "left": 788, + "top": 369.6303606465582, + "width": 204, + "height": 202, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" \n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"sum(maleCount) / count(maleCount)\" \n| revealImage origin=\"bottom\" image={asset \"asset-e644a484-4097-40b9-a08e-7250ba963059\"} emptyImage={asset \"asset-7e4f7119-b2d8-4527-9bd8-887cb25974e7\"}" + }, + { + "id": "element-3f52813f-7d0e-4ec7-9aad-c731b670d88d", + "position": { + "left": -69, + "top": 400.19203602130153, + "width": 388, + "height": 141, + "angle": 90 + }, + "expression": "timelion \n \".es(index=kibana_sample_data_ecommerce, metric=sum:taxless_total_price, timefield=order_date)\" interval=\"1d\" from={essql \"SELECT order_date as min FROM kibana_sample_data_ecommerce order by order_date limit 1\" | getCell min} to={essql \"SELECT order_date as max FROM kibana_sample_data_ecommerce order by order_date DESC limit 1\" | getCell max}\n| pointseries x=\"@timestamp\" y=\"value\"\n| plot yaxis=false defaultStyle={seriesStyle points=\"0\" bars=\"50000000\" lines=\"0\" color=\"#00A89C\"} \n font={font family=\"gilroy extrabold, Avenir\" size=16 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-dc86d147-0611-4ce8-9b0b-e95fc6f8ab80", + "position": { + "left": 244, + "top": 138, + "width": 157, + "height": 145, + "angle": -45 + }, + "expression": "essql \"SELECT category, COUNT(category) AS count FROM \\\"kibana_sample_data_ecommerce\\\" GROUP BY category\" \n| mapColumn \"category\" fn={if {getCell \"category\" | eq \"Men's Accessories\"} then={getCell \"category\"} else=\"Other\"} \n| ply by=\"category\" fn={math \"sum(count)\" | as \"count\"} | staticColumn \"total\" value={math \"sum(count)\"} \n| mapColumn \"percentage\" fn={math \"round(count/total * 100, 2)\"} \n| pointseries color=\"category\" size=\"percentage\"\n| pie hole=\"85\" labels=false palette={palette \"#00A89C\" \"#CBCBCB\" gradient=false}" + }, + { + "id": "element-29967798-174d-4109-b229-e776b0a4bf8c", + "position": { + "left": 425.5, + "top": 138, + "width": 157, + "height": 145, + "angle": -99 + }, + "expression": "essql \"SELECT category, COUNT(category) AS count FROM \\\"kibana_sample_data_ecommerce\\\" GROUP BY category\" \n| mapColumn \"category\" fn={if {getCell \"category\" | eq \"Men's Clothing\"} then={getCell \"category\"} else=\"Other\"} \n| ply by=\"category\" fn={math \"sum(count)\" | as \"count\"} | staticColumn \"total\" value={math \"sum(count)\"} \n| mapColumn \"percentage\" fn={math \"round(count/total * 100, 2)\"} \n| pointseries color=\"category\" size=\"percentage\"\n| pie hole=\"85\" labels=false palette={palette \"#00A89C\" \"#CBCBCB\" gradient=false}" + }, + { + "id": "element-abaa4e35-cfc0-4171-8c34-0914cea35082", + "position": { + "left": 610, + "top": 136, + "width": 157, + "height": 145, + "angle": -56 + }, + "expression": "essql \"SELECT category, COUNT(category) AS count FROM \\\"kibana_sample_data_ecommerce\\\" GROUP BY category\" \n| mapColumn \"category\" fn={if {getCell \"category\" | eq \"Men's Shoes\"} then={getCell \"category\"} else=\"Other\"} \n| ply by=\"category\" fn={math \"sum(count)\" | as \"count\"} | staticColumn \"total\" value={math \"sum(count)\"} \n| mapColumn \"percentage\" fn={math \"round(count/total * 100, 2)\"} \n| pointseries color=\"category\" size=\"percentage\"\n| pie hole=\"85\" labels=false palette={palette \"#00A89C\" \"#CBCBCB\" gradient=false}" + }, + { + "id": "element-20da5d5d-2b29-4888-a304-a14377d727ec", + "position": { + "left": 245, + "top": 383, + "width": 157, + "height": 145, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Accessories\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"85\" labels=false palette={palette \"#CBCBCB\" \"#F05A24\" gradient=false}" + }, + { + "id": "element-9dd99310-e0a6-4ab7-b049-c7ea63180b4e", + "position": { + "left": 429, + "top": 380, + "width": 157, + "height": 145, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"85\" labels=false palette={palette \"#CBCBCB\" \"#F05A24\" gradient=false}" + }, + { + "id": "element-715b318d-fe6d-42b2-abea-b238b0daa8c7", + "position": { + "left": 610, + "top": 384, + "width": 157, + "height": 145, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 2)'}\n| pointseries color=category size=percentage\n| pie hole=\"85\" labels=false palette={palette \"#CBCBCB\" \"#F05A24\" gradient=false}" + }, + { + "id": "element-9c27c6d0-b9d9-4adb-a5f3-abb7a3403977", + "position": { + "left": 239, + "top": 157, + "width": 172, + "height": 102, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-e79711e8-d9da-45e1-a234-9efe226a444d\"}\n| render" + }, + { + "id": "element-c9b7f707-f27c-44cc-b9f1-e7b693c66702", + "position": { + "left": 463, + "top": 165, + "width": 85, + "height": 86, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-9493e336-1b11-4e61-bad2-716c46194550\"}\n| render" + }, + { + "id": "element-8bcb4071-0012-46da-9316-524c06bb673a", + "position": { + "left": 648, + "top": 165, + "width": 85, + "height": 86, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-23f2bfe9-e58c-4a56-98c6-fad59eecdf74\"}\n| render" + }, + { + "id": "element-3532c81f-a341-4d23-90b6-68912c04ee46", + "position": { + "left": 1016, + "top": 391, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"W\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-2673d24b-2706-4ffe-a38b-5736c3bc616c", + "position": { + "left": 1018, + "top": 420, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"O\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-5d2b6fe8-34a9-49bc-8229-4e1c2b8029e1", + "position": { + "left": 1018, + "top": 446, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"M\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-b67e44c0-afe0-4f15-b521-af0759348dc6", + "position": { + "left": 1020, + "top": 475, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"E\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-370b7910-dd0b-4257-90de-229d25bd6610", + "position": { + "left": 1019, + "top": 504, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"N\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-cbdd2309-101d-4edc-874c-47c3e6c99df5", + "position": { + "left": 1018, + "top": 173, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"M\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-7288cfda-673f-4741-bec2-4675bc4952ed", + "position": { + "left": 1020, + "top": 201, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"E\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-e68822cc-f4b7-48a4-a8b2-86d84d8ddeb1", + "position": { + "left": 1019, + "top": 229, + "width": 78, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"N\" \n font={font family=\"gilroy extrabold, Avenir\" size=24 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-f446c8e1-b65e-4a1f-8476-e80e437a31ec", + "position": { + "left": 240, + "top": 414, + "width": 169, + "height": 100, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-86d05b5e-1a4b-4979-95e9-7071b9923470\"}\n| render" + }, + { + "id": "element-5406c1e9-9626-413c-9eaa-a73ca1e10b8c", + "position": { + "left": 464, + "top": 414, + "width": 85, + "height": 86, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-fdfc9cc7-2c6a-44fe-b9be-c4ff115c92c1\"}\n| render" + }, + { + "id": "element-d3fe9442-583b-4acb-a700-3935adb4316c", + "position": { + "left": 654, + "top": 419, + "width": 74, + "height": 76, + "angle": 0 + }, + "expression": "image mode=\"contain\" dataurl={asset \"asset-58ae3445-4001-45e7-9603-19ec8d41e64e\"}\n| render" + }, + { + "id": "element-28ffc136-8702-4cfc-9643-9825dfd7a6a3", + "position": { + "left": 48, + "top": 247, + "width": 118, + "height": 22, + "angle": 0 + }, + "expression": "markdown \"P R O G R E S S\" \n font={font family=\"gilroy extrabold, Avenir\" size=12 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-c6b853cc-72a3-4110-b40b-359ecb7b1af6", + "position": { + "left": 92, + "top": 268, + "width": 27, + "height": 4, + "angle": 0 + }, + "expression": "markdown \"\"\n| render containerStyle={containerStyle backgroundColor=\"#F05A24\"}" + }, + { + "id": "element-692a539e-0c3b-4e8d-bc3e-3cf84ddd53c7", + "position": { + "left": 90, + "top": 98, + "width": 27, + "height": 4, + "angle": 0 + }, + "expression": "markdown \"\"\n| render containerStyle={containerStyle backgroundColor=\"#F05A24\"}" + }, + { + "id": "element-99bed359-ef39-403d-bcb3-81cf8d1f6c62", + "position": { + "left": 44, + "top": 77, + "width": 118, + "height": 22, + "angle": 0 + }, + "expression": "markdown \"T O T A L\" \n font={font family=\"gilroy extrabold, Avenir\" size=12 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-8d72d271-b12e-41af-a18b-795490cf7f38", + "position": { + "left": 276, + "top": 290, + "width": 93, + "height": 40, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Accessories\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Men's Accessories\"}}\n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=36 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-cc17144e-096c-47b1-85dc-047724cc095e", + "position": { + "left": 465, + "top": 291, + "width": 78, + "height": 40, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Men's Clothing\"}}\n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=36 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-f38ee1d6-4fd7-4ff9-b304-84663f60fab2", + "position": { + "left": 651, + "top": 290, + "width": 76, + "height": 40, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Men's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Men's Shoes\"}}\n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=36 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-0b0b1c4a-0acf-40e3-a3f0-3128bd59f45c", + "position": { + "left": 340, + "top": 293, + "width": 47, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=24 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-3efcd68f-7fca-4ad3-aa13-737260ec5436", + "position": { + "left": 525, + "top": 293, + "width": 47, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=24 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-a617cb84-6e50-47c3-bb95-ea67df89d117", + "position": { + "left": 710, + "top": 292, + "width": 47, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=24 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-5426b988-29d6-40aa-b0a2-40a4a0729ef0", + "position": { + "left": 277, + "top": 540, + "width": 93, + "height": 40, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Accessories\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Women's Accessories\"}}\n| markdown {getCell \"percentage\"} \"\" font={font family=\"nexa bold, Avenir\" size=36 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-c1579899-59fc-4960-9bf0-1187b3535593", + "position": { + "left": 461, + "top": 541, + "width": 93, + "height": 40, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Clothing\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Women's Clothing\"}}\n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=36 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-31df9407-2156-408d-b9d4-54e32adfdc2b", + "position": { + "left": 644, + "top": 541, + "width": 93, + "height": 40, + "angle": 0 + }, + "expression": "essql 'SELECT category, COUNT(category) AS count FROM \"kibana_sample_data_ecommerce\" GROUP BY category'\n| mapColumn category fn={if {getCell category | eq \"Women's Shoes\"} then={getCell category} else=\"Other\"}\n| ply by=category fn={math 'sum(count)' | as count}\n| staticColumn total value={math 'sum(count)'}\n| mapColumn percentage fn={math 'round(count/total * 100, 0)'}\n| filterrows {getCell \"category\" | any {eq \"Women's Shoes\"}}\n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=36 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-d82b37e0-2f8e-48cb-8a85-d3d22b019499", + "position": { + "left": 343, + "top": 543, + "width": 45, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-ae570ea8-06b8-4ffa-a2f1-b7281481779f", + "position": { + "left": 528, + "top": 543, + "width": 45, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-81dd855d-d4fa-4c1c-a72f-6c6ab5b100cf", + "position": { + "left": 711, + "top": 543, + "width": 45, + "height": 29, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=24 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-b8f13a87-b781-42d5-a663-5dbd4f645d6d", + "position": { + "left": 837, + "top": 472, + "width": 91, + "height": 63, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"FEMALE\"}} \n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-86b06b67-893e-4555-ad38-7fba9ea3153b", + "position": { + "left": 837, + "top": 219, + "width": 90, + "height": 72, + "angle": 0 + }, + "expression": "esdocs index=\"kibana_sample_data_ecommerce\" fields=\"customer_gender\" \n| ply by=\"customer_gender\" expression={rowCount | as \"percentage\"} \n| filterrows {getCell \"customer_gender\" | any {eq \"MALE\"}} \n| markdown {getCell \"percentage\"} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-507337d9-6e0e-4752-8770-6ebe88e9b3da", + "position": { + "left": 913, + "top": 220, + "width": 44, + "height": 42, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=36 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-19f6b029-a6ef-426e-aa07-8f91ef846a95", + "position": { + "left": 914, + "top": 475, + "width": 44, + "height": 42, + "angle": 0 + }, + "expression": "markdown \"%\" \n font={font family=\"nexa extrabold, Avenir\" size=36 align=\"left\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-8ef60cfc-3823-42b6-9651-75a07b8e412d", + "position": { + "left": 19, + "top": 124, + "width": 44, + "height": 42, + "angle": 0 + }, + "expression": "markdown \"$\" \n font={font family=\"nexa bold, Avenir\" size=36 align=\"left\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-3dfda897-cc59-4bf6-ad3d-38f00bd8814b", + "position": { + "left": 362, + "top": 606, + "width": 378, + "height": 92, + "angle": 0 + }, + "expression": "markdown \"ACME Inc.\" font={font family=\"gilroy extrabold, Avenir\" size=72 align=\"center\" color=\"#CDCDCD\" weight=\"bold\" underline=false italic=false}" + }, + { + "id": "element-b336534a-6604-41be-b34a-109d631dcdb2", + "position": { + "left": 27.25, + "top": 133.03796394394163, + "width": 195.5, + "height": 80.08297100325825, + "angle": 0 + }, + "expression": "essql \n query=\"SELECT sum(taxless_total_price) AS sum_total_price FROM \\\"kibana_sample_data_ecommerce\\\"\"\n| math \"sum_total_price\"\n| formatNumber \"0a\"\n| metric \n metricFont={font family=\"nexa bold, Avenir\" size=72 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}\n| render" + } + ] + } + ], + "colors": [ + "#37988d", + "#c19628", + "#b83c6f", + "#3f9939", + "#1785b0", + "#ca5f35", + "#45bdb0", + "#f2bc33", + "#e74b8b", + "#4fbf48", + "#1ea6dc", + "#fd7643", + "#72cec3", + "#f5cc5d", + "#ec77a8", + "#7acf74", + "#4cbce4", + "#fd986f", + "#a1ded7", + "#f8dd91", + "#f2a4c5", + "#a6dfa2", + "#86d2ed", + "#fdba9f", + "#000000", + "#444444", + "#777777", + "#BBBBBB", + "#FFFFFF", + "rgba(255,255,255,0)" + ], + "@timestamp": "2018-10-22T15:19:02.081Z", + "@created": "2018-10-22T15:19:02.081Z", + "assets": { + "asset-66a89124-fc39-4109-8acd-e1ac7f382e04": { + "id": "asset-66a89124-fc39-4109-8acd-e1ac7f382e04", + "@created": "2018-07-10T18:33:25.683Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-4acbecf1-e514-4e3b-bce4-61920335941e": { + "id": "asset-4acbecf1-e514-4e3b-bce4-61920335941e", + "@created": "2018-07-10T18:34:30.379Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-ae290f99-dd16-41a4-8191-7dd7be154be6": { + "id": "asset-ae290f99-dd16-41a4-8191-7dd7be154be6", + "@created": "2018-07-10T18:37:50.932Z", + "type": "dataurl", + "value": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAF0AAABvCAYAAACOw8xlAAAACXBIWXMAAAsSAAALEgHS3X78AAAMXklEQVR42u1dv4vkyBl90+5gA8PoDgd2tFpQZtDoAuFwZHBm8Clw7O3MxjjQf3C9yTm0nDkwWAPOV3sY7Ow0sWyskcE4EIwGHNhgOK05wxkM46C/mqmtKan1qz5pdlfQ7HbPjKR69ep97/uqVH1ye3uLx3I4rm8B8ADY0qsAUFRlnj2WdpysEXTH9T0AFoBAAtcDcArgEkBDYEP6WQMgqsq8eA96P5BtACGBHNDHBb1q8W9V5nXHORIAzwG8ABBXZd68B71bMgS4MUlFPeI8IYA9Md4GsFur5GxXcA8JAdVUZZ5OOI84R+C4fgTgcwAn75nezs4QwDWAD8bIAsWAnwH4RlXmIX3WAPgagD8ByABka2H+dkHAbZKToCrz2nH9VwAi6oQ+IAfSq6FXIv1aAeBXAL6i34kd1z8DcCU6gTqieSdAJx3/LbkNod8xgD84rv89AP+S3Ik4hF306L0ALqJOa+i9fPyD2J1K1xUdFQF46bg+eyewy4vj+jsAnwL4VlXmJ8rPPgPwIYBfUzBUNVvrYuicUVXmnvRZBmB/TFJI4kRHiJGQAkhN2c8tI9gBsdkC8FMa7qESPH9ELqapynw/4PQ7Ovfgg66vjoQQQErvRQekj4bppN0JycK+KvOYPo8AhFWZBxrmJaT1Rc/OTKsyt5TPezG9Z+yI6KNoDvA3JnWbEpZr0ktbAC5ZRY86RWVeAiAhph07YgkU+TjXxIWho6CoyjyuytwG8BmAC/V+VwE6gb0nmQCAZ1WZ79UARe9TnVupyjwiwLIu4EnLrarME81ouZo5KP4AwEvFIS0POoFQCF2synx3JLvcA3iuY09V5jsKnlrg6bM2locaJzPVbT2la1kkjcuC7rh+4Lh+QSBGVZkHfbSUOuSiw5uHwh5qgI+oZJC2/F0yI588cjUFgJ8D2E+Rmc1EsG3H9UX0T6oyt0cEmghASAERGgkKVOCpwZ+Qa9GNtnpmu+dJ9aF/0ghLWEGXdPuabkQNkkOCVUONiDt+rgIfA7hoka7R9rHjsIWVpf/HAOyxMrMZAbgHoCIgnlVlHk0NWOTJW7VSAr6WYkbUYk894bsNML0ggjXUufueDmsy0xMA/8WR+vaIo08jPApoQUtHR+TZTaTyqvsS5YXEKOjCogH4NoBgahQf2Ig9Me2qw8OHBlguOrtu6eRAF4/mZHpEWV5DDfzFHMmCphGhxnfvxM8lfbcVabHmTNel45RGdSFdX8heNCCRGwY69eaHwv+SO3gxpzWTtDJWnEoC4AuqyTRU2MoA/EXqIFMsb5UYuueERkFkgukRgL8CKCiYihTck97PAXxKjRDeXUjOpdKwFIcScELlht2cCdGIePRJXxw2PVluA/hYqmXEEjOTIb08oBE7KlqJskAqJUsiBtjS68wg0193yShJz4u+VnUzgOUXOMzCiEJVILmZcM4WUiP2FMBCaQSc6SSJKpUfGZyAKPCwvq8rvNlkNmYBXSQcDbmXWGSDpO2nMwdUUHXParOlNJRv5IogFjx08Wg06EpaLXo8oUKVOPllDyZMre94AG4c1/coeFotNs7EUeN+mvCY7c2OycxmAMtF9LaJfa+U2odtuOEWgL9Th8c4zP6DEfS+lrC1ltQLdDWtJrY/lbRcBNCMAXTgML1oSQHdYgK9keov5z3iUdzF9k2PXlPT6hvH9T0KbJZkkzgA+IoCa12V+Q91gdVkIO1b9jhWS9oMkBbdUJP9sccwxD2aQhONuRqagk+Ut1lqSZueAVTtdZ1dNMp0Ytmp5l5Md7YIkGd9PHufoLo50lNJh74JjbfoM66hrrLfZr5mMeCaEbk87yjo1JPnLaCrQTOVi0CGjxulARyyhrFS1papbroy0JYMT/WsGYHOoa9DrJupYlcxkGQiUw2Pgd46savRVrGMYolF+MUxC2cgQWoGsr0hfGLZ96rSEkqBoHOoVWUuFlwWtBoggNlKXyNLW1XmjeP6Q7JawVBPGTEF9DNDulHWDJXTqswTx/V3jutHVZnH2yEsVxpvtQy/xYMY2bQI9xVIMRqu6D5rpYSg+mmP1llmSvs8jC/w7XFYH5lsNTf7HMCzIyfI8HACuMbM1cYhAU4BSMwwiVr8oPlcx/VjzagtqH3NGMdUlXlGarDbalh+OXLCmSvIiRmlCPePzmhHxdhlIR3ntKsyLxzXfzphpIYbjWtJev5xoLlR0/Yto6EvhngB4EnHSJw7QRJg/3JIKZsWZQmXF20Vb26rizH7MoEYcMps4SwAv28J4GJBFCRthxRIdfd6I43YtC1eSGWIPoCLR3piseZ+qxa3JgLx2nF9e+b1MA/kpSrznaS7bXFkq4xMmUxajZceGt61nPOSOizrw266pgVlrf1W0fOpgVC4CyOgUzA6o/9HksXVOamvD3ya4272SXqYeNShY/eDjFTy5sWAoe3NVI2bw0Z6GvCeTjhnmynozEZpVqugkRK0dfpmgDdXG3XKEcB61F84M+GmA/A9gD/jMP/gdRF4S948HANWi36bZrqOhVyj60EuQgQQhP2oj1pshPUaEfx0k9EcTH+j4KbUuh8EdZMdPoTdaoSf8tSCDf6jbxI2Jah3Zp1j2K0y3cNh9noogJnmxriqfpZJVncE4hrAd8awWwd6A+Dacf1kwLrEB2xges5eJ2EFx6gjCX5C7N6PPc+GlqXtqMhV47AEOeuxPKytoTdzLiidS/tnBn/SarKN3IvUeyKTihzXbxzXb3uSrK1RpgtfdyPMcf2I3Fet8c+m7mOylG00vdhUZZ7QGvCQGnjtuH4qTzm1zM4bZZist+QcdtBMQEw5qDi1HzHCex/bHpW1jNLaHQ6LI8XjfLG6iwUT02XnJDr439DvmrEnqUtx2Fak7gBbPO3xMQ4rlL9r6sa3Pdl199ihdHNfOK5/gcPjMNwJ0hXuZ3D2dL29cs8xPeMqakq/ob1d7rYVIZnYSQWuGIe9v46NHMs46EpjUhymnWxq6LUCfoYeuxPNkY5LRS9bZ1XVdYVEGHlbkVNi9ZBN1oR7Gl2RHf3ENAVe4XogLCeAbzIVuQIF3NfHXFNV5intV2DT339A7zMwHpP3BtCA/2MGz1y3JGb2gPsultq7cbadjYhtOxrGtwxMD+ce9gOuvfwuGAscunLD0JVXk+LJGkE3mpWSLKhJitH8YFWa3qG5FgPbbSVpOh2zQQJ3eeGxykubnFyaZntHJr4KpnNMZtgLXPe9vNBkcE0xpAbPxMqkmPWY5aWWLGJClvGPTEyfRCpToBtfYidpq9ixLsXhOVN77WzZGBz6HJVGsYNcQOn81PUuU4L4OyEvYkRZC+wL0KyR6RwreOXUny0xm8MlGQG9YwUYV4C11nyNxy4vXPWW9TOdcZg3S3TE1Kx088iHuW4lFleNfPSqgEctLy0WcdSDWGMz4rWBzqa3SmWxYAK9WSPoXMP8ShPUrDUzfWsYdI+JcVCeQeLakcNaG9O5hnkN4Pu43+wn0UgOV2L2Tvh0Afp/cCh47XAofl1hxXV100zn2qHComUgYr14w5SVnq8KdMY1JXfDXFrel4GntLzKMsBSa9Vr8MjLqARpw9B4jmm78wWuO9oscARS07vYNQvHk9XJS8Y0zN+QMdERDLZxVNb9NljGNjnhsI3NGpnOFdCWqjaOqr+8DYG0LaBxFNxGBVKOL4G1mBjnKV8iuMja88WZ3vHcvinGJbh/AOxLJk33VgX6AslQI73/G4NdHTUBzwH6jentYMWcJdVfxN6/X2K5LWIXB71maovYnzGmB5C5pG1wPsABOtec5VKBc/CaeA7QuSYzdBZxLZtDLBJIrYWYzpUnrA70jCkrbUuGjIFOo8ge+vDv22IZ25hurMNpP5wMI7bi2jIx8JwJdOMjSsp6QwDhmEfcjTOda9quJVGp5+wIyjeEMbDH7inAJS9s30ekeOZZAil9e3xMiVdclXkwhUxcoHPMzo/yzAPY7eGw2iCees4tE+gxgJcdm/KsLjFTtHs/B9isTKeNed7YF8aQ3Lyh4WMe/CIp2UvlC29OwDmZfrc1ibThWULf3BLjsL1TPRPoVgdzRYd4Lb9n4/4bCEJTm++c3N7eYqlD2azsFe7312pGnCsA8BMcvvH9U6kDfgfgf8T4S6lz6hY5Sk3L36KgKywU+2uJDsiOASDtIxbifuLiCe4nMBrpPClWcqwC9I4OCAi4QnpZJAMBJV3cwfntA72lvhEQ2IEkDfVYKVr6+D8ZoENCDEPqAgAAAABJRU5ErkJggg==" + }, + "asset-565cd264-9196-4ebd-9d6e-f413f1db734d": { + "id": "asset-565cd264-9196-4ebd-9d6e-f413f1db734d", + "@created": "2018-07-10T18:38:37.796Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-6222f3e0-1dab-4aa9-a06c-63d7732cc5f4": { + "id": "asset-6222f3e0-1dab-4aa9-a06c-63d7732cc5f4", + "@created": "2018-07-10T18:39:47.394Z", + "type": "dataurl", + "value": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADkAAAAcCAYAAADbeRcAAAAACXBIWXMAAAsSAAALEgHS3X78AAAD0ElEQVRYw92YMY/dRBSFv41WIqBI+2giBAVGcYWI4yKW6DIFPf4HOP/ANZV/gktK0yIK09Hh7ZDcGNeWeOmIhBRHAonONGfQPK+f37PXK20Y6cp+z57xnLnn3ntmLoZh4F1ofhCFwA5ourbul/S9uI8g/SDaAQlgZFfAK2APvNBr10AFFF1b798ZkAKXA98APwElUI1B6D0DxLISyI6BXQTSoYwna4C+a+tqA4AxUMg76SnvjABn8nzatXWxGKQfREYDxEAvytirBf3MrvzUR86YaCIPJl1blysXycijN4AeBalOuUDkArCfWc0YSPV+eu5kHYCma+tmg+RUjYFOgvSDKNOEs66t85W0K7u2Tk68aykfb0H5kUdD65QHEy8V8opZChBAHvSAUGPNtUzZsdoqeWmsUmNzA6QfRLni7FbUUR0zAprPeDF2J7NhyzT2IUgnwSRLi+0M0BhINPa4xaJ0vzVC0XRvv3s5Qp/dNvjHH5MnUyUEt9nY2brWGoULwHd+EP186WSlsGtrcwfUyYE3fhDtRl7bqQytAWLrtNE4oewK+E0lzlpx6VCnuAOAdG3d+0F0vdRzKkuhIzyMU5PfKis3ApJJlDSjCkHX1s2lQ52cu2uVJlzOqCjjAHK9sheYwt6fGcfGOs6Nyf6WsWAnO24e8BXwyA+iL4GH+u8x8Avwj+xvXf+SXclrz4CvnfHe+kGUnqGsrDDg4snT51b3VU6MHJuwpctUewX8KRCPdH3PGacHXgN/yB4DnwEvJ8bqjyVAiY1cc82maqxUVNq1dTj25EPnvpxJCo0T6C7NPtXzPfCjQDX6XQD5WOr5QbR3CvgSsVEq5ko/iA52II5gzw5knTrsurZOz0gGlQPWxst+ZuV3wBvgw3EsacUzZfZ+RYhYXW29a81zK4UFGaowe2eI35OadEIHh11bx0eel/JQfMt8kANfAO8Dn7iL9sCmWSmEdKbAVqLFEoCehMBc5k4Azw+iSp5ZU6Ysqz5QeSkF/IZ2zYDMfehQyu7TlpaZ8pQAd3SulWLJQi8axbYHfC6rgMoPosIPot3BVkvUsjuQXpIsWSPYtQOxYr8/s0/seD3X0UdzhJ5GLEEMKyZYlAPejf2ks9X6FfhIgr1ZSFGbRc3KhGLPboyytj3E8pzfNj+cVFFTIHdAC3wM/AB8e855i/qlsuJUpl4pNPo1G4gxXUPVtMapNfbkrLJ6UVR2hbGRKvle9XCzncwW7T+QTok48IJzfmOL/gun/7WKfjV3BnQvQCqOfgderjltu/dtGAaGYeDJ0+eevf+/2b9/hrMMA+Zz7QAAAABJRU5ErkJggg==" + }, + "asset-f8ac482e-0c7a-4cac-8bcf-6f4f55300081": { + "id": "asset-f8ac482e-0c7a-4cac-8bcf-6f4f55300081", + "@created": "2018-07-10T18:40:34.480Z", + "type": "dataurl", + "value": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD8AAAAZCAYAAACGqvb0AAAACXBIWXMAAAsSAAALEgHS3X78AAADxklEQVRYw8WYz4rkVBTGf92IoCATBFEEMVK1Eqoqi6p1Z+HOhXmDrkeo2boxs5ql8Q3iG9QguE6ju4DGrEaIkNm5EUpwbWbz3eH27Zt00nbFA6GKqntzznf+n3PRdR1DtFzvQiAGzCdAAGyco38Dlb63ehLPuYfS95LB0NUI/kVTl0XfCy/6wC/Xuz1wkPA3QGG9FKBq6vJknY+kFIDIUtYGeAEcm7rMx6CUwvd6AoGawt82VgAcgbSpy3YQ/HK9M4dDIJXQp4eaS+9L9C6AfZ81dPYAfCNL50OWm6DIFLgGnjZ1mXnBi3khre55ZJI3ZcDB9QKL90kKah+ZdySj5k1dpj7wORA0dZlwJpIQhQAerd8LoD2H0j28o6Yu20tH89dyu7NRU5eVeGQWbxOjc/DOTAheWv8lwM1ju1uPELllCZTYsv+SWybQUVhvgQ/lEnNRpapgeFdzMJX1nyzXu9AGH1tlZA46WaVpbroBboFnZvCutWdXxOX/oXYl1ysLfGHicFbwy/UuULYNgEiCnZsS4IWV4HIgOTdvF+vFYrWNlP43wF/AwrnzyhMOhSdcWiexFANCtG6npzpfmAbEcyf2hE3o/OaeiYAnnnjfAK/eNDlinrpCOz2zic3IwyRwBPvUOfMH8A/wMfCelPqn/vtI9z8AfgfeBz507v+mJGknzMpTQewzra90G6xvOdaLXKuqNNyplWpVY0f7vmnPeE4AvCOAPwD/Wgp7KaG/BD6RAl46lttYljO8TIU62t3iCAoAfODHJKtcZzN9v9fdda9yh4ue/v7npi4PPf/7vC5Xa56ObJQ2TV0WtttH0mA4ADxWh2R689OE7D5qYLL678OEEdieRJMebzVnEykpunTd25NYzKVMDA5NXSbnAG7JEQOZQmtM13Zq6jKWJ/66XO/SeypN7pvqUiDWi2xLGAskU3p/6+7kEdnygOOUuxbPO6OxZvsKCJu6PLlNTgaERuPL9e5gCRBNBJ48RHjHAyL1HoUEZ4LnVEAlObD6iTcDlG+TE2vt9Avw2dDmZWBzkkmA/cQs3Bc2qSa/tC9ZDhggV7i+DXze1GU0tMaKgR9Vlr5u6vL5xL3bwcoNjzaiSi4TfumEZLhWeXwX+KKpy5/ugHc0vFfpy5RBM3VfVc9mNwG+0t4tPedOQCGZWrP50dOYBZZc18B3wvMt8OzWGksgjj1JIpYyYnVtZkV8ZX03u7E5lhF2YjNybSRL6zRDRjmtJxkmdF3HYrUNFqvtoes67nsWq224WG3jMWfnfMbKJaz7rut4DW0holiCTPaYAAAAAElFTkSuQmCC" + }, + "asset-2f64bd10-953d-4163-90e9-a55e9ca4c52a": { + "id": "asset-2f64bd10-953d-4163-90e9-a55e9ca4c52a", + "@created": "2018-07-13T13:12:49.516Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-3a26727a-b756-44be-a82c-273dd85bda09": { + "id": "asset-3a26727a-b756-44be-a82c-273dd85bda09", + "@created": "2018-07-13T13:12:56.611Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-93e415d8-82c6-47d4-8c55-e38df329b88b": { + "id": "asset-93e415d8-82c6-47d4-8c55-e38df329b88b", + "@created": "2018-07-13T13:13:02.894Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-aaa14d64-2c1c-47f2-95c0-21306ee18cba": { + "id": "asset-aaa14d64-2c1c-47f2-95c0-21306ee18cba", + "@created": "2018-07-13T13:14:32.348Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-960c8c6e-da72-412d-9d04-34a98cdb5760": { + "id": "asset-960c8c6e-da72-412d-9d04-34a98cdb5760", + "@created": "2018-07-13T13:14:42.533Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-8ae4b612-43a3-4846-8f0d-abb9785e95c3": { + "id": "asset-8ae4b612-43a3-4846-8f0d-abb9785e95c3", + "@created": "2018-07-13T13:15:19.432Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-b1602228-f014-402d-88cd-42821af09dcf": { + "id": "asset-b1602228-f014-402d-88cd-42821af09dcf", + "@created": "2018-08-21T18:29:08.616Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-18070a2a-cd01-410a-ba89-a4505e2fbc5b": { + "id": "asset-18070a2a-cd01-410a-ba89-a4505e2fbc5b", + "@created": "2018-09-06T19:41:55.368Z", + "type": "dataurl", + "value": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABDgAAAQ4CAYAAADsEGyPAAAACXBIWXMAAAsSAAALEgHS3X78AAAgAElEQVR4nOzdwXlbV5Yu7OV+et7sCC4UganBHhuKoKgIDEZgMQJJEVCOgKwIxIpA8HgPxIrAqAgubwT/P8CRTcsECZAA1t7nvO+kb3dVWd91uyXiw9pr/RAA8EK11llELCLi54hYllLOUwMBADA5P2QHAKBftdZ5RPwSEWff/UuvSimrowcCAGCy/js7AAB9qbWexHpa45eImG34t72PCFMcAAAcjQkOALYyTGv8HOty4yl3sZ7iuDtkJgAA+MYEBwAbbTmt8ZCTiHgXER/2HgoAAB5gggOAv9lxWmMTUxwAAByNCQ4AIuKPaY2zWO/PmO3hL2mKAwCAozHBATBx9068/hLrUmKf7kop/7vnvyYAAPyNggNgooZi43287BnKNs5LKdcH/jUAAJg4T1QAJuaIxcY37yPi+ki/FgAAE2WCA2Aihh0b72O9F+PYTHEAAHBQJjgARm4oNt7FYXZsbMsUBwAAB/Vf2QEAOJxa6yIivsa6YMgqNyIiZrXWs8RfHwCAkTPBATBCtdZ5RFxGxGlylPt+iYib7BAAAIyTHRwAIzIsEL2MiFanJd6UUpbZIQAAGB9PVABGotb6IdbPUVotNyLWT2UAAGDvTHAAdG54jnIVEbPcJFszxQEAwN7ZwQHQqeE6ymVELJKj7OrniFhmhwAAYFxMcAB0aLiOchm5l1Fe4lUpZZUdAgCA8TDBAdCRYYnoVUTMc5O82PuIOM8OAQDAeJjgAOhErfVdrIuBXqc2vmeKAwCAvTHBAdC4EU1tfM8UBwAAe2OCA6BhI5za+J4pDgAA9sIEB0CDhgspn2N8UxvfM8UBAMBemOAAaEyt9SzWT1LGOrXxPVMcAAC8mAkOgEYMUxuXEbFIjnJspjgAAHgxExwADai1nsb6ScosOUoWUxwAALzIf2UHAJi6YZHo15huuRGxnuIAAIBnM8EBkGRCi0S3ZYoDAIBnM8EBkKDWOo+I30O5cZ8pDgAAns0EB8CR1Vo/hA/zm5jiAADgWVxRATiS4UnKVUScZWdpmIsqAAA8iwkOgCNwJWUnb0opy+wQAAD0xQ4OgAOrtS4i4ksoN7bl+Q4AADszwQFwQLXWq4hYZOfokCkOAAB2YgcHwAEM+za+RMRpdpZOvY+IZXYIAAD64YkKwJ4N+zZ+D+XGS8xrrZaxAgCwNQUHwB7d27dxkhxlDC6zAwAA0A8FB8Ce1Fo/xPoMrHJjP2ZDYQQAAE+yZBTghYZ9G5dhmegh3EXEq1LKXXYQAADaZoID4AXuLRNdJEcZq5OIeJcdAgCA9pngAHimYZmofRuHZ4oDAIAnmeAAeIbhwody4zi+PQECAICNTHAA7GhYfHmVnWOCXpVSVtkhAABokwkOgB3UWi9DuZHF33cAADYywQGwpVrrVVgmmu1NKWWZHQIAgPb8d3YAgNYNl1I+R8Q8OQrrKY5X2SEAAGiPJyoAj7h3BnaeHIW1Wa3V2VgAAP7GExWADWqts1hPbpwmR+GvnI0FAOBvTHAAPKDWehoRX2Na5canWJcHrTuJiPfZIQAAaIuCA+A7Q7nxJdYfpKfgNtbLOy8i4tfsMFt6N0zYAABARCg4AP5iguXGx1LK63uXSXqZ4ohwNhYAgHsUHACDWusiplNu3EbE61LKh/v/w2GvRS9THPNa61l2CAAA2qDgAIg/yo2rmEa58W1q43bDv/4pIlZHzPMSl9kBAABog4IDmLx75cbYrWK9a+PDY/+mYYrj4zEC7cGs1vohOwQAAPmciQUmbULlxnVEXOxyWrXW+ntEzA4VaI/uYv3cZpUdBACAPP+dHQAgy0TKjbuIOC+l3DzjP3sREZ/3nOcQTmL9VOVtdhAAAPKY4AAmaSLlxm1EvH3JZEOt9UtEzPcV6MDe3LsGAwDAxJjgACZnIuXGp1LKxR7+Oh+jn4LjKiJeZYcAACCHJaPApEyg3LiL9STDPsqNGCYinvO8JYOFowAAE6bgACZjAuXGbayXbS73/NfdS1lyJO9rrbPsEAAAHJ+CA5iECZQbn0opB7kkMvw1P+37r3tAY/7fMwAAGyg4gNEbebnx7UrKoacsPg6/Vg/mtdaz7BAAAByXggMYtZGXG6tY79u4PvQvVEq5i4hfD/3r7NFVrfUkOwQAAMej4ABGa+TlxjLW+zZuj/ULllI+xLpU6cFJRLzPDgEAwPEoOIBRqrXOY7zlxqdSypthquLYelo4+m745wAAgAlQcACjU2s9jYjP2TkO4Fj7NjYqpdzEenqkF5fZAQAAOA4FBzAqQ7nxJdZPFMbkLo60b2MLPU1xnNZaP2SHAADg8H7IDgCwLyMuN25jXW40c8Wk1noVEYvsHDt4dYgTugAAtMMEBzAKw8WMzzG+cuMmGis3BhfRz9nYiPHuYwEAYKDgALo3lBtfImKWHGXfrkspbxssN3o8Gzuvtb7LDgEAwOF4ogJ07V65cZqdZc/OG9m38aha6+/RT7F0F+vTuqvsIAAA7J8JDqB3VzGucuPbpZTr7CBbOs8OsIOTcFUFAGC0THAA3epw0eVTvl1Kuc0Osota6+eIOMvOsYO3w7lbAABGxAQH0KXh9OciOcY+dVluDHo6GxsRcTU8bQIAYEQUHEB3aq2LiHifnWOPbmN9xrTHciOGnRYfs3Ps4CRcVQEAGB0FB9CVWutZjOvD6W20eQZ2V58iYpUdYgdnwz9LAACMhB0cQDdqraexvpgylucFy1jvg+i93IiIP8qnz9k5dnAX68mZUfz9BwCYOhMcQBfunYMdS7lxXUoZw+TGH4bFncvsHDvwVAUAYEQUHEDzRlpu9HRedRfnsZ6M6IWnKgAAI6HgAHpwFRGn2SH2ZMzlxreFo79m59iRqyoAACOg4ACaVmu9ioixfMM+6nLjm1LKh+hr4ainKgAAI6DgAJo1nINdJMfYl09TKDfu6e3/r2e11nfZIQAAeD5XVIAm1Vrnsd67MQbnpZTr7BDHNkzfLLJz7OAuIl4Pz2wAAOiMCQ6gOcM52J7OjT5mkuXG4CL6WjjqqQoAQMcUHEBThmWPVzGOiylTLjdiOIF7kZ1jR/Na64fsEAAA7E7BAbTmc4zjYsqky41vhr8Hy+QYu3o/TBEBANARBQfQjFrrZUTMs3PsgXLjr3pbOBrhdCwAQHcUHEAThospY7hica3c+KthaefH7Bw7Oo2I99khAADYnisqQLrhOcCX6H/vxvXETsHupNb6Nfp7fvSmlLLMDgEAwNNMcACphmcAn0O5MQW9LRyNiPjsqQoAQB8UHEC2zxExyw7xQsqNLQyTEJ+yc+zI6VgAgE4oOIA0I1kqqtzYzceIWGWH2NFZrXUM+2EAAEbNDg4gRa31LNbTGz1bllLeZIfoTa11HuudKz25i/U+jtvsIAAAPMwEB3B0w1LR3sf+byPibXaIHg1PVa6TY+zqJJyOBQBomoIDOKrhA+JV9L1U9DbW3+bfZQfp2EWspyJ64nQsAEDDFBzAsV1Gf6dC71uFcuPFhr9/Pe4ueTc8rwIAoDEKDuBohkWNi+wcL3AXEW+VG/tRSrmJiJvsHM9wVWudZYcAAOCvFBzAUQx7Ny6zc7yAJZOHcR79PVU5if4X5AIAjI6CAzi4Ye9G7x8Iz5Ub+9fxU5XT4cwxAACNUHAAx3AVEbPsEC9wPjyn4AA6fqpiHwcAQEMUHMBBDXs3ev4Q+KmUcp0dYgJ6fKoSYR8HAEAzFBzAwYxg78Z1KeUiO8QUDE9V3mbneIYxPL8CABgFBQdwEMPejavsHC9wW0rpcTdEt0opy4j4lJ3jGezjAABogIIDOJTLiDjNDvFMtxHxJjvERH2MiFV2iGewjwMAIJmCA9i7WusiIhbJMZ7rLtZLRXvcB9G9jq+qRKz3cfRa6gEAdE/BAezVsHCx53H9t87B5ur4qcpJrEuOk+wgAABTpOAA9u1zrD/o9eh8+HBNsmG5a49FU++LdQEAuqXgAPam1voh+t27ce0cbHN6faqyGJ5pAQBwRD9kBwDGodY6j4gv2TmeaVlKsVS0QbXWd9HvRMRrz50AAI7HBAfwYp2fhL2NiLfZIXhYKeVTRCyzczzTZ/s4AACOR8EB7MNlRMyyQzyDiyl9OI/1/656M4v1ThoAAI5AwQG8SK31LPo9CXvuCUH7Simr6Hcfx7zW2usTGwCArig4gGfr/GnKx1LKTXYItjP87+o6O8czvbN0FADg8BQcwEv0ehL2ppTyITsEO7uIiFV2iGe6rLX2emEIAKALCg7gWYbrFvPsHM9wG/0+d5i0YVdKrwthT8LSUQCAg1JwADurtc4i4n12jmewVLRzw86Ui+wczzQLS0cBAA5GwQE8x1X0+TTlwlLR/nV+OtbSUQCAA1FwADvp+GnKp1LKdXYI9uZt9Hk6NsLSUQCAg/ghOwDQj+Fpytfob3rjtpTyOjsE+1VrnUfEl+wcL/DaRBEAwP6Y4AB20ePTlJ4XU/KIUsoyIj5l53iBL5aOAgDsj4ID2ErHT1PellJW2SE4jFLKRawv4/ToJJQcAAB7o+AAntTx1ZSPw7f8jFvP+zhOI8LSUQCAPVBwANvo8WnKspTyITsEhzdM6Jxn53iBRa31Q3YIAIDeKTiAR3X6NMXejYkppdxE3/s43rusAgDwMq6oABt1fDXl7fCBl4mptX6N9bOPHt1FxBuXVQAAnscEB/CYy+iv3Pik3Ji0nvdxWDoKAPACCg7gQbXWs4g4y86xo9vhqgYTNYJ9HEoOAIBnUnAAfzN8uLrKzrEjezeIiD/2cXzMzvECp9Hf//0BAKRTcAAP6fFpysXw7T3EcEFnmRzjJc5qrUoOAIAdKDiAv6i1ziNikRxjVzellOvsEDSn530cEevzsYvsEAAAvVBwAN/r7VvjVfS9c4EDKaXcRcSb7BwvdDXswwEA4AkKDuAPtdYPETFLjrGr8+GDLPzNcHK198WzV7XWXk/fAgAczQ/ZAYA21FpnEfF7do4dfXI1hW0M+ywW2Tle4C4iXtszAwCwmQkO4JvenqY4CcsuLiLiNjvEC5xExGfnYwEANlNwADEsMpwnx9iVvRtsbXjGdB59Lx09jYgv2SEAAFql4ICJG74RvszOsaOPw24F2Nrwz0zvxdip87EAAA9TcADvYz3+3ovbUsqH7BD0qZRyExEfs3O80ELJAQDwdwoOmLDhMsO77Bw7uIuIt9kh6NtQkN1k53ihxfC0DACAgYIDpq3Hpymr7BCMwnn0vXQ0Yn0+dpEdAgCgFc7EwkQNH4x6GnNfllLeZIdgPIYJpi/R1xOth7y2kwYAwAQHTFKHi0W/XcCAvRnJ0tGIiC9DWQMAMGkKDpim3haLeprCQYxk6ehJKDkAADxRgakZPgR9zc6xg9tSyuvsEIzbcJVkkZ3jhW4j4k0p5S47CABABhMcMD09PU2JGMcTAtp3Ef0vHT2N9SRHT9NZAAB7o+CACam1nkXEPDvHDj5ansgxDFMPb2O976VnSg4AYLIUHDAtPU1v3JZSPmSHYDqGPS9juNRzGn393zoAwF4oOGAiaq0fImKWHGMXF9kBmJ4RXVZZDHtFAAAmQ8EBE1BrnUXEL9k5dvCplLLMDsE0lVKuI+JTdo49UHIAAJOi4IBp6Oks7Cr6P9tJ50opFxFxk51jDxa1Vs9VAIBJUHDAyA1nYRfZOXZw4cwljTiP/i+rRES8q7UuskMAAByaggPGr6dvb29KKWP41pwRGNFllYiIKyUHADB2Cg4Ysc7Owt6FxaI05t5lFSUHAEDjFBwwbj1Nb3wcPkxCU4bLKmMp35QcAMBoKThgpGqt76Kfs7C3pZQxXK1gpIbLKmMqOebZIQAA9k3BASNUaz2J9eWUXozlgyMjNpRw19k59uTzsIAYAGA0FBwwTu+in7Ow16WUZXYI2EYp5Twiltk59uAkIr4oOQCAMVFwwMjUWmfRz/SGxaL06G2M43yskgMAGBUFB4xPL+VGxHqx6BiuUzAhwz+zY7msouQAAEbjh+wAwP4M0xu/Z+fY0m0p5XV2CHiuoRT4Ev08B3vMXUS8GS7GAAB0yQQHjMtVdoAdeJpC14Yy4Dw7x56Y5AAAuqfggJEYzj7Ok2Nsy2JRRqGUchNKDgCAJig4YDx62b1hsSijUkq5joiP2Tn2RMkBAHRLwQEj0Nn0xq8WizI2pZQPEXGdHGNflBwAQJcUHDAOvezeWA0fBGF0SinnEXGTnWNPlBwAQHcUHNC5WusiImbJMbY1ll0FsMl5RIzlEomSAwDoioID+tfL7o2lxaKM3fD86k0oOQAAjk7BAR0zvQHtGUqOt7FeqDsGSg4AoAsKDuhbL9Mb16WUVXYIOJbhn/c3oeQAADgaBQd0qqPpDWdhmaRSym0oOQAAjkbBAR2qtZ5EP9MbzsIyWUPJMaaCT8kBADRLwQF9ehd9TG84C8vklVKuY1w7aJQcAECTFBzQmWF645fsHFv6mB0AWqDkAAA4PAUH9OddrD9ctO52+FAHxB8lx6fsHHt0EhFfh31A8CK11lmtdZ6dA4C+KTigI51Nb4xp7wDsRSnlIiKus3Ps2ZWSgz14H+upoC+11ll2GAD6pOCAvvQyvbEspSyzQ0CLSinnoeSAPwyFxmL4b+cR8Xut9XIo9QFgawoO6ITpDRgPJQf8xUNXwd7Fuuh4d+wwAPRLwQH96GV643o4jQk87iIixvZ/K1c+kLKLYVHtYsO/fBIRl7XW3+3nAGAbCg7ox8/ZAbbkcgpsoZRyFxFvYnwlx2Wt9So7BN243OLfMwv7OQDYgoIDOjCMfc+SY2zjupSyyg4BvRhxybFQcvCUYSpjvsN/ZB72cwDwCAUH9OGh98mtuQu7N2BnSg4m7Ll/ttnPAcCDfsgOADxumN7o4UPCx1LKh+wQ0KvhG+kvEXGanWXPlhHxdihyICL+mN74soe/1Coizl3uAiDCBAf0oJfpjU/ZIaBn9yY5xlYEzGO9P8GTAu7b159ts7CfA4CBggMa1tHujV99OwsvN+KS4zSUHAyesXtjG/OwnwNg8hQc0DbTGzAxw5nlsZYcvw9nQZm2Q/7Z9m0/x+KAvwYAjVJwQKOGb7hmyTG2YXoD9mzEJcdJrCc5lBwTdaDpje+dRMRVrfXr8OsBMBEKDmiX6Q2YsAmUHGfZQUhxzD/bvj2NurKfA2AaFBzQoCN9w7UPH01vwOGMvOT47BnBtCT+2baIiK+11g8JvzYAR6TggDb9kh1gC6tSiukNOLARlxwR62cE77JDcDSZJ89PIuJ9rfV3z1YAxkvBAY0Zxmh7GN3+mB0ApmLkJcdlrTXzgy9H0NBVsFmsn6189mwFYHwUHNCeHnZvrEop19khYEpGXnIshj0JznuOV2t/tp2FZysAo/NDdgDgT8O3Sb9n59jCuYIDcgwXSL7EeuR+bG4j4o3dPuMyTG+0PKWzivWfa8vkHAC8kAkOaMsiO8AW7iLiJjsETNXIJzm+Xb2YZQdhr1qb3vjeLP68tjLG4hBgMhQc0Ijhh6oelov+6ttVyDWBkuPrMKlC5xravbGNRUT8bvEtQL8UHNCORbQ/cn4XES6nQANGXnKcxPob9R4WLvO41qc3vncS68W3X5RsAP1RcEA7TG8AO5lAyfF5mACgQ51Nb3xvHsMSUs9WAPqh4IAGdPJDoOkNaNDIS46IiCtnZLvV2/TGQ97HuuiYZwcB4GkKDmjDz9kBtmB6Axo1gZLDGdnOdFLcb2sWlpACdMGZWEg2fCv0JTvHE+4i4pWCA9o28hOyEc7IdmEoAX6Pcf5zeBfrk7KuiQE0yAQH5OtheuPaBwpo3zDJ8TrWRcAYubDSh3cxznIj4s/dMJ9NcwC0R8EBiWqts1hfT2ndr9kBgO2UUlaxfq4y1pJjFi6sNKujk+cvdRZOygI0R8EBuXr4IfB6+MAEdGKYuBpzyeHCSrvGPL3xvfsnZWfZYQBQcECa4VuuRXaOLXzMDgDsbgIlR4QLK02Z0PTG9+axfjplmgMgmYID8pxF+99y3ZjegH5NpORYDN+gt/776RRMaXrje6Y5ABqg4IA877MDbMHuDejcvZJjzFcf5rHey2H5aJIJT298bx6mOQDSOBMLCTo5DbsspbzJDgHsz/CcY5Gd44DuIuJtKWWZHWRqaq0foo/i/piWsf7n0RUygCMxwQE5eviWy/QGjEwp5TwirrNzHNBJrCc5FtlBpsT0xkbzWF9acfEH4EgUHHBkw9vc1n/YWZVSxjzODpM1gZIjwvLRY5vy7o2nfLv489meGIDDU3DA8S2yA2zB5RQYsaHkuMjOcWCLWutXHyoPy/TG1s5iPc0xzw4CMGYKDji+1n8QvItxLyMEIqKU8ikizrNzHNhprBc+Wj56OJdhemNb355QXSreAA5DwQFHNLwLb/2Hml8tRINpKKVcx/hLjlnYy3EQw5PLRXKMHr0LV38ADkLBAcf1c3aALXzKDgAcz1ByvIn19NZYncR6L8dldpCRcTXl+b5NF33IDgIwJs7EwpEM39R8zc7xhOvhbT4wMcPvUV+i/Smzl1qG050vNkxv/J6dYySWEXFeSlkl5wDongkOOJ7Wd29EOA0Lk1VKuY31JMcqOcqhzcNejn0wvbE/81j/M9n6hTWA5pnggCMYlon9Hm1/M7ospbzJDgHkGn6/+hLrEfoxu4uIi+GJDjswvXFQnyLiowkjgOcxwQHHcRZtlxsRpjeAiBg+WL2JiNvsLAdmL8fzmd44HAtIAV7ABAccQa31a7T9beiqlPIqOwTQllrrVUzjSsYy7OXYiumNo7mL9SSHxd8AOzDBAQc2fAvTcrkRYXoDeMCwdPg6O8cRzCPid9+ab8X0xnGcRMRlrfXz8GwMgC0oOODwWl8uehfT+AADPMNQclxk5ziCk1gvenyXHaRVw/TGIjnG1JyFpbgAW1NwwAEN37q0vhX9xlg28JhhTH4qJ6Qva61XvjV/0FV2gImahfINYCsKDjisHpaLfswOALRvuDbyOtZTX2O3CIse/6LWOo/1Ux7yeLIC8AQFBxxW689TlqWUVXYIoA+llNtYX1iZQslxGuuSY5EdpBF2b7TBkxWARyg44EA6WS76z+wAQF+GkuNVjP+MbIRTshFheqNBs1C+ATxIwQGH0/r0xmoYOQfYybC3501E3GRnOZJ3tdavw5LNKTK90Z5v5Zt9MQD3KDjgcFpfLmp6A3i2UspdKeVtTOcK02msnwa0/nv7XpneaN4i1tMcs+QcAE1QcMABDGOjrX+jcp0dAOjfhM7IRqx/X/88sScrvUxvLLMDJJpk+QbwEAUHHMbP2QGecGO5KLAv987ITmH5aMREnqx0NL1xXUp5E9P6Z/B738q3D9lBADIpOGDPhh9458kxnuJ5CrBXw06fqVxYiZjGt+a9TG98jPjjn8FXMe0JxfdOyQJTpuCA/VtkB3jCqpQylcWAwBENF1ZexzQurESM+MlKZ9Mbq2//zbAb5jzWZdtq039o5M5ivZej9UtuAHun4ID9a/15yq/ZAYDxGj5sTunCSsQ4n6z0Utp8fOh/WEpZxrpse/Bfn4DTWJccY54wAvibH7IDwJgM33h9yc7xhP8dTjwCHFSt9Sran2rbp7uIuOj9BPewKPsqO8cWrodpjUcNkwxXsf7QP0UfSykfskMAHIMJDtiv1qc3rpUbwLEMHz6f/AA6IicRcVVrvep8B0JXuzeeUkq5LaVMeZrDXg5gMhQcsCfDDw6tj4L+KzsAMC0TXD4asZ5a+drjDoRhemOWHGMb17teAxumGF7HNE/KftvLMcsOAnBICg7Yn7NYf3vXKstFgRTDPoQ3MZ3loxHrkuBrrfVddpAdjWp643vDNMebiLiIaZVuEX9e/plnBwE4FAUH7M8/sgM8wWlYIM1wYeVNTO/b88ta65cengeMeXrje6WUTzHNaY6TWE9yLLKDAByCggP2YBj5bP15ynV2AGDahhOebyLiU3aWI5tHxO8dXLToYXrjLva0S6OUsprwNMfVsAQYYFQUHLAfrf/QevPSb7sA9qWUchHTWj4asf7m/HOrC0g7mt74dd9/ng3THFN7QhURsehlughgWwoO2I/Wr6dYLgo0ZVg++jqm9835ItpcQNrL9MZBpn8mfGllHpaPAiOi4IAXGn5Ibe0H1fvuhg8SAE0Z9nK8iul9cz6LdcnxITlHRHQ3vXHQQuzepZUp/TP5bfloyz/LAGxFwQEv1/r0xnV2AIBNhg+sb2Kav1e9r7V+beDb80lPb3zv3jTHlHbFWD4KjIKCA16u9f0brqcATRuWj57Hetnj1Hz79jzlnOwwRTLL+LV3dPDpje8Nu2LeRMTqmL9uopNYLx/t7bQxwB9+yA4APRtuyX/JzvGIb99CAXRh+H31c6w/bE3NMiLOj7UUelgu+Xu0//f6LiJeHbvg+Gb4+3QV7X+hsU/XQ+kI0BUTHPAyrT9PMb0BdKWUsozp7UD4Zh7raY5jfZB+F+2XGxEJ0xv3DRNGbyPibUxnKe6i1vrZhRWgNwoOeJnWv825zg4AsKthgmGqezm+nZM96IfL4a/9y6H++nt0tN0bTyml3MS6fFsmRzmWs1jv5VByAN1QcMAzDd+wtfyH/k3mN14ALzHxvRwR6w+Xvx9wmsP0xjOUUlallDcxnXOyLqwAXVFwwPP9IzvAEzxPAbpXSvkU62/Nm/mQe0QHmeYwvfFy987JrnKTHMUs1pMcSg6geQoOeIbhh8OWn6fcDaO0AN0rpdxGxKuY5l6OiP1Pc/QyvfGxpemN7w3/XL6OiCn8efvtjGzLP/sAuKICzzHcib/KzvEI28+BUaq1Xsb6A/pU3cT60sqzPvh3dDllVUp5lR1iW8Np1ffR/t/XfTgvpVxnhwB4iAkOeJ7Wn6f8mh0A4BBKKRcRcR7TfLIS8fJpjm6mN7ID7GJ4SvUmpjFldDUUOgDNMcEBOxq+/fq/2Tke0dW3XgDPMewDuIr1EsSp2mmaw19pGRgAACAASURBVPTG4Q1/jy8jYpEc5RhMiwLNMcEBu2v9/anlosDoDfsPpnpK9ptv0xyLLf/9vTyh6Gp6475713+mMGW0qLW2/FwXmCATHLCjWuvnaLvkeFVKWWWHADiWYVz+MjtHsmWspzlWD/2LtdZZrKc3Wtft9Mb3JjRldB0RFy0vhAWmwwQH7KCD6ym3yg1gau6dkl0lR8k0j4ivj+xGeH/ELC/R7fTG9yY0ZbSI9YWVHqaDgJFTcMBuWi43IjxPASZqYic7NzmJiMta69dheiAi/pjeWGSF2sFqbNc57j1ZucjOcmCnoeQAGqDggN20fj1lyj/YAxM3fJh8G+P/MPmU01hPc1wOHzhNbyS7N2U05mccSg4gnR0csKUOrqfcDD/YA0zeMMHwOSJmyVGyraKPvwej2b3xmOFnic+xflI0VrcR8cZODiCDCQ7YXuvPU/6VHQCgFZ6s/GGWHWBLk5i6GaaM3kTEp+wsB3Qa6+s+Y1+uCjRIwQHb8zwFoCOerHRjWUqZ1J9hpZSLGPcp2ZNYP1dRcgBHpeCALXRwPeXGKCjAw1xZad5od288Zlio+ibWTzrGSMkBHJ2CA7bTcrkR4XkKwKPuPVm5To7CXy1LKcvsEFnunZJdJkc5FCUHcFQKDtjOT9kBnjCp0V6A57h3snPMTwN6M8npjfsmsJdDyQEcjYIDttPyBIfnKQA7mMDTgF5MenrjeyPfy6HkAI5CwQFPqLWexfoP5lZ5ngKwo1LKbSnldYz3W/MeTH5643v3yjclB8AzKDjgaa6nAIzU8K35WD9Qtsz0xgbDXo5XMc4JIyUHcFAKDnia5ykAIzZ80H4VCuNjMr3xiOHP9jcxzqW4Sg7gYBQc8IjhD1/PUwBGblj0+DYiLsI0x6GZ3tjCvaW4YyyDlBzAQSg44HE/Zwd4gm8bAfaolPIpLCA9tDF+YD+YUsqHGOfyUSUHsHcKDnic5ykAE2MB6UFdm97Y3YiXjyo5gL1ScMAGwx+2s+wcj/A8BeCA7i0gXSVHGRPTG880LB99HeObLlJyAHuj4IDN5tkBnuB5CsCBDdMGr2Ocyx6P7bqUssoO0bPh79+biFjmJtk7JQewFwoO2Kzl/RuepwAcyb1lj29jfE8Ejsn0xh4M/zyO8cLKSURc1VpbXu4ONE7BAQ8Y/nBt+VsEz1MAjqyUchPOyT6X6Y09G+mFldNYT3IoOYBnUXDAw1peLhrhh2uAFM7JPtvYPog34d6FlTFRcgDPpuCAh/0jO8Ajlp6nAOQazsm+jvHtQjgE0xsHNFxYGdvzKSUH8CwKDnjYPDvAIzxPAWhAKWU17EIwzfE40xsHNjyfGtsZ2dOI+JwdAuiLggO+U2s9i/Wiq1Z5ngLQENMcjzK9cSTDGdmxnTWe11qvskMA/VBwwN/9lB3gEbd+UARoj2mOjUxvHNFQcryOiNvsLHu0UHIA21JwwN+1vGDU8xSAhpnm+ItPSvnjG/Z0vYnxlRwfskMA7VNwwD211llEzJJjPMbzFIDGmeaIiPX/v01vJLlXclwnR9mn97XWRXYIoG0KDvirlqc3VsPoKQAdmPg0x68ufuUaThqfx7hKjislB/AYBQf8VcvnYU1vAHTm3jTHeUxnmuMuIj5lh2BtpCXHaXYIoE0KDhgMt9bn2Tke8Vt2AACep5RyHRGvYhpltemNxgwlx5hKpy9KDuAhCg740zw7wCPuhhv3AHRqeDLwNiLexninOUxvNKqUchHrSaIxOIl1yXGSHQRoi4ID/tTy85RldgAA9mMorF/FOIsA0xsNGyaJlBzAaCk44E/z7ACPcB4WYESGaY6LGNc5T9MbHRhZyXEaEZ+zQwDtUHBARAzvOGfZOR7heQrACJVSlqWU17E+qdr75IPpjU6MrOSY11qvskMAbVBwwNo8O8Ajbv3ACDBupZQP0fdJWdMbnRlZybGotX7IDgHkU3DA2k/ZAR7heQrABNw7KdvjElLTGx0aWcnxvta6yA4B5FJwwNpZdoBHeJ4CMCEdLiFdDRModGhkJceV87EwbQoOJq/WOs/O8Ii7UspYls8BsKV7S0h7eLbyMTsALzOykuNLrXWWHQLIoeCAts/Dmt4AmLBSyu3wbOU82ny2sho+HNO5EZUcJxHx2flYmCYFB7S9YNT+DQC+ffhs8dmK6Y0RGVHJ4XwsTNQP2QEg09Du/9/sHI/4X0vbALhv2DFwGfkF/aqU8io5AwcwLOscw+nV61LKGAobYEsmOJi6lpeLLpUbAHzvu2crq8QopjdGakSTHAuXVWBaFBxMXcvnYX/LDgBAu4YPoa9jXTQcuxC3e2PkRlRyuKwCE6LgYOrm2QEeYcEoAI8arq18iHXRcX3EX9r0xgSMqORwWQUmwg4OJmv4g+737Bwb3JVS/jc7BAB9GU6fv4/DFvh2b0zMSHZy3EbEG89/YdxMcDBlLe/fML0BwM5KKcthP8fbONx+DtMbEzOSSY5vy3mBEVNwMGX2bwAwSqWUm2HKYt+LSG/t3pim4X/vrZ0p3tWi1vouOwRwOAoOpmyeHeARy+wAAPSvlHI9FB37WkR6sYe/Bp0qpVzEcXe9HMLl8JQLGCE7OJikYZv21+wcG9yWUl5nhwBgXGqtJxHxLiJ+iYiTZ/wlvj1/YeJqrVcRscjO8QJ3EfG6lLLKDgLslwkOpmqeHeARy+wAAIzPvYsrr+J5Tw3s3iAiIkop59H3JMdJRHweSj9gRBQcTJX9GwBM0lB0XMS66Lje8j+2LKUsDxaKHl3E+jJJrywdhRFScDBV8+wAm5RSXFAB4OBKKavhm/hX8fT0oOkN/mI4t/om+i45FsMJXGAkFBxMzrBYqtWRxGV2AACmZSg63sT6w+rygX+L6Q0edK/kWCVHeYmrYTcbMAIKDqZonh3gEZ6nAJCilLK8V3Ss7v1LpjfYaCg53sZ+rvRksY8DRkLBwRS1vH/D8xQAUg1Fx6uIOI+Ia9MbPKWUchvrYqzXkmMWEVfZIYCXcyaWyam1/n/ZGTa4K6X8b3YIAIDnGPZZ9FwUXJRSnnNhCGiECQ4mZdi/0apldgAAgOcqpVzHevKnV5f2cUDfFBxMzTw7wCPs3wAAujaUHD1PQdjHAR1TcDA1P2YHeMQyOwAAwEuVUi4i4jo7xzPNou9nNjBpCg6mZp4dYIO7YUEXAMAYXERErz/bnNVa32WHAHan4GAyhjeVrY4cLrMDAADsy3A+9vuTwz2xjwM6pOBgSubZAR5h/wYAMCpDyfE2+j0fax8HdEbBwZT8lB3gEcvsAAAA+zY8wX2bneOZZhFxmR0C2J6CgymZZwfYwP4NAGC0SinL6Pd87KLWusgOAWxHwcEk2L8BAJBnOB97nRzjuS5rrbPsEMDTFBxMRctLouzfAABGr5RyHn1+sXMSTsdCFxQcTIX9GwAA+d5Gn5dV5rXWD9khgMcpOJiKeXaADezfAAAmo/PLKu+djoW2KTgYveG81yw7xwbL7AAAAMc0fLnT69JRp2OhYQoOpmCeHeAR9m8AAJNTSrmJiI/ZOZ5hFhHvs0MAD1NwMAX2bwAANKaU8iEibrJzPMO7Wus8OwTwdwoOpqDVt5L2bwAAU3ceET3+POSpCjRIwcEUzLMDbNDjH+YAAHszLB09j/6WjjodCw1ScDBqjY8P2r8BAEzeMNF6kZ3jGc5qrWfZIYA/KTgYu1afp0TYvwEAEBERpZTriPiUneMZrjxVgXYoOBi7ZheMllKW2RkAAFpRSrmI/p7weqoCDVFwMHatTnAsswMAADTobfS3j8NTFWiEgoPRqrXOYn2rvEW9fTsBAHBwpZRVrEuO3niqAg1QcDBmrU5vRFgwCgDwoOEZ78fsHDvyVAUaoOBgzJrdvxGeqAAAbFRK+RD9/bzkqQokU3AwZq1OcKyGm+8AAGzW4z6OS09VII+CgzGbZwfYYJkdAACgdcMXQufZOXY0i4j32SFgqhQcjFKttdXpjYiIf2cHAADoQSnlJiI+ZefY0bta6zw7BEyRgoOxmmcHeMQyOwAAQC9KKRfR3wW6y+wAMEUKDsbqx+wAm5RSevsDGgAgW2/7OE5rrR+yQ8DUKDgYq1afqCyzAwAA9KaUsoqIi+wcO3pfa51lh4ApUXAwVq0WHL9lBwAA6FEp5ToibrJz7OgqOwBMiYKD0Wl8qZPnKQAAz3ceEavsEDuY11oX2SFgKhQcjFGr0xsRnqgAADxbp6djL2utJ9khYAoUHIxRqwtGV8MfygAAPFMpZRl9nY49iYj32SFgChQcjNE8O8AGnqcAAOzHx+jrZ6t3tdaWp4xhFBQcjMow/jfLzrGBBaMAAHvQ61OV7AAwdgoOxqblZrynbxkAAJpWSrmN9SRHLywchQNTcDA28+wAmwzvRQEA2JNSyofo60skC0fhgBQcjE2rC0Z7+oMXAKAnPT1VsXAUDkjBwdjMsgNsoOAAADiADp+qWDgKB6LgYGxa/cPi39kBAADGqsenKtkBYIwUHIxGrXWeneERPf2BCwDQo56eqsxrrWfZIWBsFByMSavTGxaMAgAcWIdPVUxxwJ4pOBgTC0YBACass6cqs1rrh+wQMCYKDsak1QmOZXYAAIAJ6empyi/OxsL+KDgYk1YLDgtGAQCOZHiq8ik7x5ZOwlMV2BsFB6PQ+KmtVXYAAICJ+Rj9/Ay2aPxnWeiGgoOxaPYPBQtGAQCOq5RyF309VTHFAXug4GAsLBgFAOAPw5dMN9k5tjSvtc6zQ0DvFByMRasTHAoOAIA8FxFxlx1iS6Y44IUUHIxFqwWHBaMAAElKKatY7+PowWmtdZEdAnqm4KB7tdZZrDdQt8gEBwBAolLKp+jnZ7L32QGgZwoOxmCWHWATC0YBAJpwkR1gS7Na64fsENArBQdjMM8OsEEv3xQAAIza8KXTdXKMbf1Sa211OhmapuBgDFq9oLLKDgAAwB96WTh6EhHvskNAjxQcjMEsO8AGFowCADSilHIX/SwcNcUBz6DgYAxavaCyzA4AAMCfOlo4ehIWjsLOFBx0rdY6z87wiB7+8AQAmJpeFo6+G64FAltScNC7WXaADe6GMUgAABrS2cJRUxywAwUHvZtlB9jA9AYAQLs+Rh8LRxemOGB7Cg5691N2gA1+yw4AAMDDSimriPg1O8eWTHHAlhQc9G6WHWCDVXYAAAAe9Sn6+JnNFAdsScFB72bZATbwRAUAoGGdnY01xQFb+CE7ADzXcEHlS3aOh5RS/N8WAEAHaq1fI+I0O8cWXg1Pa4ANTHDQs1l2gA1MbwAA9KOXs7GmOOAJCg56NssOsMEqOwAAANsZzsYuk2Nswy4OeIKCg561ekHl39kBAADYyXl2gC2Z4oBHKDjo2Sw7wAaeqAAAdGTYbXGdHGMbpjjgEQoOejbLDrCBggMAoD8fI+IuO8QWTHHABgoOujRcUGmS7dYAAP0Zfob7NTvHFs5qrSfZIaBFCg56NcsOsMEyOwAAAM/2Kdqf4jiJiHfZIaBFCg56NcsOsMEqOwAAAM9TSrmLPqY4fjHFAX+n4KBXrV5Q+U92AAAAXsQUB3RKwUGvWm2sl9kBAAB4vmGK42N2ji38nB0AWqPgoFen2QE2WGUHAADgZUopn6L9n+tmtdZFdghoiYKD7tRaWy03XFABABiPHqY4nIyFexQc9GiWHWCDZXYAAAD2o5RyHX1MccyzQ0ArFBz0qNUJjlV2AAAA9soUB3REwUGP/k92gA1cUAEAGJFOpjjmLT/hhmNScNCjWXaADW6zAwAAsHc9THH8kh0AWqDgoEetNtSr7AAAAOxXJ1Mci1rrLDsEZFNw0JVa60lEnGTneEgpxQQHAMA49TDFscgOANkUHPSm1ekN5QYAwEgNUxx32Tme4JkKk6fgoDez7AAbtP4HHgAAL/NrdoAnnNRaF9khIJOCg97MsgNs8Ft2AAAADupTtP+llikOJk3BQW9+zA6wwSo7AAAAh1NKuYv2pzhOa63z7BCQRcFBb5pcMBoKDgCAKehhiuPn7ACQRcFBb+bZATawZBQAYOSGKY6b7BxPWAyXB2FyFBx0o+HfqO+GP+wAABi/Hk7GvssOABkUHPTEiVgAAFKVUlYRcZ0c4ymeqTBJCg56MssOsMEqOwAAAEf1z+wAT5jVWs+yQ8CxKTjoySw7wAb/yQ4AAMDxlFKWEbFMjvEUUxxMjoKDnrR6ItYTFQCA6Wn9ZOxZrXWWHQKOScFBT5pdMpodAACA4yql3ET7T5UX2QHgmBQc9KTJJaPDiCIAANPT+hSHZypMioKDnrQ4wWF6AwBguq6j7Z8HLRtlUhQcdKHWOs/OsIH9GwAAE1VKuYv2T8b+IzsAHIuCA15mlR0AAIBUrT9TWdRaW5yEhr1TcNCLeXaADZyIBQCYsFLKKiJusnM8YZEdAI5BwUEv/ic7wAaeqAAA8M/sAE+wbJRJUHDQiyYvqETbS6UAADiCDk7GntZaW/15GvZGwUEvWn03aIIDAICI9ndxmOJg9BQc9KLJxnnYnA0AANfZAZ6wyA4Ah6bgoHkNb31eZgcAAKANHZyMPam1nmWHgENScNCDJqc3wv4NAAD+qvVlo//IDgCHpOCgB61OcPw7OwAAAO0opSyj7WWji4ano+HFFBz0wAQHAAC9aH3ZqGcqjJaCgx78T3aADVxQAQDge9fZAZ7gmQqjpeCgByY4AADoQgfLRs88U2GsFBz0oMnfgEspJjgAAHjIv7IDPGGRHQAOQcFBD1qc4DC9AQDAg0opN9H2stGfswPAISg44HlMbwAA8JiWT8ae1lpn2SFg3xQcNK3WOs/OsIEJDgAAHnOdHeAJrqkwOgoOeJ5/ZwcAAKBdpZRVtD3165kKo6PgoHXz7AAbmOAAAOApv2YHeIRnKoyOggOep+U2HgCANtxkB3iCZyqMioKD1v2YHWADExwAADyqlHIXbe/i8EyFUVFw0LqT7AAPKaWY4AAAYBv/yg7wCM9UGBUFB62bZQd4gOkNAAC2Ukq5ibZ/fpxnB4B9UXDQull2gAeY3gAAYBct7+L4R3YA2BcFB82qtTb5PAUAAHb0z+wAjzjzczdjoeCgZafZATb4LTsAAAD9KKUsI2KVHOMxrqkwCgoOAACAw2v5mcpP2QFgHxQctGyeHWADOzgAANhV089UsgPAPig4YHctb8EGAKBBpZTbaPeZykmtVclB9xQctOzH7AAbmOAAAOA5PFOBA1Jw0LImtzmXUkxwAADwHJ6pwAEpOGhZiwWHcgMAgGdp/JnKrNY6yw4BL6HgoGUtnon1PAUAgJdo+ZmKKQ66puAAAAA4nn9lB3iEPRx0TcFBk2qtLU5vRET8lh0AAIB+lVKW0e6zZxMcdE3BQata3L8BAAD70OwzFedi6ZmCg1a1WnDYwQEAwEt5pgIHoOCgVa0+UWl1nBAAgE6UUpqd4AjPVOiYggN2o+AAAGAfWi05nIulWwoOWvVjdoCHDLfLAQDgpVp+pjLPDgDPoeCgVa3u4AAAgH1YZgd4xD+yA8BzKDhge6Y3AADYi1LKKtr9+XKeHQCeQ8FBq+bZAR5g/wYAAPvU6jOVk1prq0v/YSMFB2xPwQEAwD61umg0os0vHOFRCg6aU2ttdf/Gv7MDAAAwHsMC+1a/RPspOwDsSsFBi4zDAQAwFa1OccyzA8CuFBywvVaXQAEA0K/fsgNsYA8H3VFw0KJZdoANWh0fBACgX8vsAI+YZweAXSg4aNEsOwAAABxD4+di7eGgKwoO2FIpZZmdAQCAUVpmB9hgnh0AdqHgoEU/ZgcAAIAjsocD9kDBQYtaPBO7yg4AAMBoLbMDPGKeHQC2peCA7ayyAwAAME6llLtot+QwXU03FBy0yBgcAABT0+ozlXl2ANiWgoMWeaICAMDULLMDbDCrtc6yQ8A2FBywnf9kBwAAYLwav9hnwpouKDhoii3NAABM2DI7wAY/ZQeAbSg4aE2Lz1MiIm6zAwAAMHqt7uHwJSRdUHDAdu6yAwAAMHrL7AAbzLMDwDYUHLRmlh0AAAAytLyHo9Y6z84AT1Fw0JpZdoANPFEBAOAYWv250zMVmqfggC2UUjxRAQDgGJbZATb4MTsAPEXBQWv+JzsAAAAksmgUnknBQWta/I2z1TFBAADGp9WfPVv8OR3+QsEBT/M8BQCAoyilrCJilRzjQRaN0joFBwAAQFtMccAzKDhozTw7wANW2QEAAJiUVvdwWDRK0xQc8LT/ZAcAAGBSTHDAMyg4AAAAGlJKWWZn2EDBQdMUHDSj1jrLzrCBJaMAABxbk1McFo3SMgUHLZllB9igyT9cAAAYtVZ/BjXFQbMUHAAAAO35d3aADf5PdgDYRMEBAADQHhMcsCMFBy1p9TfLVv9wAQBgpCwahd0pOGjJSXaAh5RSLBkFACBDi1+0nTR8HICJU3AAAAC0qcWCI6Ld4wBMnIIDHmd6AwCALP/JDrDBPDsAPETBQUt+zA7wgFZbcwAAxm+ZHWADl1RokoKDljS5gwMAAJK0+mXbLDsAPETBAQAA0KBh2X2LT6bn2QHgIQoOeNwqOwAAAJPW5BRHrdX0Nc1RcNCSFm9qt7rYCQCAafgtO8AGLf7szsQpOGiJFhgAAP5qlR1gAwUHzVFwAAAAtGuVHWADX07SHAUHPG6VHQAAgOkqpSyzM2zwU3YA+J6CgybUWmfZGTZYZQcAAGDyWrykYoKD5ig4aMUsOwAAADSqxUsqdnDQHAUHAABA21osOFqewmaiFBzwuBbHAQEAmJb/lx1gg1l2ALhPwQGPKKU02ZYDADApy+wAG3imQlMUHLTCb44AAPCwVqeKLRqlKQoOWuE3RwAAeEDDU8U/ZgeA+xQcAAAA7VtlB3iALylpioIDNltmBwAAgMEqO8ADPDOnKQoOAACA9rX4TMUEB01RcNCKn7IDAABAw5o8FVtrNcVBMxQcAAAA7WtxgiPCFAcNUXAAAAC0r9VTsbPsAPCNggM2+y07AAAADFqd4JhlB4BvFBwAAACNK6W0OsHxP9kB4BsFB62YZQcAAIDGtTjFYckozVBw0IpZdgAAAGhcq1Mc0AQFBwAAQB9W2QEeYIKDZig4YLNldgAAALjnP9kBHuBMLM1QcAAAAADdU3AAAAD0YZkd4CG11nl2BohQcNCAWussOwMAAAB9U3DQgll2AAAA6MAqO8AG9nDQBAUHbOYMFwAAzSilrLIzbOCSCk1QcMAGpZTb7AwAAABsR8EBAADQD1/CwQYKDgAAgH60+Iz6p+wAEKHgAAAAAEZAwUEL5tkBAACgE6vsANAqBQcAAEA//pMd4AGz7AAQoeCATSxvAgCA7cyyA0CEggM2aXF5EwAAABsoOAAAAPqxzA4ArVJwAAAA8CK11pPsDKDgAAAA4KVOswOAggMAAADonoKDFvyUHQAAADrh2h9soOCAh7miAgBAc0opfk6FDRQc8LB/ZwcAAABgewoOAAAAXmqWHQAUHAAAALzULDsAKDgAAACA7ik4AAAA+uKSCjzgv7MDkKPWOov1GNl8+B/9GBEnw/97/rf/wOOWw3+9i/VyzrtY/6a7KqWsnh0SAAB4SLeXVO59DjmN9eePfX4O+fY/8zlkohQcE1BrPY31bxY/xl9LjX25/9c7++7Xjlj/JnMb6990bkspGmcAABi54XPIaaw/h3z7TLJP9/963z6HvB9+7Yih7Ij155ClzyHjp+AYoXuFxj9i/7+JPMc87uWotd7F+jeb3yLiJiURAACwV/c+h/w0/NeTx/79RzC//9/cKz3+FQqPUfohOwD7UWs9iz8LjVlqmHH4WEr5kB0CAAC+V2v9Em18kdm7VQyFRynFF68jYIKjY/dKjbPIb0fHRpsLAADjNouIRUQshinzm1B2dE3B0ZlhKc8iIn4OkxqH1O3iJgAAYGcn8WfZsYqIf0bEtWWlfVFwdKLWOo+IX+K7JZ4AAADs1SzWy0rf11pvIuLXUsoyNRFbUXA0rta6iPW0xjw3CQAAwOScRcRZrXUZEf8spVznxuExCo5GDcXG+/AMBQAAINs8Iua11vexPkhwnRuHhyg4GjM8RbmM9Z1oAAAA2jGLiKta6y8RceHpSlsUHI0YlodehacoAAAArTuNiC/D05Vzy0jboOBIVms9iYh3sX6OAgAAQD/mEfF7rfVjRHwqpbjGmOi/sgNM2fAc5WsoNwAAAHr2PiK+Dp/xSGKCI8EwtfE+1pMbAAAA9G8W62crn2K9iNQ0x5GZ4Diye1Mbyg0AAIDxeRemOVIoOI6o1vohIr6E068AAABjNov1NMeH5ByT4onKEQxPUj6HCykAAABT8r7W+lNEvPVk5fBMcBxYrfU0In4P5QYAAMAUzWN9aeU0O8jYKTgOqNa6iPWTlJPkKAAAwHjMswOws5NYP1lZZAcZMwXHgQxvra5CudGlUsoyOwMAADAqJxFxZS/H4Sg4DqDWehXrM7AAAABw3/vhMyN7puDYs+Ef1EV2DgAAAJq1UHLsnysqe+JSCgAAADtY1Fpn4cLK3pjg2IOh3PgSyg0AAOCAXOIYnXmsl4/a3bgHCo79+BwRfqMBAAAOzQfh8TmN9WdKXkjB8ULDu6l5dg4AAAC6NbeT4+UUHC9goeh41VovszMAAACTYvHoCyk4nmm4XbxIjsHhvKu1LrJDAADAd/6RHYCDWgyfNXmGH7ID9Gj44KtZm4a3pZSb7BAAAFBrncf6uAHjd15Kuc4O0RsFx46GrcVfwnKfqbiLiDellNvsIAAATJfPIZPjc8gzKDh2MJzu+RoRs+QoHNdtrH9zcZsaAICjGz6HfAmXG6dmFRGvfQ7Znh0cu/kcyo0pOg1PkgAAyHMZyo0pmoXzsTtRcGxpWPQyT45BnrNa67vsEAAATMuw/2+RHIM8c0tHt+eJyhaG925fs3PQhNfewQEAcAz2bnCPzyFbMMHxhOG9m7EgvvFUBQCAY7kK5QZrn4fPpjxCwfG09f7O7gAAIABJREFU92HvBn86NSIGAMChDT9z2rvBN7NYfzblEZ6oPMKdaR5hRAwAgIPwRJ5HvCmlLLNDtOq/swM0bmrPEW5jfYro37G+u/zUB/jTWI/M/RjrRnFKDfNVRLzODgEAwCj5HPK4qX8OeZUdolUmODYYRsLGPgK0jIjfImK5rxZwmHqZR8Q/Yvy/0VyUUj5lhwAAYDyGy32X2TkO7DYi/hWH+RzyU4z/+uXHUsqH7BAtUnA8oNY6i4jfs3McyE2sfzO5KaXcHfIXGpbgnEXEzzHO32TuIuLVof8+AvD/t3cH120d2bqAd791580bQcMRmB7U2HAEliJoKgJLEUiKQFIEYkcgOgLB4xqYHYFxI7h8Ebw3OMUWLZMUSALYVed831pckty2tMUmgar/7NoFsAxt/fxHzHOw6CYi/hXH3Yf83H6co+9KKdvsInoj4LhFrfVTzOsb4SoiPkTEedY3QQuNziLil5jXC/Z5KeVFdhEAAIyv1voxpjXzXNiHHM5FKeV5dhG9EXB8ZWaDRbcxtS+dJ9fxHy1NPYvp+M9cXmCkpwAAPMnMusivIuJtTMFGN93OtdazmNctmQaOfkXA8ZVa6+cY/zjFVUzBRrfzIVrQ8TLmkaRuSik/ZRcBAMC4ZrQP+RAR73sKNr7W5pzM4YGrfchXBBw3zKR74zym4ZfdvqDc1IKOjzH+kSDpKQAAjzKTfchFRLwYbB/yLsY/EmQfcoOA44bBU9NtTC8om+Q6HqXW+iymoGPUFFV6CgDAowy+D7mKaR9ykV3IY7Rw6WOMe2zFPuSG/5NdQC9uXCs0oouI+GHUcCMior0gfhfT32VE6/Y1BAAAO5vBPuS7UcONiIi2h/oh7ENmQcDxxevsAh7pVSnl+SitYPcppVy1ScBvs2t5pF+yCwAAYDj/zC7gkd7OcB/yKruWRxp1L7t3jqhERK31NCJ+z67jga4i4vnIXRv3GfjIihtVAADYyaA3pwx9JOVbWjfEpxhvH/JDKeUyu4hsOjgmoz15v4qZD5NpL5g/xfR3HYn0FACAXY26D5lluBHxnyMrI+5DRvtaOojFd3C06bn/m13HA1y/qCwinWvdNZ9jnAT1KqYujtFeEAEAOKK2D/kjxlrn2of07b+Xvg/RwTHWtUCLelGJiGh/15ES1JMY/8pbAAAO71mMs3m2DxnDWXYB2QQc47TyLO5F5dqALy6jfE0BAJBnlDWjfYh9yDAWHXC0tqNVdh07er7EF5Vr7e8+ylTj0zYwCgAA/qKtFU+z69jRK/uQeJ5dx45WbY+7WIsOOGKcK5lezXmg6K5KKecxzhWyi09PAQC401l2ATt629bgi9b2YqM8bB1lj3sQSw84zrIL2MFFKeV9dhG9KKW8iYhNchm7MIcDAIC7jLAJ3bS1NxHR9mQj3B5zll1ApsUGHO1+496H+mwj4kV2ER16Hv2fg1t8exgAAH81yDH5qxjnWMYxvYhpj9azk7bXXaTFBhwR8XN2ATt4sfRrfm7TPicjBD+6OAAA+No6u4Ad2IfcYqB9yAh73YNYcsDR++bzwtyNu5VSLqL/oyqLfWEBAOBOvR9P2bS1Nrdoe7TePz+973UPZpEBR5tavEou4z6jJIPZev8cndZaez8GBQDAkbS1Ye/HmHtfY/fgRfR9ZH611FsdFxlwRP+J1gctYd9WStlG/7eq9P61BgDA8ayzC/iGt22NzT3aXu1Ddh3fsMh9yFIDjh+zC7jHVUS4NWV376Pv9LTnrzUAAI6r5yPM9iEPYx/SoaUGHOvsAu6he+MBBkhPe29BBADgeHpeG9qHPMAA+5B1dgEZFhdwtLNIvc5FkJo+Ts+fM3M4AAAYYf5Gz2vqXvXcxXGyxDkciws4ou8k61xq+nDtc3aeXcc9en4jAwDgOHpeE9qHPMIA+5B1dgHHtsSAY5VdwD16bnHqXc+fu3V2AQAApFtnF3CPntfSvev5c7fKLuDYlhhw9Dps5dLE4scrpVxGxDa7jjt8n10AAADpel0Tbttamkdoe7heP3+97n0PZokBR6+tYf/KLmAGek1PV9kFAACQbpVdwB16XUOPpNe9XK9734NZVMDRBvv0OvDxIruAGdhkF3CHxb2wAADwF72uCTfZBcxAr3u5k6VdeLCogCP6fVFxPGUPej6mUmvt9WsPAIAD63gt6HjKHnR+TKXXr72DWFrAscou4A6b7AJmZJNdwB0WlZwCAPAnva4FN9kFzMgmu4A79Pq1dxACjj78ll3AjPT6uVxUcgoAwJ/0uhbsde08ol4/l71+7R3E0gKOv2cXcIdNdgEz0mtr2KKSUwAA/qTXteAmu4AZ2WQXcIde98AHsbSAo8f0altKucouYi46PkP4j+wCAABI0+Va0BzA/Wl7um12HbfocQ98MEsLOHq0zS5ghjbZBdxilV0AAABpVtkF3GKTXcAMbbMLWDoBR75eOw5GpiMGAADuZ828f/Z2yZYWcKyzC7jF/80uYIb+nV0AAAB0zpp5/3rc262zCzimpQUcPdpmF8BRLOrsGwAAf2ItuAzb7AKWTsCRb5tdwAxtswu4Ra+TswEAOLwe14Lb7AJmaJtdwNIJOJijbXYBAADQuW12AbBvAg4AAABgeAIOAAAAYHgCDjgO13ABACyXtSAcgYCDOdpmF3ALd2IDACxXj2vBbXYBsG8CDmanlLLNruEW2+wCAABIs80u4GudrpnhSQQczNUmu4Cv/JZdAAAAaXpbC26yC4BDEHAwV79mF/CVTXYBAACk2WQX8JXe1sqwFwIO5uoiu4AbLrUAAgAsV1sL9jSHo6e1MuyNgINZam8im+Qyrn3ILgAAgHS9rAk3Hr4xVwIO5uxtdgERsS2lnGcXAQBArrYm3CaXEdHHGhkOQsDBbJVSNpHffvcq+c8HAKAf2WvDi7ZGhlkScDB3ryLiKunPviilZAcsAAB0oq0Ns9aHV5EfsMBBCTiYtXa+8EXCH5315wIA0LcXkXNU5YXZG8ydgIPZa0n5McOGq4h4XkrJ6hwBAKBTbY34PI7bZfxCZzFLIOBgEdpQp2OEHFcR8VMppadrwAAA6EhbK/4Uxwk5Xhh6z1IIOFiMGyHHod5ILiPiB+EGAADf0taMP8S0hjyEqxBusDACDhalvcD/EBGbPf/W72Pq3Nju+fcFAGCm2trxp5jWkvu0ienB2/mef1/omoCDxSmlbEspP8V+BjydR8R3pZRXZm4AAPBQpZSrUsqriPguprXlU2xj6trw4I1F+q/sAiBLS7TPa63riPhnRDyLiJMd/tPLiPg1Is69cQAAsA/Xt//VWt9GxFlE/BwRpzv8p1cxXT37r1LK5lD1wQgEHCxeeyPYxPSGsoqIVUSsv/rXrmIKNi51agAAcCgt6HgTEW9qrScxhRyn8dcHcZuI2HrgBl8IOOCG9gaxjf3P6AAAgAdpD9Y2YW0KOzGDAwAAABiegAMAAAAYnoADAAAAGJ6AAwAAABiegAMAAAAYnoADAAAAGJ6AAwAAABiegAMAAAAYnoADAAAAGJ6AAwAAABiegAMAAAAYnoADAAAAGN5iAo5a62l2DQAAAHBMS9oLLybgiIiT7ALucJldAAAAAE/W696u173w3i0p4OhSKeUquwYAAACext4un4ADAAAAGJ6AAwAAAJ6o1rqYoyC9EnAkq7WusmsAAADgyRYzzLNXAo58q+wCAAAAYHSLCThKKZvsGgAAAOCYlrQXXkzAAQAAAMyXgAMAAAAYnoADAAAAGJ6AI59JuwAAAONbZxewdAKOfO5KBgAAgCdaWsCxyS4AAAAAjmSTXcAxLS3g6NE/sgsAAADgyb7PLmDpBBz5VtkFAAAA8GTGDyRbWsCxzS4AAACAWeox4NhmF3BMSws4/ie7gFusswsAAADgyXq8IbPHPfDBLC3gAAAAAGZoaQHHNruA29Rae0z6AAAA2EGtdZ1dwx222QUck4CjDz2e1QIAAGA3ve7pttkFHNPSAo6r7ALuoIMDAABgXL3u6XrdAx/EogKOUspldg136DXtAwAA4Nv+kV3AbTreAx/EogKOjv2YXQAAAACPtsougGUGHJvsAm6xyi4AAACAR+vxiMomu4BjW2LA0aNVdgEAAAA8XK31JPocO7Co+RsRyww4fssu4DYdXysEAADA3Xrs3oiI+Hd2Ace2xICj1xSr128KAAAA7tbrXq7Xve/BLDHg6HWKbJdTdwEAALjX99kF3KHXve/BCDj60WvqBwAAwN163cv1uvc9mMUFHKWUXtt01tkFAAAA8GBdBhwd730PZnEBR7PJLuA2tdYuvzEAAAD4q44vi9hkF5BhqQHHNruAO6yzCwAAAGBn6+wC7rDNLiDDUgOOXq/L+TG7AAAAAHbW64DRXve8B7XUgKPXYSuOqAAAAIxjnV3AHXrd8x6UgKMvq1rrKrsIAAAA7tdmKJ5k13GHXve8B7XIgKNNk91m13GHdXYBAAAAfNM6u4A7bJd4g0rEQgOOptdE6+fsAgAAAPimXmco9rrXPbglBxy/ZRdwh3V2AQAAAHzTs+wC7tDrXvfglhxw9JpqnbSzXAAAAHSo1rrOruEeve51D26xAUcpZZNdwz3+mV0AAAAAd+p2tEDne92DWmzA0fSabK2zCwAAAOBOvR5P6XWPexRLDzg22QXc4dR1sQAAAP1pIwVW2XXcYZNdQKalBxw9D1/pNREEAABYsnV2AffoeY97cEsPODbZBdzDHA4AAID+9LxX22QXkGnRAUcp5Sr6PaPkmAoAAEBH2h6t11svL9sed7EWHXA0m+wC7uGYCgAAQD9+yS7gHpvsArIJOPo+o9TzNw8AAMDS9PwQuue97VH8LbuAHtRa/192Dff4oZTS6zEaAACARai1riPic3YddymlLH5/r4Njssku4B66OAAAAPIZLto5Acfk1+wC7vGs1nqSXQQAAMBStT3ZWXYd9+h5T3s0Ao7JRXYB9ziJvs95AQAAzN1ZdgHf0POe9mgEHBFRStlGxDa5jPu8zi4AAABgwXoeHbBte9rFE3B80XPitWoDbQAAADiiWuuziFhl13GPnveyRyXg+OJf2QV8gy4OAACA4+u5eyOi/73s0Sz+Gpmbaq1/RN/J3HdajwAAAI6j1noaEb9n13GPbSnlu+wieqGD4896b+3RxQEAAHA8vXdv9L6HPSoBx5/13tpzVmtdZRcBAAAwd23vdZZcxrf0voc9KgHHDaWUy+j7NpUIXRxHVWtdG/AKAEAvrE+Pqve917btYWnM4PhKrfVdRLzMruMbzOLYs1rrSUQ8i4gfI2Idd89iuWwfv5ZStIMBAHAQX61PT9vHba7Xp79FxEUp5eo4Fc5b6974I7uOb3hfSnmVXURPBBxfGeQL+aKU8jy7iDloQ4N+ice1nl3FdObtrcAJAIB9aPuR12F9mqrW+jmmB5898+D7KwKOW9Raf4+7E9Je/FRK2WQXMaqWiL+L/Z2pextTgioxBwDgwQ6wPn0fU9BhffpA7QjQ5+w6vuGylPJDdhG9MYPjdh+yC9hB7+fBulVrfRZTl87ZHn/b1xHxe+sIAQCAnbUN9b7Xpy/D+vSx3mUXsIMR9qxHJ+C43UVM7V09W9daz7KLGE2t9WVEfIqIkwP89quI+Oz/FwAAdtXWjp/jcOvT361Pd9c+V72HQtdHkfiKgOMWrY1rhC+Yd62VjR20AbKHTmNPIuKjNxEAAL6lrRk/HuGPsj7dwY1jQr0zTPYOAo67jdDycxKOquykvaAf83acj67vAgDgLkcMN659bEe1udvrOEwnzb6NsFdNYcjoPQYZNhph4Oi92rnD3xP+6KuYJhtLVwEA+I/k9ekPbt74q0EGi0YYLnovHRz3GyUZG6GNKtOnpD/3JI6bygMAMIasNaL16S3a0ZRRPi+j7FFTCDjuUUo5j/6HjUZEnLb5Enyl1vompuFKWZ45qgIAwLUOhliuHVX5i9eRu2fY1VXbo3IHAce3jZKQvbSR/rOWxP6SXUeYkwIAwBc9rA09HG3aHuqYs/qeYpS9aRoBx7e9jzG6OCKmwUEjDMU5lmfRx5CgtfvHAQBo3Rur5DIiIlYejv7ngWjWcfaHuoppb8o9BBzfMNCVsRHTi+UoZ8eOoYfujWs91QIAQI6fswu44Z/ZBXTgY/TxQHQXrobdgYBjN2+zC3iAZ7XWUVqsDqalsT11TayzCwAAIE9bn/Y0+6KnWo6u7ZlG+hyMtCdNI+DYQbtG6Ty5jId4p+Wsu0BhVWtdZRcBAECanh6+RUScLPUYddsrjTSH5NzVvrsRcOxutMTs01JfsJoe/+6r7AIAAEizzi7gFj2umQ+q7ZFGmbtxbbS9aBoBx44G7OI4iWUPHf1HdgG3WGcXAAAAN6yyCzimtjcaae5GhO6NBxFwPMxoydlpRHzOLiLJKrsAAAC44cfsAojPMV7Xymh70FQCjgcYsIsjIuK01upmFQAAYLHanmi0cEP3xgMJOB7uVUx3EI/kTMgBAAAsUdsLnWXX8UBXMe09eQABxwO1u4c/ZNfxCEIOAABgUQYNNyIiPrS9Jw8g4Hic9xGxzS7iEYQcAADAIgwcbmxj2nPyQAKOR2hJ2qjDXoQcAADArA0cbkREvNW98TgCjkcqpZxHxCa5jMc6q7Uu+QpZAABghmqtJ4OHG5u21+QRBBxPM/LQl7OI+CzkAAAA5qDtbT7HuOFGxNh7zHQCjicopVzG2GejTmMKOUa7LmlUf88uAAAA5qjtaT7HeFfB3vS+7TF5JAHH072N8a6Nvek65HiWXciebbMLuMXIL7YAANCltpcZPdwYec5jNwQcT9SGv7zIruOJTiLiU631TXYhe/Q/2QUAAACH1fYwn2La04zshcGiTyfg2INSykVEXGTXsQeva63mcgAAAF1rw0Q/R8Tr7Fr24KLtKXkiAcf+vIixj6pcW0fEHzM8sgIAAJk8RNyTtlf5I6a9y+jmcCKgGwKOPZnJUZVr10dWPunmAACAvehxPsRQD2hb18anmMeRlGuOpuyRgGOPZnRU5dqz0M0BAABzNcyNHTe6Nua0N3E0Zc/+K7uAGXoRUzq7Sq5jX667OTYxpYvb3HIAAIClqLWuIuJjzOM4yk3bmM8JgG7o4NizmR1VuWkdUzfHG8dWHq3HtkQAAOhOO47yJuYza+NrjqYcgIDjAEopm5jvHcavYwo6XmYX8g09ttsJhgAA4BvaXuOPmMcNKbd52/aM7JmA40BKKW8iYpNcxqGcRMS7Wusftdaz7GLuIA0FAKAL7ZgF31BrPau1/hER72K+Dwc3ba/IAZjBcVjPI+L3mM88jq+tIuJjrfV1TB0rF9qsAADgL1bZBdyhi7V7e2j6Ovr9PO3LNqY9Igfyt+wC5q7WehpTyLEEVxHxISLOs4eR1lrXEfE5s4Y7/LcQCABgWXpdm5ZS0vaDba7fy4j4JebbrfG1H0opPR6lnw1HVA6sfQHPcejobU7iy4yOj+2FnD8zaBQAgMWqta5rrR8j4n9j2jssJdx4Idw4PEdUjqCUcl5r/T6mhHIpziLirNa6jamr4+LIXR1ePAAA6MVSNvG3ajNInsXUrbFKLSbH+1LKeXYRS+CIyhHVWj/F9I29VJuI+FccaVZHrfX/HfrPeISfTEwGAFiWdt1pdzeCHPKISjuC8iwifo5l74EuSinmbhyJDo7jehFTYrnUYwrr9vGx1noZX8KObWJNx7bo9B4AgG7sveP5RqfGzzGt+5duSeMKuiDgOKJSylWt9aeY980quzptH+/aMZaLiPgtpmuT5jyE8zSmvysAAGR68pq7dWmsI+LHmIKN1VN/zxnZxtS9Pee9TXcEHEfWQo7nMU1R9jR/soppPsnLiIjW3bGJiH/HFHhsH/n7XsZyu2UAAOjH99kF7EPr0DiNKdBYh7X2Xa4i4rlw4/gEHAlKKZetk0PIcbvr7o6IiKi1XsUUVvzWftzuOIHYCwoAAD0Ybs1faz2NL8frf2w/Dvf3SHAVU+eGSw8SCDiSCDke5Lr1bX39D2qtEVPYcRVT8HEdglx1/mLyY3YBAAAQEb+1EOMkvoQXP974NQ8n3EjmFpVk7UVFyLEcm1LKT9lFAABwPLXW/w3r/bkTbnTg/2QXsHTtG+BVOE6xFN7YAACWxxpw3q4i4pVwI5+AowOllPOI+CmEHEug3Q8AAObjunPjPLsQBBzdaGmfkAMAAGak1rrOroGDcSylMwKOjgg5lqFdrwUAAIxLuNEhAUdnboQc2+RSOJxVdgEAABzNKrsA9m4bwo0uCTg61L5Rfojp2lPmx5ApAIDlWGUXwF5dRsQPwo0+CTg6VUq5iqmT4yK7FvbOoFEAABjPRUydG0YKdOq/sgvgbu0b53mt9V1EvMyuBwAAeLAfswtgL96XUl5lF8H9dHAMoH0jvciug73xJgcAAON4IdwYg4BjEO1e5R/C8FEAABjJOrsAHm0b07yN8+Q62JGAYyA3ho9ukkvhaczgAACAvm3CMNHh/C27AB6n1vomIl5n18HjlFJ87wEAzFyt9TQifs+ugwd7W0p5k10ED6eDY1DtG86RlUG1NzsAAObtJLsAHmQbU9fGm+Q6eCQBx8BuHFk5Ty6Fh/NmBwAwf+vsAtjZeTiSMjzXxA6uXSX7otb6a0R8DBvnUZyGWSoAAJDtKqZbUi6yC+HpdHDMRPuG/C4ifGOOQRAFADB/P2YXwL3OI+I74cZ86OCYkdbN8bzWuo6pm2OVWhD38WYHADB/Hmr1aRtT18YmuQ72TAfHDLVv1B8i4m1yKdzNmx0AwPwZLN+ftzHN2thkF8L+uapy5mqtq4h4FxHPkkvhK66KBQCYr7YO/yO7Dv7jIiJelVK22YVwODZYC9GOrbwLKXJPvvMCCwAwT239/Tm7DuIypmBjk10Ih+eIykKUUjallB8i4kVMZ87It8ouAACAg/FgMdc2pjkbjqMsiIBjYUop56WU70LQ0YN1dgEAABzMP7ILWKhtTMHGd6WU8+RaODIBx0IJOrrw9+wCAAA4GB0cx7UNwcbiCTgWTtCRypseAMB8WesdxzYEGzSGjPIntdZnEfFLOD5xDFellP/OLgIAgP2qtZ5ExP9m1zFzm4j4UEq5yC6Efgg4uFWt9TSmoONZRJwklzNn/11KucouAgCA/XGDysFcxXTd64dSymV2MfTnv7ILoE/tBeNFrfVVRJxFxD9Dm90hnMaUPgMAMB/Wzft1GRH/iohzDwe5j4CDe7UXkPcR8V5Xx0GsQ8ABADA3blB5Ot0aPJiAg51dd3XE1NnxLCJ+DmHHU3nzAwCYHx0cj3MdavxqtgaPYQYHTybseJLLUsoP2UUAALA/tdb/DeviXQk12BsBB3vVwo4fYwo7VrnVjKGU4vsQAGAmaq2riPgju47ObeNLqLHJLYU5sbHiYNqL+zqm7o51SLHv8oNzhQAA89Ae+H3KrqMzVzHNnfs1IjallG1qNcyWGRwcTHvhOm8f11fPrmPq8DgNHR7XTmOaDA0AwPjM35g6NC4j4reYAg1rXY5CwMHRtBe2y5huZbnu8DhtH9ehxxK7PL7PLgAAgL35MbuAI7uKL2HGZUwz5rapFbFYAg7StBe+bUzn7yLiL6HH9zF1ecw9BZ/73w8AYElW2QUc0CamQOPf7edbYQY9MYODIbTgYxVfujy+bz/OouvDoFEAgPHNYMDodTfGdYhx/WtBBkOwqWIWbgQgEX8OPb6PPwcgvQYiBo0CAAyu4wGj2xsf/9P+2XV4ESHAYCYcUWEWbhx3iZja5W5Va/0YEWcHL+jhDBoFABhfr0eP/1VKeZNdBBza/8kuAI7s39kF3MGgUQCA8fU6YHSTXQAcg4CDpem1S2KdXQAAAE/WawfHNrsAOAYBB4tSStlk13CHXt8MAQDYQa2111lvV+ZrsBQCDpZom13AbWqt6+waAAB4tF4fWPXawQx7J+BgiXp9kV9nFwAAwKP1On/jt+wC4FgEHCxRry/yBo0CAIxLBwckE3CwRL2+yK+zCwAA4OFqrSch4IB0Ag4Wp+NBoydtOBUAAGNZZxdwBwNGWRQBB0vVa5K9zi4AAIAH63X+xia7ADgmAQdL1WvAYQ4HAMB4eu3C/Xd2AXBMAg6WqtdBo+vsAgAAeLB1dgF32GQXAMck4GCpeu3gWNVaV9lFAACwm1rrOruGu3Q8ew4OQsDBIpVSLiPiKruOO6yzCwAAYGfr7ALu0OsDPTgYAQdL1uuLfq9DqgAA+Kufswu4wya7ADg2AQdL1uscjmfZBQAA8G211pMwYBS6IeBgyTbZBdzhpNba6xslAABfrLMLuMcmuwA4NgEHi9X50KV1dgEAAHxTr0eLt6WUbXYRcGwCDpZuk13AHXp9swQA4ItejxZvsguADAIOlq7XQaO9vlkCABARtdZVRKySy7iL+RsskoCDpet10GjXd6oDAND1keJNdgGQQcDB0m2yC7hHr1eOAQDQ71rtqpTSa5cyHJSAg0UrpVxFv8dU1tkFAABwp3V2AXfYZBcAWQQc0O+bwGk72wkAQEfaUeKT7Dru0O0RbDg0AQf0/Sawzi4AAIC/6PV4SkTERXYBkEXAweKVUnp+E+j5zRMAYKnW2QXcYVtK2WYXAVkEHDDZZBdwB9fFAgB0pB0hPs2u4w6b7AIgk4ADJt0eU6m1CjkAAPrR89qs2zUtHIOAAyaOqQAAsIsfswu4R89rWjg4AQdERLsr/Cq7jjusswsAACCi1noS/XZwXJZSel3PwlEIOOCLTXYBd1jVWns95wkAsCS9hhsR/a5l4WgEHPDFr9kF3OOf2QUAAND10eGe17JwFAIO+GKTXcA9en5aAACwFOvsAu5wVUrZZBcB2QQc0LQ7wy+z67iDYyoAAInazXYn2XXcYZNdAPRAwAF/tsku4B6OqQAA5HE8BTon4IA/6/nNwTEVAIA8Pa/FNtkFQA8EHHBDO7vY6/VajqkAACRwqARCAAAdNElEQVTo/HjKZTtqDYsn4IC/usgu4B6OqQAAHF/Px1M22QVALwQc8Fe/ZRdwj55bIwEA5qrnNdi/sguAXgg44K967uBwTAUA4Ig6P56yLaX0egsgHJ2AA75SSrmKvkMOx1QAAI6n57XXJrsA6ImAA27nmAoAwMLVWk+i77VXzzcAwtEJOOB2PXdwrGqt6+wiAAAWoOdw46qU0vOaFY5OwAG3aFdt9XyesedWSQCAueh5zSXcgK8IOOBuPU+k7vlpAgDA8Gqtq4hYJ5dxn56PVEMKAQfcredU/KTWepZdBADAjPX+QKnntSqkEHDAHQY4pvJzdgEAADP2S3YB97hoN/8BNwg44H5dH1NprZMAAOxRrfU0IlbZddzD7SlwCwEH3K/31r/eWycBAEbUc/dGRP9rVEgh4IB7DHBMpfc3XwCAodRaT6Lvh0iOp8AdBBzwbT0fU1nVWtfZRQAAzMiziDjJLuIejqfAHQQc8G29twD2fD87AMBoel5bXUX/a1NII+CAbxjgmMpZa6UEAOAJ2gD3dXIZ93E8Be4h4IDd9HxMJaLvc6IAAKPofb6Z4ylwDwEH7OY8u4BveJ1dAADADJxlF3CPq1KK4ylwDwEH7KC1Avb8hmLYKADAE9Raz6Lv4aI9r0WhCwIO2F3vLYE9D8QCAOhd72upD9kFQO8EHLC7i5gmV/fKsFEAgEeotZ5G38NFt6WUnofeQxcEHLCjAY6pRES8zC4AAGBAvQ8X7X3gPXRBwAEP0/ubS++tlQAAXWkdsL3fSHeeXQCMQMABD1BK2UTENrmM+6zagCwAAHZzFn0PF92UUrbZRcAIBBzwcLo4AADmw/EUmAkBBzzceXYB37Bug7IAALhHrfVZRKyy67jHCDPgoBsCDnig1iK4SS7jW3p/EgEA0IPe10wXbdA9sAMBBzxO762CrowFALjHAFfDRkR8yC4ARiLggEcopZzH1DLYM1fGAgDcrffujctSymV2ETASAQc83nl2Ad/wiy4OAIC/qrWuYro9pWe9dwxDdwQc8Hi9twyOcKc7AECG3rs3Ivp/mAbdEXDAIw0ybPR1dgEAAD1pHa5n2XV8w7nhovBwAg54mt5bB1e11rPsIgAAOvIypk7XnvXeKQxdEnDAEwwybHSEFkwAgGPpfW1kuCg8koADnu48u4BvOK21rrOLAADI1jpbdW/ATAk44OlGeBMyiwMAoP810VVEXGQXAaMScMATtWGjvb8RrXVxAABL1ro3VsllfIvhovAEAg7YD10cAAB9G2EtNMKaErol4IA9KKVsImKbXMa36OIAABZpkO6Ni9YZDDySgAP25212ATsY4ckFAMC+jbAG0r0BTyTggP25iP6vjNXFAQAsyiDdG9vWEQw8gYAD9qQNhDrPrmMHIzzBAADYlxHWPiN0AkP3BBywXyO0FuriAAAWYZDuDVfDwp4IOGCP2mCo8+QydjHCkwwAgKcaYc3zwdWwsB8CDtg/XRwAAMkG6d6IGOPhGAxBwAF7Vkq5jIhNdh07GOGJBgDAY42w1jl3NSzsj4ADDmOEQVG6OACAWRqoe2OENSMMQ8ABB9Cu+doml7GLEZ5sAADsrNZ6EmOscTa6N2C/BBxwOCMk8uv2hAMAYC5ehu4NWKS/ZRcAc1Zr/SP6f4PdllK+yy4CAOCpWvfGHxFxkl3LN2xKKT9lFwFzo4MDDmuEZH6liwMAmImX0X+4ETHGGhGGo4MDDmigpwhXEfGdO9gBgFHVWlcxrbt6p3sWDkQHBxxQCww+ZNexg5OYnngAAIxqhMGiEbo34GB0cMCBDdbF8YNp3gDAaGqt64j4nF3HDnRvwAHp4IADG6yLY5QnHwAAN42yhtG9AQck4IDjeB9Th0Tvzmqtp9lFAADsqtb6LCLW2XXsYFtKOc8uAuZMwAFHMFAXR0TEu+wCAAAeYJS1i+4NODABBxzPKF0c6/YkBACga7XWNxGxSi5jF7o34AgEHHAko3VxtOGoAABdamuVX7Lr2JHuDTgCAQcc1yhdHKtwbSwA0Ld30f8tdRG6N+BoBBxwRIN1cfxSa11lFwEA8LV2LexZchm70r0BRyLggOMbpYvjJMYZ2gUALMsoaxTdG3BEAg44ssG6OJ61JyQAAF2otb6MiFGutde9AUck4IAco3RxRER8zC4AACDiP4NFX2fXsaNL3RtwXAIOSNC6OF5l17GjVbuCDQAg2yiDRSPGWevBbPwtuwBYslrrHzHG3e1XEfFDKWWbXQgAsEzt2Ozn7Dp2tCml/JRdBCyNDg7INcq5zJNwVAUAyDXKYNGIcdZ4MCsCDkjUzmVeZtexo3Wt9Vl2EQDA8rTjsqMMFr0opWyyi4AlEnBAvpHOZ35sw70AAI6i1rqKiF+y63iAkdZ2MCsCDkjWEv5Nchm7GmlyOQAwDx9jnMGi52aWQR4BB/RhpKT/ZRvyBQBwULXWs4hYJ5exq5FuyYNZEnBAB0oplxFxnl3HAziqAgAcVFtrjDRY9EMp5Sq7CFgyAQf0421Myf8IVhHxMrsIAGDWRjqaso2I99lFwNIJOKAT7bzmh+w6HuB1rXWUaeYAwEDazW0j3d72VvcG5BNwQF/ex/QEYBQfswsAAOalHU0ZaY1xWUo5zy4CEHBAV1ry/za7jgc4bffSAwDsy0hHUyIMFoVu/C27AOCvaq2fY5yJ4RERP7RBqQAAj9aOpnzKruMBLkopz7OLACY6OKBPI3VxRIzVRgoAdGjAoymuhYXOCDigQ6WUTYx1bexprXWka9wAgP6MdjTlQxsSD3RCwAH9ehXjXBsbEfGy1rrOLgIAGE+t9SzGujVlG66Fhe4IOKBTAw4cjYj42NpLAQB2UmtdRcRonaCvXAsL/RFwQMdKKe8jYqThnasYb4ECAOQa7WjKppRykV0E8FcCDujfaMOrztoEdACAe7Xr5tfJZTzUi+wCgNsJOKBzAw4cjZiOqqyyiwAA+lVrPY2I19l1PNBbg0WhXwIOGMNoA0dHu+YNADiiAa+EjYjYllLeZBcB3E3AAQMYdODourWdAgB87V1EnGYX8UCOpkDn/pZdALC7WuvnGO+c6g+llJEGpQIAB9RmdX3KruOBLkopz7OLAO6ngwPGMtrA0YiIT66OBQAi/nMl7GhHU65C9wYMQcABA2mdEKMdVVnFeAsZAOAwPsVYV8JGTINFR5qFBosl4IDxvI+IbXYRD/Ss1voyuwgAIE+tdcS5G5tSyvvsIoDdCDhgMO0Jwohtku/adXAAwMK0uRsjPuwYcc0FiyXggAGVUjYRcZ5cxmOYxwEACzPo3I2I6WjKNrsIYHcCDhjXq5iGXo1kFWMucACAxxtx7sZlKeVNdhHAwwg4YFADH1UxjwMAFqLW+jHGm7sRMeYaCxZPwAEDK6VcRMRFdh2P8K7Wus4uAgA4nFrrWUScJZfxGG/bzXXAYP6WXQDwNG2mxR8xXuvnVUR859o1AJifNlj8c4y3PrkspfyQXQTwODo4YHADH1U5iWnhAwDMSHv4MuLcjYgx11RAI+CAGRj4qMppO5sLAMzHp5gGi4/G0RQYnIAD5uNFjHerSkTEWTujCwAMrtb6LiLW2XU8gltTYAYEHDATAx9ViYj42M7qAgCDag8sRr0pbdQ1FHCDgANmpB1VOc+u45E+11pX2UUAAA/XHlS8y67jkRxNgZkQcMD8vIqIbXYRj3ASEZ/aYDIAYBCDDxV1NAVmRMABMzP4UZWRn/4AwFJ9jjGHil5FxPPsIoD9EXDADJVSNhHxNruORzqrtb7JLgIA+LZ2G9qoc7TellK22UUA+/O37AKAw6m1/h7jLjpelFLOs4sAAG5Xa30Z43ZeXpRSdG/AzOjggHkb9erYiIh3blYBgD61G1NGDTdGPs4L3EPAATPWJoK/yq7jkU7CzSoA0J3Bb0yJiHjeZpYBMyPggJlrxzwusut4JDerAEBH2oOHzzHmjSkREe/brDJghgQcsAwvYsyrYyOmGSKfs4sAgKUb/DrYiOlK2FE7W4EdCDhgAVob5siDtE7blHYAIM/nGHd4+ehrIWAHAg5YiDaPY9SrYyOm62NHPu8LAMMa/DrYiOl2tm12EcBhuSYWFqbW+jki1tl1PIHrYwHgiFq4cZZdxxOcl1LcmgILoIMDlud5jHt1bETEx3Y1HQBwYO099yy5jKcY+UY54IF0cMAC1VrXMf7gzh/asRsA4ABauDHyDKyriPjJegGWQwcHLFC7Hm3keRwREZ9rrSOfBQaAbs0g3IiIeCXcgGXRwQELVmv9FBHPsut4Ak9mAGDP2gOEzzHudbAREe9dCQvLo4MDlu1FRGyzi3iCk5g6OUZegAFAN2YSblwKN2CZBBywYKWU6zvhRx46KuQAgD2YSbhxvbYBFkjAAQvXjneM/pTjNIQcAPBotdZVjB9uREQ8L6Vss4sAcgg4gCilnEfEeXIZTyXkAIBHaO+dn2L8cONVG6QOLJQho8B/1Fp/jykoGNllTINHRz52AwBH0cKNzzH++/95KeVFdhFALh0cwE0/xdjzOCJ0cgDATmYUbszhuC2wBwIO4D9a18NP2XXswWlEvMsuAgB6NaNw4yqmuRujP6AB9kDAAfxJGzo6hxbPs1rrx+wiAKA3Mwo3IgwVBW4QcAB/0YaOvs+uYw+EHABww8zCDUNFgT8xZBS4U631c0Sss+vYA4PHAFi8mYUb3tuBv9DBAdzneUyDu0ankwOARZtZuHEp3ABuo4MDuFet9TSmBdEcbiVxhSwAizOzcGMbET94Lwduo4MDuFcbOvo8u449cYUsAIsys3DDjSnAvQQcwDe1AV5zaQUVcgCwCDMLNyKmcGMOR2eBAxFwADuZ0c0qEUIOAGauHTH9PeYTbrxwYwrwLWZwAA/ShnWeZdexJ2ZyADA7M5ufFeHGFGBHOjiAh3oV87hZJeJLJ8dcnm4BsHDCDWDJBBzAg7Ruh59CyAEAXZlhuHEZ04MVgJ0IOIAHayHHi5immc/BSQg5ABhYrfUsppkbcwo3HCMFHkTAATxKm2L+U8wv5DjLLgQAHqK9d33MrmOPrmIaKjqXNQZwJAIO4NFayDGnc7EnEfFRyAHAKGqtb2J+4cZProMFHkPAATxJKeUi5hVyREwhx5vsIgDgPu1ms9fZdezZc+EG8FiuiQX2otb6MiLeZdexZya3A9CdWutJTF0bz7Jr2bMXpZTz7CKAcQk4gL1pT5LOsuvYs4twDhiATrRw43NMt4DNiXADeDJHVIC9ad0O59l17NmzmIaPzmUqPQCDard9/R7zCzfeCzeAfdDBAexdrfVTzK9t1tAzANLUWtcR8Snmcw3sNcdBgb3RwQEcwouY7q+fk+trZOcW3ADQuXa71+cQbgDcS8AB7F2bV/FTzDPk+OQaWQCOpdb6LuZ1Dew14Qawd46oAAcz40FoERZmABzQjG9KiZgegPxkgDewbwIO4KBmHnJsIuK5BRoA+1RrXcU0b2OO753CDeBgBBzAwbWQ4/eIWCWXcgjbmEKOuR3HASDBjIeJRgg3gAMzgwM4uLaQeR7TTSRzswrDRwHYg1rry5jnMNEI4QZwBDo4gKOptZ7GfBduERFvSylvsosAYCyt0/FdRJwll3Iowg3gKAQcwFEtIOS4iIgXFnEA7GLm8zYihBvAEQk4gKNbQMixDXM5APiGmc/biBBuAEdmBgdwdG3j/1PMcyZHxJe5HGfJdQDQqZnP24gQbgAJdHAAaRbQyRERcV5KeZFdBAB9aPM2PkbEnIdTCzeAFAIOINVCQo7LmI6sbLMLASBPe8/7FPO8Nv2acANI44gKkGoBx1UipsFxv7tKFmC52pGU30O4AXAwOjiALixgivy196WUV9lFAHAcCzmSEiHcADog4AC60RaBn2P+IYcjKwALsJAjKRHCDaATjqgA3WgLo59iWijN2fWRlbPsQgA4jIUcSYmI2IRwA+iEDg6gOwvq5IiIOI+IVxaGAPPQ3sM+RcQ6uZRjcFMY0BUBB9ClhS0QtzEdWZl75wrArLVh0h9j3jeDXRNuAN0RcABdq7V+jIiz7DqO5G0p5U12EQA8TAvlX0fEy+xajkS4AXRJwAF0b2EhhwGkAANZ0CDRa69KKe+ziwC4jSGjQPfaU6KlLKauB5Au5SkgwLBqrW9iGYNEr70QbgA908EBDKPdOvIxu44j2sS0mNwm1wHADa1r42MsYxj2tRellPPsIgDuo4MDGEZbWC3pzO86dHMAdOVG18ZSwo2riPhBuAGMQAcHMJz25OxzLGNK/bVN6OYASLPQro2riPjJLV/AKHRwAMNpC62fYlp4LcU6dHMApFhg10bENPT6O+EGMBIdHMCw2rV8n2NZC84I3RwAR7HQro2I6X3meSllSQ8SgBkQcABDayHHp5g6HJbkKiI+lFLeZBcCMDftveVlRLzOriXBebu9DGA4Ag5gFmqtHyPiLLuOBJcxdXNoIQbYg1rrOqaujVVuJSneCs6BkQk4gNlo8yneZdeR5H1MC1PtxACP0Lo2PkbEs+xakrgGFhiegAOYlVrrWUwhx5JuWLm2jYhXpZSL7EIARtIC8texzPcON6UAsyHgAGZnodfI3rQJQ0gBvmnBQ0SvXcY0THSbXQjAPgg4gFla8A0rN72NiPeOrQD8WXuPeB3TINGluogpDPceAcyGgAOYrbaAfRfLHD56bRuOrQD8x8KPo1x7X0p5lV0EwL4JOIDZW/jw0WubmIIOZ6yBRWq3o7yLZXf2XcX0XnCeXQjAIQg4gEWotT6L6Zz1kp/YRbhtBViYWusqpmBjqbejXDNMFJg9AQewGIbJ/cdVTCHH++xCAA6lHVO8Po6ydJcxhRvCbWDWBBzAorQF78fwJC/CfA5gphZ+ZfjXzkspL7KLADgGAQewSLXWN+Gp3rVNTB0dm+Q6AJ6kzdn4GBGr3Eq6YN4GsDgCDmCx2kL4U3jCd+0ipsXwNrsQgIdor+evI2KdW0k3thHx3LwNYGkEHMCiteFzn8JcjpvOY+ro2CbXAXAvA0RvdRERL8zbAJZIwAEQEbXWdzENo+OLtxHx3iIZ6E0LNl5HxFluJd15W0p5k10EQBYBB0DjKtlbXUXEhxB0AB0QbNzpKqYjKZvsQgAyCTgAbnCV7J0EHUCadgPW69Bpd5tNTOGG12Zg8QQcAF+xkL6XoAM4mtaxcRYRv4Tuuts4kgJwg4AD4A6OrNxL0AEcjKMo3+RICsAtBBwA93DLyjcJOoC9EWzsxC0pAHcQcADsoNb6JqZFN3c7D9fLAo8g2NjZq1LK++wiAHol4ADYUa11HdORlVVuJd07j4gPpZTL7EKAvrXX1dcRsc6tpHuXMXVteF0FuIeAA+AB2gDSjxHxLLuWAWxi6ujYJNcBdKbWehbT4FDH/77tfSnlVXYRACMQcAA8QlucvwsDSHexjSnoOE+uA0jUAuKzmIKNVWoxYzBIFOCBBBwAj9TOjH8MrdW7uh5Iem5OByzHjfkaz0IovCuDRAEeQcAB8ES11pcxLd4t3Hd3HhH/8mQS5qtdtf1LCIEf4iqmYOMiuxCAEQk4APag1noaUzeH8+QPcxlTV8eFJ5UwPsdQnmQT05EUr4UAjyTgANgj18k+2lVMLdluX4EBtdtQ/hmueX2Mq5jmFLn+FeCJBBwAe6ab48l0dcAAdGvsxSamIynb5DoAZkHAAXAgujmeTFcHdEi3xl7o2gA4AAEHwAG5aWVvtvGlq2ObWwosT3stO4sp2Fhl1jIDbkgBOBABB8ARuGllry4i4tdSynl2ITBn7QjK9U0ojtw9nRtSAA5MwAFwJO0J6LuYNgw83fURll9tGGB/2vWu/wyvVft0HhGvdG0AHJaAA+DI2ubhY+jm2KermDYQ/zKvAx6uvS79HFOo4bVpf7YxdW1skusAWAQBB0CC1vr9OiJeZtcyQ9uYOjuEHXAPocbBvS2lvMkuAmBJBBwAiVwpe3DbmMKO3xxjAaHGkWzC1a8AKQQcAB0whPQozOxgcW4MCv05ptucvMYczjamORteXwCSCDgAOtE2Iu9iuoqRw7uIiF8jYuNJK3PSBhrfDDU4vLcR8d4QUYBcAg6AztRa1zEFHY6tHM9lTG3lvxoGyIja0ZMfYwo2VrnVLMomHEcB6IaAA6BTtdazmIIOLeXHdRXTpuW3iLiwcaFHbX7POr6EGhzXNhxHAeiOgAOgY25b6cI2/hx4aEHn6Nqxk3VMgcY6dGlkuYqID25HAeiTgANgAG1z8zGcp+/B9XGW32Ka3yHwYO8EGl06j+nq121yHQDcQcABMBDzObq0jS+Bx2Up5TK1GoZ048jJ9yHQ6M0mpuMovrcBOifgABhQm8/xOmyCenQ9w+Pf7cdLXR7c1I6erWMKKn9sP5q1059tmLMBMBQBB8Cg2ibpZUT8EjZHvbtsH/+OKfDY5JbDsbTv05vdGachmOzdVUzBxnl2IQA8jIADYHAGkQ7rMqYnxNedHltn+8fW5mactg9hxniuIuJDRLzXdQUwJgEHwEy0zdXriDjLrYQnuIov3R7/c/1zm62+tO+1VUxdGf+48XPG9T6mAaK+1wAGJuAAmJm2+XoXEc+SS2G/NjF1fFwHH1eOuhzOjaMlq/bxfUxHwdZpRXEI5+FmFIDZEHAAzFS7ceV12JAtwab9+NvNXwtA7nYjwIj48j3y41e/Zr7OQ7ABMDsCDoCZE3QQU+fHtv38t1v+2Wzmf7TrVq+H7t78+XV4sQpzMZbsPAQbALMl4ABYCEEHD7D56te/3fLvXMY0M+SQVvHXMOLv8aXzImIKME4D7ncegg2A2RNwACyMoANYkPMQbAAshoADYKEEHcCMnYdgA2BxBBwAC9dmFvwSrpcFxncegg2AxRJwABAR/7le9nUIOoCxXEXEh4g4F2wALJuAA4A/aUHHWUxdHSf3/ssAea6DjfellEMPvAVgAAIOAG5Vaz2JL0HHKrUYgC+2MR1DOU+uA4DOCDgA+KZa61lE/DMMJAXybGIKNjbJdQDQKQEHADtrN6/8M8zpAI7nPAwOBWAHAg4AHsycDuDAthHxrzBfA4AHEHAA8CTt+MovEXGaXAowvk1EfCilXGQXAsB4BBwA7EWt9TSmoONZ6OoAdncV0zGUD46hAPAUAg4A9srtK8CONhHxL7ehALAvAg4ADkZXB/AV3RoAHIyAA4CDa10dz8KsDliqi4j4VbcGAIck4ADgqNoNLNddHavUYoBD2kbEh4i40K0BwDEIOABIU2t9FhE/hyMsMBdXMXVrfCilXGYXA8CyCDgASHfjCMt12AGM5TymIyiudwUgjYADgK6Y1wHDuIiIX2M6gnKVXQwACDgA6Fab1/EsIv4Zwg7ogVADgG4JOAAYgrAD0gg1ABiCgAOA4bSwYx1mdsChCDUAGI6AA4Ch3ZjZ8WO4jQUe6/r2E4NCARiWgAOAWam1ruNLZ8cqtRjo22V86dJwpSsAwxNwADBbN+Z2XHd3wJJdRcQmplBjU0rZplYDAHsm4ABgMW50d6zDoFKWQZcGAIsh4ABgkb6a3bEOx1mYh8uYujR+i6lLw4BQABZDwAEA8aebWQQejESgAQCNgAMAbnEj8Pg+HGmhHwINALiDgAMAdtCOtJzGly6P03AlLYd1PRT03zGFGZvUagCgcwIOAHikWutpTEHH9/El/IDH2sTUoXEdaGxTqwGAwQg4AGCP2k0tpxHxjxB6cLdNfAkzLt1wAgBPJ+AAgANrnR6rmAKPH9vPV3kVcUTbuBFkxBRmbDMLAoC5EnAAQJLW7bFqH4KPsV3GNDPjt5hCja2ZGQBwXAIOAOhM6/g4iel4y99j6vxYhfAj2za+dGT835iOmVw5XgIAfRBwAMBAboQf1z9+335chQDkqa67MLYR8T/xJdDYOlYCAP0TcADAjNy4zjbiSwjy9xv/7Ob/vhTXwUXEdIQk4kt4EY6SAMA8CDgAYMHaHJBrq/hzF8jNYOSm6+DkGLbt42u/ffXrP/17QgsAWJ7/D/Q/pTpuLhLZAAAAAElFTkSuQmCC" + }, + "asset-803ec373-2608-4f6f-8cf9-0dbb2f6437ce": { + "id": "asset-803ec373-2608-4f6f-8cf9-0dbb2f6437ce", + "@created": "2018-09-06T19:42:19.366Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-466fdcbd-f265-4081-bbcc-367bfcfeaf4f": { + "id": "asset-466fdcbd-f265-4081-bbcc-367bfcfeaf4f", + "@created": "2018-09-06T19:43:02.342Z", + "type": "dataurl", + "value": "data:image/png;base64,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CiRdClkAAAAcaURPVAAAAAIAAAAAAAACyQAAACgAAALJAAACyQACUiJfkBKEAABAAElEQVR4AezdCZydWV0n/H9XUvuayr6vvdB729isza6AiDJuw7jMAOoroKMMigqDA6g4KoPOi7ijiIoivDqoL7I1Co3QG73vnU46+1qpVFJVqSXbnCdNQpKuSm7VfZ6qu3wPn/rUvc9ynnO+5zZPbt3fPeeS5z73uSdDIUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBHIVuCQL6N1+++25VqoyAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBQ7wKXJAAz6NX7q0D/CRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQCB3gTMBvdGBp3KvXIUECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKAeBVp61oaAXj2OvD4TIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKECAnqF8qqcAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBOpVQECvXkdevwkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgUAEBvUJ5VU6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC9SogoFevI6/fBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCogIBeobwqJ0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF6FRDQq9eR128CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQKFRAQK9QXpUTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQL0KCOjV68jrNwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUKiCgVyivygkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgXgUE9Op15PWbAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAoVENArlFflBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCvAgJ69Try+k2AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEChQoI6BXKq3ICBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqFcBAb16HXn9JkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFCBQT0CuVVOQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjUq4CAXr2OvH4TIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKECAnqF8qqcAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBOpVQECvXkdevwkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgUAEBvUJ5VU6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC9SogoFevI6/fBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCogIBeobwqJ0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF6FRDQq9eR128CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQKFRAQK9QXpUTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQL0KCOjV68jrNwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUKiCgVyivygkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgXgUE9Op15PWbAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAoVENArlFflBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCvAgJ69Try+k2AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEChQoI6BXKq3ICBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqFcBAb16HXn9JkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFCBQT0CuVVOQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjUq4CAXr2OvH4TIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKECAnqF8qqcAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBOpVQECvXkdevwkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgUAEBvUJ5VU6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC9SogoFevI6/fBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCogIBeobwqJ0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF6FRDQq9eR128CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQKFRAQK9QXpUTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQL0KCOjV68jrNwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUKiCgVyivygkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgXgUE9Op15PWbAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAoVENArlFflBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCvAgJ69Try+k2AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEChQoI6BXKq3ICBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqFcBAb16HXn9JkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFCBQT0CuVVOQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjUq4CAXr2OvH4TIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKECAnqF8qqcAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBOpVQECvXkdevwkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgUAEBvUJ5VU6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC9SogoFevI6/fBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCogIBeobwqJ0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF6FRDQq9eR128CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQKFRAQK9QXpUTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQL0KCOjV68jrNwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUKiCgVyivygkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgXgUE9Op15PWbAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAoVENArlFflBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCvAgJ69Try+k2AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEChQoI6BXKq3ICBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqFcBAb16HXn9JkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFCBQT0CuVVOQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjUq4CAXr2OvH4TIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQKECAnqF8qqcAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBOpVQECvXkdevwkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgUAEBvUJ5VU6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC9SogoFevI6/fBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCogIBeobwqJ0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF6FRDQq9eR128CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQKFRAQK9QXpUTIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQL0KCOjV68jrNwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgUKiCgVyivygkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgXgUE9Op15PWbAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAoVENArlFflBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCvAgJ69Try+k2AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEChQoI6BXKq3ICBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqFcBAb16HXn9JkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIFCBQT0CuVVOQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjUq4CAXr2OvH7XvMD49k1x4sjQtPrZuHBpzOldNKVzR+77Whw7sDfGn3jgzHlNl10bc+cvjtbrX3BmWykPZqrtJ0aGY3zbkxM2qeXy6ybcfrGNE9U5Hc+LXcd+AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACByhcQ0Kv8MdJCAtMSOPCH742jmx6b1rntr/6h6Hz591303CyMNvz1z8fIv/5TnBgbnfT4huaWaH3Z95RUZ1bJTLQ9u07W9sF/+Gj28Bll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ObtLWeZ2ooDeOZWc9yRrw/y3vPe8rZ4SIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjUgoCAXi2Moj4QKFGg3JDb6ctky9b2/+F7nxFgO73/Qr+zQNq8N7yj5KVtT9dVTtsnWpr3YkvWTuecrK0CeqdHzG8CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEBPa8BAnUkUE7I7XymLKQ3dMvfx5Gv/Mv5uyZ93v7qH4rOl3/fpPsvtKOctk90bimz4U00697FlrkV0LvQKNpHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEKgvAQG9+hpvva1zgYmCatNZ4vZsxiyQNnr/12L0zlvP3nzmcUNzSzRdd1N0vuIHYk7vojPbp/qgnLZPJ2iXtW+ia14s2CegN9WRdTwBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAoHYFBPRqd2z1jMCMC2ThtJMjQ3HswN5oXLE+Gto6omnl+hlvhwsSIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQqAQBAb1KGAVtIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIGaExDQq7kh1SECMy8wtvGhmb9ozldsvvTqnGtUHQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQL0LCOjV+ytA/wnkILDnF16fQy2zW0Xby14bXd/1I7PbCFcnQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCoKQEBvZoaTp0hMDsCAnqz4+6qBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEClS0goFfZ46N1BKpCQECvKoZJIwkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBGZYQEBvhsFdjkAtCgjo1eKo6hMBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEC5AgJ65Qo6nwCBENDzIiBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDwTAEBvWea2EKAwBQFDv//fzXFMyrv8K7v/rHKa5QWESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEClCgjoVerIaBcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVLWAgF5VD5/GEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEA9CowfPR4HD4/Fvv4jp7q/ckln9HQ21yOFPhMgQIAAgYoWENCr6OHROAIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg8C2Bw0Nj0Z+CeYPD49/a+M1H11y64BnbbCBAgAABAgRmV0BAb3b9XZ0AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECJQk8ODGvgset3pZZ3S1m0Xvgkh2EiBAgACBGRYQ0JthcJcjQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKlCJw4cTIaGi6JiwXzTtfV0dYYa5d3n37qNwECBAgQIFABAgJ6FTAImkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBM4W2N03HH0HR87eVNLjdcu7or2tqaRjHUSAAAECBAgULyCgV7yxKxAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgZIEDgyMxK79wyUdO9FBXR3NsXpp50S7bCNAgAABAgRmQUBAbxbQXZIAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECJwtcGT0aOxOwbwjo8fO3jytxxtWdkdrS+O0znUSAQIECBAgkK+AgF6+nmojQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJTEshmzMtmzsurmEUvL0n1ECBAgACB8gUE9Mo3VAMBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEJiywKHBsdi2Z3DK55VywrrlXdHe1lTKoY4hQIAAAQIEChQQ0CsQV9UECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQOB8gRMnTkY2a97Bw6Pn78rteUdbY6xd3p1bfSoiQIAAAQIEpicgoDc9N2cRIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEpCwwOj6dw3lCMHz0x5XOnesKaZV3R2W4Wvam6OZ4AAQIECOQpIKCXp6a6CBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAJAJ7DxyJff1HJtmb/+b21rmxbkVP/hWrkQABAgQIEChZQECvZCoHEiBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBqQscO3Yitu8djKEjR6d+cplnrFrSGd2dzWXW4nQCBAgQIEBgugICetOVcx4BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIELiIwFBa0nbHvqE4mkJ6s1Fam+fEhlXzZuPSrkmAAAECBAgkAQE9LwMCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIFCAQN/BkdjdN1xAzVOrcsXijpjX1TK1kxxNgAABAgQI5CIgoJcLo0oIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMC3BHamWfP6D41+a8MsPmpumhOXrTaL3iwOgUsTIECAQB0LCOjV8eDrOgECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjkK3AsLWW7fe9gDB05mm/FZda2bGF7zO9pLbMWpxMgQIAAAQJTFRDQm6qY4wkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwAQCI6NH48nthybYM/ubGuc2xBVre2e/IVpAgAABAgTqTEBAr84GXHcJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIH+Bw0NjsXX3YP4V51jjkgXtsXCeWfRyJFUVAQIECBC4qICA3kWJHECAAAECBAgQIECAAAECBAgQIECAAAEC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AQQQQAABBBBAAAEEEEAAAQQQQAABBBCISwEC9OLysnPSCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACTgsQoOe0MO0jgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgjEpQABenF52TlpBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABpwUI0HNamPYRQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQTiUoAAvbi87Jw0AggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIICA0wIE6DktTPsIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJxKUCAXlxedk4aAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEDAaQEC9JwWpn0EEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIG4FCBALy4vOyeNAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCDgtAABek4L0z4CCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggEBcChCgF5eXnZNGAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBwWoAAPaeFaR8BBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQCAuBQjQi8vLzkkjgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgg4LUCAntPCtI8AAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIBCXAgToxeVl56QRQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQScFiBAz2lh2kcAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEIhLAQL04vKyc9IIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJOCxCg57Qw7SOAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCMSlAAF6cXnZOWkEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAGnBQjQc1qY9hFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBOJSgAC9uLzsnDQCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggIDTAgToOS1M+wgggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAnEpQIBeXF52ThoBBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMBpAQL0nBamfQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAgbgUIEAvLi87J40AAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIOC0AAF6TgvTPgIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAQFwKEKAXl5edk0YAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEHBagAA9p4VpHwEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAIC4FCNCLy8vOSSOAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCDgtQICe08K0jwACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgggEJcCBOjF5WXnpBFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBJwWIEDPaWHaRwABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQiEsBAvTi8rJz0ggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAII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gAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAQCUCBOhVokVZBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBMoUIECvTCiKIYAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIFCJAAF6lWhRFgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIEyBQjQKxOKYggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAghUIkCAXiValEUAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEECgTAEC9MqEohgCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAAClQgQoFeJFmURQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQKFOAAL0yoSiGAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAQCUCBOhVokVZBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBMoUIECvTCiKIYAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIFCJAAF6lWhRFgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIEyBQjQKxOKYggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAghUIkCAXiValEUAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEECgTAEC9MqEohgCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAAClQgQoFeJFmURQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQKFOAAL0yoSiGAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAQCUCBOhVokVZBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBMoUIECvTCiKIYAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIFCJAAF6lWhRFgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIEyBQjQKxOKYggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAghUIkCAXiValEUAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEECgTAEC9MqEohgCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAAClQgQoFeJFmURQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQKFOAAL0yoSiGAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAQCUCBOhVokVZBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBMoUIECvTCiKIYAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIFCJAAF6lWhRFgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIEyBQjQKxOKYggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAghUIkCAXiValEUAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEECgTAEC9MqEohgCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAAClQgQoFeJFmURQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQKFOAAL0yoSiGAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAQCUCBOhVokVZBBAwTeDmjVtMq9sOFb9z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ktko/+S1mPmXdWwwoODuF6HLzJbtjndj0aR7xNK+f8U7bF289CFiuduRXO62Dgh3kpJAyTtPiWVtlyZsbua+A2E9/6aExfcFdqxZjNIpz/gO47bNufFhmNp3iVs8BiIBEogNAQr0YsOVXkmABEiABEiABEiABEiABEiABEiABEiABEiABEiABEiABEiABEiABEggJgQcq35B6TvPx8R3KKeWEacjc8TZoUzi2ufevQMlz90Dj7MyrnH9g5kPPwbWUVf5N3GfBJKGQMlbT8D1+4qEzcfQqh3ybnoMMBgTloN/4JLXHoZr/Rr/prjs593+NAz5beISi0FIgARiQ4ACvdhwpVcSIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESiDoB5+9LYHvr6aj7DedQ1yJHVM+bHM4s7v2O1YtQ+vazcY/rH9DcbzCs517v38R9EtA0gdoqJ/a8NQGuv/5I6Dxyb3oExnadE5qDf3DX5vUomXSff1Pc9vPveg76nJZxi8dAJEAC0SVAgV50edIbCZAACZAACZAACZAACZAACZAACZAACZAACZAACZAACZAACZAACZAACcSEgGPVQlE577mY+A7nNOvsq5He/+hwZgnpL581FfbvPk1IbF9QU8++yLl4HKDT+Zq4JQFNEqixFWHP20/CvXVzQvPPOvcapPcbmtAc5ILbpr4C58K5cl0xb8u7/SlRSa9tzOMwAAmQQPQJUKAXfab0SAIkQAIkQAIkQAIkQAIkQAIkQAIkQAIkQAIkQAIkQAIkQAIkQAIkQAJRJWBfPBvln74WVZ9KnZm69UTOVeOVmifEzvbhJDiXz09IbF9QQ8cuaHHRWOizrL4mbklAUwSqt/2NPe8+A0/x7oTmnT58JLKOPzehOQQL7qksR9FjN8HjsAcziWl7zvUPwrRft5jGoHMSIIHoE6BAL/pM6ZEESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAESIAEokagfNZnokLcZ1HzF6mj3JsfhbFtp0iHxd2++MXxqN60Ie5x/QPq81vCesGNmuDlnzf3ScC5djnK3nsBHrG8bSJf5r6Hw3r+jYlMIWxs+y/fo/zzt8Laxcog++KbkHbQwFi5p18SIIEYEKBALwZQ6ZIESIAESIAESIAESIAESIAESIAESIAESIAE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GI778TeEJz76ofBvvvvv0jEnnBRWn3RaiP8HJz8ECBAgQIAAAQIECBAg0L+AgF7/xlogQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgQEKCOgNcNINmQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgT6FxDQ699YCwQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwQAEBvQFOuiETIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQP8CAnr9G2uBAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAYoIKA3wEk3ZAIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDoX0BAr39jLRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAAAUE9AY46YZMgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAv0LCOj1b6wFAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEBiggIDeACfdkAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgfwEBvf6NtUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECAxQQ0BvgpBsyAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECPQvIKDXv7EWCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGCAAgJ6A5x0QyZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACB/gUE9Po31gIBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIDFBAQG+Ak27IBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINC/gIBe/8ZaIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEBCgjoDXDSDZkAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIE+hcQ0OvfWAsECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgMEABAb0BTrohEyBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgED/AgJ6/RtrgQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQGKCCgN8BJN2QCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ6F9AQK9/Yy0QIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwAAFBPQGOOmGTGASBX78r26ZxG7p05QJfPRHL5yyHusuAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgMMsCAnqzPLvGRmCKBAT0pmiyJrirAnoTPDm6RoAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEBiggoDfASTdkApMoIKA3ibMyfX0S0Ju+OdNjAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwywICerM8u8ZGYIoEBPSmaLImuKsCehM8ObpGgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQGKCCgN8BJN2QCkyggoDeJszJ9fRLQm74502MCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIDDLAgJ6szy7xkZgigQE9KZosia4qwJ6Ezw5ukaAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAYoIKA3wEmf9CEf3rc3HPj6/QvdXP3s08OKtesX9osb+7/yxZFDK9Y9I6zesnXkWJudfV+4PRza8Vg48E9fWii2+nlnh5XHPyusfdEFC8eabhT7F8vVjSle07VcLDuNPwJ60zhrk9dnAb3JmxM9IkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECQxYQ0Bvy7E/o2GMwbdcHfmOhdytP3hJO+KXrFvaLG4/+8k+OHFq19Yxw/FuuGTlWtxNDgXs/fXPY98mPhcPf3l96+Ypj14S1r/yxsOHCi0uvKZ7YecN14cA9d445lQBHAABAAElEQVQcPu61P18Z9jvw4Law871XjZRZsWkubH77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AAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECAxcQ0Bv4DTCJw28S0Ithucff/d+Sj7ptEtCL406tZBePx7Dc2pf+UFh16ta4e+Tn4EPbwr7P/O2iEF082SVIt/3dlyfr+k5r3/nvze/6YOPQX77ctG4L6E3rzE1WvwX0Jms+9IYAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECAxdQEBv6HfABI6/SUAvdjt1XTzeNKAXr338t68Mhx55MG52+qlaca+qwt03/XF48taPl17S9HG7pRVM4QkBvSmctAnssoDeBE6KLhEgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgQELCOgNePIndeip4N36V10aNlx48aIup4JubQJ6cSW+nddf0ymkF9t55mVXdlrlLvWY2/zguqzKly8/jdsCetM4a5PXZwG9yZsTPSJAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAkMWENAb8uxP6NjbBPTiEIqr4LUJ6MXyMaT3L3/7l5Ur2sXr8j9lgcH8NXXbVY+5HdrjbaOVgF7dHeN8EwEBvSZKriFAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgSWS0BAb7mktdNYoG1AL65Gt+v97wqHv73/SBttA3pZx2K7+794e9h/x23ZoZHXFceuCavPOT9s+KGfCMfMbR4512UntfpfrGeIj7eN4xbQiwp+liogoLdUQeUJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBcQoI6I1TU10zIxDDev+671/CoR2PhVWnbg0r1j0jrN6ydWbGN4kDEdCbxFmZvj4J6E3fnOkxAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBCYZQEBvVmeXWMjMEUCf/foN6eot7o6qQI/+D0nTmrX9IsAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAYoICA3gAn3ZAJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAoH8BAb3+jbVAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgMUENAb4KQbMgECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAj0LyCg17+xFggQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBggAICegOcdEMmQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgf4FBPT6N9YCAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECAxQQEBvgJNuyAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQv4CAXv/GWiBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBAQoI6A1w0g2ZAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPoXENDr31gLBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIDBAAQG9AU66IRMgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBA/wICev0ba4EAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEBiggoDfASTdkAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOhfQECvf2MtECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMAABQT0BjjphkyAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC/QsI6PVvrAUCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQGKCAgN4AJ92QCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKB/AQG9/o21QIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIDFBDQG+CkGzIBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI9C8goNe/sRYIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYIACAnoDnHRDJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIH+BQT0+jfWAgECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgMUEBAb4CTbsgECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0L+AgF7/xlogQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgQEKCOgNcNINmQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgT6FxDQ699YCwQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECAwQAEBvQFOuiETIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQP8CAnr9G2uBAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAYoIKA3wEk3ZAIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDoX0BAr39jLRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAAAUE9AY46YZMgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAv0LCOj1b6wFAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEBiggIDeACfdkAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgfwEBvf6NtUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECAxQQ0BvgpBsyAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECPQvIKDXv7EWCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGCAAgJ6A5x0QyZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACB/gUE9Po31gIBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIDFBAQG+Ak27IBCZR4Mf/6pZJ7JY+EWgt8NEfvbB1GQUIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACB2RQQ0JvNeTUqAlMnIKA3dVOmwyUCAnol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CBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAqH0IJAAAAVFJREFUAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCQjoVek4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOgoI6HWEU4wAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFQJCOhV6ThHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6CgjodYRTjAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIVAkI6FXpOEeAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoKCOh1hFOMAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhUCcSA3v8HLMnJsGUNNCMAAAAASUVORK5CYII=" + }, + "asset-e644a484-4097-40b9-a08e-7250ba963059": { + "id": "asset-e644a484-4097-40b9-a08e-7250ba963059", + "@created": "2018-09-06T19:44:43.075Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-7e4f7119-b2d8-4527-9bd8-887cb25974e7": { + "id": "asset-7e4f7119-b2d8-4527-9bd8-887cb25974e7", + "@created": "2018-09-06T19:44:52.474Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-e79711e8-d9da-45e1-a234-9efe226a444d": { + "id": "asset-e79711e8-d9da-45e1-a234-9efe226a444d", + "@created": "2018-09-06T20:01:04.447Z", + "type": "dataurl", + "value": "data:image/png;base64,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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQJ7/B75mKmIfIcbtAAAAAElFTkSuQmCC" + }, + "asset-9493e336-1b11-4e61-bad2-716c46194550": { + "id": "asset-9493e336-1b11-4e61-bad2-716c46194550", + "@created": "2018-09-06T20:01:22.463Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-23f2bfe9-e58c-4a56-98c6-fad59eecdf74": { + "id": "asset-23f2bfe9-e58c-4a56-98c6-fad59eecdf74", + "@created": "2018-09-06T20:01:50.445Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-86d05b5e-1a4b-4979-95e9-7071b9923470": { + "id": "asset-86d05b5e-1a4b-4979-95e9-7071b9923470", + "@created": "2018-09-06T20:17:48.355Z", + "type": "dataurl", + "value": "data:image/png;base64,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AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH9/8BS8cNlOF3xjoAAAAASUVORK5CYII=" + }, + "asset-fdfc9cc7-2c6a-44fe-b9be-c4ff115c92c1": { + "id": "asset-fdfc9cc7-2c6a-44fe-b9be-c4ff115c92c1", + "@created": "2018-09-06T20:18:11.818Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + }, + "asset-58ae3445-4001-45e7-9603-19ec8d41e64e": { + "id": "asset-58ae3445-4001-45e7-9603-19ec8d41e64e", + "@created": "2018-09-06T20:18:30.635Z", + "type": "dataurl", + "value": "data:image/png;base64,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" + } + } + } + } +] diff --git a/x-pack/plugins/canvas/server/sample_data/flights_saved_objects.json b/x-pack/plugins/canvas/server/sample_data/flights_saved_objects.json new file mode 100644 index 0000000000000..b1d0e25e89b15 --- /dev/null +++ b/x-pack/plugins/canvas/server/sample_data/flights_saved_objects.json @@ -0,0 +1,510 @@ +[ + { + "id": "workpad-a474e74b-aedc-47c3-894a-db77e62c41e0", + "type": "canvas-workpad", + "updated_at": "2018-10-22T14:17:04.040Z", + "version": 1, + "attributes": { + "name": "[Flights] Overview", + "id": "workpad-a474e74b-aedc-47c3-894a-db77e62c41e0", + "width": 1280, + "height": 720, + "page": 0, + "pages": [ + { + "id": "page-261eb6da-4ab2-400d-b1be-b72cbbcf58ff", + "style": { "background": "#f4f4f4" }, + "transition": { "name": "" }, + "elements": [ + { + "id": "element-5929e53d-4dad-49a5-a432-8de3b1d05b82", + "position": { + "left": 855.5, + "top": 185.312409153891, + "width": 407, + "height": 140.250363384436, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-60c9ac53-47a7-4ec2-a975-9d10bbe038bb", + "position": { + "left": 855.5, + "top": 26, + "width": 407, + "height": 140.250363384436, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-f573cae3-0d2b-4265-9a6f-314c865c4e5c", + "position": { + "left": 423.5251242870414, + "top": 26, + "width": 407, + "height": 140.250363384436, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-0f5b4a1f-8107-4f84-a12f-755b41dd1ca9", + "position": { + "left": 1035, + "top": 50.5, + "width": 197, + "height": 99, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(DISTINCT OriginAirportID) as total_airports\nFROM kibana_sample_data_flights\"\n| math \"total_airports\"\n| metric \"AIRPORTS\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"right\" color=\"#43988F\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"right\" color=\"#43988F\" weight=\"normal\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-096136f5-279d-4d29-a784-1bd33243db29", + "position": { + "left": 443.5, + "top": 275.250363384436, + "width": 131, + "height": 33, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"### LONGEST FLIGHT\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=10 align=\"left\" color=\"#FFFFFF\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-3d1e17df-6310-4968-8323-f0bcabf593e3", + "position": { + "left": 1042.5, + "top": 211.84415880749052, + "width": 191, + "height": 92.812409153891, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT MAX(DistanceMiles) as max_distance\nFROM kibana_sample_data_flights\nWHERE DistanceMiles > 0\"\n| math \"max_distance\"\n| formatNumber \"00.0a\"\n| metric \"MILES\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"right\" color=\"#EFB341\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"right\" color=\"#EFB341\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-3604ef7b-8f10-4a5f-a4b9-f123e32960dd", + "position": { + "left": 1036, + "top": -51, + "width": 246, + "height": 50, + "angle": 0 + }, + "expression": "\ntimefilterControl compact=true column=\"timestamp\"\n| render\n", + "filter": "timefilter from=\"now-24h\" to=now column=timestamp" + }, + { + "id": "element-08333e7c-2986-4ee7-b07c-8c07be09c751", + "position": { + "left": -1, + "top": 386.250363384436, + "width": 1283, + "height": 358, + "angle": 0 + }, + "expression": "\nimage mode=\"cover\" dataurl={asset \"asset-2da3aba1-6e0f-4a79-879e-0ab3cfa170d6\"}\n| render\n" + }, + { + "id": "element-90336033-8ca4-4bf5-ad20-94162aec28b6", + "position": { + "left": 26, + "top": 26, + "width": 375.5, + "height": 672.125545076654, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-e0ff80ac-8372-421f-918e-fd9f257b2f32", + "position": { + "left": -27, + "top": -1, + "width": 462, + "height": 699.125545076654, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-9e41d208-ec45-472d-a118-e2e2c811291b\"}\n| render\n" + }, + { + "id": "element-0d68f8e7-dc04-4358-b459-127c42e274b4", + "position": { + "left": 26, + "top": 145, + "width": 375.5, + "height": 153.375181692218, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"rgba(255,255,255,0)\" border=\"#48A8E0\" borderWidth=2 maintainAspect=true\n| render\n" + }, + { + "id": "element-f56821a4-4fd8-4de1-8bb7-6722c9ee5334", + "position": { + "left": 26, + "top": 56, + "width": 375.5, + "height": 44, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"TIME IN AIR\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=36 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-210b8adc-c5fa-412b-b280-146863fc9230", + "position": { + "left": 26, + "top": 330.562772538327, + "width": 375.5, + "height": 153.375181692218, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"rgba(255,255,255,0)\" border=\"#48A8E0\" borderWidth=2 maintainAspect=true\n| render\n", + "filter": null + }, + { + "id": "element-002f28e5-a132-4cbb-b1cb-f13f1cdeaac2", + "position": { + "left": 26, + "top": 509.562772538327, + "width": 375.5, + "height": 153.375181692218, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"rgba(255,255,255,0)\" border=\"#48A8E0\" borderWidth=2 maintainAspect=true\n| render\n", + "filter": null + }, + { + "id": "element-8a1248fa-2c2e-4be4-9e2b-95198279144d", + "position": { + "left": 26, + "top": 366.062772538327, + "width": 375.5, + "height": 65, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT FLOOR((SUM(FlightTimeMin) % 1440) / 60) as hours\nFROM kibana_sample_data_flights\"\n| math \"hours\"\n| formatNumber \"00\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-2b890a9d-2f4d-4c4d-8275-ac371190d486", + "position": { + "left": 173.25, + "top": 232.000363384436, + "width": 81, + "height": 39, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"DAYS\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-b253908c-b8bd-4ea1-a35f-eae5eb1ae63a", + "position": { + "left": 26, + "top": 179.750363384436, + "width": 375.5, + "height": 65, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT FLOOR(SUM(FlightTimeMin)/1440) as total_days\nFROM kibana_sample_data_flights\"\n| math \"total_days\"\n| formatNumber \"00a\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-9fb07d44-c181-4d03-a431-492d1977a79c", + "position": { + "left": 26, + "top": 550.750363384436, + "width": 375.5, + "height": 54, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT ((SUM(FlightTimeMin) % 1440) / 60 ) as minutes\nFROM kibana_sample_data_flights\"\n| math \"minutes\"\n| formatNumber \"00\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-60733afe-abce-4449-b0dd-5310d8ffffce", + "position": { + "left": 173.25, + "top": 416.9379542305451, + "width": 81, + "height": 39, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"HOURS\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-b7f3b9e3-2cb2-49e7-8768-b41afe0b49b1", + "position": { + "left": 173.25, + "top": 599.750363384436, + "width": 81, + "height": 39, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"MINS\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"center\" color=\"#48A8E0\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-526d29d1-8d5e-4c15-a5c2-fa23edf580ac", + "position": { + "left": 423.5251242870414, + "top": 185.312409153891, + "width": 407, + "height": 140.250363384436, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-1d11f5a4-95a3-4a50-9191-6beb61bb8fbc", + "position": { + "left": 855.5, + "top": 343.687590846109, + "width": 407, + "height": 140.250363384436, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-cfe6524e-b201-439a-974c-037406b760f6", + "position": { + "left": 616.5251242870414, + "top": 50.5, + "width": 187, + "height": 99, + "angle": 0 + }, + "expression": "\nfilters\n| essql query=\"SELECT COUNT(*) as total_flights\nFROM kibana_sample_data_flights\"\n| math \"total_flights\"\n| formatNumber \"0a]\"\n| metric \"FLIGHTS\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"right\" color=\"#4184A5\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"right\" color=\"#4184A5\" weight=\"normal\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-e162c0b4-9393-43f9-8324-0263f40b4b85", + "position": { + "left": 439.52512428704136, + "top": 40.687590846109, + "width": 78.47487571295858, + "height": 59.312409153891, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-520a03a1-f522-4a18-ad4a-b84e87e4dc44\"}\n| render\n" + }, + { + "id": "element-0c37705e-004f-49c6-abda-9847b762c9f2", + "position": { + "left": 603.5251242870414, + "top": 211.84415880749054, + "width": 200, + "height": 100, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT MIN(DistanceMiles) as min_distance\nFROM kibana_sample_data_flights\nWHERE DistanceMiles > 0\"\n| math \"min_distance\"\n| formatNumber \"00.0a\"\n| metric \"MILES\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"right\" color=\"#7EA030\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"right\" color=\"#7EA030\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-dd0f8a2e-1142-4140-bedb-913cae044204", + "position": { + "left": 439.52512428704136, + "top": 205.68795423054502, + "width": 78.47487571295858, + "height": 45.812409153891, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-08aa2e8f-6c3b-428f-82de-581004292cf0\"}\n| render\n" + }, + { + "id": "element-a81c83c7-8b61-4a1f-8da5-3270821c0089", + "position": { + "left": 435, + "top": 267.875181692218, + "width": 237, + "height": 30.5, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"SHORTEST FLIGHT\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"left\" color=\"#7EA030\" weight=\"normal\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-79393fba-8da9-4884-a280-e2a87e163f1a", + "position": { + "left": 870.7876864305622, + "top": 40.687590846109, + "width": 78.47487571295858, + "height": 59.312409153891, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-11a8022c-c1ac-4bbd-857a-db95fb8ca452\"}\n| render\n" + }, + { + "id": "element-ec914936-fc84-4915-82f7-1ca6b37ddc03", + "position": { + "left": 870.7876864305622, + "top": 262.500363384436, + "width": 237, + "height": 30.5, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"LONGEST FLIGHT\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"left\" color=\"#EFB341\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-8aae2d27-7a8c-4851-9b9c-a66e5b1dda9f", + "position": { + "left": 870.7876864305622, + "top": 198.93795423054502, + "width": 78.47487571295858, + "height": 59.312409153891, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-e73f53c5-fdcc-4232-bd6f-85a06281cf6c\"}\n| render\n", + "filter": null + }, + { + "id": "element-bca09809-6f73-4363-9732-5c86bb28f2f9", + "position": { + "left": 423.5251242870414, + "top": 343.687590846109, + "width": 407, + "height": 140.250363384436, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#FFFFFF\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-b6e7d5e1-3221-4274-ac97-5e0387d090c0", + "position": { + "left": 1033.5, + "top": 365.46897711527254, + "width": 200, + "height": 96.687590846109, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(*) as total_cancellations\nFROM kibana_sample_data_flights\nWHERE Cancelled = true\"\n| math \"total_cancellations\"\n| formatNumber \"0a\"\n| metric \"CANCELLATIONS\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"right\" color=\"#D88734\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"right\" color=\"#D88734\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-7ac04e37-e7aa-42cf-9afe-314ebd6de9d6", + "position": { + "left": 870.7876864305622, + "top": 364.4379542305451, + "width": 78.47487571295858, + "height": 59.312409153891, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-63a49130-fb96-4576-ac31-d86c934234d1\"}\n| render\n", + "filter": null + }, + { + "id": "element-0cf4194e-d460-40a1-a023-775f1946eb16", + "position": { + "left": 600.5251242870414, + "top": 364.4379542305451, + "width": 206, + "height": 105, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(DISTINCT OriginCountry) as total_countries\nFROM kibana_sample_data_flights\"\n| math \"total_countries\"\n| metric \"COUNTRIES\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"right\" color=\"#CB3072\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=24 align=\"right\" color=\"#CB3072\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-41734b58-e7aa-4888-980c-677420b1c736", + "position": { + "left": 439.52512428704136, + "top": 362.06277253832695, + "width": 78.47487571295858, + "height": 59.312409153891, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-4843e3bb-6cb0-43b7-b076-deea9a901fc6\"}\n| render\n", + "filter": null + } + ] + } + ], + "colors": [ + "#37988d", + "#c19628", + "#b83c6f", + "#3f9939", + "#1785b0", + "#ca5f35", + "#45bdb0", + "#f2bc33", + "#e74b8b", + "#4fbf48", + "#1ea6dc", + "#fd7643", + "#72cec3", + "#f5cc5d", + "#ec77a8", + "#7acf74", + "#4cbce4", + "#fd986f", + "#a1ded7", + "#f8dd91", + "#f2a4c5", + "#a6dfa2", + "#86d2ed", + "#fdba9f", + "#000000", + "#444444", + "#777777", + "#BBBBBB", + "rgba(255,255,255,0)" + ], + "@timestamp": "2018-10-31T17:32:39.068Z", + "@created": "2018-10-31T17:25:59.027Z", + "assets": { + "asset-2da3aba1-6e0f-4a79-879e-0ab3cfa170d6": { + "id": "asset-2da3aba1-6e0f-4a79-879e-0ab3cfa170d6", + "@created": "2018-10-13T16:17:38.860Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 1524.08 355.19"><defs><style>.cls-1{fill:none;}.cls-2{clip-path:url(#clip-path);}.cls-10,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7{stroke:#adefff;}.cls-10,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7,.cls-8,.cls-9{stroke-miterlimit:10;}.cls-3{fill:url(#linear-gradient);}.cls-4{fill:url(#linear-gradient-2);}.cls-5{fill:url(#linear-gradient-3);}.cls-6{fill:#31c8fa;}.cls-7,.cls-9{fill:#00a9e5;}.cls-10,.cls-8{fill:#fff;}.cls-8,.cls-9{stroke:#31c8fa;}</style><clipPath id="clip-path" transform="translate(0 -264.7)"><rect class="cls-1" x="121.87" width="1322.78" height="595.9"/></clipPath><linearGradient id="linear-gradient" x1="725.71" y1="111.65" x2="725.71" y2="479.11" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#adefff"/><stop offset="1" stop-color="#31c8fa"/></linearGradient><linearGradient id="linear-gradient-2" x1="762.04" y1="303.77" x2="762.04" y2="905.31" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#31c8fa"/><stop offset="1" stop-color="#0078a0"/></linearGradient><linearGradient id="linear-gradient-3" x1="935.3" y1="304.5" x2="935.3" y2="579.66" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#adefff"/><stop offset="1" stop-color="#00a9e5"/></linearGradient></defs><title>Airport Illustration</title><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g class="cls-2"><rect class="cls-3" x="3.37" y="165.49" width="1444.69" height="189.2"/><path class="cls-4" d="M1.09,386s77.89-81.65,95.06-76,44.89,9,70,13.94,38.29,16.41,56.78,17.27,23.77-36.84,62.06-31.21,56.78-1.82,91.11-.57,59.42,24.38,105.64,24.38S623,297.39,671.86,297.39s183.54,34.7,207.31,34.7,43.79-44.62,62.17-44.62S988.46,304,1002.47,304s103.41-35.41,123.42-37.54,56.13-1.17,86.92,0,40,21,63.81,19.36,42.32-12,63.41-11.77,124.09-2.83,146.54-3.8,37,18.87,37,18.87V516S134.44,492.42,98.79,504s-63.38,7.42-77.91,12S.5,520.51.5,520.51Z" transform="translate(0 -264.7)"/><path class="cls-5" d="M627.07,448.15l32.1,83.45h550.48l31.3-73,7.6-8c-37.17-13.8-75.4,4.25-134.86,14.87S995.82,408.12,904.5,394.31s-156.09,32.92-201.75,43.54-80.7,0-80.7,0Z" transform="translate(0 -264.7)"/><polygon class="cls-6" points="519.57 257.01 434.57 257.01 434.57 141.98 519.57 138.66 519.57 257.01"/><polygon class="cls-7" points="519.57 257.01 639.25 257.01 639.25 141.98 519.57 138.66 519.57 257.01"/><polygon class="cls-6" points="1433.59 112.95 1408.35 112.95 1403.66 88.43 1433.59 85.98 1433.59 112.95"/><polygon class="cls-7" points="1433.59 112.95 1443.47 112.95 1448.06 88.43 1433.59 85.98 1433.59 112.95"/><polygon class="cls-6" points="1396.95 275.83 1227.67 275.83 1227.67 160.02 1396.95 155.42 1396.95 275.83"/><polygon class="cls-7" points="1397.2 275.83 1416.4 275.83 1416.4 160.02 1397.2 155.42 1397.2 275.83"/><polygon class="cls-7" points="1434.68 282.42 1411.96 282.42 1411.96 131.46 1434.68 130.62 1434.68 282.42"/><polygon class="cls-7" points="1447.87 279.75 1433.85 282.42 1433.85 130.6 1447.87 131.46 1447.87 279.75"/><polygon class="cls-6" points="1433.85 138.43 1398.95 139.25 1398.95 108.89 1433.85 108.07 1433.85 138.43"/><polygon class="cls-7" points="1453.78 138.96 1433.85 138.25 1433.85 108.07 1453.78 108.62 1453.78 138.96"/><polygon class="cls-6" points="1376.71 282.42 1213.09 282.42 1213.09 190.69 1376.71 188.05 1376.71 282.42"/><polygon class="cls-7" points="1376.71 282.42 1389.86 279.52 1389.86 187.79 1376.71 188.05 1376.71 282.42"/><ellipse class="cls-7" cx="1241.24" cy="150.27" rx="9.73" ry="9.46"/><path class="cls-6" d="M630.51,544.26H428.17V470H636.6c20.51,0,97.41,26.79,89.5,50.53S630.51,544.26,630.51,544.26Z" transform="translate(0 -264.7)"/><line class="cls-8" x1="642.08" y1="286.35" x2="642.08" y2="303.84"/><rect class="cls-7" x="634.77" y="268.6" width="14.61" height="20.7" rx="4.13" ry="4.13"/><circle class="cls-9" cx="641.49" cy="312.88" r="12.52"/><path class="cls-7" d="M460.46,553.28l55.33,13c3.29.78,6.38-2.1,6.38-5.94V532c0-3.74-2.94-6.6-6.18-6l-55.24,10.4c-3.54.67-6.18,4.11-6.29,8.2h0C454.35,548.78,456.88,552.44,460.46,553.28Z" transform="translate(0 -264.7)"/><rect class="cls-7" x="420.42" y="250.69" width="90.18" height="12.78" rx="3.61" ry="3.61"/><line class="cls-10" x1="449.51" y1="263.47" x2="458.31" y2="272.68"/><path class="cls-7" d="M707.48,494.77h-25.7A26.52,26.52,0,0,1,666,489.54l-8.23-6.11a1.77,1.77,0,0,1,1-3.19h18.66S709.37,494.77,707.48,494.77Z" transform="translate(0 -264.7)"/><rect class="cls-6" x="441.12" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="458.66" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="476.21" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="493.75" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="511.29" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="528.84" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="546.38" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="563.93" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="581.47" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="599.02" y="224.54" width="8.07" height="12.41" rx="3.7" ry="3.7"/><rect class="cls-6" x="619.35" y="224.54" width="17.48" height="26.44"/><circle class="cls-7" cx="1225.46" cy="286.24" r="13.69"/><path class="cls-7" d="M1352.29,551.82H1176.91V522.68l169.27,18.2a6.84,6.84,0,0,1,6.11,6.8Z" transform="translate(0 -264.7)"/><circle class="cls-7" cx="1100.17" cy="286.24" r="13.69"/><path class="cls-7" d="M973.34,551.82h175.38V522.68l-169.27,18.2a6.84,6.84,0,0,0-6.11,6.8Z" transform="translate(0 -264.7)"/><rect class="cls-6" x="1159.44" y="208.56" width="13.07" height="54.55" rx="1.91" ry="1.91"/><circle class="cls-6" cx="1165.69" cy="267.54" r="32.39"/><rect class="cls-7" x="1124.82" y="299.92" width="12.24" height="21.19" rx="1.79" ry="1.79"/><line class="cls-10" x1="1130.94" y1="287.12" x2="1130.94" y2="299.92"/><rect class="cls-7" x="1159.85" y="312.73" width="12.24" height="21.19" rx="1.79" ry="1.79"/><line class="cls-10" x1="1165.97" y1="299.92" x2="1165.97" y2="312.73"/><rect class="cls-7" x="1198.08" y="299.19" width="12.24" height="21.19" rx="1.79" ry="1.79"/><line class="cls-10" x1="1204.2" y1="286.39" x2="1204.2" y2="299.19"/><circle class="cls-7" cx="1165.69" cy="276.89" r="9.35"/><path class="cls-7" d="M1185,526.63h-38.5a1.79,1.79,0,0,1-1.62-2.55l4-8.41a1.78,1.78,0,0,1,1.62-1h31.16a1.8,1.8,0,0,1,1.67,1.13l3.36,8.41A1.79,1.79,0,0,1,1185,526.63Z" transform="translate(0 -264.7)"/></g></g></g></svg>" + }, + "asset-9e41d208-ec45-472d-a118-e2e2c811291b": { + "id": "asset-9e41d208-ec45-472d-a118-e2e2c811291b", + "@created": "2018-10-13T16:33:38.197Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNDU5LjQ0IDI5NS45NSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOm5vbmU7fS5jbHMtMntjbGlwLXBhdGg6dXJsKCNjbGlwLXBhdGgpO30uY2xzLTN7b3BhY2l0eTowLjQ7fS5jbHMtNHtmaWxsOiNhZGVmZmY7fTwvc3R5bGU+PGNsaXBQYXRoIGlkPSJjbGlwLXBhdGgiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTUzKSI+PHJlY3QgY2xhc3M9ImNscy0xIiB4PSIyOC4yIiB3aWR0aD0iNDY0LjQ5IiBoZWlnaHQ9IjM4OC4yNiIvPjwvY2xpcFBhdGg+PC9kZWZzPjx0aXRsZT5DbG91ZHM8L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PGcgY2xhc3M9ImNscy0yIj48ZyBjbGFzcz0iY2xzLTMiPjxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTE3NS42NSwzMzUuN2ExNiwxNiwwLDAsMC02LDEuMTUsMjIuMSwyMi4xLDAsMCwwLTM2LjE3LTYuNiwzNC44NywzNC44NywwLDEsMC02OS40NCw2LjM1QTE2LDE2LDAsMCwwLDQzLDM0OUgxOTEuNDRBMTYsMTYsMCwwLDAsMTc1LjY1LDMzNS43WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtNTMpIi8+PC9nPjxnIGNsYXNzPSJjbHMtMyI+PHBhdGggY2xhc3M9ImNscy00IiBkPSJNMzM2LDE2N2ExMi4zNCwxMi4zNCwwLDAsMSw0LjU2Ljg4LDE2Ljg4LDE2Ljg4LDAsMCwxLDI3LjYxLTUsMjYuNjEsMjYuNjEsMCwwLDEsNDkuNjktMTEuMDksMjAuMzEsMjAuMzEsMCwwLDEsNC4xNi0uNDMsMjAuMDgsMjAuMDgsMCwwLDEsMTkuODMsMTYuOTMsMTIuMjUsMTIuMjUsMCwwLDEsMTcuNjIsMTAuMzlIMzIzLjc1QTEyLjIzLDEyLjIzLDAsMCwxLDMzNiwxNjdaIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIC01MykiLz48L2c+PGcgY2xhc3M9ImNscy0zIj48cGF0aCBjbGFzcz0iY2xzLTQiIGQ9Ik0xNDAuNjQsOTMuNDVhMTMuNzYsMTMuNzYsMCwwLDAtNS4xMSwxLDE5LDE5LDAsMCwwLTE0LjE5LTExLjEzLDMzLjk0LDMzLjk0LDAsMCwwLTY3LjY4LDMuNjNjMCwuNDUsMCwuODksMCwxLjMzYTE4LjkyLDE4LjkyLDAsMCwwLTMxLjI1LDguNSwxMy43LDEzLjcsMCwwLDAtMjIuNDQsOEgxNTQuMTRBMTMuNzIsMTMuNzIsMCwwLDAsMTQwLjY0LDkzLjQ1WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtNTMpIi8+PC9nPjwvZz48L2c+PC9nPjwvc3ZnPg==" + }, + "asset-520a03a1-f522-4a18-ad4a-b84e87e4dc44": { + "id": "asset-520a03a1-f522-4a18-ad4a-b84e87e4dc44", + "@created": "2018-10-13T16:39:42.089Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4=" + }, + "asset-08aa2e8f-6c3b-428f-82de-581004292cf0": { + "id": "asset-08aa2e8f-6c3b-428f-82de-581004292cf0", + "@created": "2018-10-13T16:42:03.959Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1MC44MyAyMi4zNiI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOm5vbmU7c3Ryb2tlOiM3NGEzMDA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlNob3J0IGxlbmd0aCBJY29uPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iTGF5ZXJfMS0yIiBkYXRhLW5hbWU9IkxheWVyIDEiPjxsaW5lIGNsYXNzPSJjbHMtMSIgeDE9IjEiIHgyPSIxIiB5Mj0iMjIuMzYiLz48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSI0OS44MyIgeDI9IjQ5LjgzIiB5Mj0iMjIuMzYiLz48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSI1LjY5IiB5MT0iMTEuMTgiIHgyPSIxMC4xNSIgeTI9IjExLjE4Ii8+PGxpbmUgY2xhc3M9ImNscy0xIiB4MT0iMTcuMTciIHkxPSIxMS4xOCIgeDI9IjIxLjYzIiB5Mj0iMTEuMTgiLz48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSIyOC42NSIgeTE9IjExLjE4IiB4Mj0iMzMuMTEiIHkyPSIxMS4xOCIvPjxsaW5lIGNsYXNzPSJjbHMtMSIgeDE9IjQwLjEzIiB5MT0iMTEuMTgiIHgyPSI0NC41OSIgeTI9IjExLjE4Ii8+PC9nPjwvZz48L3N2Zz4=" + }, + "asset-11a8022c-c1ac-4bbd-857a-db95fb8ca452": { + "id": "asset-11a8022c-c1ac-4bbd-857a-db95fb8ca452", + "@created": "2018-10-13T16:44:44.648Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4=" + }, + "asset-e73f53c5-fdcc-4232-bd6f-85a06281cf6c": { + "id": "asset-e73f53c5-fdcc-4232-bd6f-85a06281cf6c", + "@created": "2018-10-13T16:49:36.056Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA3Ny40NiAyMi4zNiI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOm5vbmU7c3Ryb2tlOiNmOWIxMTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvbmcgbGVuZ3RoIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PGxpbmUgY2xhc3M9ImNscy0xIiB4MT0iMSIgeDI9IjEiIHkyPSIyMi4zNiIvPjxsaW5lIGNsYXNzPSJjbHMtMSIgeDE9IjUuNjkiIHkxPSIxMS4xOCIgeDI9IjEwLjE1IiB5Mj0iMTEuMTgiLz48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSIxNy4xNyIgeTE9IjExLjE4IiB4Mj0iMjEuNjMiIHkyPSIxMS4xOCIvPjxsaW5lIGNsYXNzPSJjbHMtMSIgeDE9IjI4LjY1IiB5MT0iMTEuMTgiIHgyPSIzMy4xMSIgeTI9IjExLjE4Ii8+PGxpbmUgY2xhc3M9ImNscy0xIiB4MT0iNDAuMTMiIHkxPSIxMS4xOCIgeDI9IjQ0LjU5IiB5Mj0iMTEuMTgiLz48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSI1MS42MSIgeTE9IjExLjE4IiB4Mj0iNTYuMDgiIHkyPSIxMS4xOCIvPjxsaW5lIGNsYXNzPSJjbHMtMSIgeDE9IjYzLjA5IiB5MT0iMTEuMTgiIHgyPSI2Ny41NiIgeTI9IjExLjE4Ii8+PHBvbHlsaW5lIGNsYXNzPSJjbHMtMSIgcG9pbnRzPSI2OS41NyA1LjIyIDc2LjA1IDExLjcgNjkuNTcgMTguMTgiLz48L2c+PC9nPjwvc3ZnPg==" + }, + "asset-63a49130-fb96-4576-ac31-d86c934234d1": { + "id": "asset-63a49130-fb96-4576-ac31-d86c934234d1", + "@created": "2018-10-13T16:51:32.983Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMC43NiAzMC43NiI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOm5vbmU7c3Ryb2tlOiNmZTk5MDA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlggSWNvbjwvdGl0bGU+PGcgaWQ9IkxheWVyXzIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PGcgaWQ9IkxheWVyXzEtMiIgZGF0YS1uYW1lPSJMYXllciAxIj48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSIzMC4wNSIgeTE9IjAuNzEiIHgyPSIwLjcxIiB5Mj0iMzAuMDUiLz48bGluZSBjbGFzcz0iY2xzLTEiIHgxPSIwLjcxIiB5MT0iMC43MSIgeDI9IjMwLjA1IiB5Mj0iMzAuMDUiLz48L2c+PC9nPjwvc3ZnPg==" + }, + "asset-4843e3bb-6cb0-43b7-b076-deea9a901fc6": { + "id": "asset-4843e3bb-6cb0-43b7-b076-deea9a901fc6", + "@created": "2018-10-13T16:52:44.303Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0NC42MiA1MS4wMyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7fS5jbHMtMSwuY2xzLTJ7c3Ryb2tlOiNmMzY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9LmNscy0ye2ZpbGw6bm9uZTt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkZsYWcgSWNvbjwvdGl0bGU+PGcgaWQ9IkxheWVyXzIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PGcgaWQ9IkxheWVyXzEtMiIgZGF0YS1uYW1lPSJMYXllciAxIj48cG9seWdvbiBjbGFzcz0iY2xzLTEiIHBvaW50cz0iNDIuOTMgMjguMTUgMSAyOC4xNSAxIDEgNDIuOTMgMSAzNS40NyAxNC41OCA0Mi45MyAyOC4xNSIvPjxsaW5lIGNsYXNzPSJjbHMtMiIgeDE9IjEiIHkxPSIxIiB4Mj0iMSIgeTI9IjUxLjAzIi8+PC9nPjwvZz48L3N2Zz4=" + } + } + } + } +] diff --git a/x-pack/plugins/canvas/server/sample_data/index.js b/x-pack/plugins/canvas/server/sample_data/index.js new file mode 100644 index 0000000000000..212d9f5132831 --- /dev/null +++ b/x-pack/plugins/canvas/server/sample_data/index.js @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import ecommerceSavedObjects from './ecommerce_saved_objects.json'; +import flightsSavedObjects from './flights_saved_objects.json'; +import webLogsSavedObjects from './web_logs_saved_objects.json'; +import { loadSampleData } from './load_sample_data'; + +export { loadSampleData, ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects }; diff --git a/x-pack/plugins/canvas/server/sample_data/load_sample_data.js b/x-pack/plugins/canvas/server/sample_data/load_sample_data.js new file mode 100644 index 0000000000000..f2f462ed168d6 --- /dev/null +++ b/x-pack/plugins/canvas/server/sample_data/load_sample_data.js @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { ecommerceSavedObjects, flightsSavedObjects, webLogsSavedObjects } from './index'; + +export function loadSampleData(server) { + const now = new Date(); + const nowTimestamp = now.toISOString(); + function updateCanvasWorkpadTimestamps(savedObjects) { + return savedObjects.map(savedObject => { + if (savedObject.type === 'canvas-workpad') { + savedObject.attributes['@timestamp'] = nowTimestamp; + savedObject.attributes['@created'] = nowTimestamp; + } + + return savedObject; + }); + } + + server.addSavedObjectsToSampleDataset( + 'ecommerce', + updateCanvasWorkpadTimestamps(ecommerceSavedObjects) + ); + server.addSavedObjectsToSampleDataset( + 'flights', + updateCanvasWorkpadTimestamps(flightsSavedObjects) + ); + server.addSavedObjectsToSampleDataset('logs', updateCanvasWorkpadTimestamps(webLogsSavedObjects)); +} diff --git a/x-pack/plugins/canvas/server/sample_data/web_logs_saved_objects.json b/x-pack/plugins/canvas/server/sample_data/web_logs_saved_objects.json new file mode 100644 index 0000000000000..5b4dd9c19fdf3 --- /dev/null +++ b/x-pack/plugins/canvas/server/sample_data/web_logs_saved_objects.json @@ -0,0 +1,746 @@ +[ + { + "id": "workpad-5563cc40-5760-4afe-bf33-9da72fac53b7", + "type": "canvas-workpad", + "updated_at": "2018-10-22T12:41:57.071Z", + "version": 1, + "attributes": { + "name": "[Logs] Web Traffic", + "id": "workpad-5563cc40-5760-4afe-bf33-9da72fac53b7", + "width": 1280, + "height": 720, + "page": 0, + "pages": [ + { + "id": "page-e125ca0b-f6b2-437c-bc4c-918c468fbd9f", + "style": { "background": "#000000" }, + "transition": { "name": "" }, + "elements": [ + { + "id": "element-950e478d-39be-4630-9ebe-d46578951025", + "position": { + "left": 249, + "top": 574.3671875, + "width": 1013.5, + "height": 131.2578125, + "angle": 0 + }, + "expression": "\nshape \"square\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-f6d67bd9-7edf-4a4c-944e-019eb2a89e46", + "position": { + "left": 249, + "top": 426.5, + "width": 1013.5, + "height": 131.2578125, + "angle": 0 + }, + "expression": "\nshape \"square\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-fa296ebc-3ede-44f1-a027-f9aa0a8ba58b", + "position": { + "left": 249, + "top": 275.87109375, + "width": 1013.5, + "height": 131.2578125, + "angle": 0 + }, + "expression": "\nshape \"square\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-21844047-2818-4071-bb9b-59cc68139c5f", + "position": { + "left": 589, + "top": 110.7578125, + "width": 318, + "height": 148.3046875, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#414143\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-a2136689-36d7-4f61-a9c7-5e4e3c89f2ca", + "position": { + "left": 924.5, + "top": 109.28515625, + "width": 318, + "height": 148.3046875, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#414143\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-2e02449b-433e-47c4-84ab-6f702619e21a", + "position": { + "left": 249, + "top": 109.6328125, + "width": 318, + "height": 148.3046875, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#414143\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-0f10bedf-728c-4207-96b8-bbb3021a91f1", + "position": { + "left": 245, + "top": 12, + "width": 1017.5, + "height": 65.90625, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#221F20\" border=\"#777777\" borderWidth=0 maintainAspect=false\n| render\n", + "filter": null + }, + { + "id": "element-4130544d-054a-4600-928a-39f1423788c6", + "position": { + "left": 13.5, + "top": 12, + "width": 211, + "height": 693.625, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#221F20\" border=\"#777777\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-57ffa8a7-f3f3-45bf-a35a-025a7647b8e7", + "position": { + "left": 19.25, + "top": 88.5625, + "width": 109, + "height": 7.25, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#CFD0D2\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-4562db88-edbe-45b2-86aa-c549f2e25c98", + "position": { + "left": 671.5, + "top": 303.2421875, + "width": 574, + "height": 89.13671875, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#221F20\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=false\n| render\n" + }, + { + "id": "element-6556fa13-4557-47bc-bb9f-08a525604e13", + "position": { + "left": 56.25, + "top": 13.625, + "width": 168.25, + "height": 149, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#221F20\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=true\n| render\n" + }, + { + "id": "element-671589a9-54b6-46a1-b5e7-363b9d539795", + "position": { + "left": 258, + "top": 24.8125, + "width": 28, + "height": 36, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={\nasset {\nfilters | essql\nquery=\"SELECT host,response\nFROM kibana_sample_data_logs\nWHERE host='artifacts.elastic.co'\nORDER BY timestamp DESC\nLIMIT 1\"|\nalterColumn \"response\" type=\"number\" |\ngetCell \"response\" |\nif {compare lt to=400} then=\"asset-0a807073-d056-4c7b-9bf4-225b71e47243\" else=\"asset-1343672d-7c02-4402-929e-0f8fef69cddd\"\n}\n} | render\n" + }, + { + "id": "element-d98c4bb0-f9ae-4e4a-838d-572b6919a3a2", + "position": { + "left": 20.375, + "top": 68, + "width": 60.25, + "height": 27.8125, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"5XX\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=18 align=\"left\" color=\"#CFD0D2\" weight=\"normal\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-11de34da-7783-4d09-b22f-4ec1f8c957ea", + "position": { + "left": 573, + "top": 459.5, + "width": 79, + "height": 82, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT SUM(bytes) as total_bytes, host\nFROM kibana_sample_data_logs\nGROUP BY host\"\n| pointseries color=\"host\" size=\"total_bytes\"\n| pie hole=60 labels=false legend=false palette={palette \"#346822\" \"#57993F\" \"#C3F99C\" \"#6CBD38\" gradient=true}\n| render\n" + }, + { + "id": "element-a2e808f6-1b2e-4f84-931e-6c38424c5480", + "position": { + "left": 289.5, + "top": 29.4375, + "width": 165, + "height": 26.75, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT host\nFROM kibana_sample_data_logs\nWHERE host='artifacts.elastic.co'\nORDER BY timestamp DESC\nLIMIT 1\"\n| markdown {getCell \"host\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=12 align=\"left\" color=\"#CFD0D2\" size=18 weight=\"lighter\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-bc35a3fe-c896-4898-a7f3-e5778958d6b0", + "position": { + "left": 263.25, + "top": 436.25, + "width": 302, + "height": 110, + "angle": 0 + }, + "expression": "\nfilters\n| essql query=\"SELECT SUM(bytes) as total_bytes\nFROM kibana_sample_data_logs\"\n| math \"total_bytes\"\n| formatNumber \"0.00b\"\n| metric \"BYTES TRANSFERRED\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"left\" color=\"#FFFFFF\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=30 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-a684991f-f179-4fcc-b474-5ed71b0a6f3e", + "position": { + "left": 264.5, + "top": 586.5, + "width": 290.5, + "height": 104, + "angle": 0 + }, + "expression": "\nfilters\n| essql query=\"SELECT COUNT(timestamp) as total_visitors\nFROM kibana_sample_data_logs\"\n| math \"total_visitors\"\n| metric \"TOTAL VISITORS\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"left\" color=\"#FFFFFF\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=30 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-a8a8fa93-8e08-4e9f-b3e4-f4014543fe1f", + "position": { + "left": 515.5, + "top": 29.4375, + "width": 147, + "height": 25.75, + "angle": 0 + }, + "expression": "\nfilters\n| essql query=\"SELECT host\nFROM kibana_sample_data_logs\nWHERE host='www.elastic.co'\"\n| markdown {getCell \"host\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=12 align=\"left\" color=\"#CFD0D2\" size=18 weight=\"lighter\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-38b281b2-ab5e-41ee-aa3e-e48bc3f778df", + "position": { + "left": 719, + "top": 28.625, + "width": 247, + "height": 26.75, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT host\nFROM kibana_sample_data_logs\nWHERE host='cdn.elastic-elastic-elastic.org'\"\n| markdown {getCell \"host\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=12 align=\"left\" color=\"#CFD0D2\" size=18 weight=\"lighter\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-b481bf28-15d3-4f0b-b67b-e268c68bfe9c", + "position": { + "left": 1040.5, + "top": 28.8125, + "width": 209, + "height": 27.375, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT host\nFROM kibana_sample_data_logs\nWHERE host='elastic-elastic-elastic.org'\"\n| markdown {getCell \"host\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=12 align=\"left\" color=\"#CFD0D2\" size=18 weight=\"lighter\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-ebb18e7a-ec51-4072-8453-58fbb883584b", + "position": { + "left": 677.5, + "top": 451.77734375, + "width": 578, + "height": 90.5, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT SUM(bytes) as total_bytes, HOUR_OF_DAY(timestamp) as hour, host\nFROM kibana_sample_data_logs\nGROUP BY host, HOUR_OF_DAY(timestamp)\nORDER BY HOUR_OF_DAY(timestamp) DESC\"\n| pointseries x=\"hour\" y=\"total_bytes\" color=\"host\"\n| plot defaultStyle={seriesStyle bars=0 lines=3 points=0} legend=false xaxis=false yaxis=false palette={palette \"#346822\" \"#57993F\" \"#C3F99C\" \"#6CBD38\" gradient=true}\n| render containerStyle={containerStyle backgroundColor=\"#221F20\"}\n" + }, + { + "id": "element-05a065b5-5f01-4502-9f91-fdfc3de1b456", + "position": { + "left": 677.5, + "top": 594.875, + "width": 578, + "height": 87.25, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(timestamp) as total_visitors, HOUR_OF_DAY(timestamp) as hour, host\nFROM kibana_sample_data_logs\nGROUP BY host, HOUR_OF_DAY(timestamp)\nORDER BY HOUR_OF_DAY(timestamp) DESC\"\n| pointseries x=\"hour\" y=\"total_visitors\" color=\"host\"\n| plot defaultStyle={seriesStyle bars=0 lines=3 points=0} legend=false xaxis=false yaxis=false palette={palette \"#C83C5C\" \"#D56F79\" \"#F6C4C5\" \"#F1A3A6\" gradient=true}\n| render containerStyle={containerStyle backgroundColor=\"#221F20\"}\n" + }, + { + "id": "element-ce1da927-2d4f-413e-85e9-4fd1106b5207", + "position": { + "left": 573, + "top": 604.5, + "width": 79, + "height": 82, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(timestamp) as total_visitors, host\nFROM kibana_sample_data_logs\nGROUP BY host\"\n| pointseries color=\"host\" size=\"total_visitors\"\n| pie hole=60 labels=false legend=false palette={palette \"#C83C5C\" \"#D56F79\" \"#F6C4C5\" \"#F1A3A6\" gradient=true}\n| render\n", + "filter": null + }, + { + "id": "element-acccadaf-3ce8-4ca6-8205-4529d42c1eef", + "position": { + "left": 677, + "top": 290.62109375, + "width": 562, + "height": 101.7578125, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(timestamp) as total_errors, timestamp\nFROM kibana_sample_data_logs\nWHERE tags LIKE '%warning%'\nGROUP BY timestamp\nORDER BY timestamp DESC\"\n| pointseries x=\"timestamp\" y=\"total_errors\"\n| plot defaultStyle={seriesStyle bars=\"1\" lines=\"0\" points=0 color=\"#E9782F\"} legend=false xaxis=false yaxis=false\n| render\n" + }, + { + "id": "element-1ae8ea70-993a-4503-916a-ce98717054f6", + "position": { + "left": 680.5, + "top": 290.62109375, + "width": 562, + "height": 101.7578125, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(timestamp) as total_errors, timestamp\nFROM kibana_sample_data_logs\nWHERE tags LIKE '%error%'\nGROUP BY timestamp\nORDER BY timestamp DESC\"\n| pointseries x=\"timestamp\" y=\"total_errors\"\n| plot defaultStyle={seriesStyle bars=\"1\" lines=\"0\" points=0 color=\"#F2C242\"} legend=false xaxis=false yaxis=false\n| render\n" + }, + { + "id": "element-70a2bca6-de31-4bee-81b1-b18528820645", + "position": { + "left": 264.5, + "top": 287.4375, + "width": 215, + "height": 104.94140625, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(timestamp) as total_errors\nFROM kibana_sample_data_logs\nWHERE tags LIKE '%warning%' OR tags LIKE '%error%'\"\n| math \"total_errors\"\n| metric \"TOTAL ISSUES\"\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=60 align=\"left\" color=\"#FFFFFF\" weight=\"normal\" underline=false italic=false}\nlabelFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=30 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-5b36cc1b-e0d6-4ddc-bf16-849fc41e1f16", + "position": { + "left": 562.5, + "top": 294.1953125, + "width": 100, + "height": 98.18359375, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(timestamp) as total_errors\nFROM kibana_sample_data_logs\nWHERE tags LIKE '%warning%' OR tags LIKE '%error%'\"\n| math \"sum(total_errors / 100)\"\n| revealImage origin=\"bottom\" image={asset \"asset-a1e77720-eb0b-42a0-a1c0-a159035e4f26\"} emptyImage={asset \"asset-d2cca77f-ba40-4acb-beff-38fab19c7b65\"}\n| render\n" + }, + { + "id": "element-9d5e9c4b-a7f5-459b-ab15-cfcd1d1d00c9", + "position": { + "left": 319.5, + "top": 120.17578125, + "width": 239, + "height": 39.68359375, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"MACHINE\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=30 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-d575ce4e-4aa5-4c54-993a-ca56890e434f", + "position": { + "left": 259.5, + "top": 171.69140625, + "width": 295.5, + "height": 80.12109375, + "angle": 0 + }, + "expression": "\nfilters\n| esdocs index=\"kibana_sample_data_logs\" sort=\"timestamp, desc\" fields=\"machine.os, machine.ram\" count=1\n| markdown \"**OS:** \" {getCell \"machine.os\"} \"\\\n **RAM:** \" {getCell \"machine.ram\" | formatNumber \"00.0b\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=20 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render containerStyle={containerStyle padding=\"5px\"}\n" + }, + { + "id": "element-6f777a39-f934-4263-94ea-4f1d48f3849c", + "position": { + "left": 604.75, + "top": 171.69140625, + "width": 298, + "height": 83.74609375, + "angle": 0 + }, + "expression": "\nfilters\n| esdocs index=\"kibana_sample_data_logs\" sort=\"timestamp, desc\" fields=\"request\" count=1\n| markdown {getCell \"request\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=20 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render containerStyle={containerStyle padding=\"5px\"}\n" + }, + { + "id": "element-7bfcdb0f-3533-4e50-a94a-f0487f374bff", + "position": { + "left": 941.5, + "top": 171.69140625, + "width": 284, + "height": 80.12109375, + "angle": 0 + }, + "expression": "\nfilters\n| esdocs index=\"kibana_sample_data_logs\" sort=\"timestamp, desc\" fields=\"geo.src, geo.dest\" count=1\n| markdown \"**ORIGIN COUNTRY:** \" {getCell \"geo.src\"} \"\\\n **DESTINATION:** \" {getCell \"geo.dest\"}\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=20 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render containerStyle={containerStyle padding=\"5px\"}\n" + }, + { + "id": "element-db2d0540-f734-421e-a9a5-7f6e9eef0bd7", + "position": { + "left": 986.5, + "top": -50.75, + "width": 285, + "height": 50, + "angle": 0 + }, + "expression": "\ntimefilterControl compact=true column=\"timestamp\"\n| render\n", + "filter": "timefilter from=\"now-24h\" to=now column=timestamp" + }, + { + "id": "element-a29b5f31-3204-4174-a511-5869648ccae0", + "position": { + "left": 73.75, + "top": 34.2578125, + "width": 133.25, + "height": 108.609375, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#C83C5B\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=true\n| render\n" + }, + { + "id": "element-c509ce21-e729-4aa5-b892-f4be441cde26", + "position": { + "left": 94.875, + "top": 64, + "width": 91, + "height": 49.125, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(*) as response_code\nFROM kibana_sample_data_logs\nWHERE response >= 500\"\n| math \"response_code\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#FFFFFF\" weight=\"bold\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-d27ad090-4e58-4d9c-aef7-ccb8ca043758", + "position": { + "left": 20.375, + "top": 612.625, + "width": 109, + "height": 7.25, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#CFD0D2\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-99baa692-12dc-4d8d-9d78-05cb1aa7f7a8", + "position": { + "left": 21.1875, + "top": 436.25, + "width": 109, + "height": 7.25, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#CFD0D2\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-f0412810-61fb-4ab8-ba9f-a69ba344d4d7", + "position": { + "left": 20.25, + "top": 251.8125, + "width": 109, + "height": 7.25, + "angle": 0 + }, + "expression": "\nshape \"square\" fill=\"#CFD0D2\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=false\n| render\n" + }, + { + "id": "element-42587f38-4f6e-4a23-9ade-d0f23449efba", + "position": { + "left": 56.25, + "top": 183.4375, + "width": 168.25, + "height": 149, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#221F20\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=true\n| render\n" + }, + { + "id": "element-40d243ea-088c-4e17-b797-c47c8b94e282", + "position": { + "left": 56.25, + "top": 369, + "width": 168.25, + "height": 149, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#221F20\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=true\n| render\n" + }, + { + "id": "element-349aaa30-c164-4b95-b5aa-891a43e7b693", + "position": { + "left": 56.25, + "top": 541.5, + "width": 168.25, + "height": 149, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#221F20\" border=\"#CFD0D2\" borderWidth=2 maintainAspect=true\n| render\n" + }, + { + "id": "element-e92c89d9-4ddd-499c-8367-94271da02b3d", + "position": { + "left": 73.75, + "top": 203.6328125, + "width": 133.25, + "height": 108.609375, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#E9782F\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=true\n| render\n" + }, + { + "id": "element-f827824d-fc40-4905-937d-060e9748acce", + "position": { + "left": 74.75, + "top": 389.1953125, + "width": 133.25, + "height": 108.609375, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#F2C242\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=true\n| render\n" + }, + { + "id": "element-f7e459a0-613e-43f4-9ced-d5f4ae6f3c47", + "position": { + "left": 74.75, + "top": 561.9453125, + "width": 133.25, + "height": 108.609375, + "angle": 0 + }, + "expression": "\nshape \"circle\" fill=\"#6CBD38\" border=\"rgba(255,255,255,0)\" borderWidth=0 maintainAspect=true\n| render\n" + }, + { + "id": "element-f5760f24-d9cb-42e8-ae60-13c60335f049", + "position": { + "left": 21.1875, + "top": 590.1875, + "width": 61.375, + "height": 25.8125, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"2XX\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=18 align=\"left\" color=\"#CFD0D2\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-5e9998b3-7c27-4f4a-8f61-6b857339e07e", + "position": { + "left": 21.1875, + "top": 413.59375, + "width": 50.625, + "height": 26.28125, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"3XX\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=18 align=\"left\" color=\"#CFD0D2\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-744e0e58-e1be-4919-a9fb-eaa46c5d8aaa", + "position": { + "left": 19.25, + "top": 228.4375, + "width": 54.5, + "height": 30.625, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"4XX\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=18 align=\"left\" color=\"#CFD0D2\" weight=\"normal\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-9f7bea99-8c0c-49b1-b8a3-9af26eb0466d", + "position": { + "left": 94.875, + "top": 228.4375, + "width": 91, + "height": 59, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(*) as response_code\nFROM kibana_sample_data_logs\nWHERE response >= 400 AND response < 500\"\n| math \"unique(response_code)\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#FFFFFF\" weight=\"bold\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-607512ac-3d83-4d36-87c1-d5f13502f084", + "position": { + "left": 97.5, + "top": 418.25, + "width": 88.375, + "height": 59, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(*) as response_code\nFROM kibana_sample_data_logs\nWHERE response >= 300 AND response < 400\"\n| math \"response_code\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#FFFFFF\" weight=\"bold\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-3cc56225-d739-4279-97f2-5c179fb013a5", + "position": { + "left": 94.875, + "top": 590.1875, + "width": 91, + "height": 59, + "angle": 0 + }, + "expression": "\nfilters\n| essql\nquery=\"SELECT COUNT(*) as response_code\nFROM kibana_sample_data_logs\nWHERE response >= 200 AND response < 300\"\n| math \"response_code\"\n| formatNumber \"0a\"\n| metric\nmetricFont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=48 align=\"center\" color=\"#FFFFFF\" weight=\"bold\" underline=false italic=false}\n| render\n" + }, + { + "id": "element-f7d5956f-287d-4ac6-bcfb-fca6f8ebe63e", + "position": { + "left": 479.5, + "top": 24, + "width": 28, + "height": 36, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={\nasset {\nfilters | essql\nquery=\"SELECT host,response\nFROM kibana_sample_data_logs\nWHERE host='www.elastic.co'\nORDER BY timestamp DESC\nLIMIT 1\"|\nalterColumn \"response\" type=\"number\" |\ngetCell \"response\" |\nif {compare lt to=400} then=\"asset-0a807073-d056-4c7b-9bf4-225b71e47243\" else=\"asset-1343672d-7c02-4402-929e-0f8fef69cddd\"\n}\n} | render\n", + "filter": null + }, + { + "id": "element-254cc607-c924-49f4-a7f7-737480b4a056", + "position": { + "left": 682.5, + "top": 24.5, + "width": 28, + "height": 36, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={\nasset {\nfilters | essql\nquery=\"SELECT host,response\nFROM kibana_sample_data_logs\nWHERE host='cdn.elastic-elastic-elastic.org'\nORDER BY timestamp DESC\nLIMIT 1\"|\nalterColumn \"response\" type=\"number\" |\ngetCell \"response\" |\nif {compare lt to=400} then=\"asset-0a807073-d056-4c7b-9bf4-225b71e47243\" else=\"asset-1343672d-7c02-4402-929e-0f8fef69cddd\"\n}\n} | render\n", + "filter": null + }, + { + "id": "element-96aa263d-8222-4adc-94ff-2277a1f55dff", + "position": { + "left": 1001.5, + "top": 24, + "width": 28, + "height": 36, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={\nasset {\nfilters | essql\nquery=\"SELECT host,response\nFROM kibana_sample_data_logs\nWHERE host='elastic-elastic-elastic.org'\nORDER BY timestamp DESC\nLIMIT 1\"|\nalterColumn \"response\" type=\"number\" |\ngetCell \"response\" |\nif {compare lt to=400} then=\"asset-0a807073-d056-4c7b-9bf4-225b71e47243\" else=\"asset-1343672d-7c02-4402-929e-0f8fef69cddd\"\n}\n} | render\n", + "filter": null + }, + { + "id": "element-618ced11-d0da-4603-ae0b-77a5bb35e6c4", + "position": { + "left": 263.25, + "top": 128.658203125, + "width": 45, + "height": 28.25, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-e9118351-dcc5-4a27-a7fc-f15eb308999b\"}\n| render\n" + }, + { + "id": "element-0f3c5e51-24b8-421e-b151-0c0229f80550", + "position": { + "left": 658.5, + "top": 119.525390625, + "width": 220, + "height": 37.3828125, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"REQUEST\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=30 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-98d5f63a-ef33-415a-a1ec-44a5564c239f", + "position": { + "left": 996.5, + "top": 117.525390625, + "width": 220, + "height": 43.68359375, + "angle": 0 + }, + "expression": "\nfilters\n| demodata\n| markdown \"GEO\"\nfont={font family=\"'Open Sans', Helvetica, Arial, sans-serif\" size=30 align=\"left\" color=\"#FFFFFF\" weight=\"lighter\" underline=false italic=false}\n| render\n", + "filter": null + }, + { + "id": "element-88f2579a-50af-4330-baaf-e751092588a3", + "position": { + "left": 604.75, + "top": 129.30859375, + "width": 45, + "height": 28.25, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-c2128a19-e5ba-450c-99c0-a68abbdfa684\"}\n| render\n", + "filter": null + }, + { + "id": "element-eed60428-2b80-4558-8bcc-40b516fa63d4", + "position": { + "left": 942.5, + "top": 124.7421875, + "width": 45, + "height": 29.25, + "angle": 0 + }, + "expression": "\nimage mode=\"contain\" dataurl={asset \"asset-86622ebc-32db-40fa-8310-262c85a10979\"}\n| render\n", + "filter": null + } + ] + } + ], + "colors": [ + "#37988d", + "#c19628", + "#b83c6f", + "#3f9939", + "#1785b0", + "#ca5f35", + "#45bdb0", + "#f2bc33", + "#e74b8b", + "#4fbf48", + "#1ea6dc", + "#fd7643", + "#72cec3", + "#f5cc5d", + "#ec77a8", + "#7acf74", + "#4cbce4", + "#fd986f", + "#a1ded7", + "#f8dd91", + "#f2a4c5", + "#a6dfa2", + "#86d2ed", + "#fdba9f", + "#000000", + "#444444", + "#777777", + "#BBBBBB", + "#FFFFFF", + "rgba(255,255,255,0)" + ], + "@timestamp": "2018-10-31T17:56:10.178Z", + "@created": "2018-10-31T17:53:56.695Z", + "assets": { + "asset-a1e77720-eb0b-42a0-a1c0-a159035e4f26": { + "id": "asset-a1e77720-eb0b-42a0-a1c0-a159035e4f26", + "@created": "2018-10-13T10:48:32.499Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MS41MyA4Ny4yOSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNkOTI4NTk7fS5jbHMtMntmaWxsOiNmOTcxMDA7fS5jbHMtM3tmaWxsOiNmOWMxMDA7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5GaXJlIENvbG9yPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iTGF5ZXJfMi0yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTMwLjc3LDBoMFM2MS41MywyNy43MSw2MS41Myw1Ni41M2MwLDE5LjI3LTEzLjc3LDMwLjc3LTMwLjc3LDMwLjc3aDBBMzAuOCwzMC44LDAsMCwxLDAsNTYuNTNDMCwyOC42OCwzMC43NywwLDMwLjc3LDBaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMzAuNzcsMjBoMHMyMy43LDIxLjM0LDIzLjcsNDMuNTRjMCwxNC44NC0xMC42MSwyMy43LTIzLjcsMjMuN2gwYTIzLjczLDIzLjczLDAsMCwxLTIzLjctMjMuN0M3LjA3LDQyLjE0LDMwLjc3LDIwLDMwLjc3LDIwWiIvPjxwYXRoIGNsYXNzPSJjbHMtMyIgZD0iTTMwLjc3LDUyLjA3aDBTNDMuMTgsNjMuMjUsNDMuMTgsNzQuODhjMCw3Ljc3LTUuNTYsMTIuNDItMTIuNDIsMTIuNDJoMEExMi40MywxMi40MywwLDAsMSwxOC4zNSw3NC44OEMxOC4zNSw2My42NCwzMC43Nyw1Mi4wNywzMC43Nyw1Mi4wN1oiLz48L2c+PC9nPjwvc3ZnPg==" + }, + "asset-d2cca77f-ba40-4acb-beff-38fab19c7b65": { + "id": "asset-d2cca77f-ba40-4acb-beff-38fab19c7b65", + "@created": "2018-10-13T10:48:37.615Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MS41MyA4Ny4yOSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiM2ZDZlNzE7fS5jbHMtMntmaWxsOiM5Mzk1OTg7fS5jbHMtM3tmaWxsOiNiY2JlYzA7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5GaXJlIEdyYXk8L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8yLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMzAuNzcsMGgwQTEyNi4yNSwxMjYuMjUsMCwwLDEsNDguMzIsMjAuNTNjNi45MSwxMC4xMywxMy4yMiwyMi45NSwxMy4yMiwzNiwwLDE5LjI3LTEzLjc3LDMwLjc3LTMwLjc3LDMwLjc3aDBBMzAuOCwzMC44LDAsMCwxLDAsNTYuNTNDMCwyOC42OCwzMC43NywwLDMwLjc3LDBaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMzAuNzcsMjBoMHMyMy43LDIxLjM0LDIzLjcsNDMuNTRjMCwxNC44NC0xMC42MSwyMy43LTIzLjcsMjMuN2gwYTIzLjczLDIzLjczLDAsMCwxLTIzLjctMjMuN0M3LjA3LDQyLjE0LDMwLjc3LDIwLDMwLjc3LDIwWiIvPjxwYXRoIGNsYXNzPSJjbHMtMyIgZD0iTTMwLjc3LDUyLjA3aDBTNDMuMTgsNjMuMjUsNDMuMTgsNzQuODhjMCw3Ljc3LTUuNTYsMTIuNDItMTIuNDIsMTIuNDJoMEExMi40MywxMi40MywwLDAsMSwxOC4zNSw3NC44OEMxOC4zNSw2My42NCwzMC43Nyw1Mi4wNywzMC43Nyw1Mi4wN1oiLz48L2c+PC9nPjwvc3ZnPg==" + }, + "asset-1343672d-7c02-4402-929e-0f8fef69cddd": { + "id": "asset-1343672d-7c02-4402-929e-0f8fef69cddd", + "@created": "2018-10-13T14:50:42.520Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNC44NiAyNC44NiI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNkOTI4NTk7fS5jbHMtMntmaWxsOm5vbmU7c3Ryb2tlOiNmZmY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjNweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBpbmsgWDwvdGl0bGU+PGcgaWQ9IkxheWVyXzIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PGcgaWQ9IkxheWVyXzItMiIgZGF0YS1uYW1lPSJMYXllciAyIj48Y2lyY2xlIGNsYXNzPSJjbHMtMSIgY3g9IjEyLjQzIiBjeT0iMTIuNDMiIHI9IjEyLjQzIi8+PGxpbmUgY2xhc3M9ImNscy0yIiB4MT0iMTYuNzYiIHkxPSI4LjA5IiB4Mj0iOC4wOSIgeTI9IjE2Ljc2Ii8+PGxpbmUgY2xhc3M9ImNscy0yIiB4MT0iOC4wOSIgeTE9IjguMDkiIHgyPSIxNi43NiIgeTI9IjE2Ljc2Ii8+PC9nPjwvZz48L3N2Zz4=" + }, + "asset-0a807073-d056-4c7b-9bf4-225b71e47243": { + "id": "asset-0a807073-d056-4c7b-9bf4-225b71e47243", + "@created": "2018-10-13T14:50:49.318Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNC44NiAyNC44NiI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiM0OGMxMDA7fS5jbHMtMntmaWxsOm5vbmU7c3Ryb2tlOiNmZmY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjNweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkdyZWVuIGNoZWNrPC90aXRsZT48ZyBpZD0iTGF5ZXJfMiIgZGF0YS1uYW1lPSJMYXllciAyIj48ZyBpZD0iTGF5ZXJfMi0yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxjaXJjbGUgY2xhc3M9ImNscy0xIiBjeD0iMTIuNDMiIGN5PSIxMi40MyIgcj0iMTIuNDMiLz48bGluZSBjbGFzcz0iY2xzLTIiIHgxPSIxOC43NCIgeTE9IjguNTMiIHgyPSIxMC4wNyIgeTI9IjE3LjIiLz48bGluZSBjbGFzcz0iY2xzLTIiIHgxPSI2LjgzIiB5MT0iMTIuMzUiIHgyPSIxMS45MyIgeTI9IjE3LjQ1Ii8+PC9nPjwvZz48L3N2Zz4=" + }, + "asset-86622ebc-32db-40fa-8310-262c85a10979": { + "id": "asset-86622ebc-32db-40fa-8310-262c85a10979", + "@created": "2018-10-13T15:01:15.036Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzNy45NCAyOS43Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6IzQxNDA0MjtzdHJva2U6I2ZmZjtzdHJva2UtbWl0ZXJsaW1pdDoxMDtzdHJva2Utd2lkdGg6MnB4O308L3N0eWxlPjwvZGVmcz48dGl0bGU+R2VvIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8yLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PHJlY3QgY2xhc3M9ImNscy0xIiB4PSIxIiB5PSI3LjM1IiB3aWR0aD0iMzUuOTQiIGhlaWdodD0iMjEuMzYiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0yMy41OCwxOS43aDBTMTcsMTMuNzYsMTcsNy41OUE2LjMsNi4zLDAsMCwxLDIzLjU4LDFoMGE2LjYsNi42LDAsMCwxLDYuNTksNi41OUMzMC4xOCwxMy41NiwyMy41OCwxOS43LDIzLjU4LDE5LjdaIi8+PC9nPjwvZz48L3N2Zz4=" + }, + "asset-c2128a19-e5ba-450c-99c0-a68abbdfa684": { + "id": "asset-c2128a19-e5ba-450c-99c0-a68abbdfa684", + "@created": "2018-10-13T15:02:05.173Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMS44MyAyNi4zOSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiM0MTQwNDI7c3Ryb2tlOiNmZmY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlcXVlc3QgSWNvbjwvdGl0bGU+PGcgaWQ9IkxheWVyXzIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PGcgaWQ9IkxheWVyXzItMiIgZGF0YS1uYW1lPSJMYXllciAyIj48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0zMC44MywxSDFWMjUuMjNhLjE2LjE2LDAsMCwwLC4yOC4xMkw3LjY2LDE5SDMwLjgzWiIvPjwvZz48L2c+PC9zdmc+" + }, + "asset-e9118351-dcc5-4a27-a7fc-f15eb308999b": { + "id": "asset-e9118351-dcc5-4a27-a7fc-f15eb308999b", + "@created": "2018-10-13T15:02:24.299Z", + "type": "dataurl", + "value": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MC44MSAyNS4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiM0MTQwNDI7c3Ryb2tlOiNmZmY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPk1hY2hpbmUgSWNvbjwvdGl0bGU+PGcgaWQ9IkxheWVyXzIiIGRhdGEtbmFtZT0iTGF5ZXIgMiI+PGcgaWQ9IkxheWVyXzItMiIgZGF0YS1uYW1lPSJMYXllciAyIj48cmVjdCBjbGFzcz0iY2xzLTEiIHg9IjUuMTgiIHk9IjEiIHdpZHRoPSIyOS44MyIgaGVpZ2h0PSIxNy45NiIvPjxsaW5lIGNsYXNzPSJjbHMtMSIgeTE9IjI0LjMxIiB4Mj0iNDAuODEiIHkyPSIyNC4zMSIvPjwvZz48L2c+PC9zdmc+" + } + } + } + } +] diff --git a/x-pack/plugins/canvas/server/usage/collector.js b/x-pack/plugins/canvas/server/usage/collector.js index f0c55e6ae0a62..a4e73ffe85071 100644 --- a/x-pack/plugins/canvas/server/usage/collector.js +++ b/x-pack/plugins/canvas/server/usage/collector.js @@ -138,7 +138,7 @@ export function registerCanvasUsageCollector(server) { index, ignoreUnavailable: true, filterPath: ['hits.hits._source.canvas-workpad'], - body: { query: { term: { type: { value: CANVAS_TYPE } } } }, + body: { query: { bool: { filter: { term: { type: CANVAS_TYPE } } } } }, }; const esResponse = await callCluster('search', searchParams); diff --git a/x-pack/plugins/canvas/tasks/helpers/babelhook.js b/x-pack/plugins/canvas/tasks/helpers/babelhook.js index 5afe3b1d4507e..ebae405457d3e 100644 --- a/x-pack/plugins/canvas/tasks/helpers/babelhook.js +++ b/x-pack/plugins/canvas/tasks/helpers/babelhook.js @@ -6,8 +6,9 @@ const { resolve } = require('path'); const register = require('babel-register'); - const options = { + babelrc: false, + presets: [require.resolve('@kbn/babel-preset/node_preset')], sourceMaps: false, plugins: [ [ diff --git a/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js b/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js index db3000672e520..c53eccd87bd97 100644 --- a/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js +++ b/x-pack/plugins/canvas/tasks/helpers/webpack.plugins.js @@ -5,6 +5,7 @@ */ const path = require('path'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); const sourceDir = path.resolve(__dirname, '../../canvas_plugin_src'); const buildDir = path.resolve(__dirname, '../../canvas_plugin'); @@ -20,9 +21,12 @@ module.exports = { 'uis/arguments/all': path.join(sourceDir, 'uis/arguments/register.js'), 'functions/browser/all': path.join(sourceDir, 'functions/browser/register.js'), 'functions/common/all': path.join(sourceDir, 'functions/common/register.js'), - 'functions/server/all': path.join(sourceDir, 'functions/server/register.js'), 'types/all': path.join(sourceDir, 'types/register.js'), }, + + // there were problems with the node and web targets since this code is actually + // targetting both the browser and node.js. If there was a hybrid target we'd use + // it, but this seems to work either way. target: 'webworker', output: { @@ -33,6 +37,7 @@ module.exports = { resolve: { extensions: ['.js', '.json'], + mainFields: ['browser', 'main'], }, plugins: [ @@ -47,73 +52,31 @@ module.exports = { }); this.plugin('done', function(stats) { - if (stats.compilation.errors && stats.compilation.errors.length) { - if (isWatch) console.error(stats.compilation.errors[0]); - else throw stats.compilation.errors[0]; - } + if (!stats.hasErrors()) return; + const errorMessage = stats.toString('errors-only'); + if (isWatch) console.error(errorMessage); + else throw new Error(errorMessage); }); }, + new CopyWebpackPlugin([ + { + from: `${sourceDir}/functions/server/`, + to: `${buildDir}/functions/server/`, + ignore: '**/__tests__/**', + }, + ]), ], module: { rules: [ - // There's some React 15 propTypes funny business in EUI, this strips out propTypes and fixes it - { - test: /(@elastic\/eui|moment)\/.*\.js$/, - loaders: 'babel-loader', - options: { - babelrc: false, - presets: [ - 'react', - [ - 'env', - { - targets: { - node: 'current', - }, - }, - ], - ], - plugins: [ - 'transform-react-remove-prop-types', // specifically this, strips out propTypes - 'pegjs-inline-precompile', - 'transform-object-rest-spread', - 'transform-async-to-generator', - 'transform-class-properties', - [ - 'inline-react-svg', - { - ignorePattern: 'images/*', - svgo: { - plugins: [{ cleanupIDs: false }, { removeViewBox: false }], - }, - }, - ], - ], - }, - }, { test: /\.js$/, + exclude: [/node_modules/], loaders: 'babel-loader', options: { - plugins: [ - 'transform-object-rest-spread', - 'transform-async-to-generator', - 'transform-class-properties', - ], - presets: [ - 'react', - [ - 'env', - { - targets: { - node: 'current', - }, - }, - ], - ], + babelrc: false, + presets: [require.resolve('@kbn/babel-preset/webpack_preset')], }, - exclude: [/node_modules/], }, { test: /\.(png|jpg|gif|jpeg|svg)$/, diff --git a/x-pack/plugins/canvas/tasks/mocks/noop.js b/x-pack/plugins/canvas/tasks/mocks/noop.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/canvas/tasks/plugins.js b/x-pack/plugins/canvas/tasks/plugins.js index dd2dcabf23972..991b4d85c6ec5 100644 --- a/x-pack/plugins/canvas/tasks/plugins.js +++ b/x-pack/plugins/canvas/tasks/plugins.js @@ -4,13 +4,17 @@ * you may not use this file except in compliance with the Elastic License. */ +import path from 'path'; // eslint-disable-next-line import/no-extraneous-dependencies import webpack from 'webpack'; +import del from 'del'; import webpackConfig from './helpers/webpack.plugins'; const devtool = 'inline-cheap-module-source-map'; +const buildDir = path.resolve(__dirname, '../canvas_plugin'); export default function pluginsTasks(gulp, { log, colors }) { + log(buildDir); const onComplete = done => (err, stats) => { if (err) { done && done(err); @@ -22,16 +26,20 @@ export default function pluginsTasks(gulp, { log, colors }) { }; gulp.task('canvas:plugins:build', function(done) { - webpack({ ...webpackConfig, devtool }, onComplete(done)); + del(buildDir).then(() => webpack({ ...webpackConfig, devtool }, onComplete(done))); }); // eslint-disable-next-line no-unused-vars gulp.task('canvas:plugins:dev', function(done /* added to make gulp async */) { log(`${colors.green.bold('canvas:plugins')} Starting initial build, this will take a while`); - webpack({ ...webpackConfig, devtool, watch: true }, (err, stats) => { - onComplete()(err, stats); - }); + del(buildDir).then(() => + webpack({ ...webpackConfig, devtool, watch: true }, (err, stats) => { + onComplete()(err, stats); + }) + ); }); - gulp.task('canvas:plugins:build-prod', done => webpack(webpackConfig, onComplete(done))); + gulp.task('canvas:plugins:build-prod', function(done) { + del(buildDir).then(() => webpack(webpackConfig, onComplete(done))); + }); } diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.delete_auto_follow_pattern.json b/x-pack/plugins/console_extensions/spec/generated/ccr.delete_auto_follow_pattern.json new file mode 100644 index 0000000000000..36c50a37c8658 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.delete_auto_follow_pattern.json @@ -0,0 +1,11 @@ +{ + "ccr.delete_auto_follow_pattern": { + "methods": [ + "DELETE" + ], + "patterns": [ + "_ccr/auto_follow/{name}" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-delete-auto-follow-pattern.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.follow.json b/x-pack/plugins/console_extensions/spec/generated/ccr.follow.json new file mode 100644 index 0000000000000..704cb082161ae --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.follow.json @@ -0,0 +1,11 @@ +{ + "ccr.follow": { + "methods": [ + "PUT" + ], + "patterns": [ + "{index}/_ccr/follow" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-follow.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.follow_stats.json b/x-pack/plugins/console_extensions/spec/generated/ccr.follow_stats.json new file mode 100644 index 0000000000000..47553262c95d2 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.follow_stats.json @@ -0,0 +1,11 @@ +{ + "ccr.follow_stats": { + "methods": [ + "GET" + ], + "patterns": [ + "{index}/_ccr/stats" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-follow-stats.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.get_auto_follow_pattern.json b/x-pack/plugins/console_extensions/spec/generated/ccr.get_auto_follow_pattern.json new file mode 100644 index 0000000000000..3f988d9796f0e --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.get_auto_follow_pattern.json @@ -0,0 +1,12 @@ +{ + "ccr.get_auto_follow_pattern": { + "methods": [ + "GET" + ], + "patterns": [ + "_ccr/auto_follow", + "_ccr/auto_follow/{name}" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-auto-follow-pattern.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.pause_follow.json b/x-pack/plugins/console_extensions/spec/generated/ccr.pause_follow.json new file mode 100644 index 0000000000000..4dcb0fdaf9b87 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.pause_follow.json @@ -0,0 +1,11 @@ +{ + "ccr.pause_follow": { + "methods": [ + "POST" + ], + "patterns": [ + "{index}/_ccr/pause_follow" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-pause-follow.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.put_auto_follow_pattern.json b/x-pack/plugins/console_extensions/spec/generated/ccr.put_auto_follow_pattern.json new file mode 100644 index 0000000000000..26a197d17d711 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.put_auto_follow_pattern.json @@ -0,0 +1,11 @@ +{ + "ccr.put_auto_follow_pattern": { + "methods": [ + "PUT" + ], + "patterns": [ + "_ccr/auto_follow/{name}" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-put-auto-follow-pattern.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.resume_follow.json b/x-pack/plugins/console_extensions/spec/generated/ccr.resume_follow.json new file mode 100644 index 0000000000000..00b889d0d5f9a --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.resume_follow.json @@ -0,0 +1,11 @@ +{ + "ccr.resume_follow": { + "methods": [ + "POST" + ], + "patterns": [ + "{index}/_ccr/resume_follow" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-resume-follow.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.stats.json b/x-pack/plugins/console_extensions/spec/generated/ccr.stats.json new file mode 100644 index 0000000000000..f9d389c99e590 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.stats.json @@ -0,0 +1,11 @@ +{ + "ccr.stats": { + "methods": [ + "GET" + ], + "patterns": [ + "_ccr/stats" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-get-stats.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/generated/ccr.unfollow.json b/x-pack/plugins/console_extensions/spec/generated/ccr.unfollow.json new file mode 100644 index 0000000000000..9d9d6868a2fc9 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/generated/ccr.unfollow.json @@ -0,0 +1,11 @@ +{ + "ccr.unfollow": { + "methods": [ + "POST" + ], + "patterns": [ + "{index}/_ccr/unfollow" + ], + "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/ccr-post-unfollow.html" + } +} diff --git a/x-pack/plugins/console_extensions/spec/overrides/ccr.follow.json b/x-pack/plugins/console_extensions/spec/overrides/ccr.follow.json new file mode 100644 index 0000000000000..f95b6618fe516 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/overrides/ccr.follow.json @@ -0,0 +1,18 @@ +{ + "ccr.follow": { + "data_autocomplete_rules": { + "remote_cluster" : "", + "leader_index" : "", + "max_read_request_operation_count": "", + "max_outstanding_read_requests": "", + "max_read_request_size": "", + "max_write_request_operation_count": "", + "max_write_request_size": "", + "max_outstanding_write_requests": "", + "max_write_buffer_count": "", + "max_write_buffer_size": "", + "max_retry_delay": "", + "read_poll_timeout": "" + } + } +} diff --git a/x-pack/plugins/console_extensions/spec/overrides/ccr.put_auto_follow_pattern.json b/x-pack/plugins/console_extensions/spec/overrides/ccr.put_auto_follow_pattern.json new file mode 100644 index 0000000000000..2f050efa6016a --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/overrides/ccr.put_auto_follow_pattern.json @@ -0,0 +1,19 @@ +{ + "ccr.put_auto_follow_pattern": { + "data_autocomplete_rules": { + "remote_cluster" : "", + "leader_index_patterns" : "", + "follow_index_pattern" : "", + "max_read_request_operation_count": "", + "max_outstanding_read_requests": "", + "max_read_request_size": "", + "max_write_request_operation_count": "", + "max_write_request_size": "", + "max_outstanding_write_requests": "", + "max_write_buffer_count": "", + "max_write_buffer_size": "", + "max_retry_delay": "", + "read_poll_timeout": "" + } + } +} diff --git a/x-pack/plugins/console_extensions/spec/overrides/ccr.resume_follow.json b/x-pack/plugins/console_extensions/spec/overrides/ccr.resume_follow.json new file mode 100644 index 0000000000000..06d917343cda7 --- /dev/null +++ b/x-pack/plugins/console_extensions/spec/overrides/ccr.resume_follow.json @@ -0,0 +1,16 @@ +{ + "ccr.resume_follow": { + "data_autocomplete_rules": { + "max_read_request_operation_count": "", + "max_outstanding_read_requests": "", + "max_read_request_size": "", + "max_write_request_operation_count": "", + "max_write_request_size": "", + "max_outstanding_write_requests": "", + "max_write_buffer_count": "", + "max_write_buffer_size": "", + "max_retry_delay": "", + "read_poll_timeout": "" + } + } +} diff --git a/x-pack/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js b/x-pack/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js index e0ff4b3c0c600..b8c46c9e97f15 100644 --- a/x-pack/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js +++ b/x-pack/plugins/dashboard_mode/server/__tests__/dashboard_mode_request_interceptor.js @@ -26,21 +26,21 @@ function setup() { }; const server = new Hapi.Server(); - server.connection({ port: 0 }); // attach the extension server.ext(createDashboardModeRequestInterceptor(dashboardViewerApp)); // allow the extension to fake "render an app" - server.decorate('reply', 'renderApp', function (app) { - this({ renderApp: true, app }); + server.decorate('toolkit', 'renderApp', function (app) { + // `this` is the `h` response toolkit + return this.response({ renderApp: true, app }); }); server.route({ path: '/app/{appId}', method: 'GET', - handler(req, reply) { - reply.renderApp({ name: req.params.appId }); + handler(req, h) { + return h.renderApp({ name: req.params.appId }); } }); @@ -48,8 +48,8 @@ function setup() { server.route({ path: '/{path*}', method: 'GET', - handler(req, reply) { - reply({ catchAll: true, path: `/${req.params.path}` }); + handler(req) { + return { catchAll: true, path: `/${req.params.path}` }; } }); diff --git a/x-pack/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js b/x-pack/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js index 60de6bec0f57a..275922deb3d60 100644 --- a/x-pack/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js +++ b/x-pack/plugins/dashboard_mode/server/dashboard_mode_request_interceptor.js @@ -23,7 +23,7 @@ export function createDashboardModeRequestInterceptor(dashboardViewerApp) { return { type: 'onPostAuth', - method(request, reply) { + async method(request, h) { const { auth, url } = request; const isAppRequest = url.path.startsWith('/app/'); @@ -33,15 +33,14 @@ export function createDashboardModeRequestInterceptor(dashboardViewerApp) { // that app and none others. Here we are intercepting all other routing and ensuring the viewer // app is the only one ever rendered. // Read more about Dashboard Only Mode here: https://github.com/elastic/x-pack-kibana/issues/180 - reply.renderApp(dashboardViewerApp); - return; + const response = await h.renderApp(dashboardViewerApp); + return response.takeover(); } - reply(Boom.notFound()); - return; + throw Boom.notFound(); } - reply.continue(); + return h.continue; } }; } diff --git a/x-pack/plugins/graph/index.js b/x-pack/plugins/graph/index.js index 5950713f582a5..b87bd3f37deeb 100644 --- a/x-pack/plugins/graph/index.js +++ b/x-pack/plugins/graph/index.js @@ -21,6 +21,7 @@ export function graph(kibana) { title: 'Graph', order: 9000, icon: 'plugins/graph/icon.png', + euiIconType: 'graphApp', description: 'Graph exploration', main: 'plugins/graph/app', }, diff --git a/x-pack/plugins/graph/public/app.js b/x-pack/plugins/graph/public/app.js index 4190401822493..f7fa2f01bf288 100644 --- a/x-pack/plugins/graph/public/app.js +++ b/x-pack/plugins/graph/public/app.js @@ -80,7 +80,7 @@ uiRoutes return savedObjectsClient.find({ type: 'index-pattern', - fields: ['title'], + fields: ['title', 'type'], perPage: 10000 }).then(response => response.savedObjects); }, @@ -112,7 +112,7 @@ uiRoutes return savedObjectsClient.find({ type: 'index-pattern', - fields: ['title'], + fields: ['title', 'type'], perPage: 10000 }).then(response => response.savedObjects); }, @@ -657,7 +657,7 @@ app.controller('graphuiPlugin', function ($scope, $route, $interval, $http, kbnU } } - $scope.indices = $route.current.locals.indexPatterns; + $scope.indices = $route.current.locals.indexPatterns.filter(indexPattern => !indexPattern.get('type')); $scope.setDetail = function (data) { diff --git a/x-pack/plugins/graph/public/templates/settings.html b/x-pack/plugins/graph/public/templates/settings.html index 7b1f50d94a9d6..225c08692bed7 100644 --- a/x-pack/plugins/graph/public/templates/settings.html +++ b/x-pack/plugins/graph/public/templates/settings.html @@ -277,7 +277,6 @@ class="form-control input-sm" min="1" max="500000" - step="1000" id="qIndexSampleSize" ng-model="exploreControls.sampleSize" > diff --git a/x-pack/plugins/graph/server/lib/es/call_es_graph_explore_api.js b/x-pack/plugins/graph/server/lib/es/call_es_graph_explore_api.js index a20afb3d8d34e..142d4ea266eae 100644 --- a/x-pack/plugins/graph/server/lib/es/call_es_graph_explore_api.js +++ b/x-pack/plugins/graph/server/lib/es/call_es_graph_explore_api.js @@ -35,6 +35,6 @@ export async function callEsGraphExploreApi({ callCluster, index, query }) { throw Boom.badRequest(relevantCause.reason); } - throw Boom.wrap(error); + throw Boom.boomify(error); } } diff --git a/x-pack/plugins/graph/server/lib/es/call_es_search_api.js b/x-pack/plugins/graph/server/lib/es/call_es_search_api.js index 7636304a7469d..67fb5d115c374 100644 --- a/x-pack/plugins/graph/server/lib/es/call_es_search_api.js +++ b/x-pack/plugins/graph/server/lib/es/call_es_search_api.js @@ -16,6 +16,6 @@ export async function callEsSearchApi({ callCluster, index, body }) { }) }; } catch (error) { - throw Boom.wrap(error, error.statusCode || 500); + throw Boom.boomify(error, { statusCode: error.statusCode || 500 }); } } diff --git a/x-pack/plugins/graph/server/lib/pre/get_call_cluster_pre.js b/x-pack/plugins/graph/server/lib/pre/get_call_cluster_pre.js index 67a25727c0503..383170a13d4cf 100644 --- a/x-pack/plugins/graph/server/lib/pre/get_call_cluster_pre.js +++ b/x-pack/plugins/graph/server/lib/pre/get_call_cluster_pre.js @@ -6,8 +6,8 @@ export const getCallClusterPre = { assign: 'callCluster', - method(request, reply) { + method(request) { const cluster = request.server.plugins.elasticsearch.getCluster('data'); - reply((...args) => cluster.callWithRequest(request, ...args)); + return (...args) => cluster.callWithRequest(request, ...args); } }; diff --git a/x-pack/plugins/graph/server/lib/pre/verify_api_access_pre.js b/x-pack/plugins/graph/server/lib/pre/verify_api_access_pre.js index f253fdadae20a..a26e7247d6287 100644 --- a/x-pack/plugins/graph/server/lib/pre/verify_api_access_pre.js +++ b/x-pack/plugins/graph/server/lib/pre/verify_api_access_pre.js @@ -6,14 +6,14 @@ import Boom from 'boom'; -export function verifyApiAccessPre(request, reply) { +export function verifyApiAccessPre(request, h) { const xpackInfo = request.server.plugins.xpack_main.info; const graph = xpackInfo.feature('graph'); const licenseCheckResults = graph.getLicenseCheckResults(); if (licenseCheckResults.showAppLink && licenseCheckResults.enableAppLink) { - reply(); + return null; } else { - reply(Boom.forbidden(licenseCheckResults.message)); + throw Boom.forbidden(licenseCheckResults.message); } } diff --git a/x-pack/plugins/graph/server/routes/graph_explore.js b/x-pack/plugins/graph/server/routes/graph_explore.js index 49248814a048f..7f77903dd7050 100644 --- a/x-pack/plugins/graph/server/routes/graph_explore.js +++ b/x-pack/plugins/graph/server/routes/graph_explore.js @@ -26,12 +26,12 @@ export const graphExploreRoute = { query: Joi.object().required().unknown(true) }).default() }, - handler(request, reply) { - reply(callEsGraphExploreApi({ + handler(request) { + return callEsGraphExploreApi({ callCluster: request.pre.callCluster, index: request.payload.index, query: request.payload.query, - })); + }); } } }; diff --git a/x-pack/plugins/graph/server/routes/search_proxy.js b/x-pack/plugins/graph/server/routes/search_proxy.js index fc95c73ce8f2d..55bdb3af056f5 100644 --- a/x-pack/plugins/graph/server/routes/search_proxy.js +++ b/x-pack/plugins/graph/server/routes/search_proxy.js @@ -27,12 +27,12 @@ export const searchProxyRoute = { body: Joi.object().unknown(true).default() }).default() }, - handler(request, reply) { - reply(callEsSearchApi({ + handler(request) { + return callEsSearchApi({ callCluster: request.pre.callCluster, index: request.payload.index, body: request.payload.body - })); + }); } } }; diff --git a/x-pack/plugins/grokdebugger/common/constants/index.js b/x-pack/plugins/grokdebugger/common/constants/index.js index 12e440d7ed858..c37101b73078a 100644 --- a/x-pack/plugins/grokdebugger/common/constants/index.js +++ b/x-pack/plugins/grokdebugger/common/constants/index.js @@ -6,4 +6,4 @@ export { ROUTES } from './routes'; export { PLUGIN } from './plugin'; -export { EDITOR } from './editor'; +export { EDITOR } from './editor'; \ No newline at end of file diff --git a/x-pack/plugins/grokdebugger/public/register_feature.js b/x-pack/plugins/grokdebugger/public/register_feature.js index 0dcca799136e7..82cd43bcbbcf7 100644 --- a/x-pack/plugins/grokdebugger/public/register_feature.js +++ b/x-pack/plugins/grokdebugger/public/register_feature.js @@ -8,11 +8,21 @@ import { FeatureCatalogueRegistryProvider, FeatureCatalogueCategory } from 'ui/registry/feature_catalogue'; -FeatureCatalogueRegistryProvider.register(() => { +FeatureCatalogueRegistryProvider.register(i18n => { return { id: 'grokdebugger', - title: 'Grok Debugger', - description: 'Simulate and debug grok patterns for data transformation on ingestion.', + title: i18n('xpack.grokDebugger.registryProviderTitle', { + defaultMessage: '{grokLogParsingTool} Debugger', + values: { + grokLogParsingTool: 'Grok' + } + }), + description: i18n('xpack.grokDebugger.registryProviderDescription', { + defaultMessage: 'Simulate and debug {grokLogParsingTool} patterns for data transformation on ingestion.', + values: { + grokLogParsingTool: 'grok' + } + }), icon: 'grokApp', path: '/app/kibana#/dev_tools/grokdebugger', showOnHomePage: false, diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js index e18af08b8ae66..87df1976b7dc8 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/custom_patterns_input/custom_patterns_input.js @@ -15,6 +15,7 @@ import { EuiSpacer } from '@elastic/eui'; import { EDITOR } from '../../../../../common/constants'; +import { FormattedMessage } from '@kbn/i18n/react'; export function CustomPatternsInput({ value, onChange }) { const sampleCustomPatterns = `POSTFIX_QUEUEID [0-9A-F]{10,11} @@ -23,14 +24,24 @@ MSG message-id=<%{GREEDYDATA}>`; return ( + )} data-test-subj="btnToggleCustomPatternsInput" > + )} > { sampleCustomPatterns } diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js index 2db505f3a3248..00ee2dbd9074c 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_input/event_input.js @@ -11,11 +11,17 @@ import { EuiCodeEditor } from '@elastic/eui'; import { EDITOR } from '../../../../../common/constants'; +import { FormattedMessage } from '@kbn/i18n/react'; export function EventInput({ value, onChange }) { return ( + )} fullWidth data-test-subj="aceEventInput" > diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_output/event_output.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_output/event_output.js index 973f3728b5f89..f669ac7a61fdd 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_output/event_output.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/event_output/event_output.js @@ -10,11 +10,17 @@ import { EuiPanel, EuiCodeEditor } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export function EventOutput({ value }) { return ( + )} fullWidth data-test-subj="aceEventOutput" > diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grok_debugger/grok_debugger.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grok_debugger/grok_debugger.js index dddb75336edaa..c42a66cdf561c 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grok_debugger/grok_debugger.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/grok_debugger/grok_debugger.js @@ -20,6 +20,7 @@ import { CustomPatternsInput } from '../custom_patterns_input'; import { EventOutput } from '../event_output'; import { GrokdebuggerRequest } from '../../../../models/grokdebugger_request'; import { toastNotifications } from 'ui/notify'; +import { FormattedMessage } from '@kbn/i18n/react'; export class GrokDebugger extends React.Component { constructor(props) { @@ -123,7 +124,10 @@ export class GrokDebugger extends React.Component { isDisabled={this.isSimulateDisabled()} data-test-subj="btnSimulate" > - Simulate + diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js index 03411edddd25b..bb06da7183b9a 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/components/pattern_input/pattern_input.js @@ -12,11 +12,17 @@ import { } from '@elastic/eui'; import { EDITOR } from '../../../../../common/constants'; import { GrokMode } from '../../../../lib/ace'; +import { FormattedMessage } from '@kbn/i18n/react'; export function PatternInput({ value, onChange }) { return ( + )} fullWidth data-test-subj="acePatternInput" > diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/directives/grokdebugger/grokdebugger.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/directives/grokdebugger/grokdebugger.js index c59f1c0ed56e6..33e5c561d63a3 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/directives/grokdebugger/grokdebugger.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/directives/grokdebugger/grokdebugger.js @@ -9,6 +9,7 @@ import 'plugins/grokdebugger/services/grokdebugger'; import { GrokDebugger } from '../../components/grok_debugger'; import { render } from 'react-dom'; import React from 'react'; +import { I18nProvider } from '@kbn/i18n/react'; const app = uiModules.get('xpack/grokdebugger'); @@ -18,7 +19,7 @@ app.directive('grokdebugger', function ($injector) { return { restrict: 'E', link: (scope, el) => { - render(, el[0]); + render(, el[0]); } }; }); diff --git a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/register.js b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/register.js index 896c6f3278efa..9d8b26bf66b41 100644 --- a/x-pack/plugins/grokdebugger/public/sections/grokdebugger/register.js +++ b/x-pack/plugins/grokdebugger/public/sections/grokdebugger/register.js @@ -7,12 +7,14 @@ import { DevToolsRegistryProvider } from 'ui/registry/dev_tools'; import { XPackInfoProvider } from 'plugins/xpack_main/services/xpack_info'; -DevToolsRegistryProvider.register((Private) => { +DevToolsRegistryProvider.register((Private, i18n) => { const xpackInfo = Private(XPackInfoProvider); return { order: 6, name: 'grokdebugger', - display: 'Grok Debugger', + display: i18n('xpack.grokDebugger.displayName', { + defaultMessage: 'Grok Debugger', + }), url: '#/dev_tools/grokdebugger', disabled: !xpackInfo.get('features.grokdebugger.enableLink', false), tooltipContent: xpackInfo.get('features.grokdebugger.message') diff --git a/x-pack/plugins/grokdebugger/server/lib/call_with_request_factory/call_with_request_factory.js b/x-pack/plugins/grokdebugger/server/lib/call_with_request_factory/call_with_request_factory.js index b9a77a1a0362b..7359a831994f9 100644 --- a/x-pack/plugins/grokdebugger/server/lib/call_with_request_factory/call_with_request_factory.js +++ b/x-pack/plugins/grokdebugger/server/lib/call_with_request_factory/call_with_request_factory.js @@ -6,7 +6,7 @@ import { once } from 'lodash'; -const callWithRequest = once((server) => { +const callWithRequest = once(server => { const cluster = server.plugins.elasticsearch.getCluster('data'); return cluster.callWithRequest; }); diff --git a/x-pack/plugins/grokdebugger/server/lib/check_license/check_license.js b/x-pack/plugins/grokdebugger/server/lib/check_license/check_license.js index be2429e3cc577..b5c970b83e421 100644 --- a/x-pack/plugins/grokdebugger/server/lib/check_license/check_license.js +++ b/x-pack/plugins/grokdebugger/server/lib/check_license/check_license.js @@ -4,6 +4,8 @@ * you may not use this file except in compliance with the Elastic License. */ +import { i18n } from '@kbn/i18n'; + export function checkLicense(xpackLicenseInfo) { // If, for some reason, we cannot get the license information // from Elasticsearch, assume worst case and disable the Watcher UI @@ -11,7 +13,12 @@ export function checkLicense(xpackLicenseInfo) { return { enableLink: false, enableAPIRoute: false, - message: 'You cannot use the Grok Debugger because license information is not available at this time.' + message: i18n.translate('xpack.grokDebugger.unavailableLicenseInformationMessage', { + defaultMessage: 'You cannot use the {grokLogParsingTool} Debugger because license information is not available at this time.', + values: { + grokLogParsingTool: 'Grok' + } + }), }; } @@ -23,7 +30,13 @@ export function checkLicense(xpackLicenseInfo) { return { enableLink: false, enableAPIRoute: false, - message: `You cannot use the Grok Debugger because your ${licenseType} license has expired.` + message: i18n.translate('xpack.grokDebugger.licenseHasExpiredMessage', { + defaultMessage: 'You cannot use the {grokLogParsingTool} Debugger because your {licenseType} license has expired.', + values: { + licenseType, + grokLogParsingTool: 'Grok' + }, + }), }; } diff --git a/x-pack/plugins/grokdebugger/server/lib/error_wrappers/wrap_es_error.js b/x-pack/plugins/grokdebugger/server/lib/error_wrappers/wrap_es_error.js index ccf42d31ba46f..dfcd4e3b1e17c 100644 --- a/x-pack/plugins/grokdebugger/server/lib/error_wrappers/wrap_es_error.js +++ b/x-pack/plugins/grokdebugger/server/lib/error_wrappers/wrap_es_error.js @@ -14,5 +14,5 @@ import Boom from 'boom'; * @return Object Boom error response */ export function wrapEsError(err) { - return Boom.wrap(err, err.statusCode); + return Boom.boomify(err, { statusCode: err.statusCode }); } diff --git a/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js b/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js index 234bcca38f600..9196b8b813470 100644 --- a/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js +++ b/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js @@ -34,31 +34,29 @@ describe('license_pre_routing_factory', () => { }; }); - it ('replies with 403', (done) => { + it('replies with 403', async () => { const licensePreRouting = licensePreRoutingFactory(mockServer); const stubRequest = {}; - licensePreRouting(stubRequest, (response) => { + expect(() => licensePreRouting(stubRequest)).to.throwException((response) => { expect(response).to.be.an(Error); expect(response.isBoom).to.be(true); expect(response.output.statusCode).to.be(403); - done(); }); }); }); - describe('isAvailable is true', () => { + describe('isAvailable is true', async () => { beforeEach(() => { mockLicenseCheckResults = { isAvailable: true }; }); - it ('replies with nothing', (done) => { + it('replies with forbidden', async () => { const licensePreRouting = licensePreRoutingFactory(mockServer); const stubRequest = {}; - licensePreRouting(stubRequest, (response) => { + expect(() => licensePreRouting(stubRequest)).to.throwException((response) => { expect(response).to.eql(Boom.forbidden()); - done(); }); }); }); diff --git a/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/license_pre_routing_factory.js b/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/license_pre_routing_factory.js index 7d11251353120..8a2ef40b86ffe 100644 --- a/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/license_pre_routing_factory.js +++ b/x-pack/plugins/grokdebugger/server/lib/license_pre_routing_factory/license_pre_routing_factory.js @@ -11,13 +11,13 @@ export const licensePreRoutingFactory = (server) => { const xpackMainPlugin = server.plugins.xpack_main; // License checking and enable/disable logic - function licensePreRouting(request, reply) { + function licensePreRouting() { const licenseCheckResults = xpackMainPlugin.info.feature(PLUGIN.ID).getLicenseCheckResults(); if (!licenseCheckResults.enableAPIRoute) { - reply(Boom.forbidden(licenseCheckResults.message)); - } else { - reply(); + throw Boom.forbidden(licenseCheckResults.message); } + + return null; } return licensePreRouting; diff --git a/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.js b/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.js index 575a2700dc589..2b4d60fd55a45 100644 --- a/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.js +++ b/x-pack/plugins/grokdebugger/server/models/grokdebugger_response/grokdebugger_response.js @@ -5,6 +5,7 @@ */ import { get, isEmpty, omit } from 'lodash'; +import { i18n } from '@kbn/i18n'; /** * This model captures the grok debugger response from upstream to be passed to @@ -21,7 +22,14 @@ export class GrokdebuggerResponse { const docs = get(upstreamGrokdebuggerResponse, 'docs'); const error = docs[0].error; if (!isEmpty(error)) { - const opts = { 'error': 'Provided Grok patterns do not match data in the input' }; + const opts = { 'error': i18n.translate( + 'xpack.grokDebugger.patternsErrorMessage', { + defaultMessage: 'Provided {grokLogParsingTool} patterns do not match data in the input', + values: { + grokLogParsingTool: 'Grok' + } + } + ), }; return new GrokdebuggerResponse(opts); } const structuredEvent = omit(get(docs, '0.doc._source'), 'rawEvent'); diff --git a/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.js b/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.js index 1af538f01e481..23295c3af4555 100644 --- a/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.js +++ b/x-pack/plugins/grokdebugger/server/routes/api/grokdebugger/register_grok_simulate_route.js @@ -22,15 +22,15 @@ export function registerGrokSimulateRoute(server) { server.route({ path: '/api/grokdebugger/simulate', method: 'POST', - handler: (request, reply) => { + handler: (request) => { const callWithRequest = callWithRequestFactory(server, request); const grokdebuggerRequest = GrokdebuggerRequest.fromDownstreamJSON(request.payload); return simulateGrok(callWithRequest, grokdebuggerRequest.upstreamJSON) .then((simulateResponseFromES) => { const grokdebuggerResponse = GrokdebuggerResponse.fromUpstreamJSON(simulateResponseFromES); - reply({ grokdebuggerResponse }); + return { grokdebuggerResponse }; }) - .catch(e => reply(wrapEsError(e))); + .catch(e => wrapEsError(e)); }, config: { pre: [ licensePreRouting ] diff --git a/x-pack/plugins/index_management/__jest__/components/__snapshots__/index_table.test.js.snap b/x-pack/plugins/index_management/__jest__/components/__snapshots__/index_table.test.js.snap index f81a3d1d7c6a4..46a5b473be734 100644 --- a/x-pack/plugins/index_management/__jest__/components/__snapshots__/index_table.test.js.snap +++ b/x-pack/plugins/index_management/__jest__/components/__snapshots__/index_table.test.js.snap @@ -90,51 +90,51 @@ Array [ exports[`index table should show the right context menu options when more than one closed index is selected 1`] = ` Array [ - "Open {entity}", - "Delete {entity}", + "Open indices", + "Delete indices", ] `; exports[`index table should show the right context menu options when more than one open index is selected 1`] = ` Array [ - "Close {entity}", - "Force merge {entity}", - "Refresh {entity}", - "Clear {entity} cache", - "Flush {entity}", - "Delete {entity}", + "Close indices", + "Force merge indices", + "Refresh indices", + "Clear indices cache", + "Flush indices", + "Delete indices", ] `; exports[`index table should show the right context menu options when one index is selected and closed 1`] = ` Array [ - "Show {entity} settings", - "Show {entity} mapping", - "Edit {entity} settings", - "Open {entity}", - "Delete {entity}", + "Show index settings", + "Show index mapping", + "Edit index settings", + "Open index", + "Delete index", ] `; exports[`index table should show the right context menu options when one index is selected and open 1`] = ` Array [ - "Show {entity} settings", - "Show {entity} mapping", - "Show {entity} stats", - "Edit {entity} settings", - "Close {entity}", - "Force merge {entity}", - "Refresh {entity}", - "Clear {entity} cache", - "Flush {entity}", - "Delete {entity}", + "Show index settings", + "Show index mapping", + "Show index stats", + "Edit index settings", + "Close index", + "Force merge index", + "Refresh index", + "Clear index cache", + "Flush index", + "Delete index", ] `; exports[`index table should show the right context menu options when one open and one closed index is selected 1`] = ` Array [ - "Open {entity}", - "Delete {entity}", + "Open indices", + "Delete indices", ] `; diff --git a/x-pack/plugins/index_management/index.js b/x-pack/plugins/index_management/index.js index c3d3e8fe1caf5..4408428364b83 100644 --- a/x-pack/plugins/index_management/index.js +++ b/x-pack/plugins/index_management/index.js @@ -18,6 +18,7 @@ export function indexManagement(kibana) { publicDir: resolve(__dirname, 'public'), require: ['kibana', 'elasticsearch', 'xpack_main'], uiExports: { + styleSheetPaths: `${__dirname}/public/index.scss`, managementSections: [ 'plugins/index_management', ] diff --git a/x-pack/plugins/index_management/public/_index_management.scss b/x-pack/plugins/index_management/public/_index_management.scss new file mode 100644 index 0000000000000..4012126e64e5a --- /dev/null +++ b/x-pack/plugins/index_management/public/_index_management.scss @@ -0,0 +1,17 @@ +#indReactRoot { + background-color: $euiColorLightestShade; +} + +.indTable__link { + text-align: left; +} + +.indTable__horizontalScrollContainer { + overflow-x: auto; + max-width: 100%; + height: 100vh; +} +.indTable__horizontalScroll { + min-width: 800px; + width: 100%; +} \ No newline at end of file diff --git a/x-pack/plugins/index_management/public/index.scss b/x-pack/plugins/index_management/public/index.scss new file mode 100644 index 0000000000000..e5fcf114bcc08 --- /dev/null +++ b/x-pack/plugins/index_management/public/index.scss @@ -0,0 +1,13 @@ +// Import the EUI global scope so we can use EUI constants +@import 'ui/public/styles/_styling_constants'; + +// Index management plugin styles + +// Prefix all styles with "ind" to avoid conflicts. +// Examples +// indChart +// indChart__legend +// indChart__legend--small +// indChart__legend-isLoading + +@import 'index_management'; \ No newline at end of file diff --git a/x-pack/plugins/index_management/public/main.html b/x-pack/plugins/index_management/public/main.html index a32b3e94ec0dd..6c13c980e8371 100644 --- a/x-pack/plugins/index_management/public/main.html +++ b/x-pack/plugins/index_management/public/main.html @@ -1,3 +1,3 @@ -
      +
      diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/detail_panel.js b/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/detail_panel.js index eba3e6c75d56b..0f4875b3dc6a5 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/detail_panel.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/detail_panel.js @@ -5,7 +5,7 @@ */ import React, { Component } from 'react'; -import { injectI18n } from '@kbn/i18n/react'; +import { FormattedMessage } from '@kbn/i18n/react'; import { Route } from 'react-router-dom'; import { ShowJson } from './show_json'; import { Summary } from './summary'; @@ -30,7 +30,7 @@ function capitalizeFirstLetter(string) { } const tabs = ['Summary', 'Settings', 'Mapping', 'Stats', 'Edit settings']; -export class DetailPanelUi extends Component { +export class DetailPanel extends Component { renderTabs() { const { panelType, indexName, indexStatus, openDetailPanel } = this.props; @@ -51,7 +51,7 @@ export class DetailPanelUi extends Component { } render() { - const { panelType, indexName, closeDetailPanel, intl } = this.props; + const { panelType, indexName, closeDetailPanel } = this.props; if (!panelType) { return null; } @@ -95,10 +95,7 @@ export class DetailPanelUi extends Component { anchorPosition="upRight" detailPanel={true} iconType="arrowUp" - label={intl.formatMessage({ - id: 'xpack.idxMgmt.detailPanel.manageContextMenuLabel', - defaultMessage: 'Manage', - })} + label={} /> )} /> @@ -109,5 +106,3 @@ export class DetailPanelUi extends Component { ); } } - -export const DetailPanel = injectI18n(DetailPanelUi); \ No newline at end of file diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/summary/summary.js b/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/summary/summary.js index 7346ab6650f65..4813a67b53485 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/summary/summary.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/detail_panel/summary/summary.js @@ -38,6 +38,9 @@ const HEADERS = { }), primary_size: i18n.translate('xpack.idxMgmt.summary.headers.primaryStorageSizeHeader', { defaultMessage: 'Primary Storage Size', + }), + aliases: i18n.translate('xpack.idxMgmt.summary.headers.aliases', { + defaultMessage: 'Aliases' }) }; @@ -46,10 +49,13 @@ export class Summary extends React.PureComponent { const { index } = this.props; return Object.keys(HEADERS).map(fieldName => { const value = index[fieldName]; - const content = - fieldName === "health" ? ( - {value} - ) : value; + let content = value; + if(fieldName === 'health') { + content = {value}; + } + if(Array.isArray(content)) { + content = content.join(', '); + } return [ {HEADERS[fieldName]}: diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/index_actions_context_menu/index_actions_context_menu.js b/x-pack/plugins/index_management/public/sections/index_list/components/index_actions_context_menu/index_actions_context_menu.js index 9c0a381a1d19c..7c5339b53f75f 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/index_actions_context_menu/index_actions_context_menu.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/index_actions_context_menu/index_actions_context_menu.js @@ -285,8 +285,8 @@ class IndexActionsContextMenuUi extends Component {

      {' '} {entity}: @@ -377,8 +377,8 @@ class IndexActionsContextMenuUi extends Component {

      {' '} {entity}: @@ -459,6 +459,7 @@ class IndexActionsContextMenuUi extends Component { panelPaddingSize="none" withTitle anchorPosition={anchorPosition} + repositionOnScroll > diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js b/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js index 8ebae49b11238..19e8b4f071cbf 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/index_list/index_list.js @@ -29,7 +29,7 @@ export class IndexList extends React.PureComponent { render() { return ( -

      +
      diff --git a/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js b/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js index 49ba4ef3bedb2..df501ef98ff32 100644 --- a/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js +++ b/x-pack/plugins/index_management/public/sections/index_list/components/index_table/index_table.js @@ -168,7 +168,7 @@ export class IndexTableUi extends Component { } else if (fieldName === 'name') { return ( { openDetailPanel(value); @@ -284,12 +284,10 @@ export class IndexTableUi extends Component { id="checkboxShowSystemIndices" checked={showSystemIndices} onChange={event => showSystemIndicesChanged(event.target.checked)} - label={ - intl.formatMessage({ - id: 'xpack.idxMgmt.indexTable.systemIndicesSwitchLabel', - defaultMessage: 'Include system indices', - }) - } + label={} /> @@ -324,7 +322,12 @@ export class IndexTableUi extends Component { defaultMessage: 'Search', }) } - aria-label="Search indices" + aria-label={ + intl.formatMessage({ + id: 'xpack.idxMgmt.indexTable.systemIndicesSearchIndicesAriaLabel', + defaultMessage: 'Search indices', + }) + } /> diff --git a/x-pack/plugins/index_management/public/styles/table.less b/x-pack/plugins/index_management/public/styles/table.less index a93fe289f9b63..6ac08e744951d 100644 --- a/x-pack/plugins/index_management/public/styles/table.less +++ b/x-pack/plugins/index_management/public/styles/table.less @@ -2,23 +2,23 @@ background-color: #F5F5F5; } -.indexTable__link { +.indTable__link { text-align: left; } .indexTable__header--name { width: 25%; } -.indexTableHorizontalScrollContainer { +.indTable__horizontalScrollContainer { overflow-x: auto; max-width: 100%; height: 100vh; } -.indexTableHorizontalScroll { +.indTable__horizontalScroll { min-width: 800px; width: 100%; } -.indexDetail__codeBlock { +.indDetail__codeBlock { background: transparent; } diff --git a/x-pack/plugins/index_management/server/lib/call_with_request_factory/call_with_request_factory.js b/x-pack/plugins/index_management/server/lib/call_with_request_factory/call_with_request_factory.js index b9a77a1a0362b..7359a831994f9 100644 --- a/x-pack/plugins/index_management/server/lib/call_with_request_factory/call_with_request_factory.js +++ b/x-pack/plugins/index_management/server/lib/call_with_request_factory/call_with_request_factory.js @@ -6,7 +6,7 @@ import { once } from 'lodash'; -const callWithRequest = once((server) => { +const callWithRequest = once(server => { const cluster = server.plugins.elasticsearch.getCluster('data'); return cluster.callWithRequest; }); diff --git a/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_custom_error.js b/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_custom_error.js index 890a366ac65c1..3295113d38ee5 100644 --- a/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_custom_error.js +++ b/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_custom_error.js @@ -14,5 +14,5 @@ import Boom from 'boom'; * @return Object Boom error response */ export function wrapCustomError(err, statusCode) { - return Boom.wrap(err, statusCode); + return Boom.boomify(err, { statusCode }); } diff --git a/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_es_error.js b/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_es_error.js index 3d69ff19a6c84..2df2e4b802e1a 100644 --- a/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_es_error.js +++ b/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_es_error.js @@ -20,11 +20,11 @@ export function wrapEsError(err, statusCodeToMessageMap = {}) { // If no custom message if specified for the error's status code, just // wrap the error as a Boom error response and return it if (!statusCodeToMessageMap[statusCode]) { - return Boom.wrap(err, err.statusCode); + return Boom.boomify(err, { statusCode }); } // Otherwise, use the custom message to create a Boom error response and // return it const message = statusCodeToMessageMap[statusCode]; - return Boom.create(statusCode, message); -} \ No newline at end of file + return new Boom(message, { statusCode }); +} diff --git a/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_unknown_error.js b/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_unknown_error.js index ca72fa0030922..4b865880ae20d 100644 --- a/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_unknown_error.js +++ b/x-pack/plugins/index_management/server/lib/error_wrappers/wrap_unknown_error.js @@ -13,5 +13,5 @@ import Boom from 'boom'; * @return Object Boom error response */ export function wrapUnknownError(err) { - return Boom.wrap(err); + return Boom.boomify(err); } \ No newline at end of file diff --git a/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js b/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js index b72f8cc769731..359b3fb2ce6f4 100644 --- a/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js +++ b/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js @@ -40,14 +40,13 @@ describe('license_pre_routing_factory', () => { }; }); - it ('replies with 403', (done) => { + it ('replies with 403', () => { const licensePreRouting = licensePreRoutingFactory(mockServer); const stubRequest = {}; - licensePreRouting(stubRequest, (response) => { + expect(() => licensePreRouting(stubRequest)).to.throwException((response) => { expect(response).to.be.an(Error); expect(response.isBoom).to.be(true); expect(response.output.statusCode).to.be(403); - done(); }); }); }); @@ -59,13 +58,11 @@ describe('license_pre_routing_factory', () => { }; }); - it ('replies with nothing', (done) => { + it ('replies with nothing', () => { const licensePreRouting = licensePreRoutingFactory(mockServer); const stubRequest = {}; - licensePreRouting(stubRequest, (response) => { - expect(response).to.be(undefined); - done(); - }); + const response = licensePreRouting(stubRequest); + expect(response).to.be(null); }); }); }); diff --git a/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.js b/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.js index b3720ab265393..11e01304b6e5c 100644 --- a/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.js +++ b/x-pack/plugins/index_management/server/lib/license_pre_routing_factory/license_pre_routing_factory.js @@ -12,16 +12,15 @@ export const licensePreRoutingFactory = once((server) => { const xpackMainPlugin = server.plugins.xpack_main; // License checking and enable/disable logic - function licensePreRouting(request, reply) { + function licensePreRouting() { const licenseCheckResults = xpackMainPlugin.info.feature(PLUGIN.ID).getLicenseCheckResults(); if (!licenseCheckResults.isAvailable) { const error = new Error(licenseCheckResults.message); const statusCode = 403; - const wrappedError = wrapCustomError(error, statusCode); - reply(wrappedError); - } else { - reply(); + throw wrapCustomError(error, statusCode); } + + return null; } return licensePreRouting; diff --git a/x-pack/plugins/index_management/server/routes/api/indices/fetch_aliases.js b/x-pack/plugins/index_management/server/routes/api/indices/fetch_aliases.js new file mode 100644 index 0000000000000..2f0b622e5048c --- /dev/null +++ b/x-pack/plugins/index_management/server/routes/api/indices/fetch_aliases.js @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export async function fetchAliases(callWithRequest) { + const results = await callWithRequest('cat.aliases', { format: 'json' }); + return results.reduce((hash, { index, alias }) => { + (hash[index] = hash[index] || []).push(alias); + return hash; + }, {}); +} diff --git a/x-pack/plugins/index_management/server/routes/api/indices/fetch_aliases.test.js b/x-pack/plugins/index_management/server/routes/api/indices/fetch_aliases.test.js new file mode 100644 index 0000000000000..1371758b78fcd --- /dev/null +++ b/x-pack/plugins/index_management/server/routes/api/indices/fetch_aliases.test.js @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import sinon from 'sinon'; +import { fetchAliases } from './fetch_aliases'; + +describe('fetching aliases', () => { + const fetchFn = fetchAliases; + + test('should return map of aliases for indices', async () => { + const retVal = [ + { index: 'test1Index', alias: 'test1Alias' }, + { index: 'test2Index', alias: 'test1Alias' }, + { index: 'test3Index', alias: 'test2Alias' }, + { index: 'test3Index', alias: 'test3Alias' }, + ]; + const mockCallWithRequest = sinon.spy(() => {return retVal;}); + + const results = await fetchFn(mockCallWithRequest); + + expect(mockCallWithRequest.called); + expect(results).toBeDefined(); + expect(results).toMatchObject({ + test1Index: ['test1Alias'], + test2Index: ['test1Alias'], + test3Index: ['test2Alias', 'test3Alias'], + }); + + }); + + test('should return an empty object if no aliases exist', async () => { + const mockCallWithRequest = sinon.spy(() => {return [];}); + + const results = await fetchFn(mockCallWithRequest); + + expect(mockCallWithRequest.called); + expect(results).toBeDefined(); + expect(results).toMatchObject({}); + }); +}); diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.js index 0260c5f3023ea..5dc22f023eb5c 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_clear_cache_route.js @@ -30,7 +30,7 @@ export function registerClearCacheRoute(server) { server.route({ path: '/api/index_management/indices/clear_cache', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const indices = getIndexArrayFromPayload(request.payload); @@ -38,13 +38,13 @@ export function registerClearCacheRoute(server) { await clearCache(callWithRequest, indices); //TODO: Should we check acknowledged = true? - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.js index b2e96cd6b796c..763429de6d3e4 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_close_route.js @@ -30,7 +30,7 @@ export function registerCloseRoute(server) { server.route({ path: '/api/index_management/indices/close', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const indices = getIndexArrayFromPayload(request.payload); @@ -38,13 +38,13 @@ export function registerCloseRoute(server) { await closeIndices(callWithRequest, indices); //TODO: Should we check acknowledged = true? - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.js index 58e1d99224057..a2b2c87662959 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_delete_route.js @@ -30,19 +30,19 @@ export function registerDeleteRoute(server) { server.route({ path: '/api/index_management/indices/delete', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const indices = getIndexArrayFromPayload(request.payload); try { await deleteIndices(callWithRequest, indices); - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.js index 4d59552bf5374..f66691b9577f1 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_flush_route.js @@ -31,7 +31,7 @@ export function registerFlushRoute(server) { server.route({ path: '/api/index_management/indices/flush', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const indices = getIndexArrayFromPayload(request.payload); @@ -39,13 +39,13 @@ export function registerFlushRoute(server) { await flushIndices(callWithRequest, indices); //TODO: Should we check acknowledged = true? - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.js index 7328101ebaa99..dcc926353d07b 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_forcemerge_route.js @@ -28,7 +28,7 @@ export function registerForcemergeRoute(server) { server.route({ path: '/api/index_management/indices/forcemerge', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const { payload } = request; const { indices = [], maxNumSegments } = payload; @@ -36,13 +36,13 @@ export function registerForcemergeRoute(server) { await forcemergeIndices(callWithRequest, indices, maxNumSegments); //TODO: Should we check acknowledged = true? - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.js index 37794c7e91b9e..fefb5fc91a843 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_list_route.js @@ -7,9 +7,10 @@ import { callWithRequestFactory } from '../../../lib/call_with_request_factory'; import { isEsErrorFactory } from '../../../lib/is_es_error_factory'; import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers'; -import { licensePreRoutingFactory } from'../../../lib/license_pre_routing_factory'; +import { licensePreRoutingFactory } from '../../../lib/license_pre_routing_factory'; +import { fetchAliases } from './fetch_aliases'; -function formatHits(hits) { +function formatHits(hits, aliases) { return hits.map(hit => { return { health: hit.health, @@ -22,6 +23,7 @@ function formatHits(hits) { documents_deleted: hit["docs.deleted"], size: hit["store.size"], primary_size: hit["pri.store.size"], + aliases: aliases.hasOwnProperty(hit.index) ? aliases[hit.index] : 'none', }; }); } @@ -41,23 +43,24 @@ export function registerListRoute(server) { server.route({ path: '/api/index_management/indices', method: 'GET', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); try { + const aliases = await fetchAliases(callWithRequest); const hits = await fetchIndices(callWithRequest); - const response = formatHits(hits); - reply(response); + const response = formatHits(hits, aliases); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { - pre: [ licensePreRouting ] + pre: [licensePreRouting] } }); } diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.js index 9a8e164e0f627..bbf38d4a51adf 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_open_route.js @@ -30,7 +30,7 @@ export function registerOpenRoute(server) { server.route({ path: '/api/index_management/indices/open', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const indices = getIndexArrayFromPayload(request.payload); @@ -38,13 +38,13 @@ export function registerOpenRoute(server) { await openIndices(callWithRequest, indices); //TODO: Should we check acknowledged = true? - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.js index 666197834248c..49414f70a6588 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_refresh_route.js @@ -29,7 +29,7 @@ export function registerRefreshRoute(server) { server.route({ path: '/api/index_management/indices/refresh', method: 'POST', - handler: async (request, reply) => { + handler: async (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const indices = getIndexArrayFromPayload(request.payload); @@ -37,13 +37,13 @@ export function registerRefreshRoute(server) { await refreshIndices(callWithRequest, indices); //TODO: Should we check acknowledged = true? - reply(); + return h.response(); } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.js index 8d8431535eb6b..bf2fe6c558867 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.js @@ -8,12 +8,13 @@ import { callWithRequestFactory } from '../../../lib/call_with_request_factory'; import { isEsErrorFactory } from '../../../lib/is_es_error_factory'; import { wrapEsError, wrapUnknownError } from '../../../lib/error_wrappers'; import { licensePreRoutingFactory } from'../../../lib/license_pre_routing_factory'; +import { fetchAliases } from './fetch_aliases'; function getIndexNamesFromPayload(payload) { return payload.indexNames || []; } -function formatHits(hits) { +function formatHits(hits, aliases) { return hits.map(hit => { return { health: hit.health, @@ -26,6 +27,7 @@ function formatHits(hits) { documents_deleted: hit["docs.deleted"], size: hit["store.size"], primary_size: hit["pri.store.size"], + aliases: aliases.hasOwnProperty(hit.index) ? aliases[hit.index] : 'none', }; }); } @@ -46,20 +48,21 @@ export function registerReloadRoute(server) { server.route({ path: '/api/index_management/indices/reload', method: 'POST', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const indexNames = getIndexNamesFromPayload(request.payload); try { - const hits = await fetchIndices(callWithRequest, indexNames); - const response = formatHits(hits); - reply(response); + const indices = await fetchIndices(callWithRequest, indexNames); + const aliases = await fetchAliases(callWithRequest); + const response = formatHits(indices, aliases); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_settings_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_settings_route.js index a9208a9f1f297..c15e9f51d6464 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_settings_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_settings_route.js @@ -46,20 +46,20 @@ export function registerSettingsRoute(server) { server.route({ path: '/api/index_management/indices/settings', method: 'POST', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const indexNames = getIndexNamesFromPayload(request.payload); try { const hits = await fetchSettings(callWithRequest, indexNames); const response = formatHits(hits); - reply(response); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/indices/register_shards_route.js b/x-pack/plugins/index_management/server/routes/api/indices/register_shards_route.js index b4b2a585743b9..0d56e2146b612 100644 --- a/x-pack/plugins/index_management/server/routes/api/indices/register_shards_route.js +++ b/x-pack/plugins/index_management/server/routes/api/indices/register_shards_route.js @@ -46,20 +46,20 @@ export function registerShardsRoute(server) { server.route({ path: '/api/index_management/indices/shards', method: 'POST', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const indexNames = getIndexNamesFromPayload(request.payload); try { const hits = await fetchShards(callWithRequest, indexNames); const response = formatHits(hits); - reply(response); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.js b/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.js index 93bb8a405ca26..c988fdb159119 100644 --- a/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.js +++ b/x-pack/plugins/index_management/server/routes/api/mapping/register_mapping_route.js @@ -33,7 +33,7 @@ export function registerMappingRoute(server) { server.route({ path: '/api/index_management/mapping/{indexName}', method: 'GET', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const { indexName } = request.params; @@ -41,13 +41,13 @@ export function registerMappingRoute(server) { const hit = await fetchMapping(callWithRequest, indexName); const response = formatHit(hit, indexName); - reply(response); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.js b/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.js index 0493cd650b8ec..658ab109fd7c6 100644 --- a/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.js +++ b/x-pack/plugins/index_management/server/routes/api/settings/register_load_route.js @@ -35,20 +35,20 @@ export function registerLoadRoute(server) { server.route({ path: '/api/index_management/settings/{indexName}', method: 'GET', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const { indexName } = request.params; try { const hit = await fetchSettings(callWithRequest, indexName); const response = formatHit(hit); - reply(response); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.js b/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.js index 5a3816481406b..49904d741f057 100644 --- a/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.js +++ b/x-pack/plugins/index_management/server/routes/api/settings/register_update_route.js @@ -29,18 +29,18 @@ export function registerUpdateRoute(server) { server.route({ path: '/api/index_management/settings/{indexName}', method: 'PUT', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const { indexName } = request.params; try { const response = await updateSettings(callWithRequest, indexName, request.payload); - reply(response); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.js b/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.js index 163b240782e02..a0a0455e273c8 100644 --- a/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.js +++ b/x-pack/plugins/index_management/server/routes/api/stats/register_stats_route.js @@ -34,7 +34,7 @@ export function registerStatsRoute(server) { server.route({ path: '/api/index_management/stats/{indexName}', method: 'GET', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); const { indexName } = request.params; @@ -42,13 +42,13 @@ export function registerStatsRoute(server) { const hit = await fetchStats(callWithRequest, indexName); const response = formatHit(hit, indexName); - reply(response); + return response; } catch (err) { if (isEsError(err)) { - return reply(wrapEsError(err)); + throw wrapEsError(err); } - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/infra/common/graphql/introspection.json b/x-pack/plugins/infra/common/graphql/introspection.json new file mode 100644 index 0000000000000..cd3e36a84c306 --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/introspection.json @@ -0,0 +1,2666 @@ +{ + "__schema": { + "queryType": { "name": "Query" }, + "mutationType": null, + "subscriptionType": null, + "types": [ + { + "kind": "OBJECT", + "name": "Query", + "description": "", + "fields": [ + { + "name": "source", + "description": "Get an infrastructure data source by id", + "args": [ + { + "name": "id", + "description": "The id of the source", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraSource", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "allSources", + "description": "Get a list of all infrastructure data sources", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraSource", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "ID", + "description": + "The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `\"4\"`) or integer (such as `4`) input value will be accepted as an ID.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraSource", + "description": "A source of infrastructure data", + "fields": [ + { + "name": "id", + "description": "The id of the source", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "configuration", + "description": "The raw configuration of the source", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraSourceConfiguration", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "status", + "description": "The status of the source", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraSourceStatus", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "capabilitiesByNode", + "description": "A hierarchy of capabilities available on nodes", + "args": [ + { + "name": "nodeName", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "nodeType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "InfraNodeType", "ofType": null } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraNodeCapability", "ofType": null } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logEntriesAround", + "description": "A consecutive span of log entries surrounding a point in time", + "args": [ + { + "name": "key", + "description": "The sort key that corresponds to the point in time", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "INPUT_OBJECT", "name": "InfraTimeKeyInput", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "countBefore", + "description": "The maximum number of preceding to return", + "type": { "kind": "SCALAR", "name": "Int", "ofType": null }, + "defaultValue": "0" + }, + { + "name": "countAfter", + "description": "The maximum number of following to return", + "type": { "kind": "SCALAR", "name": "Int", "ofType": null }, + "defaultValue": "0" + }, + { + "name": "filterQuery", + "description": "The query to filter the log entries by", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + }, + { + "name": "highlightQuery", + "description": "The query to highlight the log entries with", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraLogEntryInterval", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logEntriesBetween", + "description": "A consecutive span of log entries within an interval", + "args": [ + { + "name": "startKey", + "description": "The sort key that corresponds to the start of the interval", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "INPUT_OBJECT", "name": "InfraTimeKeyInput", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "endKey", + "description": "The sort key that corresponds to the end of the interval", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "INPUT_OBJECT", "name": "InfraTimeKeyInput", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "filterQuery", + "description": "The query to filter the log entries by", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + }, + { + "name": "highlightQuery", + "description": "The query to highlight the log entries with", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraLogEntryInterval", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logSummaryBetween", + "description": "A consecutive span of summary buckets within an interval", + "args": [ + { + "name": "start", + "description": + "The millisecond timestamp that corresponds to the start of the interval", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "end", + "description": + "The millisecond timestamp that corresponds to the end of the interval", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "bucketSize", + "description": "The size of each bucket in milliseconds", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "filterQuery", + "description": "The query to filter the log entries by", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraLogSummaryInterval", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "map", + "description": "A hierarchy of hosts, pods, containers, services or arbitrary groups", + "args": [ + { + "name": "timerange", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "INPUT_OBJECT", + "name": "InfraTimerangeInput", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "filterQuery", + "description": "", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + } + ], + "type": { "kind": "OBJECT", "name": "InfraResponse", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "metrics", + "description": "", + "args": [ + { + "name": "nodeId", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "nodeType", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "InfraNodeType", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "timerange", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "INPUT_OBJECT", + "name": "InfraTimerangeInput", + "ofType": null + } + }, + "defaultValue": null + }, + { + "name": "metrics", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "InfraMetric", "ofType": null } + } + } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraMetricData", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraSourceConfiguration", + "description": "A set of configuration options for an infrastructure data source", + "fields": [ + { + "name": "metricAlias", + "description": "The alias to read metric data from", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logAlias", + "description": "The alias to read log data from", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "fields", + "description": "The field mapping to use for this source", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraSourceFields", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "String", + "description": + "The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraSourceFields", + "description": "A mapping of semantic fields to their document counterparts", + "fields": [ + { + "name": "container", + "description": "The field to identify a container by", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "host", + "description": "The fields to identify a host by", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "message", + "description": + "The fields that may contain the log event message. The first field found win.", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "pod", + "description": "The field to identify a pod by", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "tiebreaker", + "description": + "The field to use as a tiebreaker for log events that have identical timestamps", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "timestamp", + "description": "The field to use as a timestamp for metrics and logs", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraSourceStatus", + "description": "The status of an infrastructure data source", + "fields": [ + { + "name": "metricAliasExists", + "description": "Whether the configured metric alias exists", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logAliasExists", + "description": "Whether the configured log alias exists", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "metricIndicesExist", + "description": + "Whether the configured alias or wildcard pattern resolve to any metric indices", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logIndicesExist", + "description": + "Whether the configured alias or wildcard pattern resolve to any log indices", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "metricIndices", + "description": "The list of indices in the metric alias", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "logIndices", + "description": "The list of indices in the log alias", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "indexFields", + "description": "The list of fields defined in the index mappings", + "args": [ + { + "name": "indexType", + "description": "", + "type": { "kind": "ENUM", "name": "InfraIndexType", "ofType": null }, + "defaultValue": "ANY" + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraIndexField", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "Boolean", + "description": "The `Boolean` scalar type represents `true` or `false`.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "InfraIndexType", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { "name": "ANY", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "LOGS", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "METRICS", "description": "", "isDeprecated": false, "deprecationReason": null } + ], + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraIndexField", + "description": "A descriptor of a field in an index", + "fields": [ + { + "name": "name", + "description": "The name of the field", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "type", + "description": "The type of the field's values as recognized by Kibana", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "searchable", + "description": "Whether the field's values can be efficiently searched for", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "aggregatable", + "description": "Whether the field's values can be aggregated", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "InfraNodeType", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { "name": "pod", "description": "", "isDeprecated": false, "deprecationReason": null }, + { + "name": "container", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { "name": "host", "description": "", "isDeprecated": false, "deprecationReason": null } + ], + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraNodeCapability", + "description": + "One specific capability available on a node. A capability corresponds to a fileset or metricset", + "fields": [ + { + "name": "name", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "source", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "INPUT_OBJECT", + "name": "InfraTimeKeyInput", + "description": "", + "fields": null, + "inputFields": [ + { + "name": "time", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "tiebreaker", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + } + ], + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "Float", + "description": + "The `Float` scalar type represents signed double-precision fractional values as specified by [IEEE 754](http://en.wikipedia.org/wiki/IEEE_floating_point). ", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "SCALAR", + "name": "Int", + "description": + "The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1. ", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraLogEntryInterval", + "description": "A consecutive sequence of log entries", + "fields": [ + { + "name": "start", + "description": + "The key corresponding to the start of the interval covered by the entries", + "args": [], + "type": { "kind": "OBJECT", "name": "InfraTimeKey", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "end", + "description": + "The key corresponding to the end of the interval covered by the entries", + "args": [], + "type": { "kind": "OBJECT", "name": "InfraTimeKey", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hasMoreBefore", + "description": "Whether there are more log entries available before the start", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hasMoreAfter", + "description": "Whether there are more log entries available after the end", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "filterQuery", + "description": "The query the log entries were filtered by", + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "highlightQuery", + "description": "The query the log entries were highlighted with", + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "entries", + "description": "A list of the log entries", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraLogEntry", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraTimeKey", + "description": "A representation of the log entry's position in the event stream", + "fields": [ + { + "name": "time", + "description": "The timestamp of the event that the log entry corresponds to", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "tiebreaker", + "description": "The tiebreaker that disambiguates events with the same timestamp", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraLogEntry", + "description": "A log entry", + "fields": [ + { + "name": "key", + "description": + "A unique representation of the log entry's position in the event stream", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraTimeKey", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "gid", + "description": "The log entry's id", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "source", + "description": "The source id", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "message", + "description": "A list of the formatted log entry segments", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "UNION", "name": "InfraLogMessageSegment", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "UNION", + "name": "InfraLogMessageSegment", + "description": "A segment of the log entry message", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": null, + "possibleTypes": [ + { "kind": "OBJECT", "name": "InfraLogMessageFieldSegment", "ofType": null }, + { "kind": "OBJECT", "name": "InfraLogMessageConstantSegment", "ofType": null } + ] + }, + { + "kind": "OBJECT", + "name": "InfraLogMessageFieldSegment", + "description": "A segment of the log entry message that was derived from a field", + "fields": [ + { + "name": "field", + "description": "The field the segment was derived from", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "value", + "description": "The segment's message", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "highlights", + "description": "A list of highlighted substrings of the value", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraLogMessageConstantSegment", + "description": "A segment of the log entry message that was derived from a field", + "fields": [ + { + "name": "constant", + "description": "The segment's message", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraLogSummaryInterval", + "description": "A consecutive sequence of log summary buckets", + "fields": [ + { + "name": "start", + "description": + "The millisecond timestamp corresponding to the start of the interval covered by the summary", + "args": [], + "type": { "kind": "SCALAR", "name": "Float", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "end", + "description": + "The millisecond timestamp corresponding to the end of the interval covered by the summary", + "args": [], + "type": { "kind": "SCALAR", "name": "Float", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "filterQuery", + "description": "The query the log entries were filtered by", + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "buckets", + "description": "A list of the log entries", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraLogSummaryBucket", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraLogSummaryBucket", + "description": "A log summary bucket", + "fields": [ + { + "name": "start", + "description": "The start timestamp of the bucket", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "end", + "description": "The end timestamp of the bucket", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "entriesCount", + "description": "The number of entries inside the bucket", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Int", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "INPUT_OBJECT", + "name": "InfraTimerangeInput", + "description": "", + "fields": null, + "inputFields": [ + { + "name": "interval", + "description": + "The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan.", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "to", + "description": "The end of the timerange", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "from", + "description": "The beginning of the timerange", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "defaultValue": null + } + ], + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraResponse", + "description": "", + "fields": [ + { + "name": "nodes", + "description": "", + "args": [ + { + "name": "path", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "INPUT_OBJECT", "name": "InfraPathInput", "ofType": null } + } + } + }, + "defaultValue": null + }, + { + "name": "metric", + "description": "", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "INPUT_OBJECT", "name": "InfraMetricInput", "ofType": null } + }, + "defaultValue": null + } + ], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraNode", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "INPUT_OBJECT", + "name": "InfraPathInput", + "description": "", + "fields": null, + "inputFields": [ + { + "name": "type", + "description": "The type of path", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "InfraPathType", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "label", + "description": + "The label to use in the results for the group by for the terms group by", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + }, + { + "name": "field", + "description": + "The field to group by from a terms aggregation, this is ignored by the filter type", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": null + }, + { + "name": "filters", + "description": "The fitlers for the filter group by", + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "INPUT_OBJECT", "name": "InfraPathFilterInput", "ofType": null } + } + }, + "defaultValue": null + } + ], + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "InfraPathType", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { "name": "terms", "description": "", "isDeprecated": false, "deprecationReason": null }, + { + "name": "filters", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { "name": "hosts", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "pods", "description": "", "isDeprecated": false, "deprecationReason": null }, + { + "name": "containers", + "description": "", + "isDeprecated": false, + "deprecationReason": null + } + ], + "possibleTypes": null + }, + { + "kind": "INPUT_OBJECT", + "name": "InfraPathFilterInput", + "description": "A group by filter", + "fields": null, + "inputFields": [ + { + "name": "label", + "description": + "The label for the filter, this will be used as the group name in the final results", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "defaultValue": null + }, + { + "name": "query", + "description": "The query string query", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "defaultValue": null + } + ], + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "INPUT_OBJECT", + "name": "InfraMetricInput", + "description": "", + "fields": null, + "inputFields": [ + { + "name": "type", + "description": "The type of metric", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "InfraMetricType", "ofType": null } + }, + "defaultValue": null + } + ], + "interfaces": null, + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "InfraMetricType", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { "name": "count", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "cpu", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "load", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "memory", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "tx", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "rx", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "logRate", "description": "", "isDeprecated": false, "deprecationReason": null } + ], + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraNode", + "description": "", + "fields": [ + { + "name": "path", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraNodePath", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "metric", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraNodeMetric", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraNodePath", + "description": "", + "fields": [ + { + "name": "value", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraNodeMetric", + "description": "", + "fields": [ + { + "name": "name", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "InfraMetricType", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "value", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "InfraMetric", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { + "name": "hostSystemOverview", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostCpuUsage", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostFilesystem", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostK8sOverview", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostK8sCpuCap", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostK8sDiskCap", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostK8sMemoryCap", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostK8sPodCap", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostLoad", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostMemoryUsage", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "hostNetworkTraffic", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "podOverview", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "podCpuUsage", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "podMemoryUsage", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "podLogUsage", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "podNetworkTraffic", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerOverview", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerCpuKernel", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerCpuUsage", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerDiskIOOps", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerDiskIOBytes", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerMemory", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "containerNetworkTraffic", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nginxHits", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nginxRequestRate", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nginxActiveConnections", + "description": "", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "nginxRequestsPerConnection", + "description": "", + "isDeprecated": false, + "deprecationReason": null + } + ], + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraMetricData", + "description": "", + "fields": [ + { + "name": "id", + "description": "", + "args": [], + "type": { "kind": "ENUM", "name": "InfraMetric", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "series", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraDataSeries", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraDataSeries", + "description": "", + "fields": [ + { + "name": "id", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "ID", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "data", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "InfraDataPoint", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "InfraDataPoint", + "description": "", + "fields": [ + { + "name": "timestamp", + "description": "", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Float", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "value", + "description": "", + "args": [], + "type": { "kind": "SCALAR", "name": "Float", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "__Schema", + "description": + "A GraphQL Schema defines the capabilities of a GraphQL server. It exposes all available types and directives on the server, as well as the entry points for query, mutation, and subscription operations.", + "fields": [ + { + "name": "types", + "description": "A list of all types supported by this server.", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "queryType", + "description": "The type that query operations will be rooted at.", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "mutationType", + "description": + "If this server supports mutation, the type that mutation operations will be rooted at.", + "args": [], + "type": { "kind": "OBJECT", "name": "__Type", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "subscriptionType", + "description": + "If this server support subscription, the type that subscription operations will be rooted at.", + "args": [], + "type": { "kind": "OBJECT", "name": "__Type", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "directives", + "description": "A list of all directives supported by this server.", + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Directive", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "__Type", + "description": + "The fundamental unit of any GraphQL Schema is the type. There are many kinds of types in GraphQL as represented by the `__TypeKind` enum.\n\nDepending on the kind of a type, certain fields describe information about that type. Scalar types provide no information beyond a name and description, while Enum types provide their values. Object and Interface types provide the fields they describe. Abstract types, Union and Interface, provide the Object types possible at runtime. List and NonNull types compose other types.", + "fields": [ + { + "name": "kind", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "__TypeKind", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "name", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "description", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "fields", + "description": null, + "args": [ + { + "name": "includeDeprecated", + "description": null, + "type": { "kind": "SCALAR", "name": "Boolean", "ofType": null }, + "defaultValue": "false" + } + ], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Field", "ofType": null } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "interfaces", + "description": null, + "args": [], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "possibleTypes", + "description": null, + "args": [], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "enumValues", + "description": null, + "args": [ + { + "name": "includeDeprecated", + "description": null, + "type": { "kind": "SCALAR", "name": "Boolean", "ofType": null }, + "defaultValue": "false" + } + ], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__EnumValue", "ofType": null } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "inputFields", + "description": null, + "args": [], + "type": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__InputValue", "ofType": null } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "ofType", + "description": null, + "args": [], + "type": { "kind": "OBJECT", "name": "__Type", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "__TypeKind", + "description": "An enum describing what kind of type a given `__Type` is.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { + "name": "SCALAR", + "description": "Indicates this type is a scalar.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "OBJECT", + "description": + "Indicates this type is an object. `fields` and `interfaces` are valid fields.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "INTERFACE", + "description": + "Indicates this type is an interface. `fields` and `possibleTypes` are valid fields.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "UNION", + "description": "Indicates this type is a union. `possibleTypes` is a valid field.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "ENUM", + "description": "Indicates this type is an enum. `enumValues` is a valid field.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "INPUT_OBJECT", + "description": + "Indicates this type is an input object. `inputFields` is a valid field.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "LIST", + "description": "Indicates this type is a list. `ofType` is a valid field.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "NON_NULL", + "description": "Indicates this type is a non-null. `ofType` is a valid field.", + "isDeprecated": false, + "deprecationReason": null + } + ], + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "__Field", + "description": + "Object and Interface types are described by a list of Fields, each of which has a name, potentially a list of arguments, and a return type.", + "fields": [ + { + "name": "name", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "description", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "args", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__InputValue", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "type", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "isDeprecated", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "deprecationReason", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "__InputValue", + "description": + "Arguments provided to Fields or Directives and the input fields of an InputObject are represented as Input Values which describe their type and optionally a default value.", + "fields": [ + { + "name": "name", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "description", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "type", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__Type", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "defaultValue", + "description": + "A GraphQL-formatted string representing the default value for this input value.", + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "__EnumValue", + "description": + "One possible value for a given Enum. Enum values are unique values, not a placeholder for a string or numeric value. However an Enum value is returned in a JSON response as a string.", + "fields": [ + { + "name": "name", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "description", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "isDeprecated", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "deprecationReason", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "OBJECT", + "name": "__Directive", + "description": + "A Directive provides a way to describe alternate runtime execution and type validation behavior in a GraphQL document.\n\nIn some cases, you need to provide options to alter GraphQL's execution behavior in ways field arguments will not suffice, such as conditionally including or skipping a field. Directives provide this by describing additional information to the executor.", + "fields": [ + { + "name": "name", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "String", "ofType": null } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "description", + "description": null, + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "locations", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "ENUM", "name": "__DirectiveLocation", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "args", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { + "kind": "LIST", + "name": null, + "ofType": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "OBJECT", "name": "__InputValue", "ofType": null } + } + } + }, + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "onOperation", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": true, + "deprecationReason": "Use `locations`." + }, + { + "name": "onFragment", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": true, + "deprecationReason": "Use `locations`." + }, + { + "name": "onField", + "description": null, + "args": [], + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "isDeprecated": true, + "deprecationReason": "Use `locations`." + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "__DirectiveLocation", + "description": + "A Directive can be adjacent to many parts of the GraphQL language, a __DirectiveLocation describes one such possible adjacencies.", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { + "name": "QUERY", + "description": "Location adjacent to a query operation.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "MUTATION", + "description": "Location adjacent to a mutation operation.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "SUBSCRIPTION", + "description": "Location adjacent to a subscription operation.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "FIELD", + "description": "Location adjacent to a field.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "FRAGMENT_DEFINITION", + "description": "Location adjacent to a fragment definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "FRAGMENT_SPREAD", + "description": "Location adjacent to a fragment spread.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "INLINE_FRAGMENT", + "description": "Location adjacent to an inline fragment.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "SCHEMA", + "description": "Location adjacent to a schema definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "SCALAR", + "description": "Location adjacent to a scalar definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "OBJECT", + "description": "Location adjacent to an object type definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "FIELD_DEFINITION", + "description": "Location adjacent to a field definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "ARGUMENT_DEFINITION", + "description": "Location adjacent to an argument definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "INTERFACE", + "description": "Location adjacent to an interface definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "UNION", + "description": "Location adjacent to a union definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "ENUM", + "description": "Location adjacent to an enum definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "ENUM_VALUE", + "description": "Location adjacent to an enum value definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "INPUT_OBJECT", + "description": "Location adjacent to an input object type definition.", + "isDeprecated": false, + "deprecationReason": null + }, + { + "name": "INPUT_FIELD_DEFINITION", + "description": "Location adjacent to an input object field definition.", + "isDeprecated": false, + "deprecationReason": null + } + ], + "possibleTypes": null + }, + { + "kind": "ENUM", + "name": "InfraOperator", + "description": "", + "fields": null, + "inputFields": null, + "interfaces": null, + "enumValues": [ + { "name": "gt", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "gte", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "lt", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "lte", "description": "", "isDeprecated": false, "deprecationReason": null }, + { "name": "eq", "description": "", "isDeprecated": false, "deprecationReason": null } + ], + "possibleTypes": null + } + ], + "directives": [ + { + "name": "skip", + "description": + "Directs the executor to skip this field or fragment when the `if` argument is true.", + "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"], + "args": [ + { + "name": "if", + "description": "Skipped when true.", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "defaultValue": null + } + ] + }, + { + "name": "include", + "description": + "Directs the executor to include this field or fragment only when the `if` argument is true.", + "locations": ["FIELD", "FRAGMENT_SPREAD", "INLINE_FRAGMENT"], + "args": [ + { + "name": "if", + "description": "Included when true.", + "type": { + "kind": "NON_NULL", + "name": null, + "ofType": { "kind": "SCALAR", "name": "Boolean", "ofType": null } + }, + "defaultValue": null + } + ] + }, + { + "name": "deprecated", + "description": "Marks an element of a GraphQL schema as no longer supported.", + "locations": ["FIELD_DEFINITION", "ENUM_VALUE"], + "args": [ + { + "name": "reason", + "description": + "Explains why this element was deprecated, usually also including a suggestion for how to access supported similar data. Formatted in [Markdown](https://daringfireball.net/projects/markdown/).", + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "defaultValue": "\"No longer supported\"" + } + ] + } + ] + } +} diff --git a/x-pack/plugins/infra/common/graphql/root/index.ts b/x-pack/plugins/infra/common/graphql/root/index.ts new file mode 100644 index 0000000000000..47417b6376307 --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/root/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { rootSchema } from './schema.gql'; diff --git a/x-pack/plugins/infra/common/graphql/root/schema.gql.ts b/x-pack/plugins/infra/common/graphql/root/schema.gql.ts new file mode 100644 index 0000000000000..0819f2e2808b8 --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/root/schema.gql.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const rootSchema = gql` + schema { + query: Query + #mutation: Mutation + } + + type Query + + #type Mutation +`; diff --git a/x-pack/plugins/infra/common/graphql/shared/fragments.gql_query.ts b/x-pack/plugins/infra/common/graphql/shared/fragments.gql_query.ts new file mode 100644 index 0000000000000..44a5be6a85638 --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/shared/fragments.gql_query.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const sharedFragments = { + InfraTimeKey: gql` + fragment InfraTimeKeyFields on InfraTimeKey { + time + tiebreaker + } + `, +}; diff --git a/x-pack/plugins/infra/common/graphql/shared/index.ts b/x-pack/plugins/infra/common/graphql/shared/index.ts new file mode 100644 index 0000000000000..56c8675e76caf --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/shared/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { sharedFragments } from './fragments.gql_query'; +export { sharedSchema } from './schema.gql'; diff --git a/x-pack/plugins/infra/common/graphql/shared/schema.gql.ts b/x-pack/plugins/infra/common/graphql/shared/schema.gql.ts new file mode 100644 index 0000000000000..fd86e605b8747 --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/shared/schema.gql.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const sharedSchema = gql` + "A representation of the log entry's position in the event stream" + type InfraTimeKey { + "The timestamp of the event that the log entry corresponds to" + time: Float! + "The tiebreaker that disambiguates events with the same timestamp" + tiebreaker: Float! + } + + input InfraTimeKeyInput { + time: Float! + tiebreaker: Float! + } + + enum InfraIndexType { + ANY + LOGS + METRICS + } + + enum InfraNodeType { + pod + container + host + } +`; diff --git a/x-pack/plugins/infra/common/graphql/typed_resolvers.ts b/x-pack/plugins/infra/common/graphql/typed_resolvers.ts new file mode 100644 index 0000000000000..50b169601894b --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/typed_resolvers.ts @@ -0,0 +1,82 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GraphQLResolveInfo } from 'graphql'; + +type BasicResolver = ( + parent: any, + args: Args, + context: any, + info: GraphQLResolveInfo +) => Promise | Result; + +type InfraResolverResult = + | Promise + | Promise<{ [P in keyof R]: () => Promise }> + | { [P in keyof R]: () => Promise } + | { [P in keyof R]: () => R[P] } + | R; + +export type InfraResolvedResult = Resolver extends InfraResolver< + infer Result, + any, + any, + any +> + ? Result + : never; + +export type SubsetResolverWithFields = R extends BasicResolver< + Array, + infer ArgsInArray +> + ? BasicResolver< + Array>>, + ArgsInArray + > + : R extends BasicResolver + ? BasicResolver>, Args> + : never; + +export type SubsetResolverWithoutFields = R extends BasicResolver< + Array, + infer ArgsInArray +> + ? BasicResolver< + Array>>, + ArgsInArray + > + : R extends BasicResolver + ? BasicResolver>, Args> + : never; + +export type InfraResolver = ( + parent: Parent, + args: Args, + context: Context, + info: GraphQLResolveInfo +) => InfraResolverResult; + +export type InfraResolverOf = Resolver extends BasicResolver< + infer Result, + infer Args +> + ? InfraResolver + : never; + +export type InfraResolverWithFields< + Resolver, + Parent, + Context, + IncludedFields extends string +> = InfraResolverOf, Parent, Context>; + +export type InfraResolverWithoutFields< + Resolver, + Parent, + Context, + ExcludedFields extends string +> = InfraResolverOf, Parent, Context>; diff --git a/x-pack/plugins/infra/common/graphql/types.ts b/x-pack/plugins/infra/common/graphql/types.ts new file mode 100644 index 0000000000000..c79280bd7f43b --- /dev/null +++ b/x-pack/plugins/infra/common/graphql/types.ts @@ -0,0 +1,858 @@ +/* tslint:disable */ +import { GraphQLResolveInfo } from 'graphql'; + +type Resolver = ( + parent: any, + args: Args, + context: any, + info: GraphQLResolveInfo +) => Promise | Result; + +export interface Query { + source: InfraSource /** Get an infrastructure data source by id */; + allSources: InfraSource[] /** Get a list of all infrastructure data sources */; +} +/** A source of infrastructure data */ +export interface InfraSource { + id: string /** The id of the source */; + configuration: InfraSourceConfiguration /** The raw configuration of the source */; + status: InfraSourceStatus /** The status of the source */; + capabilitiesByNode: (InfraNodeCapability | null)[] /** A hierarchy of capabilities available on nodes */; + logEntriesAround: InfraLogEntryInterval /** A consecutive span of log entries surrounding a point in time */; + logEntriesBetween: InfraLogEntryInterval /** A consecutive span of log entries within an interval */; + logSummaryBetween: InfraLogSummaryInterval /** A consecutive span of summary buckets within an interval */; + map?: InfraResponse | null /** A hierarchy of hosts, pods, containers, services or arbitrary groups */; + metrics: InfraMetricData[]; +} +/** A set of configuration options for an infrastructure data source */ +export interface InfraSourceConfiguration { + metricAlias: string /** The alias to read metric data from */; + logAlias: string /** The alias to read log data from */; + fields: InfraSourceFields /** The field mapping to use for this source */; +} +/** A mapping of semantic fields to their document counterparts */ +export interface InfraSourceFields { + container: string /** The field to identify a container by */; + host: string /** The fields to identify a host by */; + message: string[] /** The fields that may contain the log event message. The first field found win. */; + pod: string /** The field to identify a pod by */; + tiebreaker: string /** The field to use as a tiebreaker for log events that have identical timestamps */; + timestamp: string /** The field to use as a timestamp for metrics and logs */; +} +/** The status of an infrastructure data source */ +export interface InfraSourceStatus { + metricAliasExists: boolean /** Whether the configured metric alias exists */; + logAliasExists: boolean /** Whether the configured log alias exists */; + metricIndicesExist: boolean /** Whether the configured alias or wildcard pattern resolve to any metric indices */; + logIndicesExist: boolean /** Whether the configured alias or wildcard pattern resolve to any log indices */; + metricIndices: string[] /** The list of indices in the metric alias */; + logIndices: string[] /** The list of indices in the log alias */; + indexFields: InfraIndexField[] /** The list of fields defined in the index mappings */; +} +/** A descriptor of a field in an index */ +export interface InfraIndexField { + name: string /** The name of the field */; + type: string /** The type of the field's values as recognized by Kibana */; + searchable: boolean /** Whether the field's values can be efficiently searched for */; + aggregatable: boolean /** Whether the field's values can be aggregated */; +} +/** One specific capability available on a node. A capability corresponds to a fileset or metricset */ +export interface InfraNodeCapability { + name: string; + source: string; +} +/** A consecutive sequence of log entries */ +export interface InfraLogEntryInterval { + start?: InfraTimeKey | null /** The key corresponding to the start of the interval covered by the entries */; + end?: InfraTimeKey | null /** The key corresponding to the end of the interval covered by the entries */; + hasMoreBefore: boolean /** Whether there are more log entries available before the start */; + hasMoreAfter: boolean /** Whether there are more log entries available after the end */; + filterQuery?: string | null /** The query the log entries were filtered by */; + highlightQuery?: string | null /** The query the log entries were highlighted with */; + entries: InfraLogEntry[] /** A list of the log entries */; +} +/** A representation of the log entry's position in the event stream */ +export interface InfraTimeKey { + time: number /** The timestamp of the event that the log entry corresponds to */; + tiebreaker: number /** The tiebreaker that disambiguates events with the same timestamp */; +} +/** A log entry */ +export interface InfraLogEntry { + key: InfraTimeKey /** A unique representation of the log entry's position in the event stream */; + gid: string /** The log entry's id */; + source: string /** The source id */; + message: InfraLogMessageSegment[] /** A list of the formatted log entry segments */; +} +/** A segment of the log entry message that was derived from a field */ +export interface InfraLogMessageFieldSegment { + field: string /** The field the segment was derived from */; + value: string /** The segment's message */; + highlights: string[] /** A list of highlighted substrings of the value */; +} +/** A segment of the log entry message that was derived from a field */ +export interface InfraLogMessageConstantSegment { + constant: string /** The segment's message */; +} +/** A consecutive sequence of log summary buckets */ +export interface InfraLogSummaryInterval { + start?: + | number + | null /** The millisecond timestamp corresponding to the start of the interval covered by the summary */; + end?: + | number + | null /** The millisecond timestamp corresponding to the end of the interval covered by the summary */; + filterQuery?: string | null /** The query the log entries were filtered by */; + buckets: InfraLogSummaryBucket[] /** A list of the log entries */; +} +/** A log summary bucket */ +export interface InfraLogSummaryBucket { + start: number /** The start timestamp of the bucket */; + end: number /** The end timestamp of the bucket */; + entriesCount: number /** The number of entries inside the bucket */; +} + +export interface InfraResponse { + nodes: InfraNode[]; +} + +export interface InfraNode { + path: InfraNodePath[]; + metric: InfraNodeMetric; +} + +export interface InfraNodePath { + value: string; +} + +export interface InfraNodeMetric { + name: InfraMetricType; + value: number; +} + +export interface InfraMetricData { + id?: InfraMetric | null; + series: InfraDataSeries[]; +} + +export interface InfraDataSeries { + id: string; + data: InfraDataPoint[]; +} + +export interface InfraDataPoint { + timestamp: number; + value?: number | null; +} + +export namespace QueryResolvers { + export interface Resolvers { + source?: SourceResolver /** Get an infrastructure data source by id */; + allSources?: AllSourcesResolver /** Get a list of all infrastructure data sources */; + } + + export type SourceResolver = Resolver; + export interface SourceArgs { + id: string /** The id of the source */; + } + + export type AllSourcesResolver = Resolver; +} +/** A source of infrastructure data */ +export namespace InfraSourceResolvers { + export interface Resolvers { + id?: IdResolver /** The id of the source */; + configuration?: ConfigurationResolver /** The raw configuration of the source */; + status?: StatusResolver /** The status of the source */; + capabilitiesByNode?: CapabilitiesByNodeResolver /** A hierarchy of capabilities available on nodes */; + logEntriesAround?: LogEntriesAroundResolver /** A consecutive span of log entries surrounding a point in time */; + logEntriesBetween?: LogEntriesBetweenResolver /** A consecutive span of log entries within an interval */; + logSummaryBetween?: LogSummaryBetweenResolver /** A consecutive span of summary buckets within an interval */; + map?: MapResolver /** A hierarchy of hosts, pods, containers, services or arbitrary groups */; + metrics?: MetricsResolver; + } + + export type IdResolver = Resolver; + export type ConfigurationResolver = Resolver; + export type StatusResolver = Resolver; + export type CapabilitiesByNodeResolver = Resolver< + (InfraNodeCapability | null)[], + CapabilitiesByNodeArgs + >; + export interface CapabilitiesByNodeArgs { + nodeName: string; + nodeType: InfraNodeType; + } + + export type LogEntriesAroundResolver = Resolver; + export interface LogEntriesAroundArgs { + key: InfraTimeKeyInput /** The sort key that corresponds to the point in time */; + countBefore?: number | null /** The maximum number of preceding to return */; + countAfter?: number | null /** The maximum number of following to return */; + filterQuery?: string | null /** The query to filter the log entries by */; + highlightQuery?: string | null /** The query to highlight the log entries with */; + } + + export type LogEntriesBetweenResolver = Resolver; + export interface LogEntriesBetweenArgs { + startKey: InfraTimeKeyInput /** The sort key that corresponds to the start of the interval */; + endKey: InfraTimeKeyInput /** The sort key that corresponds to the end of the interval */; + filterQuery?: string | null /** The query to filter the log entries by */; + highlightQuery?: string | null /** The query to highlight the log entries with */; + } + + export type LogSummaryBetweenResolver = Resolver; + export interface LogSummaryBetweenArgs { + start: number /** The millisecond timestamp that corresponds to the start of the interval */; + end: number /** The millisecond timestamp that corresponds to the end of the interval */; + bucketSize: number /** The size of each bucket in milliseconds */; + filterQuery?: string | null /** The query to filter the log entries by */; + } + + export type MapResolver = Resolver; + export interface MapArgs { + timerange: InfraTimerangeInput; + filterQuery?: string | null; + } + + export type MetricsResolver = Resolver; + export interface MetricsArgs { + nodeId: string; + nodeType: InfraNodeType; + timerange: InfraTimerangeInput; + metrics: InfraMetric[]; + } +} +/** A set of configuration options for an infrastructure data source */ +export namespace InfraSourceConfigurationResolvers { + export interface Resolvers { + metricAlias?: MetricAliasResolver /** The alias to read metric data from */; + logAlias?: LogAliasResolver /** The alias to read log data from */; + fields?: FieldsResolver /** The field mapping to use for this source */; + } + + export type MetricAliasResolver = Resolver; + export type LogAliasResolver = Resolver; + export type FieldsResolver = Resolver; +} +/** A mapping of semantic fields to their document counterparts */ +export namespace InfraSourceFieldsResolvers { + export interface Resolvers { + container?: ContainerResolver /** The field to identify a container by */; + host?: HostResolver /** The fields to identify a host by */; + message?: MessageResolver /** The fields that may contain the log event message. The first field found win. */; + pod?: PodResolver /** The field to identify a pod by */; + tiebreaker?: TiebreakerResolver /** The field to use as a tiebreaker for log events that have identical timestamps */; + timestamp?: TimestampResolver /** The field to use as a timestamp for metrics and logs */; + } + + export type ContainerResolver = Resolver; + export type HostResolver = Resolver; + export type MessageResolver = Resolver; + export type PodResolver = Resolver; + export type TiebreakerResolver = Resolver; + export type TimestampResolver = Resolver; +} +/** The status of an infrastructure data source */ +export namespace InfraSourceStatusResolvers { + export interface Resolvers { + metricAliasExists?: MetricAliasExistsResolver /** Whether the configured metric alias exists */; + logAliasExists?: LogAliasExistsResolver /** Whether the configured log alias exists */; + metricIndicesExist?: MetricIndicesExistResolver /** Whether the configured alias or wildcard pattern resolve to any metric indices */; + logIndicesExist?: LogIndicesExistResolver /** Whether the configured alias or wildcard pattern resolve to any log indices */; + metricIndices?: MetricIndicesResolver /** The list of indices in the metric alias */; + logIndices?: LogIndicesResolver /** The list of indices in the log alias */; + indexFields?: IndexFieldsResolver /** The list of fields defined in the index mappings */; + } + + export type MetricAliasExistsResolver = Resolver; + export type LogAliasExistsResolver = Resolver; + export type MetricIndicesExistResolver = Resolver; + export type LogIndicesExistResolver = Resolver; + export type MetricIndicesResolver = Resolver; + export type LogIndicesResolver = Resolver; + export type IndexFieldsResolver = Resolver; + export interface IndexFieldsArgs { + indexType?: InfraIndexType | null; + } +} +/** A descriptor of a field in an index */ +export namespace InfraIndexFieldResolvers { + export interface Resolvers { + name?: NameResolver /** The name of the field */; + type?: TypeResolver /** The type of the field's values as recognized by Kibana */; + searchable?: SearchableResolver /** Whether the field's values can be efficiently searched for */; + aggregatable?: AggregatableResolver /** Whether the field's values can be aggregated */; + } + + export type NameResolver = Resolver; + export type TypeResolver = Resolver; + export type SearchableResolver = Resolver; + export type AggregatableResolver = Resolver; +} +/** One specific capability available on a node. A capability corresponds to a fileset or metricset */ +export namespace InfraNodeCapabilityResolvers { + export interface Resolvers { + name?: NameResolver; + source?: SourceResolver; + } + + export type NameResolver = Resolver; + export type SourceResolver = Resolver; +} +/** A consecutive sequence of log entries */ +export namespace InfraLogEntryIntervalResolvers { + export interface Resolvers { + start?: StartResolver /** The key corresponding to the start of the interval covered by the entries */; + end?: EndResolver /** The key corresponding to the end of the interval covered by the entries */; + hasMoreBefore?: HasMoreBeforeResolver /** Whether there are more log entries available before the start */; + hasMoreAfter?: HasMoreAfterResolver /** Whether there are more log entries available after the end */; + filterQuery?: FilterQueryResolver /** The query the log entries were filtered by */; + highlightQuery?: HighlightQueryResolver /** The query the log entries were highlighted with */; + entries?: EntriesResolver /** A list of the log entries */; + } + + export type StartResolver = Resolver; + export type EndResolver = Resolver; + export type HasMoreBeforeResolver = Resolver; + export type HasMoreAfterResolver = Resolver; + export type FilterQueryResolver = Resolver; + export type HighlightQueryResolver = Resolver; + export type EntriesResolver = Resolver; +} +/** A representation of the log entry's position in the event stream */ +export namespace InfraTimeKeyResolvers { + export interface Resolvers { + time?: TimeResolver /** The timestamp of the event that the log entry corresponds to */; + tiebreaker?: TiebreakerResolver /** The tiebreaker that disambiguates events with the same timestamp */; + } + + export type TimeResolver = Resolver; + export type TiebreakerResolver = Resolver; +} +/** A log entry */ +export namespace InfraLogEntryResolvers { + export interface Resolvers { + key?: KeyResolver /** A unique representation of the log entry's position in the event stream */; + gid?: GidResolver /** The log entry's id */; + source?: SourceResolver /** The source id */; + message?: MessageResolver /** A list of the formatted log entry segments */; + } + + export type KeyResolver = Resolver; + export type GidResolver = Resolver; + export type SourceResolver = Resolver; + export type MessageResolver = Resolver; +} +/** A segment of the log entry message that was derived from a field */ +export namespace InfraLogMessageFieldSegmentResolvers { + export interface Resolvers { + field?: FieldResolver /** The field the segment was derived from */; + value?: ValueResolver /** The segment's message */; + highlights?: HighlightsResolver /** A list of highlighted substrings of the value */; + } + + export type FieldResolver = Resolver; + export type ValueResolver = Resolver; + export type HighlightsResolver = Resolver; +} +/** A segment of the log entry message that was derived from a field */ +export namespace InfraLogMessageConstantSegmentResolvers { + export interface Resolvers { + constant?: ConstantResolver /** The segment's message */; + } + + export type ConstantResolver = Resolver; +} +/** A consecutive sequence of log summary buckets */ +export namespace InfraLogSummaryIntervalResolvers { + export interface Resolvers { + start?: StartResolver /** The millisecond timestamp corresponding to the start of the interval covered by the summary */; + end?: EndResolver /** The millisecond timestamp corresponding to the end of the interval covered by the summary */; + filterQuery?: FilterQueryResolver /** The query the log entries were filtered by */; + buckets?: BucketsResolver /** A list of the log entries */; + } + + export type StartResolver = Resolver; + export type EndResolver = Resolver; + export type FilterQueryResolver = Resolver; + export type BucketsResolver = Resolver; +} +/** A log summary bucket */ +export namespace InfraLogSummaryBucketResolvers { + export interface Resolvers { + start?: StartResolver /** The start timestamp of the bucket */; + end?: EndResolver /** The end timestamp of the bucket */; + entriesCount?: EntriesCountResolver /** The number of entries inside the bucket */; + } + + export type StartResolver = Resolver; + export type EndResolver = Resolver; + export type EntriesCountResolver = Resolver; +} + +export namespace InfraResponseResolvers { + export interface Resolvers { + nodes?: NodesResolver; + } + + export type NodesResolver = Resolver; + export interface NodesArgs { + path: InfraPathInput[]; + metric: InfraMetricInput; + } +} + +export namespace InfraNodeResolvers { + export interface Resolvers { + path?: PathResolver; + metric?: MetricResolver; + } + + export type PathResolver = Resolver; + export type MetricResolver = Resolver; +} + +export namespace InfraNodePathResolvers { + export interface Resolvers { + value?: ValueResolver; + } + + export type ValueResolver = Resolver; +} + +export namespace InfraNodeMetricResolvers { + export interface Resolvers { + name?: NameResolver; + value?: ValueResolver; + } + + export type NameResolver = Resolver; + export type ValueResolver = Resolver; +} + +export namespace InfraMetricDataResolvers { + export interface Resolvers { + id?: IdResolver; + series?: SeriesResolver; + } + + export type IdResolver = Resolver; + export type SeriesResolver = Resolver; +} + +export namespace InfraDataSeriesResolvers { + export interface Resolvers { + id?: IdResolver; + data?: DataResolver; + } + + export type IdResolver = Resolver; + export type DataResolver = Resolver; +} + +export namespace InfraDataPointResolvers { + export interface Resolvers { + timestamp?: TimestampResolver; + value?: ValueResolver; + } + + export type TimestampResolver = Resolver; + export type ValueResolver = Resolver; +} + +export interface InfraTimeKeyInput { + time: number; + tiebreaker: number; +} + +export interface InfraTimerangeInput { + interval: string /** The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan. */; + to: number /** The end of the timerange */; + from: number /** The beginning of the timerange */; +} + +export interface InfraPathInput { + type: InfraPathType /** The type of path */; + label?: + | string + | null /** The label to use in the results for the group by for the terms group by */; + field?: + | string + | null /** The field to group by from a terms aggregation, this is ignored by the filter type */; + filters?: InfraPathFilterInput[] | null /** The fitlers for the filter group by */; +} +/** A group by filter */ +export interface InfraPathFilterInput { + label: string /** The label for the filter, this will be used as the group name in the final results */; + query: string /** The query string query */; +} + +export interface InfraMetricInput { + type: InfraMetricType /** The type of metric */; +} +export interface SourceQueryArgs { + id: string /** The id of the source */; +} +export interface CapabilitiesByNodeInfraSourceArgs { + nodeName: string; + nodeType: InfraNodeType; +} +export interface LogEntriesAroundInfraSourceArgs { + key: InfraTimeKeyInput /** The sort key that corresponds to the point in time */; + countBefore?: number | null /** The maximum number of preceding to return */; + countAfter?: number | null /** The maximum number of following to return */; + filterQuery?: string | null /** The query to filter the log entries by */; + highlightQuery?: string | null /** The query to highlight the log entries with */; +} +export interface LogEntriesBetweenInfraSourceArgs { + startKey: InfraTimeKeyInput /** The sort key that corresponds to the start of the interval */; + endKey: InfraTimeKeyInput /** The sort key that corresponds to the end of the interval */; + filterQuery?: string | null /** The query to filter the log entries by */; + highlightQuery?: string | null /** The query to highlight the log entries with */; +} +export interface LogSummaryBetweenInfraSourceArgs { + start: number /** The millisecond timestamp that corresponds to the start of the interval */; + end: number /** The millisecond timestamp that corresponds to the end of the interval */; + bucketSize: number /** The size of each bucket in milliseconds */; + filterQuery?: string | null /** The query to filter the log entries by */; +} +export interface MapInfraSourceArgs { + timerange: InfraTimerangeInput; + filterQuery?: string | null; +} +export interface MetricsInfraSourceArgs { + nodeId: string; + nodeType: InfraNodeType; + timerange: InfraTimerangeInput; + metrics: InfraMetric[]; +} +export interface IndexFieldsInfraSourceStatusArgs { + indexType?: InfraIndexType | null; +} +export interface NodesInfraResponseArgs { + path: InfraPathInput[]; + metric: InfraMetricInput; +} + +export enum InfraIndexType { + ANY = 'ANY', + LOGS = 'LOGS', + METRICS = 'METRICS', +} + +export enum InfraNodeType { + pod = 'pod', + container = 'container', + host = 'host', +} + +export enum InfraPathType { + terms = 'terms', + filters = 'filters', + hosts = 'hosts', + pods = 'pods', + containers = 'containers', +} + +export enum InfraMetricType { + count = 'count', + cpu = 'cpu', + load = 'load', + memory = 'memory', + tx = 'tx', + rx = 'rx', + logRate = 'logRate', +} + +export enum InfraMetric { + hostSystemOverview = 'hostSystemOverview', + hostCpuUsage = 'hostCpuUsage', + hostFilesystem = 'hostFilesystem', + hostK8sOverview = 'hostK8sOverview', + hostK8sCpuCap = 'hostK8sCpuCap', + hostK8sDiskCap = 'hostK8sDiskCap', + hostK8sMemoryCap = 'hostK8sMemoryCap', + hostK8sPodCap = 'hostK8sPodCap', + hostLoad = 'hostLoad', + hostMemoryUsage = 'hostMemoryUsage', + hostNetworkTraffic = 'hostNetworkTraffic', + podOverview = 'podOverview', + podCpuUsage = 'podCpuUsage', + podMemoryUsage = 'podMemoryUsage', + podLogUsage = 'podLogUsage', + podNetworkTraffic = 'podNetworkTraffic', + containerOverview = 'containerOverview', + containerCpuKernel = 'containerCpuKernel', + containerCpuUsage = 'containerCpuUsage', + containerDiskIOOps = 'containerDiskIOOps', + containerDiskIOBytes = 'containerDiskIOBytes', + containerMemory = 'containerMemory', + containerNetworkTraffic = 'containerNetworkTraffic', + nginxHits = 'nginxHits', + nginxRequestRate = 'nginxRequestRate', + nginxActiveConnections = 'nginxActiveConnections', + nginxRequestsPerConnection = 'nginxRequestsPerConnection', +} + +export enum InfraOperator { + gt = 'gt', + gte = 'gte', + lt = 'lt', + lte = 'lte', + eq = 'eq', +} +/** A segment of the log entry message */ +export type InfraLogMessageSegment = InfraLogMessageFieldSegment | InfraLogMessageConstantSegment; + +export namespace CapabilitiesQuery { + export type Variables = { + sourceId: string; + nodeId: string; + nodeType: InfraNodeType; + }; + + export type Query = { + __typename?: 'Query'; + source: Source; + }; + + export type Source = { + __typename?: 'InfraSource'; + id: string; + capabilitiesByNode: (CapabilitiesByNode | null)[]; + }; + + export type CapabilitiesByNode = { + __typename?: 'InfraNodeCapability'; + name: string; + source: string; + }; +} +export namespace MetricsQuery { + export type Variables = { + sourceId: string; + timerange: InfraTimerangeInput; + metrics: InfraMetric[]; + nodeId: string; + nodeType: InfraNodeType; + }; + + export type Query = { + __typename?: 'Query'; + source: Source; + }; + + export type Source = { + __typename?: 'InfraSource'; + id: string; + metrics: Metrics[]; + }; + + export type Metrics = { + __typename?: 'InfraMetricData'; + id?: InfraMetric | null; + series: Series[]; + }; + + export type Series = { + __typename?: 'InfraDataSeries'; + id: string; + data: Data[]; + }; + + export type Data = { + __typename?: 'InfraDataPoint'; + timestamp: number; + value?: number | null; + }; +} +export namespace WaffleNodesQuery { + export type Variables = { + sourceId: string; + timerange: InfraTimerangeInput; + filterQuery?: string | null; + metric: InfraMetricInput; + path: InfraPathInput[]; + }; + + export type Query = { + __typename?: 'Query'; + source: Source; + }; + + export type Source = { + __typename?: 'InfraSource'; + id: string; + map?: Map | null; + }; + + export type Map = { + __typename?: 'InfraResponse'; + nodes: Nodes[]; + }; + + export type Nodes = { + __typename?: 'InfraNode'; + path: Path[]; + metric: Metric; + }; + + export type Path = { + __typename?: 'InfraNodePath'; + value: string; + }; + + export type Metric = { + __typename?: 'InfraNodeMetric'; + name: InfraMetricType; + value: number; + }; +} +export namespace LogEntries { + export type Variables = { + sourceId?: string | null; + timeKey: InfraTimeKeyInput; + countBefore?: number | null; + countAfter?: number | null; + filterQuery?: string | null; + }; + + export type Query = { + __typename?: 'Query'; + source: Source; + }; + + export type Source = { + __typename?: 'InfraSource'; + id: string; + logEntriesAround: LogEntriesAround; + }; + + export type LogEntriesAround = { + __typename?: 'InfraLogEntryInterval'; + start?: Start | null; + end?: End | null; + hasMoreBefore: boolean; + hasMoreAfter: boolean; + entries: Entries[]; + }; + + export type Start = InfraTimeKeyFields.Fragment; + + export type End = InfraTimeKeyFields.Fragment; + + export type Entries = { + __typename?: 'InfraLogEntry'; + gid: string; + key: Key; + message: Message[]; + }; + + export type Key = { + __typename?: 'InfraTimeKey'; + time: number; + tiebreaker: number; + }; + + export type Message = + | InfraLogMessageFieldSegmentInlineFragment + | InfraLogMessageConstantSegmentInlineFragment; + + export type InfraLogMessageFieldSegmentInlineFragment = { + __typename?: 'InfraLogMessageFieldSegment'; + field: string; + value: string; + }; + + export type InfraLogMessageConstantSegmentInlineFragment = { + __typename?: 'InfraLogMessageConstantSegment'; + constant: string; + }; +} +export namespace LogSummary { + export type Variables = { + sourceId?: string | null; + start: number; + end: number; + bucketSize: number; + filterQuery?: string | null; + }; + + export type Query = { + __typename?: 'Query'; + source: Source; + }; + + export type Source = { + __typename?: 'InfraSource'; + id: string; + logSummaryBetween: LogSummaryBetween; + }; + + export type LogSummaryBetween = { + __typename?: 'InfraLogSummaryInterval'; + start?: number | null; + end?: number | null; + buckets: Buckets[]; + }; + + export type Buckets = { + __typename?: 'InfraLogSummaryBucket'; + start: number; + end: number; + entriesCount: number; + }; +} +export namespace SourceQuery { + export type Variables = { + sourceId?: string | null; + }; + + export type Query = { + __typename?: 'Query'; + source: Source; + }; + + export type Source = { + __typename?: 'InfraSource'; + configuration: Configuration; + status: Status; + }; + + export type Configuration = { + __typename?: 'InfraSourceConfiguration'; + metricAlias: string; + logAlias: string; + fields: Fields; + }; + + export type Fields = { + __typename?: 'InfraSourceFields'; + container: string; + host: string; + pod: string; + }; + + export type Status = { + __typename?: 'InfraSourceStatus'; + indexFields: IndexFields[]; + logIndicesExist: boolean; + metricIndicesExist: boolean; + }; + + export type IndexFields = { + __typename?: 'InfraIndexField'; + name: string; + type: string; + searchable: boolean; + aggregatable: boolean; + }; +} + +export namespace InfraTimeKeyFields { + export type Fragment = { + __typename?: 'InfraTimeKey'; + time: number; + tiebreaker: number; + }; +} diff --git a/x-pack/plugins/infra/common/http_api/index.ts b/x-pack/plugins/infra/common/http_api/index.ts new file mode 100644 index 0000000000000..90afdcb43ffb1 --- /dev/null +++ b/x-pack/plugins/infra/common/http_api/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './search_results_api'; +export * from './search_summary_api'; diff --git a/x-pack/plugins/infra/common/http_api/search_results_api.ts b/x-pack/plugins/infra/common/http_api/search_results_api.ts new file mode 100644 index 0000000000000..b866a7e1ab088 --- /dev/null +++ b/x-pack/plugins/infra/common/http_api/search_results_api.ts @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogEntryFieldsMapping, LogEntryTime } from '../log_entry'; +import { SearchResult } from '../log_search_result'; +import { TimedApiResponse } from './timed_api'; + +interface CommonSearchResultsPostPayload { + indices: string[]; + fields: LogEntryFieldsMapping; + query: string; +} + +export interface AdjacentSearchResultsApiPostPayload extends CommonSearchResultsPostPayload { + target: LogEntryTime; + before: number; + after: number; +} + +export interface AdjacentSearchResultsApiPostResponse extends TimedApiResponse { + results: { + before: SearchResult[]; + after: SearchResult[]; + }; +} + +export interface ContainedSearchResultsApiPostPayload extends CommonSearchResultsPostPayload { + start: LogEntryTime; + end: LogEntryTime; +} + +export interface ContainedSearchResultsApiPostResponse extends TimedApiResponse { + results: SearchResult[]; +} diff --git a/x-pack/plugins/infra/common/http_api/search_summary_api.ts b/x-pack/plugins/infra/common/http_api/search_summary_api.ts new file mode 100644 index 0000000000000..90e8fa8e78bc0 --- /dev/null +++ b/x-pack/plugins/infra/common/http_api/search_summary_api.ts @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogEntryFieldsMapping } from '../log_entry'; +import { SearchSummaryBucket } from '../log_search_summary'; +import { SummaryBucketSize } from '../log_summary'; +import { TimedApiResponse } from './timed_api'; + +export interface SearchSummaryApiPostPayload { + bucketSize: { + unit: SummaryBucketSize; + value: number; + }; + fields: LogEntryFieldsMapping; + indices: string[]; + start: number; + end: number; + query: string; +} + +export interface SearchSummaryApiPostResponse extends TimedApiResponse { + buckets: SearchSummaryBucket[]; +} diff --git a/x-pack/plugins/infra/common/http_api/timed_api.ts b/x-pack/plugins/infra/common/http_api/timed_api.ts new file mode 100644 index 0000000000000..7d0f227f0d0b1 --- /dev/null +++ b/x-pack/plugins/infra/common/http_api/timed_api.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface ApiResponseTimings { + [timing: string]: number; +} + +export interface TimedApiResponse { + timings: ApiResponseTimings; +} diff --git a/x-pack/plugins/infra/common/log_entry/index.ts b/x-pack/plugins/infra/common/log_entry/index.ts new file mode 100644 index 0000000000000..ba5b67eb7c07c --- /dev/null +++ b/x-pack/plugins/infra/common/log_entry/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './log_entry'; +export * from './log_entry_list'; diff --git a/x-pack/plugins/infra/common/log_entry/log_entry.ts b/x-pack/plugins/infra/common/log_entry/log_entry.ts new file mode 100644 index 0000000000000..be9de2c8828c5 --- /dev/null +++ b/x-pack/plugins/infra/common/log_entry/log_entry.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { TimeKey } from '../time'; + +export interface LogEntry { + gid: string; + origin: LogEntryOrigin; + fields: LogEntryFields; +} + +export interface LogEntryOrigin { + id: string; + index: string; + type: string; +} + +export interface LogEntryFields extends LogEntryTime { + message: string; +} + +export type LogEntryTime = TimeKey; +// export interface LogEntryTime { +// tiebreaker: number; +// time: number; +// } + +export interface LogEntryFieldsMapping { + message: string; + tiebreaker: string; + time: string; +} + +export function getLogEntryKey(entry: LogEntry) { + return { + gid: entry.gid, + tiebreaker: entry.fields.tiebreaker, + time: entry.fields.time, + }; +} + +export function isEqual(time1: LogEntryTime, time2: LogEntryTime) { + return time1.time === time2.time && time1.tiebreaker === time2.tiebreaker; +} + +export function isLess(time1: LogEntryTime, time2: LogEntryTime) { + return ( + time1.time < time2.time || (time1.time === time2.time && time1.tiebreaker < time2.tiebreaker) + ); +} + +export function isLessOrEqual(time1: LogEntryTime, time2: LogEntryTime) { + return ( + time1.time < time2.time || (time1.time === time2.time && time1.tiebreaker <= time2.tiebreaker) + ); +} + +export function isBetween(min: LogEntryTime, max: LogEntryTime, operand: LogEntryTime) { + return isLessOrEqual(min, operand) && isLessOrEqual(operand, max); +} diff --git a/x-pack/plugins/infra/common/log_entry/log_entry_list.ts b/x-pack/plugins/infra/common/log_entry/log_entry_list.ts new file mode 100644 index 0000000000000..a546d4566fed1 --- /dev/null +++ b/x-pack/plugins/infra/common/log_entry/log_entry_list.ts @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + getLogEntryKey, + isEqual, + isLess, + isLessOrEqual, + LogEntry, + LogEntryTime, +} from './log_entry'; + +export type LogEntryList = LogEntry[]; + +export function getIndexNearLogEntry(logEntries: LogEntryList, key: LogEntryTime, highest = false) { + let minIndex = 0; + let maxIndex = logEntries.length; + let currentIndex: number; + let currentKey: LogEntryTime; + + while (minIndex < maxIndex) { + currentIndex = (minIndex + maxIndex) >>> 1; // tslint:disable-line:no-bitwise + currentKey = getLogEntryKey(logEntries[currentIndex]); + + if ((highest ? isLessOrEqual : isLess)(currentKey, key)) { + minIndex = currentIndex + 1; + } else { + maxIndex = currentIndex; + } + } + + return maxIndex; +} + +export function getIndexOfLogEntry(logEntries: LogEntry[], key: LogEntryTime) { + const index = getIndexNearLogEntry(logEntries, key); + const logEntry = logEntries[index]; + + return logEntry && isEqual(key, getLogEntryKey(logEntry)) ? index : null; +} diff --git a/x-pack/plugins/infra/common/log_search_result/index.ts b/x-pack/plugins/infra/common/log_search_result/index.ts new file mode 100644 index 0000000000000..6795cc1543798 --- /dev/null +++ b/x-pack/plugins/infra/common/log_search_result/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { + getSearchResultIndexBeforeTime, + getSearchResultIndexAfterTime, + getSearchResultKey, + SearchResult, +} from './log_search_result'; diff --git a/x-pack/plugins/infra/common/log_search_result/log_search_result.ts b/x-pack/plugins/infra/common/log_search_result/log_search_result.ts new file mode 100644 index 0000000000000..a56a9d8e3531c --- /dev/null +++ b/x-pack/plugins/infra/common/log_search_result/log_search_result.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { bisector } from 'd3-array'; + +import { compareToTimeKey, TimeKey } from '../time'; + +export interface SearchResult { + gid: string; + fields: TimeKey; + matches: SearchResultFieldMatches; +} + +export interface SearchResultFieldMatches { + [field: string]: string[]; +} + +export const getSearchResultKey = (result: SearchResult) => + ({ + gid: result.gid, + tiebreaker: result.fields.tiebreaker, + time: result.fields.time, + } as TimeKey); + +const searchResultTimeBisector = bisector(compareToTimeKey(getSearchResultKey)); +export const getSearchResultIndexBeforeTime = searchResultTimeBisector.left; +export const getSearchResultIndexAfterTime = searchResultTimeBisector.right; diff --git a/x-pack/plugins/infra/common/log_search_summary/index.ts b/x-pack/plugins/infra/common/log_search_summary/index.ts new file mode 100644 index 0000000000000..4ba04cb3ea6a4 --- /dev/null +++ b/x-pack/plugins/infra/common/log_search_summary/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { SearchSummaryBucket } from './log_search_summary'; diff --git a/x-pack/plugins/infra/common/log_search_summary/log_search_summary.ts b/x-pack/plugins/infra/common/log_search_summary/log_search_summary.ts new file mode 100644 index 0000000000000..72cf643311798 --- /dev/null +++ b/x-pack/plugins/infra/common/log_search_summary/log_search_summary.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchResult } from '../log_search_result'; + +export interface SearchSummaryBucket { + start: number; + end: number; + count: number; + representative: SearchResult; +} diff --git a/x-pack/plugins/infra/common/log_summary/index.ts b/x-pack/plugins/infra/common/log_summary/index.ts new file mode 100644 index 0000000000000..3fb97a5cc20d0 --- /dev/null +++ b/x-pack/plugins/infra/common/log_summary/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './log_summary'; diff --git a/x-pack/plugins/infra/common/log_summary/log_summary.ts b/x-pack/plugins/infra/common/log_summary/log_summary.ts new file mode 100644 index 0000000000000..79d8fcc9fa60f --- /dev/null +++ b/x-pack/plugins/infra/common/log_summary/log_summary.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface LogSummaryBucket { + count: number; + end: number; + start: number; +} + +export type SummaryBucketSize = 'y' | 'M' | 'w' | 'd' | 'h' | 'm' | 's'; diff --git a/x-pack/plugins/infra/common/log_text_scale/index.ts b/x-pack/plugins/infra/common/log_text_scale/index.ts new file mode 100644 index 0000000000000..7fee2bbd398bd --- /dev/null +++ b/x-pack/plugins/infra/common/log_text_scale/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './log_text_scale'; diff --git a/x-pack/plugins/infra/common/log_text_scale/log_text_scale.ts b/x-pack/plugins/infra/common/log_text_scale/log_text_scale.ts new file mode 100644 index 0000000000000..ec33776f2a764 --- /dev/null +++ b/x-pack/plugins/infra/common/log_text_scale/log_text_scale.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export type TextScale = 'small' | 'medium' | 'large'; + +export function getLabelOfTextScale(textScale: TextScale) { + return textScale.charAt(0).toUpperCase() + textScale.slice(1); +} + +export function isTextScale(maybeTextScale: string): maybeTextScale is TextScale { + return ['small', 'medium', 'large'].includes(maybeTextScale); +} diff --git a/x-pack/plugins/infra/common/time/index.ts b/x-pack/plugins/infra/common/time/index.ts new file mode 100644 index 0000000000000..6365ecd1a55b3 --- /dev/null +++ b/x-pack/plugins/infra/common/time/index.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './time'; +export * from './time_unit'; +export * from './time_scale'; +export * from './time_key'; diff --git a/x-pack/plugins/infra/common/time/time.ts b/x-pack/plugins/infra/common/time/time.ts new file mode 100644 index 0000000000000..dc5ffd1c2c427 --- /dev/null +++ b/x-pack/plugins/infra/common/time/time.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { timeFormat } from 'd3-time-format'; + +const formatDate = timeFormat('%Y-%m-%d %H:%M:%S.%L'); + +export function formatTime(time: number) { + return formatDate(new Date(time)); +} diff --git a/x-pack/plugins/infra/common/time/time_key.ts b/x-pack/plugins/infra/common/time/time_key.ts new file mode 100644 index 0000000000000..58b058ab5e953 --- /dev/null +++ b/x-pack/plugins/infra/common/time/time_key.ts @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { ascending, bisector } from 'd3-array'; +import pick from 'lodash/fp/pick'; + +export interface TimeKey { + time: number; + tiebreaker: number; + gid?: string; +} + +export type Comparator = (firstValue: any, secondValue: any) => number; + +export const isTimeKey = (value: any): value is TimeKey => + value && + typeof value === 'object' && + typeof value.time === 'number' && + typeof value.tiebreaker === 'number'; + +export const pickTimeKey = (value: T): TimeKey => + pick(['time', 'tiebreaker'], value); + +export function compareTimeKeys( + firstKey: TimeKey, + secondKey: TimeKey, + compareValues: Comparator = ascending +): number { + const timeComparison = compareValues(firstKey.time, secondKey.time); + + if (timeComparison === 0) { + const tiebreakerComparison = compareValues(firstKey.tiebreaker, secondKey.tiebreaker); + + if ( + tiebreakerComparison === 0 && + typeof firstKey.gid !== 'undefined' && + typeof secondKey.gid !== 'undefined' + ) { + return compareValues(firstKey.gid, secondKey.gid); + } + + return tiebreakerComparison; + } + + return timeComparison; +} + +export const compareToTimeKey = ( + keyAccessor: (value: Value) => TimeKey, + compareValues?: Comparator +) => (value: Value, key: TimeKey) => compareTimeKeys(keyAccessor(value), key, compareValues); + +export const getIndexAtTimeKey = ( + keyAccessor: (value: Value) => TimeKey, + compareValues?: Comparator +) => { + const comparator = compareToTimeKey(keyAccessor, compareValues); + const collectionBisector = bisector(comparator); + + return (collection: Value[], key: TimeKey): number | null => { + const index = collectionBisector.left(collection, key); + + if (index >= collection.length) { + return null; + } + + if (comparator(collection[index], key) !== 0) { + return null; + } + + return index; + }; +}; + +export const timeKeyIsBetween = (min: TimeKey, max: TimeKey, operand: TimeKey) => + compareTimeKeys(min, operand) <= 0 && compareTimeKeys(max, operand) >= 0; diff --git a/x-pack/plugins/infra/common/time/time_scale.ts b/x-pack/plugins/infra/common/time/time_scale.ts new file mode 100644 index 0000000000000..0381f294f81cb --- /dev/null +++ b/x-pack/plugins/infra/common/time/time_scale.ts @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { TimeUnit, timeUnitLabels } from './time_unit'; + +export interface TimeScale { + unit: TimeUnit; + value: number; +} + +export const getMillisOfScale = (scale: TimeScale) => scale.unit * scale.value; + +export const getLabelOfScale = (scale: TimeScale) => `${scale.value}${timeUnitLabels[scale.unit]}`; + +export const decomposeIntoUnits = (time: number, units: TimeUnit[]) => + units.reduce((result, unitMillis) => { + const offset = result.reduce( + (accumulatedOffset, timeScale) => accumulatedOffset + getMillisOfScale(timeScale), + 0 + ); + const value = Math.floor((time - offset) / unitMillis); + + if (value > 0) { + return [ + ...result, + { + unit: unitMillis, + value, + }, + ]; + } else { + return result; + } + }, []); diff --git a/x-pack/plugins/infra/common/time/time_unit.ts b/x-pack/plugins/infra/common/time/time_unit.ts new file mode 100644 index 0000000000000..4273a9fcf2ef3 --- /dev/null +++ b/x-pack/plugins/infra/common/time/time_unit.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export enum TimeUnit { + Millisecond = 1, + Second = Millisecond * 1000, + Minute = Second * 60, + Hour = Minute * 60, + Day = Hour * 24, + Month = Day * 30, + Year = Month * 12, +} + +export type ElasticsearchTimeUnit = 's' | 'm' | 'h' | 'd' | 'M' | 'y'; + +export const timeUnitLabels = { + [TimeUnit.Millisecond]: 'ms', + [TimeUnit.Second]: 's', + [TimeUnit.Minute]: 'm', + [TimeUnit.Hour]: 'h', + [TimeUnit.Day]: 'd', + [TimeUnit.Month]: 'M', + [TimeUnit.Year]: 'y', +}; + +export const elasticSearchTimeUnits: { + [key: string]: ElasticsearchTimeUnit; +} = { + [TimeUnit.Second]: 's', + [TimeUnit.Minute]: 'm', + [TimeUnit.Hour]: 'h', + [TimeUnit.Day]: 'd', + [TimeUnit.Month]: 'M', + [TimeUnit.Year]: 'y', +}; + +export const getElasticSearchTimeUnit = (scale: TimeUnit): ElasticsearchTimeUnit => + elasticSearchTimeUnits[scale]; diff --git a/x-pack/plugins/infra/common/typed_json.ts b/x-pack/plugins/infra/common/typed_json.ts new file mode 100644 index 0000000000000..ca32bf0b46250 --- /dev/null +++ b/x-pack/plugins/infra/common/typed_json.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export type JsonValue = null | boolean | number | string | JsonObject | JsonArray; + +export interface JsonArray extends Array {} + +export interface JsonObject { + [key: string]: JsonValue; +} diff --git a/x-pack/plugins/infra/docs/arch.md b/x-pack/plugins/infra/docs/arch.md new file mode 100644 index 0000000000000..f3d7312a3491d --- /dev/null +++ b/x-pack/plugins/infra/docs/arch.md @@ -0,0 +1,106 @@ +# Adapter Based Architecture + +## Terms + +In this arch, we use 3 main terms to describe the code: + +- **Libs / Domain Libs** - Business logic & data formatting (though complex formatting might call utils) +- **Adapters** - code that directly calls 3rd party APIs and data sources, exposing clean easy to stub APIs +- **Composition Files** - composes adapters into libs based on where the code is running +- **Implementation layer** - The API such as rest endpoints or graphql schema on the server, and the state management / UI on the client + +## Arch Visual Example + +![Arch Visual Overview](/docs/assets/arch.png) + +## Code Guidelines + +### Libs & Domain Libs: + +This term is used to describe the location of business logic. Each use-case in your app should maintain its own lib. + +Now there are 2 types of libs. A "regular lib" would be something like a lib for interacting with Kibana APIs, with something like a parent app adapter. The other is a "domain lib", and would be something like a hosts, or logging lib that might have composed into it an Elasicsearch adapter. + +For the cases on this application, we might have a Logs, Hosts, Containers, Services, ParentApp, and Settings libs, just as an example. Libs should only have 1 Lib per use-case. + +Libs have, composed into them, adapters, as well as access to other libs. The inter-dependencies on other libs and adapters are explicitly expressed in the types of the lib's constructor arguments to provide static type checking and improve testability. In the following example AdapterInterface would define the required interface of an adapter composed into this lib. Likewise LibInterface would declare the inter-dependency this lib has on other libs: + +```ts +new (adapter: AdapterInterface, otherLibs: { lib1: Lib1Interface; lib2: Lib2Interface }): LibInterface +``` + +Libs must not contain code that depends on APIs and behavior specific to the runtime environment. Any such code should be extracted into an adapter. Any code that does not meet this requirement should be inside an adapter. + +### Adapters + +Adapters are the location of any code to interact with any data sources, or 3rd party API / dependency. An example of code that belongs to an adapter would be anything that interacts with Kibana, or Elasticsearch. This would also include things like, for instance, the browser's local storage. + +**The interface exposed by an adapter should be as domain-specific as possible to reduce the risk of leaking abstraction from the "adapted" technology. Therefore a method like `getHosts()` would be preferable to a `runQuery(filterArgs)` method.** This way the output can be well typed and easily stubbed out in an alternate adapter. This will result in vast improvements in testing reliability and code quality. + +Even adapters though should have required dependencies injected into them for as much as is reasonable. Though this is something that is up to the specific adapter as to what is best on a case-by-case basis. + +An app will in most cases have multiple types of each adapter. As an example, a Lib might have an Elasticsearch-backed adapter as well as an adapter backed by an in-memory store, both of which expose the same interface. This way you can compose a lib to use an in-memory adapter to functional or unit tests in order to have isolated tests that are cleaner / faster / more accurate. + +Adapters can at times be composed into another adapter. This behavior though should be kept to a strict minimum. + +**Acceptable:** + +- An Elasticsearch adapter being passed into Hosts, K8, and logging adapters. The Elasticsearch adapter would then never be exposed directly to a lib. + +**Unacceptable:** + +- A K8 adapter being composed into a hosts adapter, but then k8 also being exposed to a lib. + +The former is acceptable only to abstract shared code between adapters. It is clear that this is acceptable because only other adapters use this code. + +The latter being a "code smell" that indicates there is ether too much logic in your adapter that should be in a lib, or the adapters API is insufficient and should be reconsidered. + +### Composition files + +These files will import all libs and their required adapters to instantiate them in the correct order while passing in the respective dependencies. For a contrived but realistic example, a dev_ui composition file that composes an Elasticsearch adapter into Logs, Hosts, and Services libs, and a dev-ui adapter into ParentApp, and a local-storage adapter into Settings. Then another composition file for Kibana might compose other compatible adapters for use with the Kibana APIs. + +composition files simply export a compose method that returns the composed and initialized libs. + +## File structure + +An example structure might be... + +``` +|-- infra-ui + |-- common + | |-- types.ts + | + |-- server + | |-- lib + | | |-- adapters + | | | |-- hosts + | | | | |-- elasticsearch.ts + | | | | |-- fake_data.ts + | | | | + | | | |-- logs + | | | | |-- elasticsearch.ts + | | | | |-- fake_data.ts + | | | | + | | | |-- parent_app + | | | | |-- kibana_angular // if an adapter has more than one file... + | | | | | |-- index.html + | | | | | |-- index.ts + | | | | | + | | | | |-- ui_harness.ts + | | | | + | | |-- domains + | | | |-- hosts.ts + | | | |-- logs.ts + | | | + | | |-- compose + | | | |-- dev.ts + | | | |-- kibana.ts + | | | + | | |-- parent_app.ts // a non-domain lib + | | |-- lib.ts // a file containing lib type defs + |-- public + | | ## SAME STRUCTURE AS SERVER +``` + +Note that in the above adapters have a folder for each adapter type, then inside the implementation of the adapters. The implementation can be a single file, or a directory where index.js is the class that exposes the adapter. +`libs/compose/` contains the composition files diff --git a/x-pack/plugins/infra/docs/arch_client.md b/x-pack/plugins/infra/docs/arch_client.md new file mode 100644 index 0000000000000..2be9de469f0ee --- /dev/null +++ b/x-pack/plugins/infra/docs/arch_client.md @@ -0,0 +1,132 @@ +# Client Architecture + +All rules described in the [server-side architecture documentation](docs/arch.md) apply to the client as well. As shown below, the directory structure additionally accommodates the front-end-specific concepts like components and containers. + +## Apps + +The `apps` folder contains the entry point for the UI code, such as for use in Kibana or testing. + +## Components + +- Components should be stateless wherever possible with pages and containers holding state. +- Small (less than ~30 lines of JSX and less than ~120 lines total) components should simply get their own file. +- If a component gets too large to reason about, and/or needs multiple child components that are only used in this one place, place them all in a folder. +- All components, please use Styled-Components. This also applies to small tweaks to EUI, just use `styled(Component)` and the `attrs` method for always used props. For example: + +```jsx +export const Toolbar = styled(EuiPanel).attrs({ + paddingSize: 'none', + grow: false, +})` + margin: -2px; +`; +``` + +However, components that tweak EUI should go into `/public/components/eui/${componentName}`. + +If using an EUI component that has not yet been typed, types should be placed into `/types/eui.d.ts` + +## Containers (Also: [see GraphQL docs](docs/graphql.md)) + +- HOC's based on Apollo. +- One folder per data type e.g. `host`. Folder name should be singular. +- One file per query type. + +## Pages + +- Ideally one file per page, if more files are needed, move into folder containing the page and a layout file. +- Pages are class based components. +- Should hold most state, and any additional route logic. +- Are the only files where components are wrapped by containers. For example: + +```jsx +// Simple usage +const FancyLogPage = withSearchResults(class FancyLogPage extends React.Component { + render() { + return ( + <> + + + + <> + ); + } +}); +``` + +OR, for more complex scenarios: + +```jsx +// Advanced usage +const ConnectedToolbar = compose( + withTimeMutation, + withCurrentTime +)(Toolbar); + +const ConnectedLogView = compose( + withLogEntries, + withSearchResults, +)(LogView); + +const ConnectedSearchBar = compose( + withSearchMutation +)(SearchBar); + +interface FancyLogPageProps {} + +class FancyLogPage extends React.Component { + render() { + return ( + <> + + + + <> + ); + } +}; +``` + +## Transforms + +- If you need to do some complex data transforms, it is better to put them here than in a utility or lib. Simpler transforms are probably easier to keep in a container. +- One file per transform + +## File structure + +``` +|-- infra-ui + |-- common + | |-- types.ts + | + |-- public + | |-- components // + | | |-- eui // staging area for eui customizations before pushing upstream + | | |-- layout // any layout components should be placed in here + | | |-- button.tsx + | | |-- mega_table // Where mega table is used directly with a data prop, not a composable table + | | |-- index.ts + | | |-- row.tsx + | | |-- table.tsx + | | |-- cell.tsx + | | + | |-- containers + | | |-- host + | | | |-- index.ts + | | | |-- with_all_hosts.ts + | | | |-- transforms + | | | |-- hosts_to_waffel.ts + | | | + | | |-- pod + | | |-- index.ts + | | |-- with_all_pods.ts + | | + | |-- pages + | | |-- home.tsx // the initial page of a plugin is always the `home` page + | | |-- hosts.tsx + | | |-- logging.tsx + | | + | |-- utils // utils folder for what utils folders are for ;) + | | + | |-- lib // covered in [Our code and arch](docs/arch.md) +``` diff --git a/x-pack/plugins/infra/docs/assets/arch.png b/x-pack/plugins/infra/docs/assets/arch.png new file mode 100644 index 0000000000000..878c7d1aa16d4 Binary files /dev/null and b/x-pack/plugins/infra/docs/assets/arch.png differ diff --git a/x-pack/plugins/infra/docs/graphql.md b/x-pack/plugins/infra/docs/graphql.md new file mode 100644 index 0000000000000..5584a5ce7c0d1 --- /dev/null +++ b/x-pack/plugins/infra/docs/graphql.md @@ -0,0 +1,53 @@ +# GraphQL In Infra UI + +- The combined graphql schema collected from both the `public` and `server` directories is exported to `common/all.gql_schema.ts` for the purpose of automatic type generation only. + +## Server + +- Under `/server/graphql` there are files for each domain of data's graph schema and resolvers. + - Each file has 2 exports `${domain}Schema` e.g. `fieldsSchema`, and `create${domain}Resolvers` e.g. `createFieldResolvers` +- `/server/infra_server.ts` imports all schema and resolvers and passing the full schema to the server +- Resolvers should be used to call composed libs, rather than directly performing any meaningful amount of data processing. +- Resolvers should, however, only pass the required data into libs; that is to say all args for example would not be passed into a lib unless all were needed. + +## Client + +- Under `/public/containers/${domain}/` there is a file for each container. Each file has two exports, the query name e.g. `AllHosts` and the apollo HOC in the pattern of `with${queryName}` e.g. `withAllHosts`. This is done for two reasons: + + 1. It makes the code uniform, thus easier to reason about later. + 2. If reformatting the data using a transform, it lets us re-type the data clearly. + +- Containers should use the apollo props callback to pass ONLY the props and data needed to children. e.g. + + ```ts + import { Hosts, Pods, HostsAndPods } from '../../common/types'; + + // used to generate the `HostsAndPods` type imported above + export const hostsAndPods = gql` + # ... + `; + + type HostsAndPodsProps = { + hosts: Hosts; + pods: Pods; + } + + export const withHostsAndPods = graphql< + {}, + HostsAndPods.Query, + HostsAndPods.Variables, + HostsAndPodsProps + >(hostsAndPods, { + props: ({ data, ownProps }) => ({ + hosts: hostForMap(data && data.hosts ? data.hosts : []), +  pods: podsFromHosts(data && data.hosts ? data.hosts : []) + ...ownProps, + }), + }); + ``` + + as `ownProps` are the props passed to the wrapped component, they should just be forwarded. + +## Types + +- The command `yarn build-graphql-types` derives the schema, query and mutation types and stores them in `common/types.ts` for use on both the client and server. diff --git a/x-pack/plugins/infra/index.ts b/x-pack/plugins/infra/index.ts new file mode 100644 index 0000000000000..6a436d45a84f4 --- /dev/null +++ b/x-pack/plugins/infra/index.ts @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import JoiNamespace from 'joi'; +import { resolve } from 'path'; + +import { getConfigSchema, initServerWithKibana, KbnServer } from './server/kibana.index'; + +const APP_ID = 'infra'; + +export function infra(kibana: any) { + return new kibana.Plugin({ + id: APP_ID, + configPrefix: 'xpack.infra', + publicDir: resolve(__dirname, 'public'), + require: ['kibana', 'elasticsearch'], + uiExports: { + app: { + description: 'Explore your infrastructure', + icon: 'plugins/infra/images/infra_mono_white.svg', + main: 'plugins/infra/app', + title: 'Infrastructure', + listed: false, + url: `/app/${APP_ID}#/home`, + }, + home: ['plugins/infra/register_feature'], + links: [ + { + description: 'Explore your infrastructure', + icon: 'plugins/infra/images/infra_mono_white.svg', + euiIconType: 'infraApp', + id: 'infra:home', + order: 8000, + title: 'Infrastructure', + url: `/app/${APP_ID}#/home`, + }, + { + description: 'Explore your logs', + icon: 'plugins/infra/images/logging_mono_white.svg', + euiIconType: 'loggingApp', + id: 'infra:logs', + order: 8001, + title: 'Logs', + url: `/app/${APP_ID}#/logs`, + }, + ], + }, + config(Joi: typeof JoiNamespace) { + return getConfigSchema(Joi); + }, + init(server: KbnServer) { + initServerWithKibana(server); + }, + }); +} diff --git a/x-pack/plugins/infra/package.json b/x-pack/plugins/infra/package.json new file mode 100644 index 0000000000000..9fc5f210e6cab --- /dev/null +++ b/x-pack/plugins/infra/package.json @@ -0,0 +1,19 @@ +{ + "author": "Elastic", + "name": "infra", + "version": "7.0.0", + "private": true, + "license": "Elastic-License", + "scripts": { + "build-graphql-types": "node scripts/generate_types_from_graphql.js" + }, + "devDependencies": { + "@types/boom": "7.2.0", + "@types/lodash": "^4.14.110" + }, + "dependencies": { + "@types/color": "^3.0.0", + "boom": "3.1.1", + "lodash": "^4.17.10" + } +} diff --git a/x-pack/plugins/infra/public/app.ts b/x-pack/plugins/infra/public/app.ts new file mode 100644 index 0000000000000..255c51c9e48ce --- /dev/null +++ b/x-pack/plugins/infra/public/app.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import './apps/kibana_app'; diff --git a/x-pack/plugins/infra/public/apps/kibana_app.ts b/x-pack/plugins/infra/public/apps/kibana_app.ts new file mode 100644 index 0000000000000..ac705801175f3 --- /dev/null +++ b/x-pack/plugins/infra/public/apps/kibana_app.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import 'uiExports/autocompleteProviders'; + +import { compose } from '../lib/compose/kibana_compose'; +import { startApp } from './start_app'; +startApp(compose()); diff --git a/x-pack/plugins/infra/public/apps/start_app.tsx b/x-pack/plugins/infra/public/apps/start_app.tsx new file mode 100644 index 0000000000000..da32e65e8ffb0 --- /dev/null +++ b/x-pack/plugins/infra/public/apps/start_app.tsx @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createHashHistory } from 'history'; +import React from 'react'; +import { ApolloProvider } from 'react-apollo'; +import { Provider as ReduxStoreProvider } from 'react-redux'; +import { BehaviorSubject } from 'rxjs'; +import { pluck } from 'rxjs/operators'; +import { ThemeProvider } from 'styled-components'; + +// TODO use theme provided from parentApp when kibana supports it +import { EuiErrorBoundary } from '@elastic/eui'; +import * as euiVars from '@elastic/eui/dist/eui_theme_k6_light.json'; +import { InfraFrontendLibs } from '../lib/lib'; +import { PageRouter } from '../routes'; +import { createStore } from '../store'; + +export async function startApp(libs: InfraFrontendLibs) { + const history = createHashHistory(); + + const libs$ = new BehaviorSubject(libs); + const store = createStore({ + apolloClient: libs$.pipe(pluck('apolloClient')), + observableApi: libs$.pipe(pluck('observableApi')), + }); + + libs.framework.render( + + + + + + + + + + ); +} diff --git a/x-pack/plugins/infra/public/apps/testing_app.ts b/x-pack/plugins/infra/public/apps/testing_app.ts new file mode 100644 index 0000000000000..bcd7d0e592644 --- /dev/null +++ b/x-pack/plugins/infra/public/apps/testing_app.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { compose } from '../lib/compose/testing_compose'; +import { startApp } from './start_app'; +startApp(compose()); diff --git a/x-pack/plugins/infra/public/components/auto_sizer.tsx b/x-pack/plugins/infra/public/components/auto_sizer.tsx new file mode 100644 index 0000000000000..674a54338dcf1 --- /dev/null +++ b/x-pack/plugins/infra/public/components/auto_sizer.tsx @@ -0,0 +1,166 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import isEqual from 'lodash/fp/isEqual'; +import React from 'react'; +import ResizeObserver from 'resize-observer-polyfill'; + +interface Measurement { + width?: number; + height?: number; +} + +interface Measurements { + bounds: Measurement; + content: Measurement; +} + +interface AutoSizerProps { + detectAnyWindowResize?: boolean; + bounds?: boolean; + content?: boolean; + onResize?: (size: Measurements) => void; + children: ( + args: { measureRef: (instance: HTMLElement | null) => any } & Measurements + ) => React.ReactNode; +} + +interface AutoSizerState { + boundsMeasurement: Measurement; + contentMeasurement: Measurement; +} + +export class AutoSizer extends React.PureComponent { + public element: HTMLElement | null = null; + public resizeObserver: ResizeObserver | null = null; + public windowWidth: number = -1; + + public readonly state = { + boundsMeasurement: { + height: void 0, + width: void 0, + }, + contentMeasurement: { + height: void 0, + width: void 0, + }, + }; + + constructor(props: AutoSizerProps) { + super(props); + if (this.props.detectAnyWindowResize) { + window.addEventListener('resize', this.updateMeasurement); + } + this.resizeObserver = new ResizeObserver(entries => { + entries.forEach(entry => { + if (entry.target === this.element) { + this.measure(entry); + } + }); + }); + } + + public componentWillUnmount() { + if (this.resizeObserver) { + this.resizeObserver.disconnect(); + this.resizeObserver = null; + } + if (this.props.detectAnyWindowResize) { + window.removeEventListener('resize', this.updateMeasurement); + } + } + + public measure = (entry: ResizeObserverEntry | null) => { + if (!this.element) { + return; + } + + const { content = true, bounds = false } = this.props; + const { + boundsMeasurement: previousBoundsMeasurement, + contentMeasurement: previousContentMeasurement, + } = this.state; + + const boundsRect = bounds ? this.element.getBoundingClientRect() : null; + const boundsMeasurement = boundsRect + ? { + height: this.element.getBoundingClientRect().height, + width: this.element.getBoundingClientRect().width, + } + : previousBoundsMeasurement; + + if ( + this.props.detectAnyWindowResize && + boundsMeasurement && + boundsMeasurement.width && + this.windowWidth !== -1 && + this.windowWidth > window.innerWidth + ) { + const gap = this.windowWidth - window.innerWidth; + boundsMeasurement.width = boundsMeasurement.width - gap; + } + this.windowWidth = window.innerWidth; + const contentRect = content && entry ? entry.contentRect : null; + const contentMeasurement = + contentRect && entry + ? { + height: entry.contentRect.height, + width: entry.contentRect.width, + } + : previousContentMeasurement; + + if ( + isEqual(boundsMeasurement, previousBoundsMeasurement) && + isEqual(contentMeasurement, previousContentMeasurement) + ) { + return; + } + + requestAnimationFrame(() => { + if (!this.resizeObserver) { + return; + } + + this.setState({ boundsMeasurement, contentMeasurement }); + + if (this.props.onResize) { + this.props.onResize({ + bounds: boundsMeasurement, + content: contentMeasurement, + }); + } + }); + }; + + public render() { + const { children } = this.props; + const { boundsMeasurement, contentMeasurement } = this.state; + + return children({ + bounds: boundsMeasurement, + content: contentMeasurement, + measureRef: this.storeRef, + }); + } + + private updateMeasurement = () => { + window.setTimeout(() => { + this.measure(null); + }, 0); + }; + + private storeRef = (element: HTMLElement | null) => { + if (this.element && this.resizeObserver) { + this.resizeObserver.unobserve(this.element); + } + + if (element && this.resizeObserver) { + this.resizeObserver.observe(element); + } + + this.element = element; + }; +} diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx b/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx new file mode 100644 index 0000000000000..982de13ad9685 --- /dev/null +++ b/x-pack/plugins/infra/public/components/autocomplete_field/autocomplete_field.tsx @@ -0,0 +1,305 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiFieldSearch, + EuiFieldSearchProps, + EuiOutsideClickDetector, + EuiPanel, +} from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; + +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; + +import { composeStateUpdaters } from '../../utils/typed_react'; +import { SuggestionItem } from './suggestion_item'; + +interface AutocompleteFieldProps { + isLoadingSuggestions: boolean; + isValid: boolean; + loadSuggestions: (value: string, cursorPosition: number, maxCount?: number) => void; + onSubmit?: (value: string) => void; + onChange?: (value: string) => void; + placeholder?: string; + suggestions: AutocompleteSuggestion[]; + value: string; +} + +interface AutocompleteFieldState { + areSuggestionsVisible: boolean; + isFocused: boolean; + selectedIndex: number | null; +} + +export class AutocompleteField extends React.Component< + AutocompleteFieldProps, + AutocompleteFieldState +> { + public readonly state: AutocompleteFieldState = { + areSuggestionsVisible: false, + isFocused: false, + selectedIndex: null, + }; + + private inputElement: HTMLInputElement | null = null; + + public render() { + const { suggestions, isLoadingSuggestions, isValid, placeholder, value } = this.props; + const { areSuggestionsVisible, selectedIndex } = this.state; + + return ( + + + + {areSuggestionsVisible && !isLoadingSuggestions && suggestions.length > 0 ? ( + + {suggestions.map((suggestion, suggestionIndex) => ( + + ))} + + ) : null} + + + ); + } + + public componentDidUpdate(prevProps: AutocompleteFieldProps, prevState: AutocompleteFieldState) { + const hasNewValue = prevProps.value !== this.props.value; + const hasNewSuggestions = prevProps.suggestions !== this.props.suggestions; + + if (hasNewValue) { + this.updateSuggestions(); + } + + if (hasNewSuggestions && this.state.isFocused) { + this.showSuggestions(); + } + } + + private handleChangeInputRef = (element: HTMLInputElement | null) => { + this.inputElement = element; + }; + + private handleChange = (evt: React.ChangeEvent) => { + this.changeValue(evt.currentTarget.value); + }; + + private handleKeyDown = (evt: React.KeyboardEvent) => { + const { suggestions } = this.props; + + switch (evt.key) { + case 'ArrowUp': + evt.preventDefault(); + if (suggestions.length > 0) { + this.setState( + composeStateUpdaters(withSuggestionsVisible, withPreviousSuggestionSelected) + ); + } + break; + case 'ArrowDown': + evt.preventDefault(); + if (suggestions.length > 0) { + this.setState(composeStateUpdaters(withSuggestionsVisible, withNextSuggestionSelected)); + } else { + this.updateSuggestions(); + } + break; + case 'Enter': + evt.preventDefault(); + if (this.state.selectedIndex !== null) { + this.applySelectedSuggestion(); + } else { + this.submit(); + } + break; + case 'Escape': + evt.preventDefault(); + this.setState(withSuggestionsHidden); + break; + } + }; + + private handleKeyUp = (evt: React.KeyboardEvent) => { + switch (evt.key) { + case 'ArrowLeft': + case 'ArrowRight': + case 'Home': + case 'End': + this.updateSuggestions(); + break; + } + }; + + private handleFocus = () => { + this.setState(composeStateUpdaters(withSuggestionsVisible, withFocused)); + }; + + private handleBlur = () => { + this.setState(composeStateUpdaters(withSuggestionsHidden, withUnfocused)); + }; + + private selectSuggestionAt = (index: number) => () => { + this.setState(withSuggestionAtIndexSelected(index)); + }; + + private applySelectedSuggestion = () => { + if (this.state.selectedIndex !== null) { + this.applySuggestionAt(this.state.selectedIndex)(); + } + }; + + private applySuggestionAt = (index: number) => () => { + const { value, suggestions } = this.props; + const selectedSuggestion = suggestions[index]; + + if (!selectedSuggestion) { + return; + } + + const newValue = + value.substr(0, selectedSuggestion.start) + + selectedSuggestion.text + + value.substr(selectedSuggestion.end); + + this.setState(withSuggestionsHidden); + this.changeValue(newValue); + this.focusInputElement(); + }; + + private changeValue = (value: string) => { + const { onChange } = this.props; + + if (onChange) { + onChange(value); + } + }; + + private focusInputElement = () => { + if (this.inputElement) { + this.inputElement.focus(); + } + }; + + private showSuggestions = () => { + this.setState(withSuggestionsVisible); + }; + + private submit = () => { + const { isValid, onSubmit, value } = this.props; + + if (isValid && onSubmit) { + onSubmit(value); + } + + this.setState(withSuggestionsHidden); + }; + + private updateSuggestions = () => { + const inputCursorPosition = this.inputElement ? this.inputElement.selectionStart || 0 : 0; + this.props.loadSuggestions(this.props.value, inputCursorPosition, 10); + }; +} + +const withPreviousSuggestionSelected = ( + state: AutocompleteFieldState, + props: AutocompleteFieldProps +): AutocompleteFieldState => ({ + ...state, + selectedIndex: + props.suggestions.length === 0 + ? null + : state.selectedIndex !== null + ? (state.selectedIndex + props.suggestions.length - 1) % props.suggestions.length + : Math.max(props.suggestions.length - 1, 0), +}); + +const withNextSuggestionSelected = ( + state: AutocompleteFieldState, + props: AutocompleteFieldProps +): AutocompleteFieldState => ({ + ...state, + selectedIndex: + props.suggestions.length === 0 + ? null + : state.selectedIndex !== null + ? (state.selectedIndex + 1) % props.suggestions.length + : 0, +}); + +const withSuggestionAtIndexSelected = (suggestionIndex: number) => ( + state: AutocompleteFieldState, + props: AutocompleteFieldProps +): AutocompleteFieldState => ({ + ...state, + selectedIndex: + props.suggestions.length === 0 + ? null + : suggestionIndex >= 0 && suggestionIndex < props.suggestions.length + ? suggestionIndex + : 0, +}); + +const withSuggestionsVisible = (state: AutocompleteFieldState) => ({ + ...state, + areSuggestionsVisible: true, +}); + +const withSuggestionsHidden = (state: AutocompleteFieldState) => ({ + ...state, + areSuggestionsVisible: false, + selectedIndex: null, +}); + +const withFocused = (state: AutocompleteFieldState) => ({ + ...state, + isFocused: true, +}); + +const withUnfocused = (state: AutocompleteFieldState) => ({ + ...state, + isFocused: false, +}); + +const FixedEuiFieldSearch: React.SFC< + React.InputHTMLAttributes & + EuiFieldSearchProps & { + inputRef?: (element: HTMLInputElement | null) => void; + onSearch: (value: string) => void; + } +> = EuiFieldSearch as any; + +const AutocompleteContainer = styled.div` + position: relative; +`; + +const SuggestionsPanel = styled(EuiPanel).attrs({ + paddingSize: 'none', + hasShadow: true, +})` + position: absolute; + width: 100%; + margin-top: 2px; + overflow: hidden; +`; diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/index.ts b/x-pack/plugins/infra/public/components/autocomplete_field/index.ts new file mode 100644 index 0000000000000..16def61958d78 --- /dev/null +++ b/x-pack/plugins/infra/public/components/autocomplete_field/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './autocomplete_field'; diff --git a/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx b/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx new file mode 100644 index 0000000000000..09112ede6fa11 --- /dev/null +++ b/x-pack/plugins/infra/public/components/autocomplete_field/suggestion_item.tsx @@ -0,0 +1,124 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiIcon } from '@elastic/eui'; +import { tint } from 'polished'; +import React from 'react'; +import styled from 'styled-components'; + +import { AutocompleteSuggestion } from 'ui/autocomplete_providers'; + +interface SuggestionItemProps { + isSelected?: boolean; + onClick?: React.MouseEventHandler; + onMouseEnter?: React.MouseEventHandler; + suggestion: AutocompleteSuggestion; +} + +export class SuggestionItem extends React.Component { + public static defaultProps: Partial = { + isSelected: false, + }; + + public render() { + const { isSelected, onClick, onMouseEnter, suggestion } = this.props; + + return ( + + + + + {suggestion.text} + + + ); + } +} + +const SuggestionItemContainer = styled.div<{ + isSelected?: boolean; +}>` + display: flex; + flex-direction: row; + font-size: ${props => props.theme.eui.euiFontSizeS}; + height: ${props => props.theme.eui.euiSizeXl}; + white-space: nowrap; + background-color: ${props => + props.isSelected ? props.theme.eui.euiColorLightestShade : 'transparent'}; +`; + +const SuggestionItemField = styled.div` + align-items: center; + cursor: pointer; + display: flex; + flex-direction: row; + height: ${props => props.theme.eui.euiSizeXl}; + padding: ${props => props.theme.eui.euiSizeXs}; +`; + +const SuggestionItemIconField = SuggestionItemField.extend<{ suggestionType: string }>` + background-color: ${props => tint(0.1, getEuiIconColor(props.theme, props.suggestionType))}; + color: ${props => getEuiIconColor(props.theme, props.suggestionType)}; + flex: 0 0 auto; + justify-content: center; + width: ${props => props.theme.eui.euiSizeXl}; +`; + +const SuggestionItemTextField = SuggestionItemField.extend` + flex: 2 0 0; + font-family: ${props => props.theme.eui.euiCodeFontFamily}; +`; + +const SuggestionItemDescriptionField = SuggestionItemField.extend` + flex: 3 0 0; + + p { + display: inline; + + span { + font-family: ${props => props.theme.eui.euiCodeFontFamily}; + } + } +`; + +const getEuiIconType = (suggestionType: string) => { + switch (suggestionType) { + case 'field': + return 'kqlField'; + case 'value': + return 'kqlValue'; + case 'recentSearch': + return 'search'; + case 'conjunction': + return 'kqlSelector'; + case 'operator': + return 'kqlOperand'; + default: + return 'empty'; + } +}; + +const getEuiIconColor = (theme: any, suggestionType: string): string => { + switch (suggestionType) { + case 'field': + return theme.eui.euiColorVis7; + case 'value': + return theme.eui.euiColorVis0; + case 'operator': + return theme.eui.euiColorVis1; + case 'conjunction': + return theme.eui.euiColorVis2; + case 'recentSearch': + default: + return theme.eui.euiColorMediumShade; + } +}; diff --git a/x-pack/plugins/infra/public/components/beta_badge_header_section.tsx b/x-pack/plugins/infra/public/components/beta_badge_header_section.tsx new file mode 100644 index 0000000000000..3512afe18acfe --- /dev/null +++ b/x-pack/plugins/infra/public/components/beta_badge_header_section.tsx @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiBetaBadge, EuiHeaderSection } from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; + +interface BetaBadgeHeaderSectionProps { + tooltipContent?: React.ReactNode; +} + +export const BetaBadgeHeaderSection: React.SFC = ({ + tooltipContent = 'Please help us improve by reporting issues or bugs in the Kibana repo.', +}) => ( + + + +); + +export const InfrastructureBetaBadgeHeaderSection = () => ( + +); + +export const LogsBetaBadgeHeaderSection = () => ( + +); + +const VerticallyCenteredHeaderSection = styled(EuiHeaderSection)` + padding-left: ${props => props.theme.eui.euiSizeS}; + padding-right: ${props => props.theme.eui.euiSizeS}; + align-items: center; +`; diff --git a/x-pack/plugins/infra/public/components/empty_page.tsx b/x-pack/plugins/infra/public/components/empty_page.tsx new file mode 100644 index 0000000000000..44e4ac30d0de5 --- /dev/null +++ b/x-pack/plugins/infra/public/components/empty_page.tsx @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton, EuiEmptyPrompt } from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; + +interface EmptyPageProps { + message: string; + title: string; + actionLabel: string; + actionUrl: string; + 'data-test-subj'?: string; +} + +export const EmptyPage: React.SFC = ({ + actionLabel, + actionUrl, + message, + title, + ...rest +}) => ( + {title}} + body={

      {message}

      } + actions={ + + {actionLabel} + + } + {...rest} + /> +); + +const CenteredEmptyPrompt = styled(EuiEmptyPrompt)` + align-self: center; +`; diff --git a/x-pack/plugins/infra/public/components/eui/index.ts b/x-pack/plugins/infra/public/components/eui/index.ts new file mode 100644 index 0000000000000..f1623ce98c727 --- /dev/null +++ b/x-pack/plugins/infra/public/components/eui/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { Toolbar } from './toolbar'; diff --git a/x-pack/plugins/infra/public/components/eui/toolbar/index.ts b/x-pack/plugins/infra/public/components/eui/toolbar/index.ts new file mode 100644 index 0000000000000..f1623ce98c727 --- /dev/null +++ b/x-pack/plugins/infra/public/components/eui/toolbar/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { Toolbar } from './toolbar'; diff --git a/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx b/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx new file mode 100644 index 0000000000000..9d7005091bd75 --- /dev/null +++ b/x-pack/plugins/infra/public/components/eui/toolbar/toolbar.tsx @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiPanel } from '@elastic/eui'; + +import styled from 'styled-components'; + +export const Toolbar = styled(EuiPanel).attrs({ + grow: false, + paddingSize: 'none', +})` + border-top: none; + border-right: none; + border-left: none; + border-radius: 0; + padding: ${props => props.theme.eui.euiSizeS} ${props => props.theme.eui.euiSizeL}; + z-index: 1; +`; diff --git a/x-pack/plugins/infra/public/components/header.tsx b/x-pack/plugins/infra/public/components/header.tsx new file mode 100644 index 0000000000000..38c71741ab4b9 --- /dev/null +++ b/x-pack/plugins/infra/public/components/header.tsx @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiBreadcrumbDefinition, + EuiHeader, + EuiHeaderBreadcrumbs, + EuiHeaderSection, +} from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; + +interface HeaderProps { + breadcrumbs?: EuiBreadcrumbDefinition[]; + appendSections?: React.ReactNode; +} + +export class Header extends React.PureComponent { + private staticBreadcrumbs = [ + { + href: '#/', + text: 'Infrastructure', + }, + ]; + + public render() { + const { breadcrumbs = [], appendSections = null } = this.props; + + return ( + + + + + {appendSections} + + ); + } +} + +const HeaderWrapper = styled(EuiHeader)` + height: 29px; +`; diff --git a/x-pack/plugins/infra/public/components/loading/index.tsx b/x-pack/plugins/infra/public/components/loading/index.tsx new file mode 100644 index 0000000000000..143ef5b2ece25 --- /dev/null +++ b/x-pack/plugins/infra/public/components/loading/index.tsx @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiLoadingChart, EuiPanel, EuiText } from '@elastic/eui'; +import * as React from 'react'; +import styled from 'styled-components'; + +interface InfraLoadingProps { + text: string; + height: number | string; + width: number | string; +} + +export class InfraLoadingPanel extends React.PureComponent { + public render() { + const { height, text, width } = this.props; + return ( + + + + + +

      {text}

      +
      +
      +
      +
      + ); + } +} + +export const InfraLoadingStaticPanel = styled.div` + position: relative; + overflow: hidden; + display: flex; + flex-direction: column; + justify-content: center; +`; + +export const InfraLoadingStaticContentPanel = styled.div` + flex: 0 0 auto; + align-self: center; + text-align: center; +`; diff --git a/x-pack/plugins/infra/public/components/loading_page.tsx b/x-pack/plugins/infra/public/components/loading_page.tsx new file mode 100644 index 0000000000000..606f1fb69aa55 --- /dev/null +++ b/x-pack/plugins/infra/public/components/loading_page.tsx @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiFlexGroup, + EuiFlexItem, + EuiLoadingSpinner, + EuiPageBody, + EuiPageContent, +} from '@elastic/eui'; +import React from 'react'; + +import { FlexPage } from './page'; + +interface LoadingPageProps { + message?: string; +} + +export const LoadingPage = ({ message }: LoadingPageProps) => ( + + + + + + + + {message} + + + + +); diff --git a/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx b/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx new file mode 100644 index 0000000000000..2e444460fff9e --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_customization_menu.tsx @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButtonEmpty, EuiPopover } from '@elastic/eui'; +import * as React from 'react'; +import styled from 'styled-components'; + +interface LogCustomizationMenuState { + isShown: boolean; +} + +export class LogCustomizationMenu extends React.Component<{}, LogCustomizationMenuState> { + public readonly state = { + isShown: false, + }; + + public show = () => { + this.setState({ + isShown: true, + }); + }; + + public hide = () => { + this.setState({ + isShown: false, + }); + }; + + public toggleVisibility = () => { + this.setState(state => ({ + isShown: !state.isShown, + })); + }; + + public render() { + const { children } = this.props; + const { isShown } = this.state; + + const menuButton = ( + + Customize + + ); + + return ( + + {children} + + ); + } +} + +const CustomizationMenuContent = styled.div` + min-width: 200px; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx new file mode 100644 index 0000000000000..bf524678e7f2b --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/density_chart.tsx @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { scaleLinear, scaleTime } from 'd3-scale'; +import { area, curveMonotoneY } from 'd3-shape'; +import max from 'lodash/fp/max'; +import * as React from 'react'; +import styled from 'styled-components'; + +import { SummaryBucket } from './types'; + +interface DensityChartProps { + buckets: SummaryBucket[]; + end: number; + start: number; + width: number; + height: number; +} + +export const DensityChart: React.SFC = ({ + buckets, + start, + end, + width, + height, +}) => { + if (start >= end || height <= 0 || width <= 0 || buckets.length <= 0) { + return null; + } + + const yScale = scaleTime() + .domain([start, end]) + .range([0, height]); + + const xMax = max(buckets.map(bucket => bucket.entriesCount)) || 0; + const xScale = scaleLinear() + .domain([0, xMax]) + .range([0, width / 2]); + + const path = area() + .x0(xScale(0)) + .x1(bucket => xScale(bucket.entriesCount)) + .y(bucket => yScale((bucket.start + bucket.end) / 2)) + .curve(curveMonotoneY); + const pathData = path(buckets); + + return ( + + + + + ); +}; + +const PositiveAreaPath = styled.path` + fill: ${props => props.theme.eui.euiColorLightShade}; +`; + +const NegativeAreaPath = styled.path` + fill: ${props => props.theme.eui.euiColorLightestShade}; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx new file mode 100644 index 0000000000000..67981d1b5e9bf --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/highlighted_interval.tsx @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; +import styled from 'styled-components'; + +interface HighlightedIntervalProps { + className?: string; + getPositionOfTime: (time: number) => number; + start: number; + end: number; + width: number; +} + +export const HighlightedInterval: React.SFC = ({ + className, + end, + getPositionOfTime, + start, + width, +}) => { + const yStart = getPositionOfTime(start); + const yEnd = getPositionOfTime(end); + + return ( + + ); +}; + +HighlightedInterval.displayName = 'HighlightedInterval'; + +const HighlightPolygon = styled.polygon` + fill: ${props => props.theme.eui.euiColorPrimary}; + fill-opacity: 0.3; + stroke: ${props => props.theme.eui.euiColorPrimary}; + stroke-width: 1; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/index.ts b/x-pack/plugins/infra/public/components/logging/log_minimap/index.ts new file mode 100644 index 0000000000000..8798a5fd022f2 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { LogMinimap } from './log_minimap'; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx new file mode 100644 index 0000000000000..85f47cd4eb1e1 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/log_minimap.tsx @@ -0,0 +1,166 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { scaleLinear } from 'd3-scale'; +import * as React from 'react'; +import styled from 'styled-components'; + +import { LogEntryTime } from '../../../../common/log_entry'; +// import { SearchSummaryBucket } from '../../../../common/log_search_summary'; +import { DensityChart } from './density_chart'; +import { HighlightedInterval } from './highlighted_interval'; +// import { SearchMarkers } from './search_markers'; +import { TimeRuler } from './time_ruler'; +import { SummaryBucket } from './types'; + +interface LogMinimapProps { + className?: string; + height: number; + highlightedInterval: { + end: number; + start: number; + } | null; + jumpToTarget: (params: LogEntryTime) => any; + reportVisibleInterval: ( + params: { + start: number; + end: number; + bucketsOnPage: number; + pagesBeforeStart: number; + pagesAfterEnd: number; + } + ) => any; + intervalSize: number; + summaryBuckets: SummaryBucket[]; + // searchSummaryBuckets?: SearchSummaryBucket[]; + target: number | null; + width: number; +} + +export class LogMinimap extends React.Component { + public handleClick: React.MouseEventHandler = event => { + const svgPosition = event.currentTarget.getBoundingClientRect(); + const clickedYPosition = event.clientY - svgPosition.top; + const clickedTime = Math.floor(this.getYScale().invert(clickedYPosition)); + + this.props.jumpToTarget({ + tiebreaker: 0, + time: clickedTime, + }); + }; + + public getYScale = () => { + const { height, intervalSize, target } = this.props; + + const domainStart = target ? target - intervalSize / 2 : 0; + const domainEnd = target ? target + intervalSize / 2 : 0; + return scaleLinear() + .domain([domainStart, domainEnd]) + .range([0, height]); + }; + + public getPositionOfTime = (time: number) => { + const { height, intervalSize } = this.props; + + const [minTime] = this.getYScale().domain(); + + return ((time - minTime) * height) / intervalSize; + }; + + public updateVisibleInterval = () => { + const { summaryBuckets, intervalSize } = this.props; + const [minTime, maxTime] = this.getYScale().domain(); + + const firstBucket = summaryBuckets[0]; + const lastBucket = summaryBuckets[summaryBuckets.length - 1]; + + const pagesBeforeStart = firstBucket ? (minTime - firstBucket.start) / intervalSize : 0; + const pagesAfterEnd = lastBucket ? (lastBucket.end - maxTime) / intervalSize : 0; + const bucketsOnPage = firstBucket + ? (maxTime - minTime) / (firstBucket.end - firstBucket.start) + : 0; + + this.props.reportVisibleInterval({ + end: Math.ceil(maxTime), + start: Math.floor(minTime), + bucketsOnPage, + pagesBeforeStart, + pagesAfterEnd, + }); + }; + + public componentDidUpdate(prevProps: LogMinimapProps) { + const hasNewTarget = prevProps.target !== this.props.target; + const hasNewIntervalSize = prevProps.intervalSize !== this.props.intervalSize; + + if (hasNewTarget || hasNewIntervalSize) { + this.updateVisibleInterval(); + } + } + + public render() { + const { + className, + height, + highlightedInterval, + // jumpToTarget, + summaryBuckets, + // searchSummaryBuckets, + width, + } = this.props; + + const [minTime, maxTime] = this.getYScale().domain(); + + return ( + + + + + + {highlightedInterval ? ( + + ) : null} + {/* + + */} + + ); + } +} + +const MinimapBackground = styled.rect` + fill: ${props => props.theme.eui.euiColorLightestShade}; +`; + +const MinimapBorder = styled.line` + stroke: ${props => props.theme.eui.euiColorMediumShade}; + stroke-width: 1px; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx new file mode 100644 index 0000000000000..70cfc5ddac799 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker.tsx @@ -0,0 +1,114 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; +import styled, { keyframes } from 'styled-components'; + +import { LogEntryTime } from '../../../../common/log_entry'; +import { SearchSummaryBucket } from '../../../../common/log_search_summary'; +import { SearchMarkerTooltip } from './search_marker_tooltip'; + +interface SearchMarkerProps { + bucket: SearchSummaryBucket; + height: number; + width: number; + jumpToTarget: (target: LogEntryTime) => void; +} + +interface SearchMarkerState { + hoveredPosition: ClientRect | null; +} + +export class SearchMarker extends React.PureComponent { + public readonly state = { + hoveredPosition: null, + }; + + public handleClick: React.MouseEventHandler = evt => { + evt.stopPropagation(); + + this.props.jumpToTarget(this.props.bucket.representative.fields); + }; + + public handleMouseEnter: React.MouseEventHandler = evt => { + this.setState({ + hoveredPosition: evt.currentTarget.getBoundingClientRect(), + }); + }; + + public handleMouseLeave: React.MouseEventHandler = () => { + this.setState({ + hoveredPosition: null, + }); + }; + + public render() { + const { bucket, height, width } = this.props; + const { hoveredPosition } = this.state; + + const bulge = + bucket.count > 1 ? ( + + ) : ( + <> + + + + ); + + return ( + <> + {hoveredPosition ? ( + + {bucket.count} {bucket.count === 1 ? 'search result' : 'search results'} + + ) : null} + + + {bulge} + + + ); + } +} + +const fadeInAnimation = keyframes` + from { + opacity: 0; + } + to { + opacity: 1; + } +`; + +const SearchMarkerGroup = styled.g` + animation: ${fadeInAnimation} ${props => props.theme.eui.euiAnimSpeedExtraSlow} ease-in both; +`; + +const SearchMarkerBackgroundRect = styled.rect` + fill: ${props => props.theme.eui.euiColorSecondary}; + opacity: 0; + transition: opacity ${props => props.theme.eui.euiAnimSpeedNormal} ease-in; + + ${SearchMarkerGroup}:hover & { + opacity: 0.2; + } +`; + +const SearchMarkerForegroundRect = styled.rect` + fill: ${props => props.theme.eui.euiColorSecondary}; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx new file mode 100644 index 0000000000000..1f995947dfd4e --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/search_marker_tooltip.tsx @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { calculatePopoverPosition, EuiPortal } from '@elastic/eui'; +import * as React from 'react'; + +import { AutoSizer } from '../../auto_sizer'; + +interface SearchMarkerTooltipProps { + markerPosition: ClientRect; +} + +export class SearchMarkerTooltip extends React.PureComponent { + public render() { + const { children, markerPosition } = this.props; + + return ( + +
      + + {({ measureRef, bounds: { width, height } }) => { + const { top, left } = + width && height + ? calculatePopoverPosition(markerPosition, { width, height }, 'left', 16, [ + 'left', + ]) + : { + left: -9999, // render off-screen before the first measurement + top: 0, + }; + + return ( +
      + {children} +
      + ); + }} +
      +
      +
      + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/search_markers.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/search_markers.tsx new file mode 100644 index 0000000000000..8ad3947cc5a23 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/search_markers.tsx @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import classNames from 'classnames'; +import { scaleTime } from 'd3-scale'; +import * as React from 'react'; + +import { LogEntryTime } from '../../../../common/log_entry'; +import { SearchSummaryBucket } from '../../../../common/log_search_summary'; +import { SearchMarker } from './search_marker'; + +interface SearchMarkersProps { + buckets: SearchSummaryBucket[]; + className?: string; + end: number; + start: number; + width: number; + height: number; + jumpToTarget: (target: LogEntryTime) => void; +} + +export class SearchMarkers extends React.PureComponent { + public render() { + const { buckets, start, end, width, height, jumpToTarget, className } = this.props; + const classes = classNames('minimapSearchMarkers', className); + + if (start >= end || height <= 0 || Object.keys(buckets).length <= 0) { + return null; + } + + const yScale = scaleTime() + .domain([start, end]) + .range([0, height]); + + return ( + + {buckets.map(bucket => ( + + + + ))} + + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx new file mode 100644 index 0000000000000..0577dba01e09b --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/time_ruler.tsx @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { scaleTime } from 'd3-scale'; +import * as React from 'react'; +import styled from 'styled-components'; + +interface TimeRulerProps { + end: number; + height: number; + start: number; + tickCount: number; + width: number; +} + +export const TimeRuler: React.SFC = ({ end, height, start, tickCount, width }) => { + const yScale = scaleTime() + .domain([start, end]) + .range([0, height]); + + const ticks = yScale.ticks(tickCount); + const formatTick = yScale.tickFormat(); + + return ( + + {ticks.map((tick, tickIndex) => { + const y = yScale(tick); + return ( + + + {formatTick(tick)} + + + + ); + })} + + ); +}; + +TimeRuler.displayName = 'TimeRuler'; + +const TimeRulerTickLabel = styled.text` + font-size: ${props => props.theme.eui.euiFontSizeXs}; + line-height: ${props => props.theme.eui.euiLineHeight}; + color: ${props => props.theme.eui.euiTextColor}; +`; + +const TimeRulerGridLine = styled.line` + stroke: ${props => props.theme.eui.euiColorMediumShade}; + stroke-dasharray: 2, 2; + stroke-opacity: 0.5; + stroke-width: 1px; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap/types.ts b/x-pack/plugins/infra/public/components/logging/log_minimap/types.ts new file mode 100644 index 0000000000000..ac3ea48bc4b16 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap/types.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface SummaryBucket { + start: number; + end: number; + entriesCount: number; +} diff --git a/x-pack/plugins/infra/public/components/logging/log_minimap_scale_controls.tsx b/x-pack/plugins/infra/public/components/logging/log_minimap_scale_controls.tsx new file mode 100644 index 0000000000000..b195fd3af005a --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_minimap_scale_controls.tsx @@ -0,0 +1,59 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFormRow, EuiRadioGroup } from '@elastic/eui'; +import * as React from 'react'; + +interface IntervalSizeDescriptor { + label: string; + intervalSize: number; +} + +interface LogMinimapScaleControlsProps { + availableIntervalSizes: IntervalSizeDescriptor[]; + intervalSize: number; + setIntervalSize: (intervalSize: number) => any; +} + +export class LogMinimapScaleControls extends React.PureComponent { + public handleScaleChange = (intervalSizeDescriptorKey: string) => { + const { availableIntervalSizes, setIntervalSize } = this.props; + const [sizeDescriptor] = availableIntervalSizes.filter( + intervalKeyEquals(intervalSizeDescriptorKey) + ); + + if (sizeDescriptor) { + setIntervalSize(sizeDescriptor.intervalSize); + } + }; + + public render() { + const { availableIntervalSizes, intervalSize } = this.props; + const [currentSizeDescriptor] = availableIntervalSizes.filter(intervalSizeEquals(intervalSize)); + + return ( + + ({ + id: getIntervalSizeDescriptorKey(sizeDescriptor), + label: sizeDescriptor.label, + }))} + onChange={this.handleScaleChange} + idSelected={getIntervalSizeDescriptorKey(currentSizeDescriptor)} + /> + + ); + } +} + +const getIntervalSizeDescriptorKey = (sizeDescriptor: IntervalSizeDescriptor) => + `${sizeDescriptor.intervalSize}`; + +const intervalKeyEquals = (key: string) => (sizeDescriptor: IntervalSizeDescriptor) => + getIntervalSizeDescriptorKey(sizeDescriptor) === key; + +const intervalSizeEquals = (size: number) => (sizeDescriptor: IntervalSizeDescriptor) => + sizeDescriptor.intervalSize === size; diff --git a/x-pack/plugins/infra/public/components/logging/log_search_controls/index.ts b/x-pack/plugins/infra/public/components/logging/log_search_controls/index.ts new file mode 100644 index 0000000000000..bc2800f18e2b9 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_search_controls/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { LogSearchControls } from './log_search_controls'; diff --git a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_buttons.tsx b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_buttons.tsx new file mode 100644 index 0000000000000..5c24a36fac669 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_buttons.tsx @@ -0,0 +1,71 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import classNames from 'classnames'; +import * as React from 'react'; + +import { LogEntryTime } from '../../../../common/log_entry'; + +interface LogSearchButtonsProps { + className?: string; + jumpToTarget: (target: LogEntryTime) => void; + previousSearchResult: LogEntryTime | null; + nextSearchResult: LogEntryTime | null; +} + +export class LogSearchButtons extends React.PureComponent { + public handleJumpToPreviousSearchResult: React.MouseEventHandler = () => { + const { jumpToTarget, previousSearchResult } = this.props; + + if (previousSearchResult) { + jumpToTarget(previousSearchResult); + } + }; + + public handleJumpToNextSearchResult: React.MouseEventHandler = () => { + const { jumpToTarget, nextSearchResult } = this.props; + + if (nextSearchResult) { + jumpToTarget(nextSearchResult); + } + }; + + public render() { + const { className, previousSearchResult, nextSearchResult } = this.props; + + const classes = classNames('searchButtons', className); + const hasPreviousSearchResult = !!previousSearchResult; + const hasNextSearchResult = !!nextSearchResult; + + return ( + + + + Previous + + + + + Next + + + + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_controls.tsx b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_controls.tsx new file mode 100644 index 0000000000000..d61fde2aaa881 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_controls.tsx @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import classNames from 'classnames'; +import * as React from 'react'; + +import { LogEntryTime } from '../../../../common/log_entry'; +import { LogSearchButtons } from './log_search_buttons'; +import { LogSearchInput } from './log_search_input'; + +interface LogSearchControlsProps { + className?: string; + clearSearch: () => any; + isLoadingSearchResults: boolean; + previousSearchResult: LogEntryTime | null; + nextSearchResult: LogEntryTime | null; + jumpToTarget: (target: LogEntryTime) => any; + search: (query: string) => any; +} + +export class LogSearchControls extends React.PureComponent { + public render() { + const { + className, + clearSearch, + isLoadingSearchResults, + previousSearchResult, + nextSearchResult, + jumpToTarget, + search, + } = this.props; + + const classes = classNames('searchControls', className); + + return ( + + + + + + + + + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx new file mode 100644 index 0000000000000..95f4b7bdfc65b --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_search_controls/log_search_input.tsx @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFieldSearch } from '@elastic/eui'; +import classNames from 'classnames'; +import * as React from 'react'; +import styled from 'styled-components'; + +interface LogSearchInputProps { + className?: string; + isLoading: boolean; + onSearch: (query: string) => void; + onClear: () => void; +} + +interface LogSearchInputState { + query: string; +} + +export class LogSearchInput extends React.PureComponent { + public readonly state = { + query: '', + }; + + public handleSubmit: React.FormEventHandler = evt => { + evt.preventDefault(); + + const { query } = this.state; + + if (query === '') { + this.props.onClear(); + } else { + this.props.onSearch(this.state.query); + } + }; + + public handleChangeQuery: React.ChangeEventHandler = evt => { + this.setState({ + query: evt.target.value, + }); + }; + + public render() { + const { className, isLoading } = this.props; + const { query } = this.state; + + const classes = classNames('loggingSearchInput', className); + + return ( +
      + + + ); + } +} + +const PlainSearchField = styled(EuiFieldSearch)` + background: transparent; + box-shadow: none; + + &:focus { + box-shadow: inset 0 -2px 0 0 ${props => props.theme.eui.euiColorPrimary}; + } +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx b/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx new file mode 100644 index 0000000000000..95749c62d0756 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_statusbar.tsx @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import styled from 'styled-components'; + +export const LogStatusbar = styled(EuiFlexGroup).attrs({ + alignItems: 'center', + gutterSize: 'none', + justifyContent: 'flexEnd', +})` + padding: ${props => props.theme.eui.euiSizeS}; + border-top: ${props => props.theme.eui.euiBorderThin}; + max-height: 48px; + min-height: 48px; + background-color: ${props => props.theme.eui.euiColorEmptyShade}; + flex-direction: row; +`; + +export const LogStatusbarItem = EuiFlexItem; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_scale_controls.tsx b/x-pack/plugins/infra/public/components/logging/log_text_scale_controls.tsx new file mode 100644 index 0000000000000..089142891a36e --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_scale_controls.tsx @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFormRow, EuiRadioGroup } from '@elastic/eui'; +import * as React from 'react'; + +import { getLabelOfTextScale, isTextScale, TextScale } from '../../../common/log_text_scale'; + +interface LogTextScaleControlsProps { + availableTextScales: TextScale[]; + textScale: TextScale; + setTextScale: (scale: TextScale) => any; +} + +export class LogTextScaleControls extends React.PureComponent { + public setTextScale = (textScale: string) => { + if (isTextScale(textScale)) { + this.props.setTextScale(textScale); + } + }; + + public render() { + const { availableTextScales, textScale } = this.props; + + return ( + + ({ + id: availableTextScale.toString(), + label: getLabelOfTextScale(availableTextScale), + }))} + idSelected={textScale} + onChange={this.setTextScale} + /> + + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/empty_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/empty_view.tsx new file mode 100644 index 0000000000000..d4f0a51a0bc7c --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/empty_view.tsx @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton, EuiEmptyPrompt } from '@elastic/eui'; +import * as React from 'react'; + +interface LogTextStreamEmptyViewProps { + reload: () => void; +} + +export class LogTextStreamEmptyView extends React.PureComponent { + public render() { + const { reload } = this.props; + + return ( + There are no log messages to display.} + titleSize="m" + body={

      Try adjusting your filter.

      } + actions={ + + Check for new data + + } + /> + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/index.ts b/x-pack/plugins/infra/public/components/logging/log_text_stream/index.ts new file mode 100644 index 0000000000000..77781b58a3ccd --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { ScrollableLogTextStreamView } from './scrollable_log_text_stream_view'; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts b/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts new file mode 100644 index 0000000000000..75ee65aa2c3e0 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/item.ts @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { bisector } from 'd3-array'; + +import { getLogEntryKey, LogEntry } from '../../../../common/log_entry'; +import { SearchResult } from '../../../../common/log_search_result'; +import { compareToTimeKey, TimeKey } from '../../../../common/time'; + +export type StreamItem = LogEntryStreamItem; + +export interface LogEntryStreamItem { + kind: 'logEntry'; + logEntry: LogEntry; + searchResult: SearchResult | undefined; +} + +export function getStreamItemTimeKey(item: StreamItem) { + switch (item.kind) { + case 'logEntry': + return getLogEntryKey(item.logEntry); + } +} + +export function getStreamItemId(item: StreamItem) { + const { time, tiebreaker, gid } = getStreamItemTimeKey(item); + + return `${time}:${tiebreaker}:${gid}`; +} + +export function parseStreamItemId(id: string) { + const idFragments = id.split(':'); + + return { + gid: idFragments.slice(2).join(':'), + tiebreaker: parseInt(idFragments[1], 10), + time: parseInt(idFragments[0], 10), + }; +} + +const streamItemTimeBisector = bisector(compareToTimeKey(getStreamItemTimeKey)); + +export const getStreamItemBeforeTimeKey = (streamItems: StreamItem[], key: TimeKey) => + streamItems[Math.min(streamItemTimeBisector.left(streamItems, key), streamItems.length - 1)]; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/item_date_field.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_date_field.tsx new file mode 100644 index 0000000000000..82f8057b08fce --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_date_field.tsx @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { darken } from 'polished'; +import * as React from 'react'; +import { css } from 'styled-components'; + +import { TextScale } from '../../../../common/log_text_scale'; +import { tintOrShade } from '../../../utils/styles'; +import { LogTextStreamItemField } from './item_field'; + +interface LogTextStreamItemDateFieldProps { + children: string; + hasHighlights: boolean; + isHovered: boolean; + scale: TextScale; +} + +export class LogTextStreamItemDateField extends React.PureComponent< + LogTextStreamItemDateFieldProps, + {} +> { + public render() { + const { children, hasHighlights, isHovered, scale } = this.props; + + return ( + + {children} + + ); + } +} + +const highlightedFieldStyle = css` + background-color: ${props => + tintOrShade(props.theme.eui.euiTextColor, props.theme.eui.euiColorSecondary, 0.15)}; + border-color: ${props => props.theme.eui.euiColorSecondary}; +`; + +const hoveredFieldStyle = css` + background-color: ${props => darken(0.05, props.theme.eui.euiColorHighlight)}; + border-color: ${props => darken(0.2, props.theme.eui.euiColorHighlight)}; + color: ${props => props.theme.eui.euiColorFullShade}; +`; + +const LogTextStreamItemDateFieldWrapper = LogTextStreamItemField.extend.attrs<{ + hasHighlights: boolean; + isHovered: boolean; +}>({})` + background-color: ${props => props.theme.eui.euiColorLightestShade}; + border-right: solid 2px ${props => props.theme.eui.euiColorLightShade}; + color: ${props => props.theme.eui.euiColorDarkShade}; + white-space: pre; + + ${props => (props.hasHighlights ? highlightedFieldStyle : '')}; + ${props => (props.isHovered ? hoveredFieldStyle : '')}; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/item_field.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_field.tsx new file mode 100644 index 0000000000000..c9d360fc116a7 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_field.tsx @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import styled from 'styled-components'; + +import { switchProp } from '../../../utils/styles'; + +export const LogTextStreamItemField = styled.div.attrs<{ + scale?: 'small' | 'medium' | 'large'; +}>({})` + font-size: ${props => + switchProp('scale', { + large: props.theme.eui.euiFontSizeM, + medium: props.theme.eui.euiFontSizeS, + small: props.theme.eui.euiFontSizeXs, + [switchProp.default]: props.theme.eui.euiFontSize, + })}; + line-height: ${props => props.theme.eui.euiLineHeight}; + padding: 2px ${props => props.theme.eui.euiSize}; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/item_message_field.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_message_field.tsx new file mode 100644 index 0000000000000..1c411adaf4e1c --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_message_field.tsx @@ -0,0 +1,109 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { darken } from 'polished'; +import * as React from 'react'; +import styled, { css } from 'styled-components'; + +import { TextScale } from '../../../../common/log_text_scale'; +import { tintOrShade } from '../../../utils/styles'; +import { LogTextStreamItemField } from './item_field'; + +interface LogTextStreamItemMessageFieldProps { + children: string; + highlights: string[]; + isHovered: boolean; + isWrapped: boolean; + scale: TextScale; +} + +export class LogTextStreamItemMessageField extends React.PureComponent< + LogTextStreamItemMessageFieldProps, + {} +> { + public render() { + const { children, highlights, isHovered, isWrapped, scale } = this.props; + + const hasHighlights = highlights.length > 0; + const content = hasHighlights ? renderHighlightFragments(children, highlights) : children; + return ( + + {content} + + ); + } +} + +const renderHighlightFragments = (text: string, highlights: string[]): React.ReactNode[] => { + const renderedHighlights = highlights.reduce( + ({ lastFragmentEnd, renderedFragments }, highlight) => { + const fragmentStart = text.indexOf(highlight, lastFragmentEnd); + return { + lastFragmentEnd: fragmentStart + highlight.length, + renderedFragments: [ + ...renderedFragments, + text.slice(lastFragmentEnd, fragmentStart), + {highlight}, + ], + }; + }, + { + lastFragmentEnd: 0, + renderedFragments: [], + } as { + lastFragmentEnd: number; + renderedFragments: React.ReactNode[]; + } + ); + + return [...renderedHighlights.renderedFragments, text.slice(renderedHighlights.lastFragmentEnd)]; +}; + +const highlightedFieldStyle = css` + background-color: ${props => + tintOrShade(props.theme.eui.euiTextColor, props.theme.eui.euiColorSecondary, 0.15)}; +`; + +const hoveredFieldStyle = css` + background-color: ${props => darken(0.05, props.theme.eui.euiColorHighlight)}; +`; + +const wrappedFieldStyle = css` + overflow: visible; + white-space: pre-wrap; +`; + +const unwrappedFieldStyle = css` + overflow: hidden; + white-space: pre; +`; + +const LogTextStreamItemMessageFieldWrapper = LogTextStreamItemField.extend.attrs<{ + hasHighlights: boolean; + isHovered: boolean; + isWrapped?: boolean; +}>({})` + flex-grow: 1; + text-overflow: ellipsis; + background-color: ${props => props.theme.eui.euiColorEmptyShade}; + + ${props => (props.hasHighlights ? highlightedFieldStyle : '')}; + ${props => (props.isHovered ? hoveredFieldStyle : '')}; + ${props => (props.isWrapped ? wrappedFieldStyle : unwrappedFieldStyle)}; +`; + +const HighlightSpan = styled.span` + display: inline-block; + padding: 0 ${props => props.theme.eui.euiSizeXs}; + background-color: ${props => props.theme.eui.euiColorSecondary}; + color: ${props => props.theme.eui.euiColorGhost}; + font-weight: ${props => props.theme.eui.euiFontWeightMedium}; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/item_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_view.tsx new file mode 100644 index 0000000000000..c4a75771fa5a0 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/item_view.tsx @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; + +import { TextScale } from '../../../../common/log_text_scale'; +import { StreamItem } from './item'; +import { LogTextStreamLogEntryItemView } from './log_entry_item_view'; + +interface StreamItemProps { + item: StreamItem; + scale: TextScale; + wrap: boolean; +} + +export const LogTextStreamItemView = React.forwardRef( + ({ item, scale, wrap }, ref) => { + switch (item.kind) { + case 'logEntry': + return ( + + ); + } + } +); diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx new file mode 100644 index 0000000000000..6b89004d97f56 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/loading_item_view.tsx @@ -0,0 +1,126 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButtonEmpty, EuiIcon, EuiProgress, EuiText } from '@elastic/eui'; +import * as React from 'react'; +import styled from 'styled-components'; + +import { RelativeTime } from './relative_time'; + +interface LogTextStreamLoadingItemViewProps { + alignment: 'top' | 'bottom'; + className?: string; + hasMore: boolean; + isLoading: boolean; + isStreaming: boolean; + lastStreamingUpdate: number | null; + onLoadMore?: () => void; +} + +export class LogTextStreamLoadingItemView extends React.PureComponent< + LogTextStreamLoadingItemViewProps, + {} +> { + public render() { + const { + alignment, + className, + hasMore, + isLoading, + isStreaming, + lastStreamingUpdate, + onLoadMore, + } = this.props; + + if (isStreaming) { + return ( + + + Streaming new entries + + {lastStreamingUpdate ? ( + + + last updated{' '} + ago + + + ) : null} + + ); + } else if (isLoading) { + return ( + + Loading additional entries + + ); + } else if (!hasMore) { + return ( + + No additional entries found + {onLoadMore ? ( + + Load again + + ) : null} + + ); + } else { + return null; + } + } +} + +interface ProgressEntryProps { + alignment: 'top' | 'bottom'; + className?: string; + color: 'subdued' | 'primary'; + isLoading: boolean; +} + +// tslint:disable-next-line:max-classes-per-file +class ProgressEntry extends React.PureComponent { + public render() { + const { alignment, children, className, color, isLoading } = this.props; + + return ( + + + {children} + + ); + } +} + +const ProgressEntryWrapper = styled.div` + align-items: center; + display: flex; + min-height: ${props => props.theme.eui.euiSizeXxl}; + position: relative; +`; + +const ProgressMessage = styled.div` + padding: 8px 16px; +`; + +const AlignedProgress = styled(EuiProgress).attrs<{ + alignment: 'top' | 'bottom'; +}>({})` + top: ${props => (props.alignment === 'top' ? 0 : 'initial')}; + bottom: ${props => (props.alignment === 'top' ? 'initial' : 0)}; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_item_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_item_view.tsx new file mode 100644 index 0000000000000..2e910cad56785 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_item_view.tsx @@ -0,0 +1,93 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; +import styled from 'styled-components'; + +import { LogEntry } from '../../../../common/log_entry'; +import { SearchResult } from '../../../../common/log_search_result'; +import { TextScale } from '../../../../common/log_text_scale'; +import { formatTime } from '../../../../common/time'; +import { LogTextStreamItemDateField } from './item_date_field'; +import { LogTextStreamItemMessageField } from './item_message_field'; + +interface LogTextStreamLogEntryItemViewProps { + boundingBoxRef?: React.Ref; + logEntry: LogEntry; + searchResult?: SearchResult; + scale: TextScale; + wrap: boolean; +} + +interface LogTextStreamLogEntryItemViewState { + isHovered: boolean; +} + +export class LogTextStreamLogEntryItemView extends React.PureComponent< + LogTextStreamLogEntryItemViewProps, + LogTextStreamLogEntryItemViewState +> { + public readonly state = { + isHovered: false, + }; + + public handleMouseEnter: React.MouseEventHandler = () => { + this.setState({ + isHovered: true, + }); + }; + + public handleMouseLeave: React.MouseEventHandler = () => { + this.setState({ + isHovered: false, + }); + }; + + public render() { + const { boundingBoxRef, logEntry, scale, searchResult, wrap } = this.props; + const { isHovered } = this.state; + + return ( + + + {formatTime(logEntry.fields.time)} + + + {logEntry.fields.message} + + + ); + } +} + +const LogTextStreamLogEntryItemDiv = styled.div` + font-family: ${props => props.theme.eui.euiCodeFontFamily}; + font-size: ${props => props.theme.eui.euiFontSize}; + line-height: ${props => props.theme.eui.euiLineHeight}; + color: ${props => props.theme.eui.euiTextColor}; + overflow: hidden; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: flex-start; + align-items: stretch; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_stream_item_view_.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_stream_item_view_.tsx new file mode 100644 index 0000000000000..98bc10a6240d9 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_stream_item_view_.tsx @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; +import styled from 'styled-components'; + +import { LogEntry } from '../../../../common/log_entry'; + +interface LogEntryStreamItemViewProps { + boundingBoxRef?: React.Ref<{}>; + item: LogEntry; +} + +export class LogEntryStreamItemView extends React.PureComponent { + public render() { + const { boundingBoxRef, item } = this.props; + + return ( + // @ts-ignore: silence error until styled-components supports React.RefObject + {JSON.stringify(item)} + ); + } +} + +const LogEntryDiv = styled.div` + border-top: 1px solid red; + border-bottom: 1px solid green; +`; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/measurable_item_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/measurable_item_view.tsx new file mode 100644 index 0000000000000..4ade3be2bd872 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/measurable_item_view.tsx @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; + +export interface Rect { + top: number; + left: number; + width: number; + height: number; +} + +interface MeasureableProps { + children: (measureRef: React.Ref) => React.ReactNode; + register: (key: any, element: MeasurableItemView | null) => void; + registrationKey: any; +} + +export class MeasurableItemView extends React.PureComponent { + public childRef = React.createRef(); + + public getOffsetRect = (): Rect | null => { + const currentElement = this.childRef.current; + + if (currentElement === null) { + return null; + } + + return { + height: currentElement.offsetHeight, + left: currentElement.offsetLeft, + top: currentElement.offsetTop, + width: currentElement.offsetWidth, + }; + }; + + public componentDidMount() { + this.props.register(this.props.registrationKey, this); + } + + public componentWillUnmount() { + this.props.register(this.props.registrationKey, null); + } + + public componentDidUpdate(prevProps: MeasureableProps) { + if (prevProps.registrationKey !== this.props.registrationKey) { + this.props.register(prevProps.registrationKey, null); + this.props.register(this.props.registrationKey, this); + } + } + + public render() { + return this.props.children(this.childRef); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/relative_time.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/relative_time.tsx new file mode 100644 index 0000000000000..247b444a3b6a6 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/relative_time.tsx @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; + +import { decomposeIntoUnits, getLabelOfScale, TimeUnit } from '../../../../common/time'; + +interface RelativeTimeProps { + time: number; + refreshInterval?: number; +} + +interface RelativeTimeState { + currentTime: number; + timeoutId: number | null; +} + +export class RelativeTime extends React.Component { + public readonly state = { + currentTime: Date.now(), + timeoutId: null, + }; + + public updateCurrentTimeEvery = (refreshInterval: number) => { + const nextTimeoutId = window.setTimeout( + this.updateCurrentTimeEvery.bind(this, refreshInterval), + refreshInterval + ); + + this.setState({ + currentTime: Date.now(), + timeoutId: nextTimeoutId, + }); + }; + + public cancelUpdate = () => { + const { timeoutId } = this.state; + + if (timeoutId) { + window.clearTimeout(timeoutId); + this.setState({ + timeoutId: null, + }); + } + }; + + public componentDidMount() { + const { refreshInterval } = this.props; + + if (refreshInterval && refreshInterval > 0) { + this.updateCurrentTimeEvery(refreshInterval); + } + } + + public componentWillUnmount() { + this.cancelUpdate(); + } + + public render() { + const { time } = this.props; + const { currentTime } = this.state; + const timeDifference = Math.abs(currentTime - time); + + const timeFragments = decomposeIntoUnits(timeDifference, unitThresholds); + + if (timeFragments.length === 0) { + return '0s'; + } else { + return timeFragments.map(getLabelOfScale).join(' '); + } + } +} + +const unitThresholds = [TimeUnit.Day, TimeUnit.Hour, TimeUnit.Minute, TimeUnit.Second]; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx new file mode 100644 index 0000000000000..17a80f92b9f8a --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx @@ -0,0 +1,192 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as React from 'react'; + +import { TextScale } from '../../../../common/log_text_scale'; +import { TimeKey } from '../../../../common/time'; +import { callWithoutRepeats } from '../../../utils/handlers'; +import { InfraLoadingPanel } from '../../loading'; +import { LogTextStreamEmptyView } from './empty_view'; +import { getStreamItemBeforeTimeKey, getStreamItemId, parseStreamItemId, StreamItem } from './item'; +import { LogTextStreamItemView } from './item_view'; +import { LogTextStreamLoadingItemView } from './loading_item_view'; +import { MeasurableItemView } from './measurable_item_view'; +import { VerticalScrollPanel } from './vertical_scroll_panel'; + +interface ScrollableLogTextStreamViewProps { + height: number; + width: number; + items: StreamItem[]; + scale: TextScale; + wrap: boolean; + isReloading: boolean; + isLoadingMore: boolean; + hasMoreBeforeStart: boolean; + hasMoreAfterEnd: boolean; + isStreaming: boolean; + lastLoadedTime: number | null; + target: TimeKey | null; + jumpToTarget: (target: TimeKey) => any; + reportVisibleInterval: ( + params: { + pagesBeforeStart: number; + pagesAfterEnd: number; + startKey: TimeKey | null; + middleKey: TimeKey | null; + endKey: TimeKey | null; + } + ) => any; + loadNewerItems: () => void; +} + +interface ScrollableLogTextStreamViewState { + target: TimeKey | null; + targetId: string | null; +} + +export class ScrollableLogTextStreamView extends React.PureComponent< + ScrollableLogTextStreamViewProps, + ScrollableLogTextStreamViewState +> { + public static getDerivedStateFromProps( + nextProps: ScrollableLogTextStreamViewProps, + prevState: ScrollableLogTextStreamViewState + ): Partial | null { + const hasNewTarget = nextProps.target && nextProps.target !== prevState.target; + const hasItems = nextProps.items.length > 0; + + if (nextProps.isStreaming && hasItems) { + return { + target: nextProps.target, + targetId: getStreamItemId(nextProps.items[nextProps.items.length - 1]), + }; + } else if (hasNewTarget && hasItems) { + return { + target: nextProps.target, + targetId: getStreamItemId(getStreamItemBeforeTimeKey(nextProps.items, nextProps.target!)), + }; + } else if (!nextProps.target || !hasItems) { + return { + target: null, + targetId: null, + }; + } + + return null; + } + + public readonly state = { + target: null, + targetId: null, + }; + + public render() { + const { + items, + height, + width, + scale, + wrap, + isReloading, + isLoadingMore, + hasMoreBeforeStart, + hasMoreAfterEnd, + isStreaming, + lastLoadedTime, + } = this.props; + const { targetId } = this.state; + const hasItems = items.length > 0; + if (isReloading && !hasItems) { + return ; + } else if (!hasItems) { + return ; + } else { + return ( + + {registerChild => ( + <> + + {items.map(item => ( + + {measureRef => ( + + )} + + ))} + + + )} + + ); + } + } + + private handleReload = () => { + const { jumpToTarget, target } = this.props; + + if (target) { + jumpToTarget(target); + } + }; + + private handleLoadNewerItems = () => { + const { loadNewerItems } = this.props; + + if (loadNewerItems) { + loadNewerItems(); + } + }; + + // this is actually a method but not recognized as such + // tslint:disable-next-line:member-ordering + private handleVisibleChildrenChange = callWithoutRepeats( + ({ + topChild, + middleChild, + bottomChild, + pagesAbove, + pagesBelow, + }: { + topChild: string; + middleChild: string; + bottomChild: string; + pagesAbove: number; + pagesBelow: number; + }) => { + this.props.reportVisibleInterval({ + endKey: parseStreamItemId(bottomChild), + middleKey: parseStreamItemId(middleChild), + pagesAfterEnd: pagesBelow, + pagesBeforeStart: pagesAbove, + startKey: parseStreamItemId(topChild), + }); + } + ); +} diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx new file mode 100644 index 0000000000000..db0a6bd29f1d9 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/vertical_scroll_panel.tsx @@ -0,0 +1,274 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { bisector } from 'd3-array'; +import sortBy from 'lodash/fp/sortBy'; +import throttle from 'lodash/fp/throttle'; +import * as React from 'react'; +import styled from 'styled-components'; + +import { Rect } from './measurable_item_view'; + +interface VerticalScrollPanelProps { + children?: ( + registerChild: (key: Child, element: MeasurableChild | null) => void + ) => React.ReactNode; + onVisibleChildrenChange?: ( + visibleChildren: { + topChild: Child; + middleChild: Child; + bottomChild: Child; + pagesAbove: number; + pagesBelow: number; + } + ) => void; + target: Child | undefined; + height: number; + width: number; + hideScrollbar?: boolean; +} + +interface VerticalScrollPanelSnapshot { + scrollTarget: Child | undefined; + scrollOffset: number | undefined; +} + +interface MeasurableChild { + getOffsetRect(): Rect | null; +} + +const SCROLL_THROTTLE_INTERVAL = 250; +const ASSUMED_SCROLLBAR_WIDTH = 20; + +export class VerticalScrollPanel extends React.PureComponent< + VerticalScrollPanelProps +> { + public static defaultProps: Partial> = { + hideScrollbar: false, + }; + + public scrollRef = React.createRef(); + public childRefs = new Map(); + public childDimensions = new Map(); + + public handleScroll: React.UIEventHandler = throttle( + SCROLL_THROTTLE_INTERVAL, + () => { + this.reportVisibleChildren(); + } + ); + + public registerChild = (key: any, element: MeasurableChild | null) => { + if (element === null) { + this.childRefs.delete(key); + } else { + this.childRefs.set(key, element); + } + }; + + public updateChildDimensions = () => { + this.childDimensions = new Map( + sortDimensionsByTop( + Array.from(this.childRefs.entries()).reduce( + (accumulatedDimensions, [key, child]) => { + const currentOffsetRect = child.getOffsetRect(); + + if (currentOffsetRect !== null) { + accumulatedDimensions.push([key, currentOffsetRect]); + } + + return accumulatedDimensions; + }, + [] as Array<[any, Rect]> + ) + ) + ); + }; + + public getVisibleChildren = () => { + if (this.scrollRef.current === null || this.childDimensions.size <= 0) { + return; + } + + const { + childDimensions, + props: { height: scrollViewHeight }, + scrollRef: { + current: { scrollTop }, + }, + } = this; + + return getVisibleChildren(Array.from(childDimensions.entries()), scrollViewHeight, scrollTop); + }; + + public getScrollPosition = () => { + if (this.scrollRef.current === null) { + return; + } + + const { + props: { height: scrollViewHeight }, + scrollRef: { + current: { scrollHeight, scrollTop }, + }, + } = this; + + return { + pagesAbove: scrollTop / scrollViewHeight, + pagesBelow: (scrollHeight - scrollTop - scrollViewHeight) / scrollViewHeight, + }; + }; + + public reportVisibleChildren = () => { + const { onVisibleChildrenChange } = this.props; + const visibleChildren = this.getVisibleChildren(); + const scrollPosition = this.getScrollPosition(); + + if (!visibleChildren || !scrollPosition || typeof onVisibleChildrenChange !== 'function') { + return; + } + + onVisibleChildrenChange({ + bottomChild: visibleChildren.bottomChild, + middleChild: visibleChildren.middleChild, + topChild: visibleChildren.topChild, + ...scrollPosition, + }); + }; + + public centerTarget = (target: Child, offset?: number) => { + const { + props: { height: scrollViewHeight }, + childDimensions, + scrollRef, + } = this; + + if (scrollRef.current === null || !target || childDimensions.size <= 0) { + return; + } + + const targetDimensions = childDimensions.get(target); + + if (targetDimensions) { + const targetOffset = typeof offset === 'undefined' ? targetDimensions.height / 2 : offset; + scrollRef.current.scrollTop = targetDimensions.top + targetOffset - scrollViewHeight / 2; + } + }; + + public handleUpdatedChildren = (target: Child | undefined, offset: number | undefined) => { + this.updateChildDimensions(); + if (!!target) { + this.centerTarget(target, offset); + } + this.reportVisibleChildren(); + }; + + public componentDidMount() { + this.handleUpdatedChildren(this.props.target, undefined); + } + + public getSnapshotBeforeUpdate( + prevProps: VerticalScrollPanelProps + ): VerticalScrollPanelSnapshot { + if (prevProps.target !== this.props.target && this.props.target) { + return { + scrollOffset: undefined, + scrollTarget: this.props.target, + }; + } else { + const visibleChildren = this.getVisibleChildren(); + + if (visibleChildren) { + return { + scrollOffset: visibleChildren.middleChildOffset, + scrollTarget: visibleChildren.middleChild, + }; + } + } + + return { + scrollOffset: undefined, + scrollTarget: undefined, + }; + } + + public componentDidUpdate( + prevProps: VerticalScrollPanelProps, + prevState: {}, + snapshot: VerticalScrollPanelSnapshot + ) { + this.handleUpdatedChildren(snapshot.scrollTarget, snapshot.scrollOffset); + } + + public componentWillUnmount() { + this.childRefs.clear(); + } + + public render() { + const { children, height, width, hideScrollbar } = this.props; + const scrollbarOffset = hideScrollbar ? ASSUMED_SCROLLBAR_WIDTH : 0; + + return ( + + {typeof children === 'function' ? children(this.registerChild) : null} + + ); + } +} + +const ScrollPanelWrapper = styled.div.attrs<{ scrollbarOffset?: number }>({})` + overflow-x: hidden; + overflow-y: scroll; + position: relative; + padding-right: ${props => props.scrollbarOffset || 0}px; + + & * { + overflow-anchor: none; + } +`; + +const getVisibleChildren = ( + childDimensions: Array<[Child, Rect]>, + scrollViewHeight: number, + scrollTop: number +) => { + const middleChildIndex = Math.min( + getChildIndexBefore(childDimensions, scrollTop + scrollViewHeight / 2), + childDimensions.length - 1 + ); + + const topChildIndex = Math.min( + getChildIndexBefore(childDimensions, scrollTop, 0, middleChildIndex), + childDimensions.length - 1 + ); + + const bottomChildIndex = Math.min( + getChildIndexBefore(childDimensions, scrollTop + scrollViewHeight, middleChildIndex), + childDimensions.length - 1 + ); + + return { + bottomChild: childDimensions[bottomChildIndex][0], + bottomChildOffset: childDimensions[bottomChildIndex][1].top - scrollTop - scrollViewHeight, + middleChild: childDimensions[middleChildIndex][0], + middleChildOffset: scrollTop + scrollViewHeight / 2 - childDimensions[middleChildIndex][1].top, + topChild: childDimensions[topChildIndex][0], + topChildOffset: childDimensions[topChildIndex][1].top - scrollTop, + }; +}; + +const sortDimensionsByTop = sortBy<[any, Rect]>('1.top'); + +const getChildIndexBefore = bisector<[any, Rect], number>(([key, rect]) => rect.top + rect.height) + .left; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_wrap_controls.tsx b/x-pack/plugins/infra/public/components/logging/log_text_wrap_controls.tsx new file mode 100644 index 0000000000000..7500780961e74 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_text_wrap_controls.tsx @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFormRow, EuiSwitch } from '@elastic/eui'; +import * as React from 'react'; + +interface LogTextWrapControlsProps { + wrap: boolean; + setTextWrap: (scale: boolean) => any; +} + +export class LogTextWrapControls extends React.PureComponent { + public toggleWrap = () => { + this.props.setTextWrap(!this.props.wrap); + }; + + public render() { + const { wrap } = this.props; + + return ( + + + + ); + } +} diff --git a/x-pack/plugins/infra/public/components/logging/log_time_controls.tsx b/x-pack/plugins/infra/public/components/logging/log_time_controls.tsx new file mode 100644 index 0000000000000..9d719168bcb39 --- /dev/null +++ b/x-pack/plugins/infra/public/components/logging/log_time_controls.tsx @@ -0,0 +1,84 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiDatePicker, EuiFilterButton, EuiFilterGroup } from '@elastic/eui'; +import moment, { Moment } from 'moment'; +import React from 'react'; +import styled from 'styled-components'; + +const noop = () => undefined; + +interface LogTimeControlsProps { + currentTime: number | null; + startLiveStreaming: (interval: number) => any; + stopLiveStreaming: () => any; + isLiveStreaming: boolean; + jumpToTime: (time: number) => any; +} + +export class LogTimeControls extends React.PureComponent { + public render() { + const { currentTime, isLiveStreaming } = this.props; + + const currentMoment = currentTime ? moment(currentTime) : null; + + if (isLiveStreaming) { + return ( + + + + + + Stop streaming + + + ); + } else { + return ( + + + + + + Stream live + + + ); + } + } + + private handleChangeDate = (date: Moment | null) => { + if (date !== null) { + this.props.jumpToTime(date.valueOf()); + } + }; + + private startLiveStreaming = () => { + this.props.startLiveStreaming(5000); + }; + + private stopLiveStreaming = () => { + this.props.stopLiveStreaming(); + }; +} + +const InlineWrapper = styled.div` + display: inline-block; +`; diff --git a/x-pack/plugins/infra/public/components/metrics/index.tsx b/x-pack/plugins/infra/public/components/metrics/index.tsx new file mode 100644 index 0000000000000..c9475ef4a48f0 --- /dev/null +++ b/x-pack/plugins/infra/public/components/metrics/index.tsx @@ -0,0 +1,84 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiPageContentBody, EuiTitle } from '@elastic/eui'; +import React from 'react'; + +import { InfraMetricData } from '../../../common/graphql/types'; +import { InfraMetricLayout, InfraMetricLayoutSection } from '../../pages/metrics/layouts/types'; +import { metricTimeActions } from '../../store'; +import { InfraLoadingPanel } from '../loading'; +import { Section } from './section'; + +interface Props { + metrics: InfraMetricData[]; + layouts: InfraMetricLayout[]; + loading: boolean; + nodeName: string; + onChangeRangeTime?: (time: metricTimeActions.MetricRangeTimeState) => void; +} + +interface State { + crosshairValue: number | null; +} + +export class Metrics extends React.PureComponent { + public readonly state = { + crosshairValue: null, + }; + + public render() { + if (this.props.loading) { + return ( + + ); + } + return {this.props.layouts.map(this.renderLayout)}; + } + + private renderLayout = (layout: InfraMetricLayout) => { + return ( + + + +

      {`${layout.label} Overview`}

      +
      +
      + {layout.sections.map(this.renderSection(layout))} +
      + ); + }; + + private renderSection = (layout: InfraMetricLayout) => (section: InfraMetricLayoutSection) => { + let sectionProps = {}; + if (section.type === 'chart') { + const { onChangeRangeTime } = this.props; + sectionProps = { + onChangeRangeTime, + crosshairValue: this.state.crosshairValue, + onCrosshairUpdate: this.onCrosshairUpdate, + }; + } + return ( +
      + ); + }; + + private onCrosshairUpdate = (crosshairValue: number) => { + this.setState({ + crosshairValue, + }); + }; +} diff --git a/x-pack/plugins/infra/public/components/metrics/section.tsx b/x-pack/plugins/infra/public/components/metrics/section.tsx new file mode 100644 index 0000000000000..89170d053b3a9 --- /dev/null +++ b/x-pack/plugins/infra/public/components/metrics/section.tsx @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { InfraMetricData } from '../../../common/graphql/types'; +import { InfraMetricLayoutSection } from '../../pages/metrics/layouts/types'; +import { metricTimeActions } from '../../store'; +import { sections } from './sections'; + +interface Props { + section: InfraMetricLayoutSection; + metrics: InfraMetricData[]; + onChangeRangeTime?: (time: metricTimeActions.MetricRangeTimeState) => void; + crosshairValue?: number; + onCrosshairUpdate?: (crosshairValue: number) => void; +} + +export class Section extends React.PureComponent { + public render() { + const metric = this.props.metrics.find(m => m.id === this.props.section.id); + if (!metric) { + return null; + } + let sectionProps = {}; + if (this.props.section.type === 'chart') { + sectionProps = { + onChangeRangeTime: this.props.onChangeRangeTime, + crosshairValue: this.props.crosshairValue, + onCrosshairUpdate: this.props.onCrosshairUpdate, + }; + } + const Component = sections[this.props.section.type]; + return ; + } +} diff --git a/x-pack/plugins/infra/public/components/metrics/sections/chart_section.tsx b/x-pack/plugins/infra/public/components/metrics/sections/chart_section.tsx new file mode 100644 index 0000000000000..290656b707d78 --- /dev/null +++ b/x-pack/plugins/infra/public/components/metrics/sections/chart_section.tsx @@ -0,0 +1,236 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { EuiIcon, EuiPageContentBody, EuiTitle } from '@elastic/eui'; +import { + EuiAreaSeries, + EuiBarSeries, + EuiCrosshairX, + EuiDataPoint, + EuiLineSeries, + EuiSeriesChart, + EuiSeriesChartProps, + EuiSeriesProps, + EuiXAxis, + EuiYAxis, +} from '@elastic/eui/lib/experimental'; +import Color from 'color'; +import { get } from 'lodash'; +import moment from 'moment'; +import React, { ReactText } from 'react'; +import { InfraDataSeries, InfraMetricData } from '../../../../common/graphql/types'; +import { InfraFormatter, InfraFormatterType } from '../../../lib/lib'; +import { + InfraMetricLayoutSection, + InfraMetricLayoutVisualizationType, +} from '../../../pages/metrics/layouts/types'; +import { metricTimeActions } from '../../../store'; +import { createFormatter } from '../../../utils/formatters'; + +const MARGIN_LEFT = 60; +const chartComponentsByType = { + [InfraMetricLayoutVisualizationType.line]: EuiLineSeries, + [InfraMetricLayoutVisualizationType.area]: EuiAreaSeries, + [InfraMetricLayoutVisualizationType.bar]: EuiBarSeries, +}; + +interface Props { + section: InfraMetricLayoutSection; + metric: InfraMetricData; + onChangeRangeTime?: (time: metricTimeActions.MetricRangeTimeState) => void; + crosshairValue?: number; + onCrosshairUpdate?: (crosshairValue: number) => void; +} + +const isInfraMetricLayoutVisualizationType = ( + subject: any +): subject is InfraMetricLayoutVisualizationType => { + return InfraMetricLayoutVisualizationType[subject] != null; +}; + +const getChartName = (section: InfraMetricLayoutSection, seriesId: string) => { + return get(section, ['visConfig', 'seriesOverrides', seriesId, 'name'], seriesId); +}; + +const getChartColor = (section: InfraMetricLayoutSection, seriesId: string): string | undefined => { + const color = new Color( + get(section, ['visConfig', 'seriesOverrides', seriesId, 'color'], '#999') + ); + return color.hex().toString(); +}; + +const getChartType = (section: InfraMetricLayoutSection, seriesId: string) => { + const value = get(section, ['visConfig', 'type']); + const overrideValue = get(section, ['visConfig', 'seriesOverrides', seriesId, 'type']); + if (isInfraMetricLayoutVisualizationType(overrideValue)) { + return overrideValue; + } + if (isInfraMetricLayoutVisualizationType(value)) { + return value; + } + return InfraMetricLayoutVisualizationType.line; +}; + +const getFormatter = (formatter: InfraFormatterType, formatterTemplate: string) => ( + val: ReactText +) => { + if (val == null) { + return ''; + } + return createFormatter(formatter, formatterTemplate)(val); +}; + +const titleFormatter = (dataPoints: EuiDataPoint[]) => { + if (dataPoints.length > 0) { + const [firstDataPoint] = dataPoints; + const { originalValues } = firstDataPoint; + return { + title: , + value: moment(originalValues.x).format('lll'), + }; + } +}; + +const createItemsFormatter = ( + formatter: InfraFormatter, + labels: string[], + seriesColors: string[] +) => (dataPoints: EuiDataPoint[]) => { + return dataPoints.map(d => { + return { + title: ( + + + {labels[d.seriesIndex]} + + ), + value: formatter(d.y), + }; + }); +}; + +const seriesHasLessThen2DataPoints = (series: InfraDataSeries): boolean => { + return series.data.length < 2; +}; + +export class ChartSection extends React.PureComponent { + public render() { + const { crosshairValue, section, metric, onCrosshairUpdate } = this.props; + const { visConfig } = section; + const crossHairProps = { + crosshairValue, + onCrosshairUpdate, + }; + const chartProps: EuiSeriesChartProps = { + xType: 'time', + showCrosshair: false, + showDefaultAxis: false, + enableSelectionBrush: true, + onSelectionBrushEnd: this.handleSelectionBrushEnd, + }; + const stacked = visConfig && visConfig.stacked; + if (stacked) { + chartProps.stackBy = 'y'; + } + const bounds = visConfig && visConfig.bounds; + if (bounds) { + chartProps.yDomain = [bounds.min, bounds.max]; + } + if (!metric) { + chartProps.statusText = 'Missing data'; + } + if (metric.series.some(seriesHasLessThen2DataPoints)) { + chartProps.statusText = + 'Not enough data points to render chart, try increasing the time range.'; + } + const formatter = get(visConfig, 'formatter', InfraFormatterType.number); + const formatterTemplate = get(visConfig, 'formatterTemplate', '{{value}}'); + const formatterFunction = getFormatter(formatter, formatterTemplate); + const seriesLabels = get(metric, 'series', [] as InfraDataSeries[]).map(s => + getChartName(section, s.id) + ); + const seriesColors = get(metric, 'series', [] as InfraDataSeries[]).map( + s => getChartColor(section, s.id) || '' + ); + const itemsFormatter = createItemsFormatter(formatterFunction, seriesLabels, seriesColors); + return ( + + +

      {section.label}

      +
      +
      + + + + + {metric && + metric.series.map(series => { + if (!series || series.data.length < 2) { + return null; + } + const data = series.data.map(d => { + return { x: d.timestamp, y: d.value || 0, y0: 0 }; + }); + const chartType = getChartType(section, series.id); + const name = getChartName(section, series.id); + const seriesProps: EuiSeriesProps = { + data, + name, + lineSize: 2, + }; + const color = getChartColor(section, series.id); + if (color) { + seriesProps.color = color; + } + const EuiChartComponent = chartComponentsByType[chartType]; + return ( + + ); + })} + +
      +
      + ); + } + + private handleSelectionBrushEnd = (area: Area) => { + const { onChangeRangeTime } = this.props; + const { startX, endX } = area.domainArea; + if (onChangeRangeTime) { + onChangeRangeTime({ + to: endX.valueOf(), + from: startX.valueOf(), + } as metricTimeActions.MetricRangeTimeState); + } + }; +} + +interface DomainArea { + startX: moment.Moment; + endX: moment.Moment; + startY: number; + endY: number; +} + +interface DrawArea { + x0: number; + x1: number; + y0: number; + y1: number; +} + +interface Area { + domainArea: DomainArea; + drawArea: DrawArea; +} diff --git a/x-pack/plugins/infra/public/components/metrics/sections/gauges_section.tsx b/x-pack/plugins/infra/public/components/metrics/sections/gauges_section.tsx new file mode 100644 index 0000000000000..af58fe80230d4 --- /dev/null +++ b/x-pack/plugins/infra/public/components/metrics/sections/gauges_section.tsx @@ -0,0 +1,103 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiFlexItem, + EuiPageContentBody, + EuiPanel, + EuiProgress, + EuiSpacer, + EuiText, + EuiTitle, +} from '@elastic/eui'; +import { get, last, max } from 'lodash'; +import React, { ReactText } from 'react'; +import styled from 'styled-components'; +import { InfraMetricData } from '../../../../common/graphql/types'; +import { InfraFormatterType } from '../../../lib/lib'; +import { InfraMetricLayoutSection } from '../../../pages/metrics/layouts/types'; +import { createFormatter } from '../../../utils/formatters'; + +interface Props { + section: InfraMetricLayoutSection; + metric: InfraMetricData; +} + +const getFormatter = (section: InfraMetricLayoutSection, seriesId: string) => (val: ReactText) => { + if (val == null) { + return ''; + } + const defaultFormatter = get(section, ['visConfig', 'formatter'], InfraFormatterType.number); + const defaultFormatterTemplate = get(section, ['visConfig', 'formatterTemplate'], '{{value}}'); + const formatter = get( + section, + ['visConfig', 'seriesOverrides', seriesId, 'formatter'], + defaultFormatter + ); + const formatterTemplate = get( + section, + ['visConfig', 'seriesOverrides', seriesId, 'formatterTemplate'], + defaultFormatterTemplate + ); + return createFormatter(formatter, formatterTemplate)(val); +}; + +export class GaugesSection extends React.PureComponent { + public render() { + const { metric, section } = this.props; + return ( + + + + {metric.series.map(series => { + const lastDataPoint = last(series.data); + if (!lastDataPoint) { + return null; + } + const formatter = getFormatter(section, series.id); + const value = formatter(lastDataPoint.value || 0); + const name = get( + section, + ['visConfig', 'seriesOverrides', series.id, 'name'], + series.id + ); + const dataMax = max(series.data.map(d => d.value || 0)); + const gaugeMax = get( + section, + ['visConfig', 'seriesOverrides', series.id, 'gaugeMax'], + dataMax + ); + return ( + + + + {name} + + +

      {value}

      +
      + +
      +
      + ); + })} +
      + +
      + ); + } +} + +const GroupBox = styled.div` + display: flex; + flex-flow: row wrap; + justify-content: space-evenly; +`; diff --git a/x-pack/plugins/infra/public/components/metrics/sections/index.ts b/x-pack/plugins/infra/public/components/metrics/sections/index.ts new file mode 100644 index 0000000000000..7c12ff7520566 --- /dev/null +++ b/x-pack/plugins/infra/public/components/metrics/sections/index.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricLayoutSectionType } from '../../../pages/metrics/layouts/types'; +import { ChartSection } from './chart_section'; +import { GaugesSection } from './gauges_section'; + +export const sections = { + [InfraMetricLayoutSectionType.chart]: ChartSection, + [InfraMetricLayoutSectionType.gauges]: GaugesSection, +}; diff --git a/x-pack/plugins/infra/public/components/metrics/time_controls.tsx b/x-pack/plugins/infra/public/components/metrics/time_controls.tsx new file mode 100644 index 0000000000000..f9209fbb16ccd --- /dev/null +++ b/x-pack/plugins/infra/public/components/metrics/time_controls.tsx @@ -0,0 +1,209 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import moment, { Moment } from 'moment'; +import React from 'react'; +import styled from 'styled-components'; + +import { RangeDatePicker, RecentlyUsed } from '../range_date_picker'; + +import { metricTimeActions } from '../../store'; + +interface MetricsTimeControlsProps { + currentTimeRange: metricTimeActions.MetricRangeTimeState; + isLiveStreaming?: boolean; + onChangeRangeTime?: (time: metricTimeActions.MetricRangeTimeState) => void; + startLiveStreaming?: () => void; + stopLiveStreaming?: () => void; +} + +interface MetricsTimeControlsState { + showGoButton: boolean; + to: moment.Moment | undefined; + from: moment.Moment | undefined; + recentlyUsed: RecentlyUsed[]; +} + +export class MetricsTimeControls extends React.Component< + MetricsTimeControlsProps, + MetricsTimeControlsState +> { + public dateRangeRef: React.RefObject = React.createRef(); + public readonly state = { + showGoButton: false, + to: moment().millisecond(this.props.currentTimeRange.to), + from: moment().millisecond(this.props.currentTimeRange.from), + recentlyUsed: [], + }; + public render() { + const { currentTimeRange, isLiveStreaming } = this.props; + const { showGoButton, to, from, recentlyUsed } = this.state; + + const liveStreamingButton = ( + + + {isLiveStreaming ? ( + + Stop refreshing + + ) : ( + + Auto-refresh + + )} + + + Reset + + + ); + + const goColor = from && to && from > to ? 'danger' : 'primary'; + const appendButton = showGoButton ? ( + + + + Go + + + + Cancel + + + ) : ( + liveStreamingButton + ); + + return ( + + + {appendButton} + + ); + } + + private handleChangeDate = ( + from: Moment | undefined, + to: Moment | undefined, + search: boolean + ) => { + const { onChangeRangeTime } = this.props; + const duration = moment.duration(from && to ? from.diff(to) : 0); + const milliseconds = duration.asMilliseconds(); + if (to && from && onChangeRangeTime && search && to > from) { + this.setState({ + showGoButton: false, + to, + from, + }); + onChangeRangeTime({ + to: to && to.valueOf(), + from: from && from.valueOf(), + } as metricTimeActions.MetricRangeTimeState); + } else if (milliseconds !== 0) { + this.setState({ + showGoButton: true, + to, + from, + }); + } + }; + + private searchRangeTime = () => { + const { onChangeRangeTime } = this.props; + const { to, from, recentlyUsed } = this.state; + if (to && from && onChangeRangeTime && to > from) { + this.setState({ + ...this.state, + showGoButton: false, + recentlyUsed: [ + ...recentlyUsed, + ...[ + { + type: 'date-range', + text: [from.format('L LTS'), to.format('L LTS')], + }, + ], + ], + }); + onChangeRangeTime({ + to: to.valueOf(), + from: from.valueOf(), + } as metricTimeActions.MetricRangeTimeState); + } + }; + + private startLiveStreaming = () => { + const { startLiveStreaming } = this.props; + + if (startLiveStreaming) { + startLiveStreaming(); + } + }; + + private stopLiveStreaming = () => { + const { stopLiveStreaming } = this.props; + + if (stopLiveStreaming) { + stopLiveStreaming(); + } + }; + + private cancelSearch = () => { + const { onChangeRangeTime } = this.props; + const to = moment(this.props.currentTimeRange.to); + const from = moment(this.props.currentTimeRange.from); + + this.setState({ + ...this.state, + showGoButton: false, + to, + from, + }); + this.dateRangeRef.current.resetRangeDate(from, to); + if (onChangeRangeTime) { + onChangeRangeTime({ + to: to && to.valueOf(), + from: from && from.valueOf(), + } as metricTimeActions.MetricRangeTimeState); + } + }; + + private resetSearch = () => { + const { onChangeRangeTime } = this.props; + const to = moment(); + const from = moment().subtract(1, 'hour'); + if (onChangeRangeTime) { + onChangeRangeTime({ + to: to.valueOf(), + from: from.valueOf(), + } as metricTimeActions.MetricRangeTimeState); + } + }; +} +const MetricsTimeControlsContainer = styled.div` + display: flex; + justify-content: right; + flex-flow: row wrap; + & > div:first-child { + margin-right: 0.5rem; + } +`; diff --git a/x-pack/plugins/infra/public/components/page.tsx b/x-pack/plugins/infra/public/components/page.tsx new file mode 100644 index 0000000000000..c4b608e2e9c64 --- /dev/null +++ b/x-pack/plugins/infra/public/components/page.tsx @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiPage } from '@elastic/eui'; +import styled from 'styled-components'; + +export const ColumnarPage = styled.div` + display: flex; + flex-direction: column; + align-items: stretch; + flex: 1 0 0%; +`; + +export const PageContent = styled.div` + flex: 1 0 0%; + display: flex; + flex-direction: row; + background-color: ${props => props.theme.eui.euiColorEmptyShade}; +`; + +export const FlexPage = styled(EuiPage)` + flex: 1 0 0%; +`; diff --git a/x-pack/plugins/infra/public/components/range_date_picker/index.tsx b/x-pack/plugins/infra/public/components/range_date_picker/index.tsx new file mode 100644 index 0000000000000..698b8fde1af72 --- /dev/null +++ b/x-pack/plugins/infra/public/components/range_date_picker/index.tsx @@ -0,0 +1,416 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { find } from 'lodash'; +import moment from 'moment'; +import React, { Fragment } from 'react'; + +import { + EuiButton, + EuiButtonEmpty, + EuiDatePicker, + EuiDatePickerRange, + EuiFieldNumber, + EuiFlexGrid, + EuiFlexGroup, + EuiFlexItem, + EuiFormControlLayout, + EuiFormRow, + EuiHorizontalRule, + EuiIcon, + EuiLink, + EuiPopover, + EuiSelect, + EuiSpacer, + EuiText, + EuiTitle, +} from '@elastic/eui'; + +const commonDates = [ + 'Today', + 'Yesterday', + 'This week', + 'Week to date', + 'This month', + 'Month to date', + 'This year', + 'Year to date', +]; + +interface RangeDatePickerProps { + startDate: moment.Moment | undefined; + endDate: moment.Moment | undefined; + onChangeRangeTime: ( + from: moment.Moment | undefined, + to: moment.Moment | undefined, + search: boolean + ) => void; + recentlyUsed: RecentlyUsed[]; + disabled?: boolean; + isLoading?: boolean; + ref?: React.RefObject; +} + +export interface RecentlyUsed { + type: string; + text: string | string[]; +} + +interface RangeDatePickerState { + startDate: moment.Moment | undefined; + endDate: moment.Moment | undefined; + isPopoverOpen: boolean; + recentlyUsed: RecentlyUsed[]; + quickSelectTime: number; + quickSelectUnit: string; +} + +export class RangeDatePicker extends React.PureComponent< + RangeDatePickerProps, + RangeDatePickerState +> { + public readonly state = { + startDate: this.props.startDate, + endDate: this.props.endDate, + isPopoverOpen: false, + recentlyUsed: [], + quickSelectTime: 1, + quickSelectUnit: 'hours', + }; + + public render() { + const { isLoading, disabled } = this.props; + const { startDate, endDate } = this.state; + const quickSelectButton = ( + + + + ); + + const commonlyUsed = this.renderCommonlyUsed(commonDates); + const recentlyUsed = this.renderRecentlyUsed([ + ...this.state.recentlyUsed, + ...this.props.recentlyUsed, + ]); + + const quickSelectPopover = ( + +
      + {this.renderQuickSelect()} + + {commonlyUsed} + + {recentlyUsed} +
      +
      + ); + + return ( + + endDate : false} + fullWidth + aria-label="Start date" + disabled={disabled} + shouldCloseOnSelect + showTimeSelect + /> + } + endDateControl={ + endDate : false} + fullWidth + disabled={disabled} + isLoading={isLoading} + aria-label="End date" + shouldCloseOnSelect + showTimeSelect + popperPlacement="top-end" + /> + } + /> + + ); + } + + public resetRangeDate(startDate: moment.Moment, endDate: moment.Moment) { + this.setState({ + ...this.state, + startDate, + endDate, + }); + } + + private handleChangeStart = (date: moment.Moment | null) => { + if (date && this.state.startDate !== date) { + this.props.onChangeRangeTime(date, this.state.endDate, false); + this.setState({ + startDate: date, + }); + } + }; + + private handleChangeEnd = (date: moment.Moment | null) => { + if (date && this.state.endDate !== date) { + this.props.onChangeRangeTime(this.state.startDate, date, false); + this.setState({ + endDate: date, + }); + } + }; + + private onButtonClick = () => { + this.setState({ + isPopoverOpen: !this.state.isPopoverOpen, + }); + }; + + private closePopover = (type: string, from?: string, to?: string) => { + const { startDate, endDate, recentlyUsed } = this.managedStartEndDateFromType(type, from, to); + this.setState( + { + ...this.state, + isPopoverOpen: false, + startDate, + endDate, + recentlyUsed, + }, + () => { + if (type) { + this.props.onChangeRangeTime(startDate, endDate, true); + } + } + ); + }; + + private managedStartEndDateFromType(type: string, from?: string, to?: string) { + let { startDate, endDate } = this.state; + let recentlyUsed: RecentlyUsed[] = this.state.recentlyUsed; + let textJustUsed = type; + + if (type === 'quick-select') { + textJustUsed = `Last ${this.state.quickSelectTime} ${singularize( + this.state.quickSelectUnit, + this.state.quickSelectTime + )}`; + startDate = moment().subtract(this.state.quickSelectTime, this.state + .quickSelectUnit as moment.unitOfTime.DurationConstructor); + endDate = moment(); + } else if (type === 'Today') { + startDate = moment().startOf('day'); + endDate = moment() + .startOf('day') + .add(24, 'hour'); + } else if (type === 'Yesterday') { + startDate = moment() + .subtract(1, 'day') + .startOf('day'); + endDate = moment() + .subtract(1, 'day') + .startOf('day') + .add(24, 'hour'); + } else if (type === 'This week') { + startDate = moment().startOf('week'); + endDate = moment() + .startOf('week') + .add(1, 'week'); + } else if (type === 'Week to date') { + startDate = moment().subtract(1, 'week'); + endDate = moment(); + } else if (type === 'This month') { + startDate = moment().startOf('month'); + endDate = moment() + .startOf('month') + .add(1, 'month'); + } else if (type === 'Month to date') { + startDate = moment().subtract(1, 'month'); + endDate = moment(); + } else if (type === 'This year') { + startDate = moment().startOf('year'); + endDate = moment() + .startOf('year') + .add(1, 'year'); + } else if (type === 'Year to date') { + startDate = moment().subtract(1, 'year'); + endDate = moment(); + } else if (type === 'date-range' && to && from) { + startDate = moment(from); + endDate = moment(to); + } + + if (textJustUsed !== undefined && !find(recentlyUsed, ['text', textJustUsed])) { + recentlyUsed.unshift({ type, text: textJustUsed }); + recentlyUsed = recentlyUsed.slice(0, 5); + } + + return { + startDate, + endDate, + recentlyUsed, + }; + } + + private renderQuickSelect = () => { + const lastOptions = [ + { value: 'seconds', text: singularize('seconds', this.state.quickSelectTime) }, + { value: 'minutes', text: singularize('minutes', this.state.quickSelectTime) }, + { value: 'hours', text: singularize('hours', this.state.quickSelectTime) }, + { value: 'days', text: singularize('days', this.state.quickSelectTime) }, + { value: 'weeks', text: singularize('weeks', this.state.quickSelectTime) }, + { value: 'months', text: singularize('months', this.state.quickSelectTime) }, + { value: 'years', text: singularize('years', this.state.quickSelectTime) }, + ]; + + return ( + + + Quick select + + + + + + Last + + + + + { + this.onChange('quickSelectTime', arg); + }} + /> + + + + + { + this.onChange('quickSelectUnit', arg); + }} + /> + + + + + this.closePopover('quick-select')} style={{ minWidth: 0 }}> + Apply + + + + + + ); + }; + + private onChange = (stateType: string, args: any) => { + let value = args.currentTarget.value; + + if (stateType === 'quickSelectTime' && value !== '') { + value = parseInt(args.currentTarget.value, 10); + } + this.setState({ + ...this.state, + [stateType]: value, + }); + }; + + private renderCommonlyUsed = (recentlyCommonDates: string[]) => { + const links = recentlyCommonDates.map(date => { + return ( + + this.closePopover(date)}>{date} + + ); + }); + + return ( + + + Commonly used + + + + + {links} + + + + ); + }; + + private renderRecentlyUsed = (recentDates: RecentlyUsed[]) => { + const links = recentDates.map((date: RecentlyUsed) => { + let dateRange; + let dateLink = ( + this.closePopover(date.type)}>{dateRange || date.text} + ); + if (typeof date.text !== 'string') { + dateRange = `${date.text[0]} – ${date.text[1]}`; + dateLink = ( + this.closePopover(date.type, date.text[0], date.text[1])}> + {dateRange || date.type} + + ); + } + + return ( + + {dateLink} + + ); + }); + + return ( + + + Recently used date ranges + + + + + {links} + + + + ); + }; +} + +const singularize = (str: string, qty: number) => (qty === 1 ? str.slice(0, -1) : str); diff --git a/x-pack/plugins/infra/public/components/waffle/gradient_legend.tsx b/x-pack/plugins/infra/public/components/waffle/gradient_legend.tsx new file mode 100644 index 0000000000000..24ec7bafd391f --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/gradient_legend.tsx @@ -0,0 +1,100 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import styled from 'styled-components'; +import { + InfraFormatter, + InfraWaffleMapBounds, + InfraWaffleMapGradientLegend, + InfraWaffleMapGradientRule, +} from '../../lib/lib'; + +interface Props { + legend: InfraWaffleMapGradientLegend; + bounds: InfraWaffleMapBounds; + formatter: InfraFormatter; +} + +const createTickRender = (bounds: InfraWaffleMapBounds, formatter: InfraFormatter) => ( + rule: InfraWaffleMapGradientRule, + index: number +) => { + const value = rule.value === 0 ? bounds.min : bounds.max * rule.value; + const style = { left: `${rule.value * 100}%` }; + const label = formatter(value); + return ( + + + {label} + + ); +}; + +export const GradientLegend: React.SFC = ({ legend, bounds, formatter }) => { + const maxValue = legend.rules.reduce((acc, rule) => { + return acc < rule.value ? rule.value : acc; + }, 0); + const colorStops = legend.rules.map(rule => { + const percent = (rule.value / maxValue) * 100; + return `${rule.color} ${percent}%`; + }); + const style = { + background: `linear-gradient(to right, ${colorStops})`, + }; + return ( + + {legend.rules.map(createTickRender(bounds, formatter))} + + ); +}; + +const GradientLegendContainer = styled.div` + position: absolute; + height: 10px; + bottom: 0; + left: 0; + right: 0; +`; + +const GradientLegendTick = styled.div` + position: absolute; + bottom: 0; + top: -18px; +`; + +const GradientLegendTickLine = styled.div` + position: absolute; + background-color: ${props => props.theme.eui.euiBorderColor}; + width: 1px; + left: 0; + top: 15px; + bottom: 0; + ${GradientLegendTick}:first-child { + top: 2px; + } + ${GradientLegendTick}:last-child { + top: 2px; + } +`; + +const GradientLegendTickLabel = styled.div` + position: absolute; + font-size: 11px; + text-align: center; + top: 0; + left: 0; + white-space: nowrap; + transform: translate(-50%, 0); + ${GradientLegendTick}:first-child & { + padding-left: 5px; + transform: translate(0, 0); + } + ${GradientLegendTick}:last-child & { + padding-right: 5px; + transform: translate(-100%, 0); + } +`; diff --git a/x-pack/plugins/infra/public/components/waffle/group_name.tsx b/x-pack/plugins/infra/public/components/waffle/group_name.tsx new file mode 100644 index 0000000000000..5e4cd29a65f48 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/group_name.tsx @@ -0,0 +1,102 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { EuiLink, EuiToolTip } from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; +import { InfraPathType } from '../../../common/graphql/types'; +import { InfraWaffleMapGroup, InfraWaffleMapOptions } from '../../lib/lib'; + +interface Props { + onDrilldown: (filter: string) => void; + group: InfraWaffleMapGroup; + isChild?: boolean; + options: InfraWaffleMapOptions; +} + +export class GroupName extends React.PureComponent { + public render() { + const { group, isChild } = this.props; + const linkStyle = { + fontSize: isChild ? '0.85em' : '1em', + }; + return ( + + + + + + {group.name} + + + + {group.count} + + + ); + } + + private handleClick = (event: React.MouseEvent) => { + event.preventDefault(); + const { groupBy } = this.props.options; + // When groupBy is empty that means there is nothing todo so let's just do nothing. + if (groupBy.length === 0) { + return; + } + const currentPath = this.props.isChild && groupBy.length > 1 ? groupBy[1] : groupBy[0]; + if (currentPath.type === InfraPathType.terms && currentPath.field) { + this.props.onDrilldown(`${currentPath.field}: "${this.props.group.name}"`); + } + if (currentPath.type === InfraPathType.filters && currentPath.filters) { + const currentFilter = currentPath.filters.find(f => f.label === this.props.group.name); + if (currentFilter) { + this.props.onDrilldown(currentFilter.query); + } + } + }; +} + +const GroupNameContainer = styled.div` + position: relative; + text-align: center + font-size: 16px; + margin-bottom: 5px; + top: 20px; + display: flex; + justify-content: center; + padding: 0 10px; +`; + +interface InnerProps { + isChild?: boolean; +} + +const Inner = styled('div')` + border: 1px solid ${props => props.theme.eui.euiBorderColor}; + background-color: ${props => + props.isChild ? props.theme.eui.euiColorLightestShade : props.theme.eui.euiColorEmptyShade}; + border-radius: 4px; + box-shadow: 0px 2px 0px 0px ${props => props.theme.eui.euiBorderColor}; + display: flex; + align-items: center; + justify-content: center; + overflow: hidden; +`; + +const Name = styled.div` + flex: 1 1 auto; + padding: 6px 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +`; + +const Count = styled.div` + flex: 0 0 auto; + border-left: 1px solid ${props => props.theme.eui.euiBorderColor}; + padding: 6px 10px; + font-size: 0.85em; + font-weight: normal; +`; diff --git a/x-pack/plugins/infra/public/components/waffle/group_of_groups.tsx b/x-pack/plugins/infra/public/components/waffle/group_of_groups.tsx new file mode 100644 index 0000000000000..a835bd4355168 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/group_of_groups.tsx @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import styled from 'styled-components'; +import { InfraNodeType, InfraTimerangeInput } from '../../../common/graphql/types'; +import { + InfraWaffleMapBounds, + InfraWaffleMapGroupOfGroups, + InfraWaffleMapOptions, +} from '../../lib/lib'; +import { GroupName } from './group_name'; +import { GroupOfNodes } from './group_of_nodes'; + +interface Props { + onDrilldown: (filter: string) => void; + options: InfraWaffleMapOptions; + group: InfraWaffleMapGroupOfGroups; + formatter: (val: number) => string; + bounds: InfraWaffleMapBounds; + nodeType: InfraNodeType; + timeRange: InfraTimerangeInput; +} + +export const GroupOfGroups: React.SFC = props => { + return ( + + + + {props.group.groups.map(group => ( + + ))} + + + ); +}; + +const GroupOfGroupsContainer = styled.div` + margin: 0 10px; +`; + +const Groups = styled.div` + display: flex; + background-color: rgba(0, 0, 0, 0.05); + flex-wrap: wrap; + justify-content: center; + padding: 20px 10px 10px; + border-radius: 4px; + border: 1px solid ${props => props.theme.eui.euiBorderColor}; + box-shadow: 0 1px 7px rgba(0, 0, 0, 0.1); +`; diff --git a/x-pack/plugins/infra/public/components/waffle/group_of_nodes.tsx b/x-pack/plugins/infra/public/components/waffle/group_of_nodes.tsx new file mode 100644 index 0000000000000..613c958c76836 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/group_of_nodes.tsx @@ -0,0 +1,74 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import styled from 'styled-components'; +import { InfraNodeType, InfraTimerangeInput } from '../../../common/graphql/types'; +import { + InfraWaffleMapBounds, + InfraWaffleMapGroupOfNodes, + InfraWaffleMapOptions, +} from '../../lib/lib'; +import { GroupName } from './group_name'; +import { Node } from './node'; + +interface Props { + onDrilldown: (filter: string) => void; + options: InfraWaffleMapOptions; + group: InfraWaffleMapGroupOfNodes; + formatter: (val: number) => string; + isChild: boolean; + bounds: InfraWaffleMapBounds; + nodeType: InfraNodeType; + timeRange: InfraTimerangeInput; +} + +export const GroupOfNodes: React.SFC = ({ + group, + options, + formatter, + onDrilldown, + isChild = false, + bounds, + nodeType, + timeRange, +}) => { + const width = group.width > 200 ? group.width : 200; + return ( + + + + {group.nodes.map(node => ( + + ))} + + + ); +}; + +const GroupOfNodesContainer = styled.div` + margin: 0 10px; +`; + +const Nodes = styled.div` + display: flex; + background-color: rgba(0, 0, 0, 0.05); + flex-wrap: wrap; + justify-content: center; + padding: 20px 10px 10px; + border-radius: 4px; + border: 1px solid ${props => props.theme.eui.euiBorderColor}; + box-shadow: 0 1px 7px rgba(0, 0, 0, 0.1); +`; diff --git a/x-pack/plugins/infra/public/components/waffle/index.tsx b/x-pack/plugins/infra/public/components/waffle/index.tsx new file mode 100644 index 0000000000000..bf72fc86b412b --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/index.tsx @@ -0,0 +1,228 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { EuiButton, EuiEmptyPrompt } from '@elastic/eui'; +import { get, max, min } from 'lodash'; +import React from 'react'; +import styled from 'styled-components'; +import { InfraMetricType, InfraNodeType, InfraTimerangeInput } from '../../../common/graphql/types'; +import { + isWaffleMapGroupWithGroups, + isWaffleMapGroupWithNodes, +} from '../../containers/waffle/type_guards'; +import { + InfraFormatterType, + InfraWaffleData, + InfraWaffleMapBounds, + InfraWaffleMapGroup, + InfraWaffleMapOptions, +} from '../../lib/lib'; +import { KueryFilterQuery } from '../../store/local/waffle_filter'; +import { createFormatter } from '../../utils/formatters'; +import { AutoSizer } from '../auto_sizer'; +import { InfraLoadingPanel } from '../loading'; +import { GroupOfGroups } from './group_of_groups'; +import { GroupOfNodes } from './group_of_nodes'; +import { Legend } from './legend'; +import { applyWaffleMapLayout } from './lib/apply_wafflemap_layout'; + +interface Props { + options: InfraWaffleMapOptions; + nodeType: InfraNodeType; + map: InfraWaffleData; + loading: boolean; + reload: () => void; + onDrilldown: (filter: KueryFilterQuery) => void; + timeRange: InfraTimerangeInput; +} + +interface MetricFormatter { + formatter: InfraFormatterType; + template: string; + bounds?: { min: number; max: number }; +} + +interface MetricFormatters { + [key: string]: MetricFormatter; +} + +const METRIC_FORMATTERS: MetricFormatters = { + [InfraMetricType.count]: { formatter: InfraFormatterType.number, template: '{{value}}' }, + [InfraMetricType.cpu]: { + formatter: InfraFormatterType.percent, + template: '{{value}}', + bounds: { min: 0, max: 1 }, + }, + [InfraMetricType.memory]: { + formatter: InfraFormatterType.percent, + template: '{{value}}', + bounds: { min: 0, max: 1 }, + }, + [InfraMetricType.rx]: { formatter: InfraFormatterType.bits, template: '{{value}}/s' }, + [InfraMetricType.tx]: { formatter: InfraFormatterType.bits, template: '{{value}}/s' }, + [InfraMetricType.logRate]: { + formatter: InfraFormatterType.abbreviatedNumber, + template: '{{value}}/s', + }, +}; + +const extractValuesFromMap = (groups: InfraWaffleMapGroup[], values: number[] = []): number[] => { + return groups.reduce((acc: number[], group: InfraWaffleMapGroup) => { + if (isWaffleMapGroupWithGroups(group)) { + return acc.concat(extractValuesFromMap(group.groups, values)); + } + if (isWaffleMapGroupWithNodes(group)) { + return acc.concat( + group.nodes.map(node => { + return node.metric.value || 0; + }) + ); + } + return acc; + }, values); +}; + +const calculateBoundsFromMap = (map: InfraWaffleData): InfraWaffleMapBounds => { + const values = extractValuesFromMap(map); + return { min: min(values), max: max(values) }; +}; + +export class Waffle extends React.Component { + public render() { + const { loading, map, reload, timeRange } = this.props; + if (loading) { + return ; + } else if (!loading && map && map.length === 0) { + return ( + There is no data to display.} + titleSize="m" + body={

      Try adjusting your time or filter.

      } + actions={ + { + reload(); + }} + > + Check for new data + + } + data-test-subj="noMetricsDataPrompt" + /> + ); + } + const { metric } = this.props.options; + const metricFormatter = get( + METRIC_FORMATTERS, + metric.type, + METRIC_FORMATTERS[InfraMetricType.count] + ); + const bounds = (metricFormatter && metricFormatter.bounds) || calculateBoundsFromMap(map); + return ( + + {({ measureRef, content: { width = 0, height = 0 } }) => { + const groupsWithLayout = applyWaffleMapLayout(map, width, height); + return ( + measureRef(el)} + data-test-subj="waffleMap" + > + + {groupsWithLayout.map(this.renderGroup(bounds, timeRange))} + + + + ); + }} + + ); + } + + // TODO: Change this to a real implimentation using the tickFormatter from the prototype as an example. + private formatter = (val: string | number) => { + const { metric } = this.props.options; + const metricFormatter = get( + METRIC_FORMATTERS, + metric.type, + METRIC_FORMATTERS[InfraMetricType.count] + ); + if (val == null) { + return ''; + } + const formatter = createFormatter(metricFormatter.formatter, metricFormatter.template); + return formatter(val); + }; + + private handleDrilldown = (filter: string) => { + this.props.onDrilldown({ + kind: 'kuery', + expression: filter, + }); + return; + }; + + private renderGroup = (bounds: InfraWaffleMapBounds, timeRange: InfraTimerangeInput) => ( + group: InfraWaffleMapGroup + ) => { + if (isWaffleMapGroupWithGroups(group)) { + return ( + + ); + } + if (isWaffleMapGroupWithNodes(group)) { + return ( + + ); + } + }; +} + +const WaffleMapOuterContiner = styled.div` + flex: 1 0 0%; + display: flex; + justify-content: center; + flex-direction: column; + overflow-x: hidden; + overflow-y: auto; +`; + +const WaffleMapInnerContainer = styled.div` + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + align-content: flex-start; + padding: 10px; +`; + +const CenteredEmptyPrompt = styled(EuiEmptyPrompt)` + align-self: center; +`; diff --git a/x-pack/plugins/infra/public/components/waffle/legend.tsx b/x-pack/plugins/infra/public/components/waffle/legend.tsx new file mode 100644 index 0000000000000..2ce97372a9726 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/legend.tsx @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import React from 'react'; +import styled from 'styled-components'; +import { InfraFormatter, InfraWaffleMapBounds, InfraWaffleMapLegend } from '../../lib/lib'; +import { GradientLegend } from './gradient_legend'; +import { isInfraWaffleMapGradientLegend, isInfraWaffleMapStepLegend } from './lib/type_guards'; +import { StepLegend } from './steps_legend'; +interface Props { + legend: InfraWaffleMapLegend; + bounds: InfraWaffleMapBounds; + formatter: InfraFormatter; +} + +export const Legend: React.SFC = ({ legend, bounds, formatter }) => { + return ( + + {isInfraWaffleMapGradientLegend(legend) && ( + + )} + {isInfraWaffleMapStepLegend(legend) && } + + ); +}; + +const LegendContainer = styled.div` + position: absolute; + bottom: 10px; + left: 10px; + right: 10px; +`; diff --git a/x-pack/plugins/infra/public/components/waffle/lib/apply_wafflemap_layout.ts b/x-pack/plugins/infra/public/components/waffle/lib/apply_wafflemap_layout.ts new file mode 100644 index 0000000000000..5f3c06fcfbba7 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/lib/apply_wafflemap_layout.ts @@ -0,0 +1,106 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { first, sortBy } from 'lodash'; +import { + isWaffleMapGroupWithGroups, + isWaffleMapGroupWithNodes, +} from '../../../containers/waffle/type_guards'; +import { InfraWaffleMapGroup } from '../../../lib/lib'; +import { sizeOfSquares } from './size_of_squares'; + +export function getColumns(n: number, w = 1, h = 1) { + const pageRatio = w / h; + const ratio = pageRatio > 1.2 ? 1.2 : pageRatio; + const width = Math.ceil(Math.sqrt(n)); + return Math.ceil(width * ratio); +} + +export function getTotalItems(groups: InfraWaffleMapGroup[]) { + if (!groups) { + return 0; + } + return groups.reduce((acc, group) => { + if (isWaffleMapGroupWithGroups(group)) { + return group.groups.reduce((total, subGroup) => subGroup.nodes.length + total, acc); + } + if (isWaffleMapGroupWithNodes(group)) { + return group.nodes.length + acc; + } + return acc; + }, 0); +} + +export function getLargestCount(groups: InfraWaffleMapGroup[]) { + if (!groups) { + return 0; + } + return groups.reduce((total, group) => { + if (isWaffleMapGroupWithGroups(group)) { + return group.groups.reduce((subTotal, subGroup) => { + if (isWaffleMapGroupWithNodes(subGroup)) { + return subTotal > subGroup.nodes.length ? subTotal : subGroup.nodes.length; + } + return subTotal; + }, total); + } + if (isWaffleMapGroupWithNodes(group)) { + return total > group.nodes.length ? total : group.nodes.length; + } + return total; + }, 0); +} + +const getTotalItemsOfGroup = (group: InfraWaffleMapGroup): number => getTotalItems([group]); + +export function applyWaffleMapLayout( + groups: InfraWaffleMapGroup[], + width: number, + height: number +): InfraWaffleMapGroup[] { + if (groups.length === 0) { + return []; + } + const levels = isWaffleMapGroupWithGroups(first(groups)) ? 2 : 1; + const totalItems = getTotalItems(groups); + const squareSize = Math.round(sizeOfSquares(width, height, totalItems, levels)); + const largestCount = getLargestCount(groups); + return sortBy(groups, getTotalItemsOfGroup) + .reverse() + .map(group => { + if (isWaffleMapGroupWithGroups(group)) { + const columns = getColumns(largestCount, width, height); + const groupOfNodes = group.groups; + const subGroups = sortBy(groupOfNodes, getTotalItemsOfGroup) + .reverse() + .filter(isWaffleMapGroupWithNodes) + .map(subGroup => { + return { + ...subGroup, + count: subGroup.nodes.length, + columns, + width: columns * squareSize, + squareSize, + }; + }); + return { + ...group, + groups: subGroups, + count: getTotalItems([group]), + squareSize, + }; + } + if (isWaffleMapGroupWithNodes(group)) { + const columns = getColumns(Math.max(group.nodes.length, largestCount), width, height); + return { + ...group, + count: group.nodes.length, + squareSize, + width: columns * squareSize, + }; + } + return group; + }); +} diff --git a/x-pack/plugins/infra/public/components/waffle/lib/color_from_value.ts b/x-pack/plugins/infra/public/components/waffle/lib/color_from_value.ts new file mode 100644 index 0000000000000..c6bfd45502f3d --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/lib/color_from_value.ts @@ -0,0 +1,88 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { eq, first, gt, gte, last, lt, lte, sortBy } from 'lodash'; +import { mix } from 'polished'; +import { + InfraWaffleMapBounds, + InfraWaffleMapGradientLegend, + InfraWaffleMapLegend, + InfraWaffleMapRuleOperator, + InfraWaffleMapStepLegend, +} from '../../../lib/lib'; +import { isInfraWaffleMapGradientLegend, isInfraWaffleMapStepLegend } from './type_guards'; + +const OPERATOR_TO_FN = { + [InfraWaffleMapRuleOperator.eq]: eq, + [InfraWaffleMapRuleOperator.lt]: lt, + [InfraWaffleMapRuleOperator.lte]: lte, + [InfraWaffleMapRuleOperator.gte]: gte, + [InfraWaffleMapRuleOperator.gt]: gt, +}; + +export const colorFromValue = ( + legend: InfraWaffleMapLegend, + value: number | string, + bounds: InfraWaffleMapBounds, + defaultColor = 'rgba(0, 179, 164, 1)' +): string => { + if (isInfraWaffleMapStepLegend(legend)) { + return calculateStepColor(legend, value, defaultColor); + } + if (isInfraWaffleMapGradientLegend(legend)) { + return calculateGradientColor(legend, value, bounds, defaultColor); + } + return defaultColor; +}; + +const normalizeValue = (min: number, max: number, value: number): number => { + return (value - min) / (max - min); +}; + +export const calculateStepColor = ( + legend: InfraWaffleMapStepLegend, + value: number | string, + defaultColor = 'rgba(0, 179, 164, 1)' +): string => { + return sortBy(legend.rules, 'sortBy').reduce((color: string, rule) => { + const operatorFn = OPERATOR_TO_FN[rule.operator]; + if (operatorFn(value, rule.value)) { + return rule.color; + } + return color; + }, defaultColor); +}; + +export const calculateGradientColor = ( + legend: InfraWaffleMapGradientLegend, + value: number | string, + bounds: InfraWaffleMapBounds, + defaultColor = 'rgba(0, 179, 164, 1)' +): string => { + if (legend.rules.length === 0) { + return defaultColor; + } + if (legend.rules.length === 1) { + return last(legend.rules).color; + } + const { min, max } = bounds; + const sortedRules = sortBy(legend.rules, 'value'); + const normValue = normalizeValue(min, max, Number(value)); + const startRule = sortedRules.reduce((acc, rule) => { + if (rule.value <= normValue) { + return rule; + } + return acc; + }, first(sortedRules)); + const endRule = sortedRules.filter(r => r !== startRule).find(r => r.value >= normValue); + if (!endRule) { + return startRule.color; + } + + const mixValue = normalizeValue(startRule.value, endRule.value, normValue); + + return mix(mixValue, endRule.color, startRule.color); +}; diff --git a/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts b/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts new file mode 100644 index 0000000000000..d96a376d50581 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/lib/size_of_squares.ts @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const SCALE_FACTOR = 0.6; +export const MAX_SIZE = Infinity; +export const MIN_SIZE = 24; + +export function sizeOfSquares( + width: number, + height: number, + totalItems: number, + levels = 1 +): number { + const levelFactor = levels > 1 ? levels * 0.7 : 1; + const scale = SCALE_FACTOR / levelFactor; + const x = width * scale; + const y = height * scale; + const possibleX = Math.ceil(Math.sqrt((totalItems * x) / y)); + let newX; + let newY; + if (Math.floor((possibleX * y) / x) * possibleX < totalItems) { + newX = y / Math.ceil((possibleX * y) / x); + } else { + newX = x / possibleX; + } + const possibleY = Math.ceil(Math.sqrt((totalItems * y) / x)); + if (Math.floor((possibleY * x) / y) * possibleY < totalItems) { + // does not fit + newY = x / Math.ceil((x * possibleY) / y); + } else { + newY = y / possibleY; + } + const size = Math.max(newX, newY); + return Math.min(Math.max(size, MIN_SIZE), MAX_SIZE); +} diff --git a/x-pack/plugins/infra/public/components/waffle/lib/type_guards.ts b/x-pack/plugins/infra/public/components/waffle/lib/type_guards.ts new file mode 100644 index 0000000000000..aff16374ae262 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/lib/type_guards.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + InfraWaffleMapGradientLegend, + InfraWaffleMapLegendMode, + InfraWaffleMapStepLegend, +} from '../../../lib/lib'; +export function isInfraWaffleMapStepLegend(subject: any): subject is InfraWaffleMapStepLegend { + return subject.type && subject.type === InfraWaffleMapLegendMode.step; +} +export function isInfraWaffleMapGradientLegend( + subject: any +): subject is InfraWaffleMapGradientLegend { + return subject.type && subject.type === InfraWaffleMapLegendMode.gradient; +} diff --git a/x-pack/plugins/infra/public/components/waffle/node.tsx b/x-pack/plugins/infra/public/components/waffle/node.tsx new file mode 100644 index 0000000000000..b4129565bf958 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/node.tsx @@ -0,0 +1,147 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiToolTip } from '@elastic/eui'; +import { darken, readableColor } from 'polished'; +import React from 'react'; +import styled from 'styled-components'; +import { InfraTimerangeInput } from 'x-pack/plugins/infra/common/graphql/types'; +import { InfraNodeType } from '../../../server/lib/adapters/nodes'; +import { InfraWaffleMapBounds, InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib'; +import { colorFromValue } from './lib/color_from_value'; +import { NodeContextMenu } from './node_context_menu'; + +const initialState = { + isPopoverOpen: false, +}; + +type State = Readonly; + +interface Props { + squareSize: number; + options: InfraWaffleMapOptions; + node: InfraWaffleMapNode; + formatter: (val: number) => string; + bounds: InfraWaffleMapBounds; + nodeType: InfraNodeType; + timeRange: InfraTimerangeInput; +} + +export class Node extends React.PureComponent { + public readonly state: State = initialState; + public render() { + const { nodeType, node, options, squareSize, bounds, formatter, timeRange } = this.props; + const { isPopoverOpen } = this.state; + const { metric } = node; + const valueMode = squareSize > 110; + const rawValue = (metric && metric.value) || 0; + const color = colorFromValue(options.legend, rawValue, bounds); + const value = formatter(rawValue); + return ( + + + + + + {valueMode && ( + + + {value} + + )} + + + + + + ); + } + + private togglePopover = () => { + this.setState(prevState => ({ isPopoverOpen: !prevState.isPopoverOpen })); + }; + + private closePopover = () => { + this.setState({ isPopoverOpen: false }); + }; +} + +const NodeContainer = styled.div` + position: relative; +`; + +interface ColorProps { + color: string; +} + +const SquareOuter = styled('div')` + position: absolute; + top: 4px; + left: 4px; + bottom: 4px; + right: 4px; + background-color: ${props => darken(0.1, props.color)}; + border-radius: 3px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2); +`; + +const SquareInner = styled('div')` + cursor: pointer; + position: absolute; + top: 0; + right: 0; + bottom: 2px; + left: 0; + border-radius: 3px; + background-color: ${props => props.color}; +`; + +const ValueInner = styled.div` + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + display: flex; + line-height: 1.2em; + align-items: center; + align-content: center; + padding: 1em; + overflow: hidden; + flex-wrap: wrap; +`; + +const Value = styled('div')` + font-weight: bold; + font-size: 0.9em; + text-align: center; + width: 100%; + flex: 1 0 auto; + line-height: 1.2em; + color: ${props => readableColor(props.color)}; +`; + +const Label = styled('div')` + text-overflow: ellipsis; + font-size: 0.7em; + margin-bottom: 0.7em; + text-align: center; + width: 100%; + flex: 1 0 auto; + white-space: nowrap; + overflow: hidden; + color: ${props => readableColor(props.color)}; +`; diff --git a/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx b/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx new file mode 100644 index 0000000000000..2de114dfe22c2 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/node_context_menu.tsx @@ -0,0 +1,85 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiContextMenu, EuiContextMenuPanelDescriptor, EuiPopover } from '@elastic/eui'; +import React from 'react'; + +import { InfraNodeType, InfraTimerangeInput } from '../../../common/graphql/types'; +import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../lib/lib'; +import { getNodeDetailUrl, getNodeLogsUrl } from '../../pages/link_to'; + +interface Props { + options: InfraWaffleMapOptions; + timeRange: InfraTimerangeInput; + node: InfraWaffleMapNode; + nodeType: InfraNodeType; + isPopoverOpen: boolean; + closePopover: () => void; +} + +export const NodeContextMenu: React.SFC = ({ + options, + timeRange, + children, + node, + isPopoverOpen, + closePopover, + nodeType, +}) => { + const nodeName = node.path.length > 0 ? node.path[node.path.length - 1].value : undefined; + const nodeLogsUrl = nodeName + ? getNodeLogsUrl({ + nodeType, + nodeName, + time: timeRange.to, + }) + : undefined; + const nodeDetailUrl = nodeName + ? getNodeDetailUrl({ + nodeType, + nodeName, + from: timeRange.from, + to: timeRange.to, + }) + : undefined; + + const panels: EuiContextMenuPanelDescriptor[] = [ + { + id: 0, + title: '', + items: [ + ...(nodeLogsUrl + ? [ + { + name: `View logs`, + href: nodeLogsUrl, + }, + ] + : []), + ...(nodeDetailUrl + ? [ + { + name: `View metrics`, + href: nodeDetailUrl, + }, + ] + : []), + ], + }, + ]; + + return ( + + + + ); +}; diff --git a/x-pack/plugins/infra/public/components/waffle/steps_legend.tsx b/x-pack/plugins/infra/public/components/waffle/steps_legend.tsx new file mode 100644 index 0000000000000..12964989e1b18 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/steps_legend.tsx @@ -0,0 +1,81 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { darken } from 'polished'; +import React from 'react'; +import styled from 'styled-components'; +import { + InfraFormatter, + InfraWaffleMapRuleOperator, + InfraWaffleMapStepLegend, + InfraWaffleMapStepRule, +} from '../../lib/lib'; + +const OPERATORS = { + [InfraWaffleMapRuleOperator.gte]: '>=', + [InfraWaffleMapRuleOperator.gt]: '>', + [InfraWaffleMapRuleOperator.lte]: '<=', + [InfraWaffleMapRuleOperator.lt]: '<', + [InfraWaffleMapRuleOperator.eq]: '=', +}; + +interface Props { + legend: InfraWaffleMapStepLegend; + formatter: InfraFormatter; +} + +const createStep = (formatter: InfraFormatter) => (rule: InfraWaffleMapStepRule, index: number) => { + const label = + rule.label != null ? rule.label : `${OPERATORS[rule.operator]} ${formatter(rule.value)}`; + const squareStyle = { backgroundColor: darken(0.4, rule.color) }; + const squareInnerStyle = { backgroundColor: rule.color }; + return ( + + + + + {label} + + ); +}; + +export const StepLegend: React.SFC = ({ legend, formatter }) => { + return {legend.rules.map(createStep(formatter))}; +}; + +const StepLegendContainer = styled.div` + display: flex; + padding: 10px; +`; + +const StepContainer = styled.div` + display: flex; + margin-right: 20px + align-items: center; +`; + +const StepSquare = styled.div` + position: relative; + width: 24px; + height: 24px; + flex: 0 0 auto; + margin-right: 5px; + border-radius: 3px; + box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2); +`; + +const StepSquareInner = styled.div` + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 2px; + border-radius: 3px; +`; + +const StepLabel = styled.div` + font-size: 12px; +`; diff --git a/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx b/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx new file mode 100644 index 0000000000000..d07ec7bedc2a1 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx @@ -0,0 +1,132 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiBadge, + EuiContextMenu, + EuiContextMenuPanelDescriptor, + EuiFilterButton, + EuiFilterGroup, + EuiPopover, +} from '@elastic/eui'; +import React from 'react'; +import { InfraNodeType, InfraPathInput, InfraPathType } from '../../../common/graphql/types'; + +interface Props { + nodeType: InfraNodeType; + groupBy: InfraPathInput[]; + onChange: (groupBy: InfraPathInput[]) => void; +} + +const OPTIONS = { + [InfraNodeType.pod]: [ + { text: 'Namespace', type: InfraPathType.terms, field: 'kubernetes.namespace' }, + { text: 'Node', type: InfraPathType.terms, field: 'kubernetes.node.name' }, + ], + [InfraNodeType.container]: [ + { text: 'Host', type: InfraPathType.terms, field: 'host.name' }, + { text: 'Availability Zone', type: InfraPathType.terms, field: 'meta.cloud.availability_zone' }, + { text: 'Machine Type', type: InfraPathType.terms, field: 'meta.cloud.machine_type' }, + { text: 'Project ID', type: InfraPathType.terms, field: 'meta.cloud.project_id' }, + { text: 'Provider', type: InfraPathType.terms, field: 'meta.cloud.provider' }, + ], + [InfraNodeType.host]: [ + { text: 'Availability Zone', type: InfraPathType.terms, field: 'meta.cloud.availability_zone' }, + { text: 'Machine Type', type: InfraPathType.terms, field: 'meta.cloud.machine_type' }, + { text: 'Project ID', type: InfraPathType.terms, field: 'meta.cloud.project_id' }, + { text: 'Cloud Provider', type: InfraPathType.terms, field: 'meta.cloud.provider' }, + ], +}; + +const initialState = { + isPopoverOpen: false, +}; +type State = Readonly; + +export class WaffleGroupByControls extends React.PureComponent { + public readonly state: State = initialState; + public render() { + const { nodeType, groupBy } = this.props; + const options = OPTIONS[nodeType]; + if (!options.length) { + throw Error(`Unable to select group by options for ${nodeType}`); + } + const panels: EuiContextMenuPanelDescriptor[] = [ + { + id: 'firstPanel', + title: 'Select up to two groupings', + items: options.map(o => { + const icon = groupBy.some(g => g.field === o.field) ? 'check' : 'empty'; + const panel = { name: o.text, onClick: this.handleClick(o.field), icon }; + return panel; + }), + }, + ]; + const buttonBody = + groupBy.length > 0 + ? groupBy + .map(g => options.find(o => o.field === g.field)) + .filter(o => o != null) + // In this map the `o && o.field` is totally unnecessary but Typescript is + // too stupid to realize that the filter above prevents the next map from being null + .map(o => ( + + {o && o.text} + + )) + : 'All'; + const button = ( + + Group By: {buttonBody} + + ); + + return ( + + + + + + ); + } + + private handleRemove = (field: string) => () => { + const { groupBy } = this.props; + this.props.onChange(groupBy.filter(g => g.field !== field)); + // We need to close the panel after we rmeove the pill icon otherwise + // it will remain open because the click is still captured by the EuiFilterButton + setTimeout(() => this.handleClose()); + }; + + private handleClose = () => { + this.setState({ isPopoverOpen: false }); + }; + + private handleToggle = () => { + this.setState(state => ({ isPopoverOpen: !state.isPopoverOpen })); + }; + + private handleClick = (field: string) => () => { + const { groupBy } = this.props; + if (groupBy.some(g => g.field === field)) { + this.handleRemove(field)(); + } else if (this.props.groupBy.length < 2) { + this.props.onChange([...groupBy, { type: InfraPathType.terms, field }]); + this.handleClose(); + } + }; +} diff --git a/x-pack/plugins/infra/public/components/waffle/waffle_metric_controls.tsx b/x-pack/plugins/infra/public/components/waffle/waffle_metric_controls.tsx new file mode 100644 index 0000000000000..fe9b015e62457 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/waffle_metric_controls.tsx @@ -0,0 +1,106 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + EuiContextMenu, + EuiContextMenuPanelDescriptor, + EuiFilterButton, + EuiFilterGroup, + EuiPopover, +} from '@elastic/eui'; +import React from 'react'; +import { InfraMetricInput, InfraMetricType, InfraNodeType } from '../../../common/graphql/types'; +interface Props { + nodeType: InfraNodeType; + metric: InfraMetricInput; + onChange: (metric: InfraMetricInput) => void; +} + +const OPTIONS = { + [InfraNodeType.pod]: [ + { text: 'CPU Usage', value: InfraMetricType.cpu }, + { text: 'Memory Usage', value: InfraMetricType.memory }, + { text: 'Inbound Traffic', value: InfraMetricType.rx }, + { text: 'Outbound Traffic', value: InfraMetricType.tx }, + ], + [InfraNodeType.container]: [ + { text: 'CPU Usage', value: InfraMetricType.cpu }, + { text: 'Memory Usage', value: InfraMetricType.memory }, + { text: 'Inbound Traffic', value: InfraMetricType.rx }, + { text: 'Outbound Traffic', value: InfraMetricType.tx }, + ], + [InfraNodeType.host]: [ + { text: 'CPU Usage', value: InfraMetricType.cpu }, + { text: 'Memory Usage', value: InfraMetricType.memory }, + { text: 'Load', value: InfraMetricType.load }, + { text: 'Inbound Traffic', value: InfraMetricType.rx }, + { text: 'Outbound Traffic', value: InfraMetricType.tx }, + { text: 'Log Rate', value: InfraMetricType.logRate }, + ], +}; + +const initialState = { + isPopoverOpen: false, +}; +type State = Readonly; + +export class WaffleMetricControls extends React.PureComponent { + public readonly state: State = initialState; + public render() { + const { metric } = this.props; + const options = OPTIONS[this.props.nodeType]; + const value = metric.type; + if (!options.length || !value) { + throw Error('Unable to select options or value for metric.'); + } + const currentLabel = options.find(o => o.value === metric.type); + if (!currentLabel) { + return 'null'; + } + const panels: EuiContextMenuPanelDescriptor[] = [ + { + id: 0, + title: '', + items: options.map(o => { + const icon = o.value === metric.type ? 'check' : 'empty'; + const panel = { name: o.text, onClick: this.handleClick(o.value), icon }; + return panel; + }), + }, + ]; + const button = ( + + Metric: {currentLabel.text} + + ); + + return ( + + + + + + ); + } + private handleClose = () => { + this.setState({ isPopoverOpen: false }); + }; + + private handleToggle = () => { + this.setState(state => ({ isPopoverOpen: !state.isPopoverOpen })); + }; + + private handleClick = (value: InfraMetricType) => () => { + this.props.onChange({ type: value }); + this.handleClose(); + }; +} diff --git a/x-pack/plugins/infra/public/components/waffle/waffle_node_type_switcher.tsx b/x-pack/plugins/infra/public/components/waffle/waffle_node_type_switcher.tsx new file mode 100644 index 0000000000000..e1071261a8de6 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/waffle_node_type_switcher.tsx @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiKeyPadMenu, EuiKeyPadMenuItem } from '@elastic/eui'; +import React from 'react'; +import { + InfraMetricInput, + InfraMetricType, + InfraNodeType, + InfraPathInput, +} from '../../../common/graphql/types'; + +interface Props { + nodeType: InfraNodeType; + changeNodeType: (nodeType: InfraNodeType) => void; + changeGroupBy: (groupBy: InfraPathInput[]) => void; + changeMetric: (metric: InfraMetricInput) => void; +} + +export class WaffleNodeTypeSwitcher extends React.PureComponent { + public render() { + return ( + + + + + + + + + + + + ); + } + + private handleClick = (nodeType: InfraNodeType) => () => { + this.props.changeNodeType(nodeType); + this.props.changeGroupBy([]); + this.props.changeMetric({ type: InfraMetricType.cpu }); + }; +} diff --git a/x-pack/plugins/infra/public/components/waffle/waffle_time_controls.tsx b/x-pack/plugins/infra/public/components/waffle/waffle_time_controls.tsx new file mode 100644 index 0000000000000..6331f86d24331 --- /dev/null +++ b/x-pack/plugins/infra/public/components/waffle/waffle_time_controls.tsx @@ -0,0 +1,82 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiButtonEmpty, EuiDatePicker, EuiFormControlLayout } from '@elastic/eui'; +import moment, { Moment } from 'moment'; +import React from 'react'; + +interface WaffleTimeControlsProps { + currentTime: number; + isLiveStreaming?: boolean; + onChangeTime?: (time: number) => void; + startLiveStreaming?: () => void; + stopLiveStreaming?: () => void; +} + +export class WaffleTimeControls extends React.Component { + public render() { + const { currentTime, isLiveStreaming } = this.props; + + const currentMoment = moment(currentTime); + + const liveStreamingButton = isLiveStreaming ? ( + + Stop refreshing + + ) : ( + + Auto-refresh + + ); + + return ( + + + + ); + } + + private handleChangeDate = (time: Moment | null) => { + const { onChangeTime } = this.props; + + if (onChangeTime && time) { + onChangeTime(time.valueOf()); + } + }; + + private startLiveStreaming = () => { + const { startLiveStreaming } = this.props; + + if (startLiveStreaming) { + startLiveStreaming(); + } + }; + + private stopLiveStreaming = () => { + const { stopLiveStreaming } = this.props; + + if (stopLiveStreaming) { + stopLiveStreaming(); + } + }; +} diff --git a/x-pack/plugins/infra/public/containers/capabilities/capabilities.gql_query.ts b/x-pack/plugins/infra/public/containers/capabilities/capabilities.gql_query.ts new file mode 100644 index 0000000000000..53845b463c0b5 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/capabilities/capabilities.gql_query.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const capabilitiesQuery = gql` + query CapabilitiesQuery($sourceId: ID!, $nodeId: String!, $nodeType: InfraNodeType!) { + source(id: $sourceId) { + id + capabilitiesByNode(nodeName: $nodeId, nodeType: $nodeType) { + name + source + } + } + } +`; diff --git a/x-pack/plugins/infra/public/containers/capabilities/with_capabilites.tsx b/x-pack/plugins/infra/public/containers/capabilities/with_capabilites.tsx new file mode 100644 index 0000000000000..efdcb0e70e1d8 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/capabilities/with_capabilites.tsx @@ -0,0 +1,88 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import _ from 'lodash'; + +import React from 'react'; +import { Query } from 'react-apollo'; +import { CapabilitiesQuery, InfraNodeType } from '../../../common/graphql/types'; +import { InfraMetricLayout } from '../../pages/metrics/layouts/types'; +import { capabilitiesQuery } from './capabilities.gql_query'; + +interface WithCapabilitiesProps { + children: (args: WithCapabilitiesArgs) => React.ReactNode; + layouts: InfraMetricLayout[]; + nodeType: InfraNodeType; + nodeId: string; + sourceId: string; +} + +interface WithCapabilitiesArgs { + filteredLayouts: InfraMetricLayout[]; + error?: string | undefined; + loading: boolean; +} + +export const WithCapabilities = ({ + children, + layouts, + nodeType, + nodeId, + sourceId, +}: WithCapabilitiesProps) => { + return ( + + query={capabilitiesQuery} + fetchPolicy="no-cache" + variables={{ + sourceId, + nodeType, + nodeId, + }} + > + {({ data, error, loading }) => { + const capabilities = data && data.source && data.source.capabilitiesByNode; + const filteredLayouts = getFilteredLayouts(layouts, capabilities); + return children({ + filteredLayouts, + error: error && error.message, + loading, + }); + }} + + ); +}; + +const getFilteredLayouts = ( + layouts: InfraMetricLayout[], + capabilities: Array | undefined +): InfraMetricLayout[] => { + if (!capabilities) { + return layouts; + } + + const metricCapabilities: Array = capabilities + .filter(cap => cap && cap.source === 'metrics') + .map(cap => cap && cap.name); + + // After filtering out sections that can't be displayed, a layout may end up empty and can be removed. + const filteredLayouts = layouts + .map(layout => getFilteredLayout(layout, metricCapabilities)) + .filter(layout => layout.sections.length > 0); + return filteredLayouts; +}; + +const getFilteredLayout = ( + layout: InfraMetricLayout, + metricCapabilities: Array +): InfraMetricLayout => { + // A section is only displayed if at least one of its requirements is met + // All others are filtered out. + const filteredSections = layout.sections.filter( + section => _.intersection(section.requires, metricCapabilities).length > 0 + ); + return { ...layout, sections: filteredSections }; +}; diff --git a/x-pack/plugins/infra/public/containers/host/index.ts b/x-pack/plugins/infra/public/containers/host/index.ts new file mode 100644 index 0000000000000..706f05c80ed0d --- /dev/null +++ b/x-pack/plugins/infra/public/containers/host/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { AllHosts } from './with_all_hosts'; +export { withAllHosts } from './with_all_hosts'; + +export const hostQueries = { + AllHosts, +}; diff --git a/x-pack/plugins/infra/public/containers/host/with_all_hosts.ts b/x-pack/plugins/infra/public/containers/host/with_all_hosts.ts new file mode 100644 index 0000000000000..de4a7fb22b7bb --- /dev/null +++ b/x-pack/plugins/infra/public/containers/host/with_all_hosts.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// import { graphql } from 'react-apollo'; +// import gql from 'graphql-tag'; +// import { GetAllHosts } from '../../../common/graphql/types'; + +// type ChildProps = { +// hosts: GetAllHosts.Query['hosts']; +// }; + +export const AllHosts = null; + +export const withAllHosts: any = (wrappedComponent: any) => wrappedComponent; +// export const withAllHosts = graphql< +// {}, +// GetAllHosts.Query, +// GetAllHosts.Variables, +// ChildProps +// >(AllHosts, { +// props: ({ data, ownProps }) => { +// return { +// hosts: data && data.hosts ? data.hosts : [], +// ...ownProps, +// }; +// }, +// }); diff --git a/x-pack/plugins/infra/public/containers/logs/with_log_filter.tsx b/x-pack/plugins/infra/public/containers/logs/with_log_filter.tsx new file mode 100644 index 0000000000000..fba0075c3c3b3 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_log_filter.tsx @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; + +import { logFilterActions, logFilterSelectors, State } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { replaceStateKeyInQueryString, UrlStateContainer } from '../../utils/url_state'; + +const withLogFilter = connect( + (state: State) => ({ + filterQuery: logFilterSelectors.selectLogFilterQuery(state), + filterQueryDraft: logFilterSelectors.selectLogFilterQueryDraft(state), + isFilterQueryDraftValid: logFilterSelectors.selectIsLogFilterQueryDraftValid(state), + }), + bindPlainActionCreators({ + applyFilterQuery: logFilterActions.applyLogFilterQuery, + applyFilterQueryFromKueryExpression: (expression: string) => + logFilterActions.applyLogFilterQuery({ + kind: 'kuery', + expression, + }), + setFilterQueryDraft: logFilterActions.setLogFilterQueryDraft, + setFilterQueryDraftFromKueryExpression: (expression: string) => + logFilterActions.setLogFilterQueryDraft({ + kind: 'kuery', + expression, + }), + }) +); + +export const WithLogFilter = asChildFunctionRenderer(withLogFilter); + +/** + * Url State + */ + +type LogFilterUrlState = ReturnType; + +export const WithLogFilterUrlState = () => ( + + {({ applyFilterQuery, filterQuery }) => ( + { + if (urlState) { + applyFilterQuery(urlState); + } + }} + onInitialize={urlState => { + if (urlState) { + applyFilterQuery(urlState); + } + }} + /> + )} + +); + +const mapToFilterQuery = (value: any): LogFilterUrlState | undefined => + value && value.kind === 'kuery' && typeof value.expression === 'string' + ? { + kind: value.kind, + expression: value.expression, + } + : undefined; + +export const replaceLogFilterInQueryString = (expression: string) => + replaceStateKeyInQueryString('logFilter', { + kind: 'kuery', + expression, + }); diff --git a/x-pack/plugins/infra/public/containers/logs/with_log_minimap.tsx b/x-pack/plugins/infra/public/containers/logs/with_log_minimap.tsx new file mode 100644 index 0000000000000..a5ad500eaeb45 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_log_minimap.tsx @@ -0,0 +1,101 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; + +import { logMinimapActions, logMinimapSelectors, State } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { UrlStateContainer } from '../../utils/url_state'; + +export const withLogMinimap = connect( + (state: State) => ({ + availableIntervalSizes, + intervalSize: logMinimapSelectors.selectMinimapIntervalSize(state), + urlState: selectMinimapUrlState(state), + }), + bindPlainActionCreators({ + setIntervalSize: logMinimapActions.setMinimapIntervalSize, + }) +); + +export const WithLogMinimap = asChildFunctionRenderer(withLogMinimap); + +export const availableIntervalSizes = [ + { + label: '1 Year', + intervalSize: 1000 * 60 * 60 * 24 * 365, + }, + { + label: '1 Month', + intervalSize: 1000 * 60 * 60 * 24 * 30, + }, + { + label: '1 Week', + intervalSize: 1000 * 60 * 60 * 24 * 7, + }, + { + label: '1 Day', + intervalSize: 1000 * 60 * 60 * 24, + }, + { + label: '1 Hour', + intervalSize: 1000 * 60 * 60, + }, + { + label: '1 Minute', + intervalSize: 1000 * 60, + }, +]; + +/** + * Url State + */ + +interface LogMinimapUrlState { + intervalSize?: ReturnType; +} + +export const WithLogMinimapUrlState = () => ( + + {({ urlState, setIntervalSize }) => ( + { + if (newUrlState && newUrlState.intervalSize) { + setIntervalSize(newUrlState.intervalSize); + } + }} + onInitialize={newUrlState => { + if (newUrlState && newUrlState.intervalSize) { + setIntervalSize(newUrlState.intervalSize); + } + }} + /> + )} + +); + +const mapToUrlState = (value: any): LogMinimapUrlState | undefined => + value + ? { + intervalSize: mapToIntervalSizeUrlState(value.intervalSize), + } + : undefined; + +const mapToIntervalSizeUrlState = (value: any) => + value && typeof value === 'number' ? value : undefined; + +const selectMinimapUrlState = createSelector( + logMinimapSelectors.selectMinimapIntervalSize, + intervalSize => ({ + intervalSize, + }) +); diff --git a/x-pack/plugins/infra/public/containers/logs/with_log_position.tsx b/x-pack/plugins/infra/public/containers/logs/with_log_position.tsx new file mode 100644 index 0000000000000..a548ae62facb0 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_log_position.tsx @@ -0,0 +1,125 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; + +import { pickTimeKey } from '../../../common/time'; +import { logPositionActions, logPositionSelectors, State } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { replaceStateKeyInQueryString, UrlStateContainer } from '../../utils/url_state'; + +export const withLogPosition = connect( + (state: State) => ({ + firstVisiblePosition: logPositionSelectors.selectFirstVisiblePosition(state), + isAutoReloading: logPositionSelectors.selectIsAutoReloading(state), + lastVisiblePosition: logPositionSelectors.selectFirstVisiblePosition(state), + targetPosition: logPositionSelectors.selectTargetPosition(state), + urlState: selectPositionUrlState(state), + visibleTimeInterval: logPositionSelectors.selectVisibleTimeInterval(state), + visibleMidpoint: logPositionSelectors.selectVisibleMidpointOrTarget(state), + visibleMidpointTime: logPositionSelectors.selectVisibleMidpointOrTargetTime(state), + }), + bindPlainActionCreators({ + jumpToTargetPosition: logPositionActions.jumpToTargetPosition, + jumpToTargetPositionTime: logPositionActions.jumpToTargetPositionTime, + reportVisiblePositions: logPositionActions.reportVisiblePositions, + reportVisibleSummary: logPositionActions.reportVisibleSummary, + startLiveStreaming: logPositionActions.startAutoReload, + stopLiveStreaming: logPositionActions.stopAutoReload, + }) +); + +export const WithLogPosition = asChildFunctionRenderer(withLogPosition, { + onCleanup: ({ stopLiveStreaming }) => stopLiveStreaming(), +}); + +/** + * Url State + */ + +interface LogPositionUrlState { + position?: ReturnType; + streamLive?: ReturnType; +} + +export const WithLogPositionUrlState = () => ( + + {({ + jumpToTargetPosition, + jumpToTargetPositionTime, + startLiveStreaming, + stopLiveStreaming, + urlState, + }) => ( + { + if (newUrlState && newUrlState.position) { + jumpToTargetPosition(newUrlState.position); + } + if (newUrlState && newUrlState.streamLive) { + startLiveStreaming(5000); + } else if ( + newUrlState && + typeof newUrlState.streamLive !== 'undefined' && + !newUrlState.streamLive + ) { + stopLiveStreaming(); + } + }} + onInitialize={initialUrlState => { + if (initialUrlState && initialUrlState.position) { + jumpToTargetPosition(initialUrlState.position); + } else { + jumpToTargetPositionTime(Date.now()); + } + if (initialUrlState && initialUrlState.streamLive) { + startLiveStreaming(5000); + } + }} + /> + )} + +); + +const selectPositionUrlState = createSelector( + logPositionSelectors.selectVisibleMidpointOrTarget, + logPositionSelectors.selectIsAutoReloading, + (position, streamLive) => ({ + position: position ? pickTimeKey(position) : null, + streamLive, + }) +); + +const mapToUrlState = (value: any): LogPositionUrlState | undefined => + value + ? { + position: mapToPositionUrlState(value.position), + streamLive: mapToStreamLiveUrlState(value.streamLive), + } + : undefined; + +const mapToPositionUrlState = (value: any) => + value && (typeof value.time === 'number' && typeof value.tiebreaker === 'number') + ? pickTimeKey(value) + : undefined; + +const mapToStreamLiveUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined); + +export const replaceLogPositionInQueryString = (time: number) => + Number.isNaN(time) + ? (value: string) => value + : replaceStateKeyInQueryString('logPosition', { + position: { + time, + tiebreaker: 0, + }, + }); diff --git a/x-pack/plugins/infra/public/containers/logs/with_log_search_controls_props.ts b/x-pack/plugins/infra/public/containers/logs/with_log_search_controls_props.ts new file mode 100644 index 0000000000000..e387da9575426 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_log_search_controls_props.ts @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/** + * Temporary Workaround + * This is not a well-designed container. It only exists to enable quick + * migration of the redux-based logging ui into the infra-ui codebase. It will + * be removed during the refactoring to graphql/apollo. + */ +import { connect } from 'react-redux'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; + +import { + // searchActions, + // searchResultsSelectors, + // sharedSelectors, + logPositionActions, + State, +} from '../../store'; + +export const withLogSearchControlsProps = connect( + (state: State) => ({ + // isLoadingSearchResults: searchResultsSelectors.selectIsLoadingSearchResults(state), + // nextSearchResult: sharedSelectors.selectNextSearchResultKey(state), + // previousSearchResult: sharedSelectors.selectPreviousSearchResultKey(state), + }), + bindPlainActionCreators({ + // clearSearch: searchActions.clearSearch, + jumpToTarget: logPositionActions.jumpToTargetPosition, + // search: searchActions.search, + }) +); diff --git a/x-pack/plugins/infra/public/containers/logs/with_log_textview.tsx b/x-pack/plugins/infra/public/containers/logs/with_log_textview.tsx new file mode 100644 index 0000000000000..5d22bc481b783 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_log_textview.tsx @@ -0,0 +1,91 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; + +import { TextScale } from '../../../common/log_text_scale'; +import { logTextviewActions, logTextviewSelectors, State } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { UrlStateContainer } from '../../utils/url_state'; + +const availableTextScales = ['large', 'medium', 'small'] as TextScale[]; + +export const withLogTextview = connect( + (state: State) => ({ + availableTextScales, + textScale: logTextviewSelectors.selectTextviewScale(state), + urlState: selectTextviewUrlState(state), + wrap: logTextviewSelectors.selectTextviewWrap(state), + }), + bindPlainActionCreators({ + setTextScale: logTextviewActions.setTextviewScale, + setTextWrap: logTextviewActions.setTextviewWrap, + }) +); + +export const WithLogTextview = asChildFunctionRenderer(withLogTextview); + +/** + * Url State + */ + +interface LogTextviewUrlState { + textScale?: ReturnType; + wrap?: ReturnType; +} + +export const WithLogTextviewUrlState = () => ( + + {({ urlState, setTextScale, setTextWrap }) => ( + { + if (newUrlState && newUrlState.textScale) { + setTextScale(newUrlState.textScale); + } + if (newUrlState && typeof newUrlState.wrap !== 'undefined') { + setTextWrap(newUrlState.wrap); + } + }} + onInitialize={newUrlState => { + if (newUrlState && newUrlState.textScale) { + setTextScale(newUrlState.textScale); + } + if (newUrlState && typeof newUrlState.wrap !== 'undefined') { + setTextWrap(newUrlState.wrap); + } + }} + /> + )} + +); + +const mapToUrlState = (value: any): LogTextviewUrlState | undefined => + value + ? { + textScale: mapToTextScaleUrlState(value.textScale), + wrap: mapToWrapUrlState(value.wrap), + } + : undefined; + +const mapToTextScaleUrlState = (value: any) => + availableTextScales.includes(value) ? (value as TextScale) : undefined; + +const mapToWrapUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined); + +const selectTextviewUrlState = createSelector( + logTextviewSelectors.selectTextviewScale, + logTextviewSelectors.selectTextviewWrap, + (textScale, wrap) => ({ + textScale, + wrap, + }) +); diff --git a/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts b/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts new file mode 100644 index 0000000000000..78f655430d3c8 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_stream_items.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; + +import { SearchResult } from '../../../common/log_search_result'; +import { logEntriesActions, logEntriesSelectors, logPositionSelectors, State } from '../../store'; +import { LogEntry, LogEntryMessageSegment } from '../../utils/log_entry'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; + +export const withStreamItems = connect( + (state: State) => ({ + isReloading: logEntriesSelectors.selectIsReloadingEntries(state), + isLoadingMore: logEntriesSelectors.selectIsLoadingMoreEntries(state), + hasMoreBeforeStart: logEntriesSelectors.selectHasMoreBeforeStart(state), + hasMoreAfterEnd: logEntriesSelectors.selectHasMoreAfterEnd(state), + lastLoadedTime: logEntriesSelectors.selectEntriesLastLoadedTime(state), + items: selectItems(state), + }), + bindPlainActionCreators({ + loadNewerEntries: logEntriesActions.loadNewerEntries, + }) +); + +export const WithStreamItems = asChildFunctionRenderer(withStreamItems); + +const selectItems = createSelector( + logEntriesSelectors.selectEntries, + logEntriesSelectors.selectIsReloadingEntries, + logPositionSelectors.selectIsAutoReloading, + // searchResultsSelectors.selectSearchResultsById, + (logEntries, isReloading, isAutoReloading /*, searchResults*/) => + isReloading && !isAutoReloading + ? [] + : logEntries.map(logEntry => + createLogEntryStreamItem(logEntry /*, searchResults[logEntry.gid] || null*/) + ) +); + +const createLogEntryStreamItem = (logEntry: LogEntry, searchResult?: SearchResult) => ({ + kind: 'logEntry' as 'logEntry', + logEntry: { + gid: logEntry.gid, + origin: { + id: logEntry.gid, + index: '', + type: '', + }, + fields: { + time: logEntry.key.time, + tiebreaker: logEntry.key.tiebreaker, + message: logEntry.message.map(formatMessageSegment).join(''), + }, + }, + searchResult, +}); + +const formatMessageSegment = (messageSegment: LogEntryMessageSegment): string => + messageSegment.__typename === 'InfraLogMessageFieldSegment' + ? messageSegment.value + : messageSegment.__typename === 'InfraLogMessageConstantSegment' + ? messageSegment.constant + : 'failed to format message'; diff --git a/x-pack/plugins/infra/public/containers/logs/with_summary.ts b/x-pack/plugins/infra/public/containers/logs/with_summary.ts new file mode 100644 index 0000000000000..424da80b460df --- /dev/null +++ b/x-pack/plugins/infra/public/containers/logs/with_summary.ts @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { connect } from 'react-redux'; + +import { logSummaryActions, logSummarySelectors, State } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; + +export const withSummary = connect( + (state: State) => ({ + buckets: logSummarySelectors.selectSummaryBuckets(state), + }), + bindPlainActionCreators({ + load: logSummaryActions.loadSummary, + }) +); + +export const WithSummary = asChildFunctionRenderer(withSummary); diff --git a/x-pack/plugins/infra/public/containers/metrics/metrics.gql_query.ts b/x-pack/plugins/infra/public/containers/metrics/metrics.gql_query.ts new file mode 100644 index 0000000000000..2a5cc0219e81a --- /dev/null +++ b/x-pack/plugins/infra/public/containers/metrics/metrics.gql_query.ts @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const metricsQuery = gql` + query MetricsQuery( + $sourceId: ID! + $timerange: InfraTimerangeInput! + $metrics: [InfraMetric!]! + $nodeId: ID! + $nodeType: InfraNodeType! + ) { + source(id: $sourceId) { + id + metrics(nodeId: $nodeId, timerange: $timerange, metrics: $metrics, nodeType: $nodeType) { + id + series { + id + data { + timestamp + value + } + } + } + } + } +`; diff --git a/x-pack/plugins/infra/public/containers/metrics/with_metrics.tsx b/x-pack/plugins/infra/public/containers/metrics/with_metrics.tsx new file mode 100644 index 0000000000000..9f44a24f4893c --- /dev/null +++ b/x-pack/plugins/infra/public/containers/metrics/with_metrics.tsx @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Query } from 'react-apollo'; +import { + InfraMetric, + InfraMetricData, + InfraNodeType, + InfraTimerangeInput, + MetricsQuery, +} from '../../../common/graphql/types'; +import { InfraMetricLayout } from '../../pages/metrics/layouts/types'; +import { metricsQuery } from './metrics.gql_query'; + +interface WithMetricsArgs { + metrics: InfraMetricData[]; + error?: string | undefined; + loading: boolean; +} + +interface WithMetricsProps { + children: (args: WithMetricsArgs) => React.ReactNode; + layouts: InfraMetricLayout[]; + nodeType: InfraNodeType; + nodeId: string; + sourceId: string; + timerange: InfraTimerangeInput; +} + +export const WithMetrics = ({ + children, + layouts, + sourceId, + timerange, + nodeType, + nodeId, +}: WithMetricsProps) => { + const metrics = layouts.reduce( + (acc, item) => { + return acc.concat(item.sections.map(s => s.id)); + }, + [] as InfraMetric[] + ); + + return ( + + query={metricsQuery} + fetchPolicy="no-cache" + variables={{ + sourceId, + metrics, + nodeType, + nodeId, + timerange, + }} + > + {({ data, error, loading }) => { + return children({ + metrics: filterOnlyInfraMetricData(data && data.source && data.source.metrics), + error: error && error.message, + loading, + }); + }} + + ); +}; + +const filterOnlyInfraMetricData = ( + metrics: Array | undefined +): InfraMetricData[] => { + if (!metrics) { + return []; + } + return metrics.filter(m => m !== null).map(m => m as InfraMetricData); +}; diff --git a/x-pack/plugins/infra/public/containers/metrics/with_metrics_time.tsx b/x-pack/plugins/infra/public/containers/metrics/with_metrics_time.tsx new file mode 100644 index 0000000000000..a6c7e94f2be16 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/metrics/with_metrics_time.tsx @@ -0,0 +1,108 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; + +import { metricTimeActions, metricTimeSelectors, State } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { replaceStateKeyInQueryString, UrlStateContainer } from '../../utils/url_state'; + +export const withMetricsTime = connect( + (state: State) => ({ + currentTimeRange: metricTimeSelectors.selectRangeTime(state), + isAutoReloading: metricTimeSelectors.selectIsAutoReloading(state), + urlState: selectTimeUrlState(state), + }), + bindPlainActionCreators({ + setRangeTime: metricTimeActions.setRangeTime, + startMetricsAutoReload: metricTimeActions.startMetricsAutoReload, + stopMetricsAutoReload: metricTimeActions.stopMetricsAutoReload, + }) +); + +export const WithMetricsTime = asChildFunctionRenderer(withMetricsTime, { + onCleanup: ({ stopMetricsAutoReload }) => stopMetricsAutoReload(), +}); + +/** + * Url State + */ + +interface MetricTimeUrlState { + time?: ReturnType; + autoReload?: ReturnType; +} + +export const WithMetricsTimeUrlState = () => ( + + {({ setRangeTime, startMetricsAutoReload, stopMetricsAutoReload, urlState }) => ( + { + if (newUrlState && newUrlState.time) { + setRangeTime(newUrlState.time); + } + if (newUrlState && newUrlState.autoReload) { + startMetricsAutoReload(); + } else if ( + newUrlState && + typeof newUrlState.autoReload !== 'undefined' && + !newUrlState.autoReload + ) { + stopMetricsAutoReload(); + } + }} + onInitialize={initialUrlState => { + if (initialUrlState && initialUrlState.time) { + setRangeTime(initialUrlState.time); + } + if (initialUrlState && initialUrlState.autoReload) { + startMetricsAutoReload(); + } + }} + /> + )} + +); + +const selectTimeUrlState = createSelector( + metricTimeSelectors.selectRangeTime, + metricTimeSelectors.selectIsAutoReloading, + (time, autoReload) => ({ + time, + autoReload, + }) +); + +const mapToUrlState = (value: any): MetricTimeUrlState | undefined => + value + ? { + time: mapToTimeUrlState(value.time), + autoReload: mapToAutoReloadUrlState(value.autoReload), + } + : undefined; + +const mapToTimeUrlState = (value: any) => + value && (typeof value.to === 'number' && typeof value.from === 'number') ? value : undefined; + +const mapToAutoReloadUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined); + +export const replaceMetricTimeInQueryString = (from: number, to: number) => + Number.isNaN(from) || Number.isNaN(to) + ? (value: string) => value + : replaceStateKeyInQueryString('metricTime', { + autoReload: false, + time: { + interval: '>=1m', + from, + to, + }, + }); diff --git a/x-pack/plugins/infra/public/containers/waffle/index.ts b/x-pack/plugins/infra/public/containers/waffle/index.ts new file mode 100644 index 0000000000000..738a2f7347ce4 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './with_waffle_filters'; +export * from './with_waffle_nodes'; diff --git a/x-pack/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts b/x-pack/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts new file mode 100644 index 0000000000000..6dad5d0b9405b --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/nodes_to_wafflemap.ts @@ -0,0 +1,117 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { first, last } from 'lodash'; +import { InfraNode, InfraNodePath } from '../../../common/graphql/types'; +import { + InfraWaffleMapGroup, + InfraWaffleMapGroupOfGroups, + InfraWaffleMapGroupOfNodes, + InfraWaffleMapNode, +} from '../../lib/lib'; +import { isWaffleMapGroupWithGroups, isWaffleMapGroupWithNodes } from './type_guards'; + +function createId(path: InfraNodePath[]) { + return path.map(p => p.value).join('/'); +} + +function findOrCreateGroupWithNodes( + groups: InfraWaffleMapGroup[], + path: InfraNodePath[] +): InfraWaffleMapGroupOfNodes { + const id = path.length === 0 ? '__all__' : createId(path); + /** + * If the group is going to be a top level group then we can just + * look for the full id. Otherwise we need to find the parent group and + * then look for the group in it's sub groups. + */ + if (path.length === 2) { + const parentId = first(path).value; + const existingParentGroup = groups.find(g => g.id === parentId); + if (isWaffleMapGroupWithGroups(existingParentGroup)) { + const existingSubGroup = existingParentGroup.groups.find(g => g.id === id); + if (isWaffleMapGroupWithNodes(existingSubGroup)) { + return existingSubGroup; + } + } + } + const existingGroup = groups.find(g => g.id === id); + if (isWaffleMapGroupWithNodes(existingGroup)) { + return existingGroup; + } + return { + id, + name: id === '__all__' ? 'All' : last(path).value, + count: 0, + width: 0, + squareSize: 0, + nodes: [], + }; +} + +function findOrCreateGroupWithGroups( + groups: InfraWaffleMapGroup[], + path: InfraNodePath[] +): InfraWaffleMapGroupOfGroups { + const id = path.length === 0 ? '__all__' : createId(path); + const existingGroup = groups.find(g => g.id === id); + if (isWaffleMapGroupWithGroups(existingGroup)) { + return existingGroup; + } + return { + id, + name: id === '__all__' ? 'All' : last(path).value, + count: 0, + width: 0, + squareSize: 0, + groups: [], + }; +} + +function createWaffleMapNode(node: InfraNode): InfraWaffleMapNode { + return { + id: node.path.map(p => p.value).join('/'), + path: node.path, + name: last(node.path).value, + metric: node.metric, + }; +} + +function withoutGroup(group: InfraWaffleMapGroup) { + return (subject: InfraWaffleMapGroup) => { + return subject.id !== group.id; + }; +} + +export function nodesToWaffleMap(nodes: InfraNode[]): InfraWaffleMapGroup[] { + return nodes.reduce((groups: InfraWaffleMapGroup[], node: InfraNode) => { + const waffleNode = createWaffleMapNode(node); + if (node.path.length === 2) { + const parentGroup = findOrCreateGroupWithNodes( + groups, + node.path.slice(0, node.path.length - 1) + ); + parentGroup.nodes.push(waffleNode); + return groups.filter(withoutGroup(parentGroup)).concat([parentGroup]); + } + if (node.path.length === 3) { + const parentGroup = findOrCreateGroupWithNodes( + groups, + node.path.slice(0, node.path.length - 1) + ); + parentGroup.nodes.push(waffleNode); + const topGroup = findOrCreateGroupWithGroups( + groups, + node.path.slice(0, node.path.length - 2) + ); + topGroup.groups = topGroup.groups.filter(withoutGroup(parentGroup)).concat([parentGroup]); + return groups.filter(withoutGroup(topGroup)).concat([topGroup]); + } + const allGroup = findOrCreateGroupWithNodes(groups, []); + allGroup.nodes.push(waffleNode); + return groups.filter(withoutGroup(allGroup)).concat([allGroup]); + }, []); +} diff --git a/x-pack/plugins/infra/public/containers/waffle/type_guards.ts b/x-pack/plugins/infra/public/containers/waffle/type_guards.ts new file mode 100644 index 0000000000000..3e21e3a56a6c6 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/type_guards.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraWaffleMapGroupOfGroups, InfraWaffleMapGroupOfNodes } from '../../lib/lib'; + +export function isWaffleMapGroupWithNodes(subject: any): subject is InfraWaffleMapGroupOfNodes { + return subject && subject.nodes != null && Array.isArray(subject.nodes); +} + +export function isWaffleMapGroupWithGroups(subject: any): subject is InfraWaffleMapGroupOfGroups { + return subject && subject.groups != null && Array.isArray(subject.groups); +} diff --git a/x-pack/plugins/infra/public/containers/waffle/waffle_nodes.gql_query.ts b/x-pack/plugins/infra/public/containers/waffle/waffle_nodes.gql_query.ts new file mode 100644 index 0000000000000..8da5b160603e7 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/waffle_nodes.gql_query.ts @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const waffleNodesQuery = gql` + query WaffleNodesQuery( + $sourceId: ID! + $timerange: InfraTimerangeInput! + $filterQuery: String + $metric: InfraMetricInput! + $path: [InfraPathInput!]! + ) { + source(id: $sourceId) { + id + map(timerange: $timerange, filterQuery: $filterQuery) { + nodes(path: $path, metric: $metric) { + path { + value + } + metric { + name + value + } + } + } + } + } +`; diff --git a/x-pack/plugins/infra/public/containers/waffle/with_waffle_filters.tsx b/x-pack/plugins/infra/public/containers/waffle/with_waffle_filters.tsx new file mode 100644 index 0000000000000..80f912574c72b --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/with_waffle_filters.tsx @@ -0,0 +1,74 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; + +import { sharedSelectors, State, waffleFilterActions, waffleFilterSelectors } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { UrlStateContainer } from '../../utils/url_state'; + +export const withWaffleFilter = connect( + (state: State) => ({ + filterQuery: waffleFilterSelectors.selectWaffleFilterQuery(state), + filterQueryDraft: waffleFilterSelectors.selectWaffleFilterQueryDraft(state), + filterQueryAsJson: sharedSelectors.selectWaffleFilterQueryAsJson(state), + isFilterQueryDraftValid: waffleFilterSelectors.selectIsWaffleFilterQueryDraftValid(state), + }), + bindPlainActionCreators({ + applyFilterQuery: waffleFilterActions.applyWaffleFilterQuery, + applyFilterQueryFromKueryExpression: (expression: string) => + waffleFilterActions.applyWaffleFilterQuery({ + kind: 'kuery', + expression, + }), + setFilterQueryDraft: waffleFilterActions.setWaffleFilterQueryDraft, + setFilterQueryDraftFromKueryExpression: (expression: string) => + waffleFilterActions.setWaffleFilterQueryDraft({ + kind: 'kuery', + expression, + }), + }) +); + +export const WithWaffleFilter = asChildFunctionRenderer(withWaffleFilter); + +/** + * Url State + */ + +type WaffleFilterUrlState = ReturnType; + +export const WithWaffleFilterUrlState = () => ( + + {({ applyFilterQuery, filterQuery }) => ( + { + if (urlState) { + applyFilterQuery(urlState); + } + }} + onInitialize={urlState => { + if (urlState) { + applyFilterQuery(urlState); + } + }} + /> + )} + +); + +const mapToUrlState = (value: any): WaffleFilterUrlState | undefined => + value && value.kind === 'kuery' && typeof value.expression === 'string' + ? { + kind: value.kind, + expression: value.expression, + } + : undefined; diff --git a/x-pack/plugins/infra/public/containers/waffle/with_waffle_nodes.tsx b/x-pack/plugins/infra/public/containers/waffle/with_waffle_nodes.tsx new file mode 100644 index 0000000000000..f8a5a7a607917 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/with_waffle_nodes.tsx @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Query } from 'react-apollo'; + +import { + InfraMetricInput, + InfraPathInput, + InfraPathType, + InfraTimerangeInput, + WaffleNodesQuery, +} from '../../../common/graphql/types'; +import { InfraNodeType } from '../../../server/lib/adapters/nodes'; +import { InfraWaffleMapGroup } from '../../lib/lib'; +import { nodesToWaffleMap } from './nodes_to_wafflemap'; +import { waffleNodesQuery } from './waffle_nodes.gql_query'; + +interface WithWaffleNodesArgs { + nodes: InfraWaffleMapGroup[]; + loading: boolean; + refetch: () => void; +} + +interface WithWaffleNodesProps { + children: (args: WithWaffleNodesArgs) => React.ReactNode; + filterQuery: string | null | undefined; + metric: InfraMetricInput; + groupBy: InfraPathInput[]; + nodeType: InfraNodeType; + sourceId: string; + timerange: InfraTimerangeInput; +} + +const NODE_TYPE_TO_PATH_TYPE = { + [InfraNodeType.container]: InfraPathType.containers, + [InfraNodeType.host]: InfraPathType.hosts, + [InfraNodeType.pod]: InfraPathType.pods, +}; + +export const WithWaffleNodes = ({ + children, + filterQuery, + metric, + groupBy, + nodeType, + sourceId, + timerange, +}: WithWaffleNodesProps) => ( + + query={waffleNodesQuery} + fetchPolicy="no-cache" + notifyOnNetworkStatusChange + variables={{ + sourceId, + metric, + path: [...groupBy, { type: NODE_TYPE_TO_PATH_TYPE[nodeType] }], + timerange, + filterQuery, + }} + > + {({ data, loading, refetch }) => + children({ + loading, + nodes: + data && data.source && data.source.map && data.source.map.nodes + ? nodesToWaffleMap(data.source.map.nodes) + : [], + refetch, + }) + } + +); diff --git a/x-pack/plugins/infra/public/containers/waffle/with_waffle_options.tsx b/x-pack/plugins/infra/public/containers/waffle/with_waffle_options.tsx new file mode 100644 index 0000000000000..0136ac6cf5fee --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/with_waffle_options.tsx @@ -0,0 +1,115 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; +import { InfraMetricInput, InfraMetricType, InfraPathType } from '../../../common/graphql/types'; +import { InfraNodeType } from '../../../server/lib/adapters/nodes'; +import { State, waffleOptionsActions, waffleOptionsSelectors } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { UrlStateContainer } from '../../utils/url_state'; + +const selectOptionsUrlState = createSelector( + waffleOptionsSelectors.selectMetric, + waffleOptionsSelectors.selectGroupBy, + waffleOptionsSelectors.selectNodeType, + (metric, groupBy, nodeType) => ({ + metric, + groupBy, + nodeType, + }) +); + +export const withWaffleOptions = connect( + (state: State) => ({ + metric: waffleOptionsSelectors.selectMetric(state), + groupBy: waffleOptionsSelectors.selectGroupBy(state), + nodeType: waffleOptionsSelectors.selectNodeType(state), + urlState: selectOptionsUrlState(state), + }), + bindPlainActionCreators({ + changeMetric: waffleOptionsActions.changeMetric, + changeGroupBy: waffleOptionsActions.changeGroupBy, + changeNodeType: waffleOptionsActions.changeNodeType, + }) +); + +export const WithWaffleOptions = asChildFunctionRenderer(withWaffleOptions); + +/** + * Url State + */ + +interface WaffleOptionsUrlState { + metric?: ReturnType; + groupBy?: ReturnType; + nodeType?: ReturnType; +} + +export const WithWaffleOptionsUrlState = () => ( + + {({ changeMetric, urlState, changeGroupBy, changeNodeType }) => ( + { + if (newUrlState && newUrlState.metric) { + changeMetric(newUrlState.metric); + } + if (newUrlState && newUrlState.groupBy) { + changeGroupBy(newUrlState.groupBy); + } + if (newUrlState && newUrlState.nodeType) { + changeNodeType(newUrlState.nodeType); + } + }} + onInitialize={initialUrlState => { + if (initialUrlState && initialUrlState.metric) { + changeMetric(initialUrlState.metric); + } + if (initialUrlState && initialUrlState.groupBy) { + changeGroupBy(initialUrlState.groupBy); + } + if (initialUrlState && initialUrlState.nodeType) { + changeNodeType(initialUrlState.nodeType); + } + }} + /> + )} + +); + +const mapToUrlState = (value: any): WaffleOptionsUrlState | undefined => + value + ? { + metric: mapToMetricUrlState(value.metric), + groupBy: mapToGroupByUrlState(value.groupBy), + nodeType: mapToNodeTypeUrlState(value.nodeType), + } + : undefined; + +const isInfraMetricInput = (subject: any): subject is InfraMetricInput => { + return subject != null && subject.type != null && InfraMetricType[subject.type] != null; +}; + +const isInfraPathInput = (subject: any): subject is InfraPathType => { + return subject != null && subject.type != null && InfraPathType[subject.type] != null; +}; + +const mapToMetricUrlState = (subject: any) => { + return subject && isInfraMetricInput(subject) ? subject : undefined; +}; + +const mapToGroupByUrlState = (subject: any) => { + return subject && Array.isArray(subject) && subject.every(isInfraPathInput) ? subject : undefined; +}; + +const mapToNodeTypeUrlState = (subject: any) => { + return subject && InfraNodeType[subject] ? subject : undefined; +}; diff --git a/x-pack/plugins/infra/public/containers/waffle/with_waffle_time.tsx b/x-pack/plugins/infra/public/containers/waffle/with_waffle_time.tsx new file mode 100644 index 0000000000000..293f6184af21b --- /dev/null +++ b/x-pack/plugins/infra/public/containers/waffle/with_waffle_time.tsx @@ -0,0 +1,96 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; +import { createSelector } from 'reselect'; + +import { State, waffleTimeActions, waffleTimeSelectors } from '../../store'; +import { asChildFunctionRenderer } from '../../utils/typed_react'; +import { bindPlainActionCreators } from '../../utils/typed_redux'; +import { UrlStateContainer } from '../../utils/url_state'; + +export const withWaffleTime = connect( + (state: State) => ({ + currentTime: waffleTimeSelectors.selectCurrentTime(state), + currentTimeRange: waffleTimeSelectors.selectCurrentTimeRange(state), + isAutoReloading: waffleTimeSelectors.selectIsAutoReloading(state), + urlState: selectTimeUrlState(state), + }), + bindPlainActionCreators({ + jumpToTime: waffleTimeActions.jumpToTime, + startAutoReload: waffleTimeActions.startAutoReload, + stopAutoReload: waffleTimeActions.stopAutoReload, + }) +); + +export const WithWaffleTime = asChildFunctionRenderer(withWaffleTime, { + onCleanup: ({ stopAutoReload }) => stopAutoReload(), +}); + +/** + * Url State + */ + +interface WaffleTimeUrlState { + time?: ReturnType; + autoReload?: ReturnType; +} + +export const WithWaffleTimeUrlState = () => ( + + {({ jumpToTime, startAutoReload, stopAutoReload, urlState }) => ( + { + if (newUrlState && newUrlState.time) { + jumpToTime(newUrlState.time); + } + if (newUrlState && newUrlState.autoReload) { + startAutoReload(); + } else if ( + newUrlState && + typeof newUrlState.autoReload !== 'undefined' && + !newUrlState.autoReload + ) { + stopAutoReload(); + } + }} + onInitialize={initialUrlState => { + if (initialUrlState) { + jumpToTime(initialUrlState.time ? initialUrlState.time : Date.now()); + } + if (initialUrlState && initialUrlState.autoReload) { + startAutoReload(); + } + }} + /> + )} + +); + +const selectTimeUrlState = createSelector( + waffleTimeSelectors.selectCurrentTime, + waffleTimeSelectors.selectIsAutoReloading, + (time, autoReload) => ({ + time, + autoReload, + }) +); + +const mapToUrlState = (value: any): WaffleTimeUrlState | undefined => + value + ? { + time: mapToTimeUrlState(value.time), + autoReload: mapToAutoReloadUrlState(value.autoReload), + } + : undefined; + +const mapToTimeUrlState = (value: any) => (value && typeof value === 'number' ? value : undefined); + +const mapToAutoReloadUrlState = (value: any) => (typeof value === 'boolean' ? value : undefined); diff --git a/x-pack/plugins/infra/public/containers/with_kibana_chrome.tsx b/x-pack/plugins/infra/public/containers/with_kibana_chrome.tsx new file mode 100644 index 0000000000000..a298f3f1c4d7d --- /dev/null +++ b/x-pack/plugins/infra/public/containers/with_kibana_chrome.tsx @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/* + * + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import chrome from 'ui/chrome'; + +import { RendererFunction } from '../utils/typed_react'; + +interface WithKibanaChromeProps { + children: RendererFunction<{ + basePath: string; + }>; +} + +export const WithKibanaChrome: React.SFC = ({ children }) => + children({ + basePath: chrome.getBasePath(), + }); diff --git a/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx new file mode 100644 index 0000000000000..b3d062aeed080 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/with_kuery_autocompletion.tsx @@ -0,0 +1,108 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { connect } from 'react-redux'; + +import { AutocompleteSuggestion, getAutocompleteProvider } from 'ui/autocomplete_providers'; +import { StaticIndexPattern } from 'ui/index_patterns'; + +import { sourceSelectors, State } from '../store'; +import { RendererFunction } from '../utils/typed_react'; + +const withIndexPattern = connect((state: State) => ({ + indexPattern: sourceSelectors.selectDerivedIndexPattern(state), +})); + +interface WithKueryAutocompletionLifecycleProps { + children: RendererFunction<{ + isLoadingSuggestions: boolean; + loadSuggestions: (expression: string, cursorPosition: number, maxSuggestions?: number) => void; + suggestions: AutocompleteSuggestion[]; + }>; + indexPattern: StaticIndexPattern; +} + +interface WithKueryAutocompletionLifecycleState { + // lacking cancellation support in the autocompletion api, + // this is used to keep older, slower requests from clobbering newer ones + currentRequest: { + expression: string; + cursorPosition: number; + } | null; + suggestions: AutocompleteSuggestion[]; +} + +export const WithKueryAutocompletion = withIndexPattern( + class WithKueryAutocompletionLifecycle extends React.Component< + WithKueryAutocompletionLifecycleProps, + WithKueryAutocompletionLifecycleState + > { + public readonly state: WithKueryAutocompletionLifecycleState = { + currentRequest: null, + suggestions: [], + }; + + public render() { + const { currentRequest, suggestions } = this.state; + + return this.props.children({ + isLoadingSuggestions: currentRequest !== null, + loadSuggestions: this.loadSuggestions, + suggestions, + }); + } + + private loadSuggestions = async ( + expression: string, + cursorPosition: number, + maxSuggestions?: number + ) => { + const { indexPattern } = this.props; + const autocompletionProvider = getAutocompleteProvider('kuery'); + const config = { + get: () => true, + }; + + if (!autocompletionProvider) { + return; + } + + const getSuggestions = autocompletionProvider({ + config, + indexPatterns: [indexPattern], + boolFilter: [], + }); + + this.setState({ + currentRequest: { + expression, + cursorPosition, + }, + suggestions: [], + }); + + const suggestions = await getSuggestions({ + query: expression, + selectionStart: cursorPosition, + selectionEnd: cursorPosition, + }); + + this.setState( + state => + state.currentRequest && + state.currentRequest.expression !== expression && + state.currentRequest.cursorPosition !== cursorPosition + ? state // ignore this result, since a newer request is in flight + : { + ...state, + currentRequest: null, + suggestions: maxSuggestions ? suggestions.slice(0, maxSuggestions) : suggestions, + } + ); + }; + } +); diff --git a/x-pack/plugins/infra/public/containers/with_options.tsx b/x-pack/plugins/infra/public/containers/with_options.tsx new file mode 100644 index 0000000000000..0e92a6ef43edb --- /dev/null +++ b/x-pack/plugins/infra/public/containers/with_options.tsx @@ -0,0 +1,95 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import moment from 'moment'; +import React from 'react'; + +import { InfraMetricType, InfraPathType } from '../../common/graphql/types'; +import { + InfraFormatterType, + InfraOptions, + InfraWaffleMapLegendMode, + // InfraWaffleMapRuleOperator, +} from '../lib/lib'; +import { RendererFunction } from '../utils/typed_react'; + +const initialState = { + options: { + sourceId: 'default', + timerange: { + interval: '1m', + to: moment.utc().valueOf(), + from: moment + .utc() + .subtract(1, 'h') + .valueOf(), + }, + wafflemap: { + formatter: InfraFormatterType.percent, + formatTemplate: '{{value}}', + metric: { type: InfraMetricType.cpu }, + path: [{ type: InfraPathType.hosts }], + /* + legend: { + type: InfraWaffleMapLegendMode.step, + rules: [ + { + value: 0, + color: '#00B3A4', + operator: InfraWaffleMapRuleOperator.gte, + label: 'Ok', + }, + { + value: 10000, + color: '#DB1374', + operator: InfraWaffleMapRuleOperator.gte, + label: 'Over 10,000', + }, + ], + }, + */ + legend: { + type: InfraWaffleMapLegendMode.gradient, + rules: [ + { + value: 0, + color: '#D9D9D9', + }, + { + value: 0.65, + color: '#00B3A4', + }, + { + value: 0.8, + color: '#E6C220', + }, + { + value: 1, + color: '#DB1374', + }, + ], + }, + }, + } as InfraOptions, +}; + +interface WithOptionsProps { + children: RendererFunction; +} + +type State = Readonly; + +export const withOptions =

      (WrappedComponent: React.ComponentType

      ) => ( + {args => } +); + +export class WithOptions extends React.Component { + public readonly state: State = initialState; + + public render() { + return this.props.children(this.state.options); + } +} diff --git a/x-pack/plugins/infra/public/containers/with_source.ts b/x-pack/plugins/infra/public/containers/with_source.ts new file mode 100644 index 0000000000000..9674cda59575c --- /dev/null +++ b/x-pack/plugins/infra/public/containers/with_source.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { connect } from 'react-redux'; + +import { sourceSelectors, State } from '../store'; +import { asChildFunctionRenderer } from '../utils/typed_react'; + +export const withSource = connect((state: State) => ({ + configuredFields: sourceSelectors.selectSourceFields(state), + logIndicesExist: sourceSelectors.selectSourceLogIndicesExist(state), + metricIndicesExist: sourceSelectors.selectSourceMetricIndicesExist(state), +})); + +export const WithSource = asChildFunctionRenderer(withSource); diff --git a/x-pack/plugins/infra/public/containers/with_state_from_location.tsx b/x-pack/plugins/infra/public/containers/with_state_from_location.tsx new file mode 100644 index 0000000000000..b8c8c85d96631 --- /dev/null +++ b/x-pack/plugins/infra/public/containers/with_state_from_location.tsx @@ -0,0 +1,126 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Location } from 'history'; +import omit from 'lodash/fp/omit'; +import { parse as parseQueryString, stringify as stringifyQueryString } from 'querystring'; +import React from 'react'; +import { RouteComponentProps, withRouter } from 'react-router'; +import { decode_object, encode_object } from 'rison-node'; +import { Omit } from '../lib/lib'; + +interface AnyObject { + [key: string]: any; +} + +interface WithStateFromLocationOptions { + mapLocationToState: (location: Location) => StateInLocation; + mapStateToLocation: (state: StateInLocation, location: Location) => Location; +} + +type InjectedPropsFromLocation = Partial & { + pushStateInLocation?: (state: StateInLocation) => void; + replaceStateInLocation?: (state: StateInLocation) => void; +}; + +export const withStateFromLocation = ({ + mapLocationToState, + mapStateToLocation, +}: WithStateFromLocationOptions) => < + WrappedComponentProps extends InjectedPropsFromLocation +>( + WrappedComponent: React.ComponentType +) => { + const wrappedName = WrappedComponent.displayName || WrappedComponent.name; + + return withRouter( + class WithStateFromLocation extends React.PureComponent< + RouteComponentProps<{}> & + Omit> + > { + public static displayName = `WithStateFromLocation(${wrappedName})`; + + public render() { + const { location } = this.props; + const otherProps = omit(['location', 'history', 'match', 'staticContext'], this.props); + + const stateFromLocation = mapLocationToState(location); + + return ( + + ); + } + + private pushStateInLocation = (state: StateInLocation) => { + const { history, location } = this.props; + + const newLocation = mapStateToLocation(state, this.props.location); + + if (newLocation !== location) { + history.push(newLocation); + } + }; + + private replaceStateInLocation = (state: StateInLocation) => { + const { history, location } = this.props; + + const newLocation = mapStateToLocation(state, this.props.location); + + if (newLocation !== location) { + history.replace(newLocation); + } + }; + } + ); +}; + +const decodeRisonAppState = (queryValues: { _a?: string }): AnyObject => { + try { + return queryValues && queryValues._a ? decode_object(queryValues._a) : {}; + } catch (error) { + if (error instanceof Error && error.message.startsWith('rison decoder error')) { + return {}; + } + throw error; + } +}; + +const encodeRisonAppState = (state: AnyObject) => ({ + _a: encode_object(state), +}); + +export const mapRisonAppLocationToState = ( + mapState: (risonAppState: AnyObject) => State = (state: AnyObject) => state as State +) => (location: Location): State => { + const queryValues = parseQueryString(location.search.substring(1)); + const decodedState = decodeRisonAppState(queryValues); + return mapState(decodedState); +}; + +export const mapStateToRisonAppLocation = ( + mapState: (state: State) => AnyObject = (state: State) => state +) => (state: State, location: Location): Location => { + const previousQueryValues = parseQueryString(location.search.substring(1)); + const previousState = decodeRisonAppState(previousQueryValues); + + const encodedState = encodeRisonAppState({ + ...previousState, + ...mapState(state), + }); + const newQueryValues = stringifyQueryString({ + ...previousQueryValues, + ...encodedState, + }); + return { + ...location, + search: `?${newQueryValues}`, + }; +}; diff --git a/x-pack/plugins/infra/public/images/docker.svg b/x-pack/plugins/infra/public/images/docker.svg new file mode 100644 index 0000000000000..e4499c8ce275d --- /dev/null +++ b/x-pack/plugins/infra/public/images/docker.svg @@ -0,0 +1,12 @@ + + + + Shape + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/x-pack/plugins/infra/public/images/hosts.svg b/x-pack/plugins/infra/public/images/hosts.svg new file mode 100644 index 0000000000000..d04e953d90fa3 --- /dev/null +++ b/x-pack/plugins/infra/public/images/hosts.svg @@ -0,0 +1,12 @@ + + + + picto-server-orange + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/x-pack/plugins/infra/public/images/infra_mono_white.svg b/x-pack/plugins/infra/public/images/infra_mono_white.svg new file mode 100644 index 0000000000000..168ca6c03f18d --- /dev/null +++ b/x-pack/plugins/infra/public/images/infra_mono_white.svg @@ -0,0 +1,15 @@ + + + + infra-mono + Created with Sketch. + + + + + + + + + + diff --git a/x-pack/plugins/infra/public/images/k8.svg b/x-pack/plugins/infra/public/images/k8.svg new file mode 100644 index 0000000000000..2509bd9e8e6b0 --- /dev/null +++ b/x-pack/plugins/infra/public/images/k8.svg @@ -0,0 +1,13 @@ + + + + k8 + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/x-pack/plugins/infra/public/images/logging_mono_white.svg b/x-pack/plugins/infra/public/images/logging_mono_white.svg new file mode 100644 index 0000000000000..0b7363ea16e8e --- /dev/null +++ b/x-pack/plugins/infra/public/images/logging_mono_white.svg @@ -0,0 +1,18 @@ + + + + logging-mono + Created with Sketch. + + + + + + + + + + + + + diff --git a/x-pack/plugins/infra/public/images/services.svg b/x-pack/plugins/infra/public/images/services.svg new file mode 100644 index 0000000000000..52a8db8126ee7 --- /dev/null +++ b/x-pack/plugins/infra/public/images/services.svg @@ -0,0 +1,9 @@ + + + Shape + Created with Sketch. + + + + + \ No newline at end of file diff --git a/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts new file mode 100644 index 0000000000000..d8f62a10856ee --- /dev/null +++ b/x-pack/plugins/infra/public/lib/adapters/framework/kibana_framework_adapter.ts @@ -0,0 +1,188 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { IModule, IScope } from 'angular'; +import * as React from 'react'; +import * as ReactDOM from 'react-dom'; + +import { UIRoutes as KibanaUIRoutes } from 'ui/routes'; + +import { + InfraBufferedKibanaServiceCall, + InfraFrameworkAdapter, + InfraKibanaAdapterServiceRefs, + InfraKibanaUIConfig, + InfraTimezoneProvider, + InfraUiKibanaAdapterScope, +} from '../../lib'; + +const ROOT_ELEMENT_ID = 'react-infra-root'; +const BREADCRUMBS_ELEMENT_ID = 'react-infra-breadcrumbs'; + +export class InfraKibanaFrameworkAdapter implements InfraFrameworkAdapter { + public appState: object; + public dateFormat?: string; + public kbnVersion?: string; + public scaledDateFormat?: string; + public timezone?: string; + + private adapterService: KibanaAdapterServiceProvider; + private timezoneProvider: InfraTimezoneProvider; + private rootComponent: React.ReactElement | null = null; + private breadcrumbsComponent: React.ReactElement | null = null; + + constructor( + uiModule: IModule, + uiRoutes: KibanaUIRoutes, + timezoneProvider: InfraTimezoneProvider + ) { + this.adapterService = new KibanaAdapterServiceProvider(); + this.timezoneProvider = timezoneProvider; + this.appState = {}; + this.register(uiModule, uiRoutes); + } + + public setUISettings = (key: string, value: any) => { + this.adapterService.callOrBuffer(({ config }) => { + config.set(key, value); + }); + }; + + public render = (component: React.ReactElement) => { + this.adapterService.callOrBuffer(() => (this.rootComponent = component)); + }; + + public renderBreadcrumbs = (component: React.ReactElement) => { + this.adapterService.callOrBuffer(() => (this.breadcrumbsComponent = component)); + }; + + private register = (adapterModule: IModule, uiRoutes: KibanaUIRoutes) => { + adapterModule.provider('kibanaAdapter', this.adapterService); + + adapterModule.directive('infraUiKibanaAdapter', () => ({ + controller: ($scope: InfraUiKibanaAdapterScope, $element: JQLite) => ({ + $onDestroy: () => { + const targetRootElement = $element[0].querySelector(`#${ROOT_ELEMENT_ID}`); + const targetBreadcrumbsElement = $element[0].querySelector(`#${ROOT_ELEMENT_ID}`); + + if (targetRootElement) { + ReactDOM.unmountComponentAtNode(targetRootElement); + } + + if (targetBreadcrumbsElement) { + ReactDOM.unmountComponentAtNode(targetBreadcrumbsElement); + } + }, + $onInit: () => { + $scope.topNavMenu = []; + }, + $postLink: () => { + $scope.$watchGroup( + [ + () => this.breadcrumbsComponent, + () => $element[0].querySelector(`#${BREADCRUMBS_ELEMENT_ID}`), + ], + ([breadcrumbsComponent, targetElement]) => { + if (!targetElement) { + return; + } + + if (breadcrumbsComponent) { + ReactDOM.render(breadcrumbsComponent, targetElement); + } else { + ReactDOM.unmountComponentAtNode(targetElement); + } + } + ); + $scope.$watchGroup( + [() => this.rootComponent, () => $element[0].querySelector(`#${ROOT_ELEMENT_ID}`)], + ([rootComponent, targetElement]) => { + if (!targetElement) { + return; + } + + if (rootComponent) { + ReactDOM.render(rootComponent, targetElement); + } else { + ReactDOM.unmountComponentAtNode(targetElement); + } + } + ); + }, + }), + scope: true, + template: ` +

      + `, + })); + + adapterModule.run(( + config: InfraKibanaUIConfig, + kbnVersion: string, + Private: (provider: Provider) => Provider, + // @ts-ignore: inject kibanaAdapter to force eager instatiation + kibanaAdapter: any + ) => { + this.timezone = Private(this.timezoneProvider)(); + this.kbnVersion = kbnVersion; + this.dateFormat = config.get('dateFormat'); + this.scaledDateFormat = config.get('dateFormat:scaled'); + }); + + uiRoutes.enable(); + + uiRoutes.otherwise({ + reloadOnSearch: false, + template: + '', + }); + }; +} + +// tslint:disable-next-line: max-classes-per-file +class KibanaAdapterServiceProvider { + public serviceRefs: InfraKibanaAdapterServiceRefs | null = null; + public bufferedCalls: Array> = []; + + public $get($rootScope: IScope, config: InfraKibanaUIConfig) { + this.serviceRefs = { + config, + rootScope: $rootScope, + }; + + this.applyBufferedCalls(this.bufferedCalls); + + return this; + } + + public callOrBuffer(serviceCall: (serviceRefs: InfraKibanaAdapterServiceRefs) => void) { + if (this.serviceRefs !== null) { + this.applyBufferedCalls([serviceCall]); + } else { + this.bufferedCalls.push(serviceCall); + } + } + + public applyBufferedCalls( + bufferedCalls: Array> + ) { + if (!this.serviceRefs) { + return; + } + + this.serviceRefs.rootScope.$apply(() => { + bufferedCalls.forEach(serviceCall => { + if (!this.serviceRefs) { + return; + } + return serviceCall(this.serviceRefs); + }); + }); + } +} diff --git a/x-pack/plugins/infra/public/lib/adapters/framework/testing_framework_adapter.ts b/x-pack/plugins/infra/public/lib/adapters/framework/testing_framework_adapter.ts new file mode 100644 index 0000000000000..da56c7b97b226 --- /dev/null +++ b/x-pack/plugins/infra/public/lib/adapters/framework/testing_framework_adapter.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraFrameworkAdapter } from '../../lib'; + +export class InfraTestingFrameworkAdapter implements InfraFrameworkAdapter { + public appState?: object; + public dateFormat?: string; + public kbnVersion?: string; + public scaledDateFormat?: string; + public timezone?: string; + + constructor() { + this.appState = {}; + } + + public render() { + return; + } + public renderBreadcrumbs() { + return; + } + public setUISettings() { + return; + } +} diff --git a/x-pack/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts b/x-pack/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts new file mode 100644 index 0000000000000..157a7ebe9fedf --- /dev/null +++ b/x-pack/plugins/infra/public/lib/adapters/observable_api/kibana_observable_api.ts @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { ajax } from 'rxjs/ajax'; +import { map } from 'rxjs/operators'; + +import { + InfraObservableApi, + InfraObservableApiPostParams, + InfraObservableApiResponse, +} from '../../lib'; + +export class InfraKibanaObservableApiAdapter implements InfraObservableApi { + private basePath: string; + private defaultHeaders: { + [headerName: string]: string; + }; + + constructor({ basePath, xsrfToken }: { basePath: string; xsrfToken: string }) { + this.basePath = basePath; + this.defaultHeaders = { + 'kbn-version': xsrfToken, + }; + } + + public post = ({ + url, + body, + }: InfraObservableApiPostParams): InfraObservableApiResponse => + ajax({ + body: body ? JSON.stringify(body) : undefined, + headers: { + ...this.defaultHeaders, + 'Content-Type': 'application/json', + }, + method: 'POST', + responseType: 'json', + timeout: 30000, + url: `${this.basePath}/api/${url}`, + withCredentials: true, + }).pipe(map(({ response, status }) => ({ response, status }))); +} diff --git a/x-pack/plugins/infra/public/lib/compose/kibana_compose.ts b/x-pack/plugins/infra/public/lib/compose/kibana_compose.ts new file mode 100644 index 0000000000000..3ce48d9a31b96 --- /dev/null +++ b/x-pack/plugins/infra/public/lib/compose/kibana_compose.ts @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import 'ui/autoload/all'; +// @ts-ignore: path dynamic for kibana +import chrome from 'ui/chrome'; +// @ts-ignore: path dynamic for kibana +import { uiModules } from 'ui/modules'; +import uiRoutes from 'ui/routes'; +// @ts-ignore: path dynamic for kibana +import { timezoneProvider } from 'ui/vis/lib/timezone'; + +import { InfraKibanaObservableApiAdapter } from '../adapters/observable_api/kibana_observable_api'; + +import introspectionQueryResultData from '../../../common/graphql/introspection.json'; +import { InfraKibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; +import { InfraFrontendLibs } from '../lib'; + +import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory'; +import ApolloClient from 'apollo-client'; +import { ApolloLink } from 'apollo-link'; +import { HttpLink } from 'apollo-link-http'; +import { withClientState } from 'apollo-link-state'; + +export function compose(): InfraFrontendLibs { + const cache = new InMemoryCache({ + fragmentMatcher: new IntrospectionFragmentMatcher({ + introspectionQueryResultData, + }), + }); + + const observableApi = new InfraKibanaObservableApiAdapter({ + basePath: chrome.getBasePath(), + xsrfToken: chrome.getXsrfToken(), + }); + + const graphQLOptions = { + cache, + link: ApolloLink.from([ + withClientState({ + cache, + resolvers: {}, + }), + new HttpLink({ + credentials: 'same-origin', + headers: { + 'kbn-xsrf': chrome.getXsrfToken(), + }, + uri: `${chrome.getBasePath()}/api/infra/graphql`, + }), + ]), + }; + + const apolloClient = new ApolloClient(graphQLOptions); + + const infraModule = uiModules.get('app/infa'); + + const framework = new InfraKibanaFrameworkAdapter(infraModule, uiRoutes, timezoneProvider); + + const libs: InfraFrontendLibs = { + apolloClient, + framework, + observableApi, + }; + return libs; +} diff --git a/x-pack/plugins/infra/public/lib/compose/testing_compose.ts b/x-pack/plugins/infra/public/lib/compose/testing_compose.ts new file mode 100644 index 0000000000000..14fd66d378121 --- /dev/null +++ b/x-pack/plugins/infra/public/lib/compose/testing_compose.ts @@ -0,0 +1,59 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import 'ui/autoload/all'; +// @ts-ignore: path dynamic for kibana +import chrome from 'ui/chrome'; +// @ts-ignore: path dynamic for kibana +import { uiModules } from 'ui/modules'; +import uiRoutes from 'ui/routes'; +// @ts-ignore: path dynamic for kibana +import { timezoneProvider } from 'ui/vis/lib/timezone'; + +import { InMemoryCache } from 'apollo-cache-inmemory'; +import ApolloClient from 'apollo-client'; +import { SchemaLink } from 'apollo-link-schema'; +import { addMockFunctionsToSchema, makeExecutableSchema } from 'graphql-tools'; +import { InfraKibanaFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; +import { InfraKibanaObservableApiAdapter } from '../adapters/observable_api/kibana_observable_api'; +import { InfraFrontendLibs } from '../lib'; + +export function compose(): InfraFrontendLibs { + const infraModule = uiModules.get('app/infa'); + const observableApi = new InfraKibanaObservableApiAdapter({ + basePath: chrome.getBasePath(), + xsrfToken: chrome.getXsrfToken(), + }); + const framework = new InfraKibanaFrameworkAdapter(infraModule, uiRoutes, timezoneProvider); + const typeDefs = ` + Query {} +`; + + const mocks = { + Mutation: () => undefined, + Query: () => undefined, + }; + + const schema = makeExecutableSchema({ typeDefs }); + addMockFunctionsToSchema({ + mocks, + schema, + }); + + const cache = new InMemoryCache((window as any).__APOLLO_CLIENT__); + + const apolloClient = new ApolloClient({ + cache, + link: new SchemaLink({ schema }), + }); + + const libs: InfraFrontendLibs = { + apolloClient, + framework, + observableApi, + }; + return libs; +} diff --git a/x-pack/plugins/infra/public/lib/lib.ts b/x-pack/plugins/infra/public/lib/lib.ts new file mode 100644 index 0000000000000..0df859fa81446 --- /dev/null +++ b/x-pack/plugins/infra/public/lib/lib.ts @@ -0,0 +1,204 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { IModule, IScope } from 'angular'; +import { NormalizedCacheObject } from 'apollo-cache-inmemory'; +import ApolloClient from 'apollo-client'; +import { AxiosRequestConfig } from 'axios'; +import React from 'react'; +import { Observable } from 'rxjs'; +import { + InfraMetricInput, + InfraNodeMetric, + InfraNodePath, + InfraPathInput, + InfraTimerangeInput, + SourceQuery, +} from '../../common/graphql/types'; + +export interface InfraFrontendLibs { + framework: InfraFrameworkAdapter; + apolloClient: InfraApolloClient; + observableApi: InfraObservableApi; +} + +export type InfraTimezoneProvider = () => string; + +export type InfraApolloClient = ApolloClient; + +export interface InfraFrameworkAdapter { + // Insstance vars + appState?: object; + dateFormat?: string; + kbnVersion?: string; + scaledDateFormat?: string; + timezone?: string; + + // Methods + setUISettings(key: string, value: any): void; + render(component: React.ReactElement): void; + renderBreadcrumbs(component: React.ReactElement): void; +} + +export interface InfraFramworkAdapterConstructable { + new (uiModule: IModule, timezoneProvider: InfraTimezoneProvider): InfraFrameworkAdapter; +} + +// TODO: replace AxiosRequestConfig with something more defined +export type InfraRequestConfig = AxiosRequestConfig; + +export interface InfraApiAdapter { + get(url: string, config?: InfraRequestConfig | undefined): Promise; + post(url: string, data?: any, config?: AxiosRequestConfig | undefined): Promise; + delete(url: string, config?: InfraRequestConfig | undefined): Promise; + put(url: string, data?: any, config?: InfraRequestConfig | undefined): Promise; +} + +export interface InfraObservableApiPostParams { + url: string; + body?: RequestBody; +} + +export type InfraObservableApiResponse = Observable<{ + status: number; + response: BodyType; +}>; + +export interface InfraObservableApi { + post( + params: InfraObservableApiPostParams + ): InfraObservableApiResponse; +} + +export interface InfraUiKibanaAdapterScope extends IScope { + breadcrumbs: any[]; + topNavMenu: any[]; +} + +export interface InfraKibanaUIConfig { + get(key: string): any; + set(key: string, value: any): Promise; +} + +export interface InfraKibanaAdapterServiceRefs { + config: InfraKibanaUIConfig; + rootScope: IScope; +} + +export type InfraBufferedKibanaServiceCall = (serviceRefs: ServiceRefs) => void; + +export interface InfraField { + name: string; + type: string; + searchable: boolean; + aggregatable: boolean; +} + +export type InfraWaffleData = InfraWaffleMapGroup[]; + +export interface InfraWaffleMapNode { + id: string; + name: string; + path: InfraNodePath[]; + metric: InfraNodeMetric; +} + +export type InfraWaffleMapGroup = InfraWaffleMapGroupOfNodes | InfraWaffleMapGroupOfGroups; + +export interface InfraWaffleMapGroupBase { + id: string; + name: string; + count: number; + width: number; + squareSize: number; +} + +export interface InfraWaffleMapGroupOfGroups extends InfraWaffleMapGroupBase { + groups: InfraWaffleMapGroupOfNodes[]; +} + +export interface InfraWaffleMapGroupOfNodes extends InfraWaffleMapGroupBase { + nodes: InfraWaffleMapNode[]; +} + +export interface InfraWaffleMapStepRule { + value: number; + operator: InfraWaffleMapRuleOperator; + color: string; + label?: string; +} + +export interface InfraWaffleMapGradientRule { + value: number; + color: string; +} + +export enum InfraWaffleMapLegendMode { + step = 'step', + gradient = 'gradient', +} + +export interface InfraWaffleMapStepLegend { + type: InfraWaffleMapLegendMode.step; + rules: InfraWaffleMapStepRule[]; +} + +export interface InfraWaffleMapGradientLegend { + type: InfraWaffleMapLegendMode.gradient; + rules: InfraWaffleMapGradientRule[]; +} + +export type InfraWaffleMapLegend = InfraWaffleMapStepLegend | InfraWaffleMapGradientLegend; + +export enum InfraWaffleMapRuleOperator { + gt = 'gt', + gte = 'gte', + lt = 'lt', + lte = 'lte', + eq = 'eq', +} + +export interface InfraWaffleMapOptions { + fields?: SourceQuery.Fields | null; + formatter: InfraFormatterType; + formatTemplate: string; + metric: InfraMetricInput; + path: InfraPathInput[]; + groupBy: InfraPathInput[]; + legend: InfraWaffleMapLegend; +} + +export interface InfraOptions { + sourceId: string; + timerange: InfraTimerangeInput; + wafflemap: InfraWaffleMapOptions; +} + +export type Omit = Pick>; + +export interface InfraWaffleMapBounds { + min: number; + max: number; +} + +export type InfraFormatter = (value: string | number) => string; +export enum InfraFormatterType { + number = 'number', + abbreviatedNumber = 'abbreviatedNumber', + bytes = 'bytes', + bits = 'bits', + percent = 'percent', +} + +export enum InfraWaffleMapDataFormat { + bytesDecimal = 'bytesDecimal', + bytesBinaryIEC = 'bytesBinaryIEC', + bytesBinaryJEDEC = 'bytesBinaryJEDEC', + bitsDecimal = 'bitsDecimal', + bitsBinaryIEC = 'bitsBinaryIEC', + bitsBinaryJEDEC = 'bitsBinaryJEDEC', + abbreviatedNumber = 'abbreviatedNumber', +} diff --git a/x-pack/plugins/infra/public/pages/404.tsx b/x-pack/plugins/infra/public/pages/404.tsx new file mode 100644 index 0000000000000..956bf90e84927 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/404.tsx @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +export class NotFoundPage extends React.PureComponent { + public render() { + return
      No content found
      ; + } +} diff --git a/x-pack/plugins/infra/public/pages/error.tsx b/x-pack/plugins/infra/public/pages/error.tsx new file mode 100644 index 0000000000000..75b158c42c5a1 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/error.tsx @@ -0,0 +1,59 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { + EuiCallOut, + EuiPage, + EuiPageBody, + EuiPageContent, + EuiPageHeader, + EuiPageHeaderSection, + EuiTitle, +} from '@elastic/eui'; +import React from 'react'; +import styled from 'styled-components'; +import { Header } from '../components/header'; +import { ColumnarPage, PageContent } from '../components/page'; + +const DetailPageContent = styled(PageContent)` + overflow: auto; + background-color: ${props => props.theme.eui.euiColorLightestShade}; +`; + +interface Props { + message: string; +} + +export const Error: React.SFC = ({ message }) => { + return ( + +
      + + + + + ); +}; + +export const ErrorPageBody: React.SFC<{ message: string }> = ({ message }) => { + return ( + + + + + +

      Oops!

      +
      +
      +
      + + +

      Please click the back button and try again.

      +
      +
      +
      +
      + ); +}; diff --git a/x-pack/plugins/infra/public/pages/home/index.tsx b/x-pack/plugins/infra/public/pages/home/index.tsx new file mode 100644 index 0000000000000..9032b30d42266 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/home/index.tsx @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { HomePageContent } from './page_content'; +import { HomeToolbar } from './toolbar'; + +import { EmptyPage } from '../../components/empty_page'; +import { Header } from '../../components/header'; +import { ColumnarPage } from '../../components/page'; + +import { InfrastructureBetaBadgeHeaderSection } from '../../components/beta_badge_header_section'; +import { WithWaffleFilterUrlState } from '../../containers/waffle/with_waffle_filters'; +import { WithWaffleOptionsUrlState } from '../../containers/waffle/with_waffle_options'; +import { WithWaffleTimeUrlState } from '../../containers/waffle/with_waffle_time'; +import { WithKibanaChrome } from '../../containers/with_kibana_chrome'; +import { WithSource } from '../../containers/with_source'; + +export class HomePage extends React.PureComponent { + public render() { + return ( + + + {({ metricIndicesExist }) => + metricIndicesExist || metricIndicesExist === null ? ( + <> + + + +
      } /> + + + + ) : ( + + {({ basePath }) => ( + + )} + + ) + } + + + ); + } +} diff --git a/x-pack/plugins/infra/public/pages/home/page_content.tsx b/x-pack/plugins/infra/public/pages/home/page_content.tsx new file mode 100644 index 0000000000000..43fcaab282e98 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/home/page_content.tsx @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { PageContent } from '../../components/page'; +import { Waffle } from '../../components/waffle'; + +import { WithWaffleFilter } from '../../containers/waffle/with_waffle_filters'; +import { WithWaffleNodes } from '../../containers/waffle/with_waffle_nodes'; +import { WithWaffleOptions } from '../../containers/waffle/with_waffle_options'; +import { WithWaffleTime } from '../../containers/waffle/with_waffle_time'; +import { WithOptions } from '../../containers/with_options'; +import { WithSource } from '../../containers/with_source'; + +export const HomePageContent: React.SFC = () => ( + + + {({ configuredFields }) => ( + + {({ wafflemap, sourceId }) => ( + + {({ filterQueryAsJson, applyFilterQuery }) => ( + + {({ currentTimeRange, isAutoReloading }) => ( + + {({ metric, groupBy, nodeType }) => ( + + {({ nodes, loading, refetch }) => ( + 0 && isAutoReloading ? false : loading} + nodeType={nodeType} + options={{ ...wafflemap, metric, fields: configuredFields, groupBy }} + reload={refetch} + onDrilldown={applyFilterQuery} + timeRange={currentTimeRange} + /> + )} + + )} + + )} + + )} + + )} + + )} + + +); diff --git a/x-pack/plugins/infra/public/pages/home/toolbar.tsx b/x-pack/plugins/infra/public/pages/home/toolbar.tsx new file mode 100644 index 0000000000000..5abccd9f9763d --- /dev/null +++ b/x-pack/plugins/infra/public/pages/home/toolbar.tsx @@ -0,0 +1,114 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle } from '@elastic/eui'; +import React from 'react'; + +import { AutocompleteField } from '../../components/autocomplete_field'; +import { Toolbar } from '../../components/eui/toolbar'; +import { WaffleTimeControls } from '../../components/waffle/waffle_time_controls'; + +import { InfraNodeType } from '../../../common/graphql/types'; +import { WaffleGroupByControls } from '../../components/waffle/waffle_group_by_controls'; +import { WaffleMetricControls } from '../../components/waffle/waffle_metric_controls'; +import { WaffleNodeTypeSwitcher } from '../../components/waffle/waffle_node_type_switcher'; +import { WithWaffleFilter } from '../../containers/waffle/with_waffle_filters'; +import { WithWaffleOptions } from '../../containers/waffle/with_waffle_options'; +import { WithWaffleTime } from '../../containers/waffle/with_waffle_time'; +import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion'; + +const TITLES = { + [InfraNodeType.host]: 'Hosts', + [InfraNodeType.pod]: 'Kubernetes Pods', + [InfraNodeType.container]: 'Docker Containers', +}; + +export const HomeToolbar: React.SFC = () => ( + + + + + {({ nodeType }) => ( + +

      {TITLES[nodeType]}

      +
      + )} +
      + +

      Showing the last 1 minute of data from the time period

      +
      +
      + + {({ nodeType, changeNodeType, changeGroupBy, changeMetric }) => ( + + + + )} + +
      + + + + {({ isLoadingSuggestions, loadSuggestions, suggestions }) => ( + + {({ + applyFilterQueryFromKueryExpression, + filterQueryDraft, + isFilterQueryDraftValid, + setFilterQueryDraftFromKueryExpression, + }) => ( + + )} + + )} + + + + {({ changeMetric, changeGroupBy, groupBy, metric, nodeType }) => ( + + + + + + + + + )} + + + + {({ currentTime, isAutoReloading, jumpToTime, startAutoReload, stopAutoReload }) => ( + + )} + + + +
      +); diff --git a/x-pack/plugins/infra/public/pages/link_to/index.ts b/x-pack/plugins/infra/public/pages/link_to/index.ts new file mode 100644 index 0000000000000..4c8051f8da73e --- /dev/null +++ b/x-pack/plugins/infra/public/pages/link_to/index.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { LinkToPage } from './link_to'; +export { getNodeLogsUrl, RedirectToNodeLogs } from './redirect_to_node_logs'; +export { getNodeDetailUrl, RedirectToNodeDetail } from './redirect_to_node_detail'; diff --git a/x-pack/plugins/infra/public/pages/link_to/link_to.tsx b/x-pack/plugins/infra/public/pages/link_to/link_to.tsx new file mode 100644 index 0000000000000..e00013a354747 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/link_to/link_to.tsx @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { match as RouteMatch, Redirect, Route, Switch } from 'react-router-dom'; + +import { RedirectToNodeDetail } from './redirect_to_node_detail'; +import { RedirectToNodeLogs } from './redirect_to_node_logs'; + +interface LinkToPageProps { + match: RouteMatch<{}>; +} + +export class LinkToPage extends React.Component { + public render() { + const { match } = this.props; + + return ( + + + + + + ); + } +} diff --git a/x-pack/plugins/infra/public/pages/link_to/query_params.ts b/x-pack/plugins/infra/public/pages/link_to/query_params.ts new file mode 100644 index 0000000000000..8b28b7df113ac --- /dev/null +++ b/x-pack/plugins/infra/public/pages/link_to/query_params.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Location } from 'history'; + +import { getParamFromQueryString, getQueryStringFromLocation } from '../../utils/url_state'; + +export const getTimeFromLocation = (location: Location) => { + const timeParam = getParamFromQueryString(getQueryStringFromLocation(location), 'time'); + return timeParam ? parseFloat(timeParam) : NaN; +}; + +export const getToFromLocation = (location: Location) => { + const timeParam = getParamFromQueryString(getQueryStringFromLocation(location), 'to'); + return timeParam ? parseFloat(timeParam) : NaN; +}; + +export const getFromFromLocation = (location: Location) => { + const timeParam = getParamFromQueryString(getQueryStringFromLocation(location), 'from'); + return timeParam ? parseFloat(timeParam) : NaN; +}; diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx new file mode 100644 index 0000000000000..889412dfba874 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_detail.tsx @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { Redirect, RouteComponentProps } from 'react-router-dom'; +import { InfraNodeType } from 'x-pack/plugins/infra/common/graphql/types'; +import { replaceMetricTimeInQueryString } from '../../containers/metrics/with_metrics_time'; +import { getFromFromLocation, getToFromLocation } from './query_params'; + +type RedirectToNodeDetailProps = RouteComponentProps<{ + nodeName: string; + nodeType: InfraNodeType; +}>; + +export const RedirectToNodeDetail = ({ + match: { + params: { nodeName, nodeType }, + }, + location, +}: RedirectToNodeDetailProps) => { + const searchString = replaceMetricTimeInQueryString( + getFromFromLocation(location), + getToFromLocation(location) + )(''); + + return ; +}; + +export const getNodeDetailUrl = ({ + nodeType, + nodeName, + to, + from, +}: { + nodeType: InfraNodeType; + nodeName: string; + to?: number; + from?: number; +}) => { + const args = to && from ? `?to=${to}&from=${from}` : ''; + return `#/link-to/${nodeType}-detail/${nodeName}${args}`; +}; diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx new file mode 100644 index 0000000000000..821bb1126658d --- /dev/null +++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import compose from 'lodash/fp/compose'; +import React from 'react'; +import { Redirect, RouteComponentProps } from 'react-router-dom'; + +import { InfraNodeType } from 'x-pack/plugins/infra/common/graphql/types'; +import { LoadingPage } from '../../components/loading_page'; +import { replaceLogFilterInQueryString } from '../../containers/logs/with_log_filter'; +import { replaceLogPositionInQueryString } from '../../containers/logs/with_log_position'; +import { WithSource } from '../../containers/with_source'; +import { getTimeFromLocation } from './query_params'; + +type RedirectToNodeLogsProps = RouteComponentProps<{ + nodeName: string; + nodeType: InfraNodeType; +}>; + +export const RedirectToNodeLogs = ({ + match: { + params: { nodeName, nodeType }, + }, + location, +}: RedirectToNodeLogsProps) => ( + + {({ configuredFields }) => { + if (!configuredFields) { + return ; + } + + const searchString = compose( + replaceLogFilterInQueryString(`${configuredFields[nodeType]}: ${nodeName}`), + replaceLogPositionInQueryString(getTimeFromLocation(location)) + )(''); + + return ; + }} + +); + +export const getNodeLogsUrl = ({ + nodeName, + nodeType, + time, +}: { + nodeName: string; + nodeType: InfraNodeType; + time?: number; +}) => [`#/link-to/${nodeType}-logs/`, nodeName, ...(time ? [`?time=${time}`] : [])].join(''); diff --git a/x-pack/plugins/infra/public/pages/logs/index.ts b/x-pack/plugins/infra/public/pages/logs/index.ts new file mode 100644 index 0000000000000..c2ae23acdc9b0 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/logs/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { LogsPage } from './logs'; diff --git a/x-pack/plugins/infra/public/pages/logs/logs.tsx b/x-pack/plugins/infra/public/pages/logs/logs.tsx new file mode 100644 index 0000000000000..7b24cbaa52609 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/logs/logs.tsx @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { LogsPageContent } from './page_content'; +import { LogsToolbar } from './toolbar'; + +import { EmptyPage } from '../../components/empty_page'; +import { Header } from '../../components/header'; +import { ColumnarPage } from '../../components/page'; + +import { LogsBetaBadgeHeaderSection } from '../../components/beta_badge_header_section'; +import { WithLogFilterUrlState } from '../../containers/logs/with_log_filter'; +import { WithLogMinimapUrlState } from '../../containers/logs/with_log_minimap'; +import { WithLogPositionUrlState } from '../../containers/logs/with_log_position'; +import { WithLogTextviewUrlState } from '../../containers/logs/with_log_textview'; +import { WithKibanaChrome } from '../../containers/with_kibana_chrome'; +import { WithSource } from '../../containers/with_source'; + +export class LogsPage extends React.Component { + public render() { + return ( + + + {({ logIndicesExist }) => + logIndicesExist || logIndicesExist === null ? ( + <> + + + + +
      } + breadcrumbs={[{ text: 'Logs' }]} + /> + + + + ) : ( + + {({ basePath }) => ( + + )} + + ) + } + + + ); + } +} diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx new file mode 100644 index 0000000000000..e2efd2f1a333a --- /dev/null +++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx @@ -0,0 +1,122 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import styled from 'styled-components'; + +import { AutoSizer } from '../../components/auto_sizer'; +import { LogMinimap } from '../../components/logging/log_minimap'; +import { ScrollableLogTextStreamView } from '../../components/logging/log_text_stream'; +import { PageContent } from '../../components/page'; +import { WithLogMinimap } from '../../containers/logs/with_log_minimap'; +import { WithLogPosition } from '../../containers/logs/with_log_position'; +import { WithLogTextview } from '../../containers/logs/with_log_textview'; +import { WithStreamItems } from '../../containers/logs/with_stream_items'; +import { WithSummary } from '../../containers/logs/with_summary'; + +export const LogsPageContent: React.SFC = () => ( + + + {({ measureRef, content: { width = 0, height = 0 } }) => ( + + + {({ textScale, wrap }) => ( + + {({ + isAutoReloading, + jumpToTargetPosition, + reportVisiblePositions, + targetPosition, + }) => ( + + {({ + hasMoreAfterEnd, + hasMoreBeforeStart, + isLoadingMore, + isReloading, + items, + lastLoadedTime, + loadNewerEntries, + }) => ( + + )} + + )} + + )} + + + )} + + + {({ measureRef, content: { width = 0, height = 0 } }) => { + return ( + + + {({ intervalSize }) => ( + + {({ buckets }) => ( + + {({ + jumpToTargetPosition, + reportVisibleSummary, + visibleMidpointTime, + visibleTimeInterval, + }) => ( + + )} + + )} + + )} + + + ); + }} + + +); + +const LogPageEventStreamColumn = styled.div` + flex: 1 0 0%; + overflow: hidden; + display: flex; + flex-direction: column; +`; + +const LogPageMinimapColumn = styled.div` + flex: 1 0 0%; + overflow: hidden; + min-width: 100px; + max-width: 100px; + display: flex; + flex-direction: column; +`; diff --git a/x-pack/plugins/infra/public/pages/logs/toolbar.tsx b/x-pack/plugins/infra/public/pages/logs/toolbar.tsx new file mode 100644 index 0000000000000..7c7c7004c4674 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/logs/toolbar.tsx @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; +import React from 'react'; + +import { AutocompleteField } from '../../components/autocomplete_field'; +import { Toolbar } from '../../components/eui'; +import { LogCustomizationMenu } from '../../components/logging/log_customization_menu'; +import { LogMinimapScaleControls } from '../../components/logging/log_minimap_scale_controls'; +import { LogTextScaleControls } from '../../components/logging/log_text_scale_controls'; +import { LogTextWrapControls } from '../../components/logging/log_text_wrap_controls'; +import { LogTimeControls } from '../../components/logging/log_time_controls'; +import { WithLogFilter } from '../../containers/logs/with_log_filter'; +import { WithLogMinimap } from '../../containers/logs/with_log_minimap'; +import { WithLogPosition } from '../../containers/logs/with_log_position'; +import { WithLogTextview } from '../../containers/logs/with_log_textview'; +import { WithKueryAutocompletion } from '../../containers/with_kuery_autocompletion'; + +export const LogsToolbar: React.SFC = () => ( + + + + + {({ isLoadingSuggestions, loadSuggestions, suggestions }) => ( + + {({ + applyFilterQueryFromKueryExpression, + /* filterQuery,*/ + filterQueryDraft, + isFilterQueryDraftValid, + setFilterQueryDraftFromKueryExpression, + }) => ( + + )} + + )} + + + + + + {({ availableIntervalSizes, intervalSize, setIntervalSize }) => ( + + )} + + + {({ availableTextScales, textScale, setTextScale, setTextWrap, wrap }) => ( + <> + + + + )} + + + + + + {({ + visibleMidpointTime, + isAutoReloading, + jumpToTargetPositionTime, + startLiveStreaming, + stopLiveStreaming, + }) => ( + + )} + + + + +); diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx new file mode 100644 index 0000000000000..8e4dd37b84a71 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx @@ -0,0 +1,234 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import React from 'react'; + +import { + EuiHideFor, + EuiPage, + EuiPageBody, + EuiPageContent, + EuiPageHeader, + EuiPageHeaderSection, + EuiPageSideBar, + EuiShowFor, + EuiSideNav, + EuiTitle, +} from '@elastic/eui'; +import styled, { withTheme } from 'styled-components'; +import { InfraNodeType, InfraTimerangeInput } from '../../../common/graphql/types'; +import { AutoSizer } from '../../components/auto_sizer'; +import { InfrastructureBetaBadgeHeaderSection } from '../../components/beta_badge_header_section'; +import { Header } from '../../components/header'; +import { Metrics } from '../../components/metrics'; +import { MetricsTimeControls } from '../../components/metrics/time_controls'; +import { ColumnarPage, PageContent } from '../../components/page'; +import { WithCapabilities } from '../../containers/capabilities/with_capabilites'; +import { WithMetrics } from '../../containers/metrics/with_metrics'; +import { + WithMetricsTime, + WithMetricsTimeUrlState, +} from '../../containers/metrics/with_metrics_time'; +import { WithOptions } from '../../containers/with_options'; +import { Error, ErrorPageBody } from '../error'; +import { layoutCreators } from './layouts'; +import { InfraMetricLayoutSection } from './layouts/types'; + +const DetailPageContent = styled(PageContent)` + overflow: auto; + background-color: ${props => props.theme.eui.euiColorLightestShade}; +`; + +const EuiPageContentWithRelative = styled(EuiPageContent)` + position: relative; +`; + +interface Props { + theme: { eui: any }; + match: { + params: { + type: string; + node: string; + }; + }; +} + +class MetricDetailPage extends React.PureComponent { + public readonly state = { + isSideNavOpenOnMobile: false, + }; + + public render() { + const nodeName = this.props.match.params.node; + const nodeType = this.props.match.params.type as InfraNodeType; + const layoutCreator = layoutCreators[nodeType]; + if (!layoutCreator) { + return ; + } + const layouts = layoutCreator(this.props.theme); + const breadcrumbs = [{ text: nodeName }]; + + return ( + +
      } + breadcrumbs={breadcrumbs} + /> + + + + {({ sourceId }) => ( + + {({ + currentTimeRange, + isAutoReloading, + setRangeTime, + startMetricsAutoReload, + stopMetricsAutoReload, + }) => ( + + {({ filteredLayouts }) => { + return ( + + {({ metrics, error, loading }) => { + if (error) { + return ; + } + const sideNav = filteredLayouts.map(item => { + return { + name: item.label, + id: item.id, + items: item.sections.map(section => ({ + id: section.id as string, + name: section.label, + onClick: this.handleClick(section), + })), + }; + }); + return ( + + + + + + + + + + + + + {({ measureRef, bounds: { width = 0 } }) => { + return ( + + + + + + + +

      {nodeName}

      +
      +
      + +
      +
      +
      + + + 0 && isAutoReloading + ? false + : loading + } + onChangeRangeTime={setRangeTime} + /> + +
      +
      + ); + }} +
      +
      + ); + }} +
      + ); + }} +
      + )} +
      + )} +
      +
      + + ); + } + + private handleClick = (section: InfraMetricLayoutSection) => () => { + const id = section.linkToId || section.id; + const el = document.getElementById(id); + if (el) { + el.scrollIntoView(); + } + }; + + private toggleOpenOnMobile = () => { + this.setState({ + isSideNavOpenOnMobile: !this.state.isSideNavOpenOnMobile, + }); + }; +} + +export const MetricDetail = withTheme(MetricDetailPage); + +const EuiSideNavContainer = styled.div` + position: fixed; + z-index: 1; + height: 88vh; + background-color: #f5f5f5; + padding-left: 16px; + margin-left: -16px; + overflow-y: auto; + overflow-x: hidden; +`; + +const MetricsDetailsPageColumn = styled.div` + flex: 1 0 0%; + display: flex; + flex-direction: column; +`; + +const MetricsTitleTimeRangeContainer = styled.div` + display: flex; + flex-flow: row wrap; + justify-content: space-between; +`; diff --git a/x-pack/plugins/infra/public/pages/metrics/layouts/container.ts b/x-pack/plugins/infra/public/pages/metrics/layouts/container.ts new file mode 100644 index 0000000000000..181f35435b9a7 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/layouts/container.ts @@ -0,0 +1,131 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetric } from '../../../../common/graphql/types'; +import { InfraFormatterType } from '../../../lib/lib'; +import { nginxLayoutCreator } from './nginx'; +import { + InfraMetricLayoutCreator, + InfraMetricLayoutSectionType, + InfraMetricLayoutVisualizationType, +} from './types'; + +export const containerLayoutCreator: InfraMetricLayoutCreator = theme => [ + { + id: 'containerOverview', + label: 'Container', + sections: [ + { + id: InfraMetric.containerOverview, + label: 'Overview', + requires: ['docker.cpu', 'docker.memory', 'docker.network'], + type: InfraMetricLayoutSectionType.gauges, + visConfig: { + seriesOverrides: { + cpu: { + name: 'CPU Usage', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + memory: { + name: 'Memory Usage', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + rx: { + name: 'Inbound (RX)', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + }, + tx: { + name: 'Outbound (TX)', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + }, + }, + }, + }, + { + id: InfraMetric.containerCpuUsage, + label: 'CPU Usage', + requires: ['docker.cpu'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + stacked: true, + type: InfraMetricLayoutVisualizationType.area, + formatter: InfraFormatterType.percent, + seriesOverrides: { + cpu: { color: theme.eui.euiColorVis1 }, + }, + }, + }, + { + id: InfraMetric.containerMemory, + label: 'Memory Usage', + requires: ['docker.memory'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + stacked: true, + type: InfraMetricLayoutVisualizationType.area, + formatter: InfraFormatterType.percent, + seriesOverrides: { + memory: { color: theme.eui.euiColorVis1 }, + }, + }, + }, + { + id: InfraMetric.containerNetworkTraffic, + label: 'Network Traffic', + requires: ['docker.network'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + type: InfraMetricLayoutVisualizationType.area, + seriesOverrides: { + rx: { color: theme.eui.euiColorVis1, name: 'in' }, + tx: { color: theme.eui.euiColorVis2, name: 'out' }, + }, + }, + }, + { + id: InfraMetric.containerDiskIOOps, + label: 'Disk IO (Ops)', + requires: ['docker.diskio'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.number, + formatterTemplate: '{{value}}/s', + type: InfraMetricLayoutVisualizationType.area, + seriesOverrides: { + read: { color: theme.eui.euiColorVis1, name: 'reads' }, + write: { color: theme.eui.euiColorVis2, name: 'writes' }, + }, + }, + }, + { + id: InfraMetric.containerDiskIOBytes, + label: 'Disk IO (Bytes)', + requires: ['docker.diskio'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.bytes, + formatterTemplate: '{{value}}/s', + type: InfraMetricLayoutVisualizationType.area, + seriesOverrides: { + read: { color: theme.eui.euiColorVis1, name: 'reads' }, + write: { color: theme.eui.euiColorVis2, name: 'writes' }, + }, + }, + }, + ], + }, + ...nginxLayoutCreator(theme), +]; diff --git a/x-pack/plugins/infra/public/pages/metrics/layouts/host.ts b/x-pack/plugins/infra/public/pages/metrics/layouts/host.ts new file mode 100644 index 0000000000000..83c4f6ad52b7d --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/layouts/host.ts @@ -0,0 +1,219 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetric } from '../../../../common/graphql/types'; +import { InfraFormatterType } from '../../../lib/lib'; +import { nginxLayoutCreator } from './nginx'; +import { + InfraMetricLayoutCreator, + InfraMetricLayoutSectionType, + InfraMetricLayoutVisualizationType, +} from './types'; + +export const hostLayoutCreator: InfraMetricLayoutCreator = theme => [ + { + id: 'hostOverview', + label: 'Host', + sections: [ + { + id: InfraMetric.hostSystemOverview, + linkToId: 'hostOverview', + label: 'Overview', + requires: ['system.cpu', 'system.load', 'system.memory', 'system.network'], + type: InfraMetricLayoutSectionType.gauges, + visConfig: { + seriesOverrides: { + cpu: { + name: 'CPU Usage', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + load: { name: 'Load (5m)', color: theme.eui.euiColorFullShade }, + memory: { + name: 'Memory Usage', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + rx: { + name: 'Inbound (RX)', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + }, + tx: { + name: 'Outbound (TX)', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + }, + }, + }, + }, + { + id: InfraMetric.hostCpuUsage, + label: 'CPU Usage', + requires: ['system.cpu'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + stacked: true, + type: InfraMetricLayoutVisualizationType.area, + formatter: InfraFormatterType.percent, + bounds: { min: 0, max: 1 }, + seriesOverrides: { + user: { color: theme.eui.euiColorVis0 }, + system: { color: theme.eui.euiColorVis2 }, + steal: { color: theme.eui.euiColorVis9 }, + irq: { color: theme.eui.euiColorVis4 }, + softirq: { color: theme.eui.euiColorVis6 }, + iowait: { color: theme.eui.euiColorVis7 }, + nice: { color: theme.eui.euiColorVis5 }, + }, + }, + }, + { + id: InfraMetric.hostLoad, + label: 'Load', + requires: ['system.load'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + seriesOverrides: { + load_1m: { color: theme.eui.euiColorVis0, name: '1m' }, + load_5m: { color: theme.eui.euiColorVis1, name: '5m' }, + load_15m: { color: theme.eui.euiColorVis3, name: '15m' }, + }, + }, + }, + { + id: InfraMetric.hostMemoryUsage, + label: 'MemoryUsage', + requires: ['system.memory'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + stacked: true, + formatter: InfraFormatterType.bytes, + type: InfraMetricLayoutVisualizationType.area, + seriesOverrides: { + used: { color: theme.eui.euiColorVis2 }, + free: { color: theme.eui.euiColorVis0 }, + cache: { color: theme.eui.euiColorVis1 }, + }, + }, + }, + { + id: InfraMetric.hostNetworkTraffic, + label: 'Network Traffic', + requires: ['system.network'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + type: InfraMetricLayoutVisualizationType.area, + seriesOverrides: { + rx: { color: theme.eui.euiColorVis1, name: 'in' }, + tx: { color: theme.eui.euiColorVis2, name: 'out' }, + }, + }, + }, + ], + }, + { + id: 'k8sOverview', + label: 'Kubernetes', + sections: [ + { + id: InfraMetric.hostK8sOverview, + linkToId: 'k8sOverview', + label: 'Overview', + requires: ['kubernetes.node'], + type: InfraMetricLayoutSectionType.gauges, + visConfig: { + seriesOverrides: { + cpucap: { + name: 'CPU Capacity', + color: 'secondary', + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + load: { name: 'Load (5m)', color: 'secondary' }, + memorycap: { + name: 'Memory Capacity', + color: 'secondary', + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + podcap: { + name: 'Pod Capacity', + color: 'secondary', + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + diskcap: { + name: 'Disk Capacity', + color: 'secondary', + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + }, + }, + }, + { + id: InfraMetric.hostK8sCpuCap, + label: 'Node CPU Capacity', + requires: ['kubernetes.node'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.abbreviatedNumber, + seriesOverrides: { + capacity: { color: theme.eui.euiColorVis2 }, + used: { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.area }, + }, + }, + }, + { + id: InfraMetric.hostK8sMemoryCap, + label: 'Node Memory Capacity', + requires: ['kubernetes.node'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.bytes, + seriesOverrides: { + capacity: { color: theme.eui.euiColorVis2 }, + used: { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.area }, + }, + }, + }, + { + id: InfraMetric.hostK8sDiskCap, + label: 'Node Disk Capacity', + requires: ['kubernetes.node'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.bytes, + seriesOverrides: { + capacity: { color: theme.eui.euiColorVis2 }, + used: { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.area }, + }, + }, + }, + { + id: InfraMetric.hostK8sPodCap, + label: 'Node Pod Capacity', + requires: ['kubernetes.node'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.number, + seriesOverrides: { + capacity: { color: theme.eui.euiColorVis2 }, + used: { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.area }, + }, + }, + }, + ], + }, + ...nginxLayoutCreator(theme), +]; diff --git a/x-pack/plugins/infra/public/pages/metrics/layouts/index.ts b/x-pack/plugins/infra/public/pages/metrics/layouts/index.ts new file mode 100644 index 0000000000000..d81bde64e230b --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/layouts/index.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { containerLayoutCreator } from './container'; +import { hostLayoutCreator } from './host'; +import { podLayoutCreator } from './pod'; +import { InfraMetricLayoutCreator } from './types'; + +interface Layouts { + [key: string]: InfraMetricLayoutCreator; +} + +export const layoutCreators: Layouts = { + host: hostLayoutCreator, + pod: podLayoutCreator, + container: containerLayoutCreator, +}; diff --git a/x-pack/plugins/infra/public/pages/metrics/layouts/nginx.ts b/x-pack/plugins/infra/public/pages/metrics/layouts/nginx.ts new file mode 100644 index 0000000000000..f03580feb72c0 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/layouts/nginx.ts @@ -0,0 +1,83 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetric } from '../../../../common/graphql/types'; +import { InfraFormatterType } from '../../../lib/lib'; +import { + InfraMetricLayoutCreator, + InfraMetricLayoutSectionType, + InfraMetricLayoutVisualizationType, +} from './types'; + +export const nginxLayoutCreator: InfraMetricLayoutCreator = theme => [ + { + id: 'nginxOverview', + label: 'Nginx', + requires: ['nginx'], + sections: [ + { + id: InfraMetric.nginxHits, + label: 'Hits', + requires: ['nginx.access'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.abbreviatedNumber, + stacked: true, + seriesOverrides: { + '200s': { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.bar }, + '300s': { color: theme.eui.euiColorVis5, type: InfraMetricLayoutVisualizationType.bar }, + '400s': { color: theme.eui.euiColorVis2, type: InfraMetricLayoutVisualizationType.bar }, + '500s': { color: theme.eui.euiColorVis9, type: InfraMetricLayoutVisualizationType.bar }, + }, + }, + }, + { + id: InfraMetric.nginxRequestRate, + label: 'Request Rate', + requires: ['nginx.statusstub'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.abbreviatedNumber, + formatterTemplate: '{{value}}/s', + seriesOverrides: { + rate: { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.area }, + }, + }, + }, + { + id: InfraMetric.nginxActiveConnections, + label: 'Active Connections', + requires: ['nginx.statusstub'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.abbreviatedNumber, + seriesOverrides: { + connections: { + color: theme.eui.euiColorVis1, + type: InfraMetricLayoutVisualizationType.bar, + }, + }, + }, + }, + { + id: InfraMetric.nginxRequestsPerConnection, + label: 'Requests per Connections', + requires: ['nginx.statusstub'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.abbreviatedNumber, + seriesOverrides: { + reqPerConns: { + color: theme.eui.euiColorVis1, + type: InfraMetricLayoutVisualizationType.bar, + name: 'reqs per conn', + }, + }, + }, + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/public/pages/metrics/layouts/pod.ts b/x-pack/plugins/infra/public/pages/metrics/layouts/pod.ts new file mode 100644 index 0000000000000..8794acee43848 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/layouts/pod.ts @@ -0,0 +1,100 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetric } from '../../../../common/graphql/types'; +import { InfraFormatterType } from '../../../lib/lib'; +import { nginxLayoutCreator } from './nginx'; +import { + InfraMetricLayoutCreator, + InfraMetricLayoutSectionType, + InfraMetricLayoutVisualizationType, +} from './types'; + +export const podLayoutCreator: InfraMetricLayoutCreator = theme => [ + { + id: 'podOverview', + label: 'Pod Overview', + sections: [ + { + id: InfraMetric.podOverview, + label: 'Pod Overview', + requires: ['kubernetes.pod'], + type: InfraMetricLayoutSectionType.gauges, + visConfig: { + seriesOverrides: { + cpu: { + name: 'CPU Usage', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + memory: { + name: 'Memory Usage', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.percent, + gaugeMax: 1, + }, + rx: { + name: 'Inbound (RX)', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + }, + tx: { + name: 'Outbound (TX)', + color: theme.eui.euiColorFullShade, + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + }, + }, + }, + }, + { + id: InfraMetric.podCpuUsage, + label: 'CPU Usage', + requires: ['kubernetes.pod'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.percent, + seriesOverrides: { + cpu: { color: theme.eui.euiColorVis1, type: InfraMetricLayoutVisualizationType.area }, + }, + }, + }, + { + id: InfraMetric.podMemoryUsage, + label: 'Memory Usage', + requires: ['kubernetes.pod'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.percent, + seriesOverrides: { + memory: { + color: theme.eui.euiColorVis1, + type: InfraMetricLayoutVisualizationType.area, + }, + }, + }, + }, + { + id: InfraMetric.podNetworkTraffic, + label: 'Network Traffic', + requires: ['kubernetes.pod'], + type: InfraMetricLayoutSectionType.chart, + visConfig: { + formatter: InfraFormatterType.bits, + formatterTemplate: '{{value}}/s', + type: InfraMetricLayoutVisualizationType.area, + seriesOverrides: { + rx: { color: theme.eui.euiColorVis1, name: 'in' }, + tx: { color: theme.eui.euiColorVis2, name: 'out' }, + }, + }, + }, + ], + }, + ...nginxLayoutCreator(theme), +]; diff --git a/x-pack/plugins/infra/public/pages/metrics/layouts/types.ts b/x-pack/plugins/infra/public/pages/metrics/layouts/types.ts new file mode 100644 index 0000000000000..d45e505a7d788 --- /dev/null +++ b/x-pack/plugins/infra/public/pages/metrics/layouts/types.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetric } from '../../../../common/graphql/types'; +import { InfraFormatterType } from '../../../lib/lib'; + +export enum InfraMetricLayoutVisualizationType { + line = 'line', + area = 'area', + bar = 'bar', +} + +export enum InfraMetricLayoutSectionType { + chart = 'chart', + gauges = 'gauges', +} + +interface SeriesOverrides { + type?: InfraMetricLayoutVisualizationType; + color: string; + name?: string; + formatter?: InfraFormatterType; + formatterTemplate?: string; +} + +interface SeriesOverrideObject { + [name: string]: SeriesOverrides | undefined; +} + +export interface InfraMetricLayoutVisualizationConfig { + stacked?: boolean; + type?: InfraMetricLayoutVisualizationType; + formatter?: InfraFormatterType; + formatterTemplate?: string; + bounds?: { min: number; max: number }; + seriesOverrides: SeriesOverrideObject; +} + +export interface InfraMetricLayoutSection { + id: InfraMetric; + linkToId?: string; + label: string; + requires: string[]; + visConfig: InfraMetricLayoutVisualizationConfig; + type: InfraMetricLayoutSectionType; +} + +export interface InfraMetricLayout { + id: string; + label: string; + sections: InfraMetricLayoutSection[]; +} + +export type InfraMetricLayoutCreator = (theme: { eui: any }) => InfraMetricLayout[]; diff --git a/x-pack/plugins/infra/public/register_feature.ts b/x-pack/plugins/infra/public/register_feature.ts new file mode 100644 index 0000000000000..a999adc30503a --- /dev/null +++ b/x-pack/plugins/infra/public/register_feature.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + FeatureCatalogueCategory, + FeatureCatalogueRegistryProvider, +} from 'ui/registry/feature_catalogue'; + +const APP_ID = 'infra'; + +FeatureCatalogueRegistryProvider.register(() => ({ + id: 'infraops', + title: 'Infrastructure', + description: + 'Explore infrastructure metrics and logs for common servers, containers, and services.', + icon: 'infraApp', + path: `/app/${APP_ID}#home`, + showOnHomePage: true, + category: FeatureCatalogueCategory.DATA, +})); + +FeatureCatalogueRegistryProvider.register(() => ({ + id: 'infralogging', + title: 'Logs', + description: + 'Stream logs in real time or scroll through historical views in a console-like experience.', + icon: 'loggingApp', + path: `/app/${APP_ID}#logs`, + showOnHomePage: true, + category: FeatureCatalogueCategory.DATA, +})); diff --git a/x-pack/plugins/infra/public/routes.tsx b/x-pack/plugins/infra/public/routes.tsx new file mode 100644 index 0000000000000..ca23ebae2279f --- /dev/null +++ b/x-pack/plugins/infra/public/routes.tsx @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { History } from 'history'; +import React from 'react'; +import { Redirect, Route, Router, Switch } from 'react-router-dom'; + +import { NotFoundPage } from './pages/404'; +import { HomePage } from './pages/home'; +import { LinkToPage } from './pages/link_to'; +import { LogsPage } from './pages/logs'; +import { MetricDetail } from './pages/metrics'; + +interface RouterProps { + history: History; +} + +export const PageRouter: React.SFC = ({ history }) => { + return ( + + + + + + + + + + + ); +}; diff --git a/x-pack/plugins/infra/public/store/actions.ts b/x-pack/plugins/infra/public/store/actions.ts new file mode 100644 index 0000000000000..ee9a2858f1c34 --- /dev/null +++ b/x-pack/plugins/infra/public/store/actions.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { + logFilterActions, + logMinimapActions, + logPositionActions, + logTextviewActions, + metricTimeActions, + waffleFilterActions, + waffleTimeActions, + waffleOptionsActions, +} from './local'; +export { logEntriesActions, logSummaryActions } from './remote'; diff --git a/x-pack/plugins/infra/public/store/epics.ts b/x-pack/plugins/infra/public/store/epics.ts new file mode 100644 index 0000000000000..4df8e1368ca01 --- /dev/null +++ b/x-pack/plugins/infra/public/store/epics.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineEpics } from 'redux-observable'; + +import { createLocalEpic } from './local'; +import { createRemoteEpic } from './remote'; + +export const createRootEpic = () => + combineEpics(createLocalEpic(), createRemoteEpic()); diff --git a/x-pack/plugins/infra/public/store/index.ts b/x-pack/plugins/infra/public/store/index.ts new file mode 100644 index 0000000000000..025da41ec40d5 --- /dev/null +++ b/x-pack/plugins/infra/public/store/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './actions'; +export * from './epics'; +export * from './reducer'; +export * from './selectors'; +export { createStore } from './store'; diff --git a/x-pack/plugins/infra/public/store/local/actions.ts b/x-pack/plugins/infra/public/store/local/actions.ts new file mode 100644 index 0000000000000..8b9e0c9f5b58a --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/actions.ts @@ -0,0 +1,14 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { logFilterActions } from './log_filter'; +export { logMinimapActions } from './log_minimap'; +export { logPositionActions } from './log_position'; +export { logTextviewActions } from './log_textview'; +export { metricTimeActions } from './metric_time'; +export { waffleFilterActions } from './waffle_filter'; +export { waffleTimeActions } from './waffle_time'; +export { waffleOptionsActions } from './waffle_options'; diff --git a/x-pack/plugins/infra/public/store/local/epic.ts b/x-pack/plugins/infra/public/store/local/epic.ts new file mode 100644 index 0000000000000..274a74b1627c5 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/epic.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineEpics } from 'redux-observable'; + +import { createLogPositionEpic } from './log_position'; +import { createMetricTimeEpic } from './metric_time'; +import { createWaffleTimeEpic } from './waffle_time'; + +export const createLocalEpic = () => + combineEpics( + createLogPositionEpic(), + createWaffleTimeEpic(), + createMetricTimeEpic() + ); diff --git a/x-pack/plugins/infra/public/store/local/index.ts b/x-pack/plugins/infra/public/store/local/index.ts new file mode 100644 index 0000000000000..c2843320bfd0c --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/index.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './actions'; +export * from './epic'; +export * from './reducer'; +export * from './selectors'; diff --git a/x-pack/plugins/infra/public/store/local/log_filter/actions.ts b/x-pack/plugins/infra/public/store/local/log_filter/actions.ts new file mode 100644 index 0000000000000..acf28ab6092c6 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_filter/actions.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +import { FilterQuery } from './reducer'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/log_filter'); + +export const setLogFilterQueryDraft = actionCreator('SET_LOG_FILTER_QUERY_DRAFT'); + +export const applyLogFilterQuery = actionCreator('APPLY_LOG_FILTER_QUERY'); diff --git a/x-pack/plugins/infra/public/store/local/log_filter/index.ts b/x-pack/plugins/infra/public/store/local/log_filter/index.ts new file mode 100644 index 0000000000000..369f5f013d669 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_filter/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as logFilterActions from './actions'; +import * as logFilterSelectors from './selectors'; + +export { logFilterActions, logFilterSelectors }; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/log_filter/reducer.ts b/x-pack/plugins/infra/public/store/local/log_filter/reducer.ts new file mode 100644 index 0000000000000..c541293b6f273 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_filter/reducer.ts @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { applyLogFilterQuery, setLogFilterQueryDraft } from './actions'; + +export interface KueryFilterQuery { + kind: 'kuery'; + expression: string; +} + +export type FilterQuery = KueryFilterQuery; + +export interface LogFilterState { + filterQuery: KueryFilterQuery | null; + filterQueryDraft: KueryFilterQuery | null; +} + +export const initialLogFilterState: LogFilterState = { + filterQuery: null, + filterQueryDraft: null, +}; + +export const logFilterReducer = reducerWithInitialState(initialLogFilterState) + .case(setLogFilterQueryDraft, (state, filterQueryDraft) => ({ + ...state, + filterQueryDraft, + })) + .case(applyLogFilterQuery, (state, filterQuery) => ({ + ...state, + filterQuery, + filterQueryDraft: filterQuery, + })) + .build(); diff --git a/x-pack/plugins/infra/public/store/local/log_filter/selectors.ts b/x-pack/plugins/infra/public/store/local/log_filter/selectors.ts new file mode 100644 index 0000000000000..b8e75e8080cfd --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_filter/selectors.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { fromKueryExpression } from 'ui/kuery'; + +import { LogFilterState } from './reducer'; + +export const selectLogFilterQuery = (state: LogFilterState) => state.filterQuery; + +export const selectLogFilterQueryDraft = (state: LogFilterState) => state.filterQueryDraft; + +export const selectIsLogFilterQueryDraftValid = createSelector( + selectLogFilterQueryDraft, + filterQueryDraft => { + if (filterQueryDraft && filterQueryDraft.kind === 'kuery') { + try { + fromKueryExpression(filterQueryDraft.expression); + } catch (err) { + return false; + } + } + + return true; + } +); diff --git a/x-pack/plugins/infra/public/store/local/log_minimap/actions.ts b/x-pack/plugins/infra/public/store/local/log_minimap/actions.ts new file mode 100644 index 0000000000000..019b1034b2bd9 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_minimap/actions.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/log_minimap'); + +export const setMinimapIntervalSize = actionCreator('SET_MINIMAP_INTERVAL_SIZE'); diff --git a/x-pack/plugins/infra/public/store/local/log_minimap/index.ts b/x-pack/plugins/infra/public/store/local/log_minimap/index.ts new file mode 100644 index 0000000000000..f75f5a8688f1c --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_minimap/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as logMinimapActions from './actions'; +import * as logMinimapSelectors from './selectors'; + +export { logMinimapActions, logMinimapSelectors }; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/log_minimap/reducer.ts b/x-pack/plugins/infra/public/store/local/log_minimap/reducer.ts new file mode 100644 index 0000000000000..e9bac97d05a11 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_minimap/reducer.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { setMinimapIntervalSize } from './actions'; + +export interface LogMinimapState { + intervalSize: number; +} + +export const initialLogMinimapState: LogMinimapState = { + intervalSize: 1000 * 60 * 60 * 24, +}; + +export const logMinimapReducer = reducerWithInitialState(initialLogMinimapState) + .case(setMinimapIntervalSize, (state, intervalSize) => ({ + intervalSize, + })) + .build(); diff --git a/x-pack/plugins/infra/public/store/local/log_minimap/selectors.ts b/x-pack/plugins/infra/public/store/local/log_minimap/selectors.ts new file mode 100644 index 0000000000000..76abd4152f125 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_minimap/selectors.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogMinimapState } from './reducer'; + +export const selectMinimapIntervalSize = (state: LogMinimapState) => state.intervalSize; diff --git a/x-pack/plugins/infra/public/store/local/log_position/actions.ts b/x-pack/plugins/infra/public/store/local/log_position/actions.ts new file mode 100644 index 0000000000000..0c677f17dd7ac --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_position/actions.ts @@ -0,0 +1,47 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +import { TimeKey } from '../../../../common/time'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/log_position'); + +export const jumpToTargetPosition = actionCreator('JUMP_TO_TARGET_POSITION'); + +export const jumpToTargetPositionTime = (time: number) => + jumpToTargetPosition({ + tiebreaker: 0, + time, + }); + +export interface ReportVisiblePositionsPayload { + pagesAfterEnd: number; + pagesBeforeStart: number; + endKey: TimeKey | null; + middleKey: TimeKey | null; + startKey: TimeKey | null; +} + +export const reportVisiblePositions = actionCreator( + 'REPORT_VISIBLE_POSITIONS' +); + +export interface ReportVisibleSummaryPayload { + start: number; + end: number; + bucketsOnPage: number; + pagesBeforeStart: number; + pagesAfterEnd: number; +} + +export const reportVisibleSummary = actionCreator( + 'REPORT_VISIBLE_SUMMARY' +); + +export const startAutoReload = actionCreator('START_AUTO_RELOAD'); + +export const stopAutoReload = actionCreator('STOP_AUTO_RELOAD'); diff --git a/x-pack/plugins/infra/public/store/local/log_position/epic.ts b/x-pack/plugins/infra/public/store/local/log_position/epic.ts new file mode 100644 index 0000000000000..01b9b6eb0bb42 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_position/epic.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action } from 'redux'; +import { Epic } from 'redux-observable'; +import { timer } from 'rxjs'; +import { exhaustMap, filter, map, takeUntil } from 'rxjs/operators'; + +import { jumpToTargetPositionTime, startAutoReload, stopAutoReload } from './actions'; + +export const createLogPositionEpic = (): Epic => action$ => + action$.pipe( + filter(startAutoReload.match), + exhaustMap(({ payload }) => + timer(0, payload).pipe( + map(() => jumpToTargetPositionTime(Date.now())), + takeUntil(action$.pipe(filter(stopAutoReload.match))) + ) + ) + ); diff --git a/x-pack/plugins/infra/public/store/local/log_position/index.ts b/x-pack/plugins/infra/public/store/local/log_position/index.ts new file mode 100644 index 0000000000000..17e06348d18b2 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_position/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as logPositionActions from './actions'; +import * as logPositionSelectors from './selectors'; + +export { logPositionActions, logPositionSelectors }; +export * from './epic'; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/log_position/reducer.ts b/x-pack/plugins/infra/public/store/local/log_position/reducer.ts new file mode 100644 index 0000000000000..c87cb432c0442 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_position/reducer.ts @@ -0,0 +1,99 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { TimeKey } from '../../../../common/time'; +import { + jumpToTargetPosition, + reportVisiblePositions, + reportVisibleSummary, + startAutoReload, + stopAutoReload, +} from './actions'; + +interface ManualTargetPositionUpdatePolicy { + policy: 'manual'; +} + +interface IntervalTargetPositionUpdatePolicy { + policy: 'interval'; + interval: number; +} + +type TargetPositionUpdatePolicy = + | ManualTargetPositionUpdatePolicy + | IntervalTargetPositionUpdatePolicy; + +export interface LogPositionState { + targetPosition: TimeKey | null; + updatePolicy: TargetPositionUpdatePolicy; + visiblePositions: { + startKey: TimeKey | null; + middleKey: TimeKey | null; + endKey: TimeKey | null; + }; + visibleSummary: { + start: number | null; + end: number | null; + }; +} + +export const initialLogPositionState: LogPositionState = { + targetPosition: null, + updatePolicy: { + policy: 'manual', + }, + visiblePositions: { + endKey: null, + middleKey: null, + startKey: null, + }, + visibleSummary: { + start: null, + end: null, + }, +}; + +const targetPositionReducer = reducerWithInitialState(initialLogPositionState.targetPosition).case( + jumpToTargetPosition, + (state, target) => target +); + +const targetPositionUpdatePolicyReducer = reducerWithInitialState( + initialLogPositionState.updatePolicy +) + .case(startAutoReload, (state, interval) => ({ + policy: 'interval', + interval, + })) + .case(stopAutoReload, () => ({ + policy: 'manual', + })); + +const visiblePositionReducer = reducerWithInitialState( + initialLogPositionState.visiblePositions +).case(reportVisiblePositions, (state, { startKey, middleKey, endKey }) => ({ + endKey, + middleKey, + startKey, +})); + +const visibleSummaryReducer = reducerWithInitialState(initialLogPositionState.visibleSummary).case( + reportVisibleSummary, + (state, { start, end }) => ({ + start, + end, + }) +); + +export const logPositionReducer = combineReducers({ + targetPosition: targetPositionReducer, + updatePolicy: targetPositionUpdatePolicyReducer, + visiblePositions: visiblePositionReducer, + visibleSummary: visibleSummaryReducer, +}); diff --git a/x-pack/plugins/infra/public/store/local/log_position/selectors.ts b/x-pack/plugins/infra/public/store/local/log_position/selectors.ts new file mode 100644 index 0000000000000..dd26905d4005f --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_position/selectors.ts @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { LogPositionState } from './reducer'; + +export const selectTargetPosition = (state: LogPositionState) => state.targetPosition; + +export const selectIsAutoReloading = (state: LogPositionState) => + state.updatePolicy.policy === 'interval'; + +export const selectFirstVisiblePosition = (state: LogPositionState) => + state.visiblePositions.startKey ? state.visiblePositions.startKey : null; + +export const selectMiddleVisiblePosition = (state: LogPositionState) => + state.visiblePositions.middleKey ? state.visiblePositions.middleKey : null; + +export const selectLastVisiblePosition = (state: LogPositionState) => + state.visiblePositions.endKey ? state.visiblePositions.endKey : null; + +export const selectVisibleMidpointOrTarget = createSelector( + selectMiddleVisiblePosition, + selectTargetPosition, + (middleVisiblePosition, targetPosition) => { + if (middleVisiblePosition) { + return middleVisiblePosition; + } else if (targetPosition) { + return targetPosition; + } else { + return null; + } + } +); + +export const selectVisibleMidpointOrTargetTime = createSelector( + selectVisibleMidpointOrTarget, + visibleMidpointOrTarget => (visibleMidpointOrTarget ? visibleMidpointOrTarget.time : null) +); + +export const selectVisibleTimeInterval = createSelector( + selectFirstVisiblePosition, + selectLastVisiblePosition, + (firstVisiblePosition, lastVisiblePosition) => + firstVisiblePosition && lastVisiblePosition + ? { + start: firstVisiblePosition.time, + end: lastVisiblePosition.time, + } + : null +); + +export const selectVisibleSummary = (state: LogPositionState) => state.visibleSummary; diff --git a/x-pack/plugins/infra/public/store/local/log_textview/actions.ts b/x-pack/plugins/infra/public/store/local/log_textview/actions.ts new file mode 100644 index 0000000000000..7aa63c8bb7fdd --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_textview/actions.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +import { TextScale } from '../../../../common/log_text_scale'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/log_textview'); + +export const setTextviewScale = actionCreator('SET_TEXTVIEW_SCALE'); + +export const setTextviewWrap = actionCreator('SET_TEXTVIEW_WRAP'); diff --git a/x-pack/plugins/infra/public/store/local/log_textview/index.ts b/x-pack/plugins/infra/public/store/local/log_textview/index.ts new file mode 100644 index 0000000000000..cebc58c7c3275 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_textview/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as logTextviewActions from './actions'; +import * as logTextviewSelectors from './selectors'; + +export { logTextviewActions, logTextviewSelectors }; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/log_textview/reducer.ts b/x-pack/plugins/infra/public/store/local/log_textview/reducer.ts new file mode 100644 index 0000000000000..45ff35cdc4af7 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_textview/reducer.ts @@ -0,0 +1,36 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { TextScale } from '../../../../common/log_text_scale'; +import { setTextviewScale, setTextviewWrap } from './actions'; + +export interface LogTextviewState { + scale: TextScale; + wrap: boolean; +} + +export const initialLogTextviewState: LogTextviewState = { + scale: 'medium', + wrap: true, +}; + +const textviewScaleReducer = reducerWithInitialState(initialLogTextviewState.scale).case( + setTextviewScale, + (state, scale) => scale +); + +const textviewWrapReducer = reducerWithInitialState(initialLogTextviewState.wrap).case( + setTextviewWrap, + (state, wrap) => wrap +); + +export const logTextviewReducer = combineReducers({ + scale: textviewScaleReducer, + wrap: textviewWrapReducer, +}); diff --git a/x-pack/plugins/infra/public/store/local/log_textview/selectors.ts b/x-pack/plugins/infra/public/store/local/log_textview/selectors.ts new file mode 100644 index 0000000000000..ee701afd4cbcb --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/log_textview/selectors.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogTextviewState } from './reducer'; + +export const selectTextviewScale = (state: LogTextviewState) => state.scale; + +export const selectTextviewWrap = (state: LogTextviewState) => state.wrap; diff --git a/x-pack/plugins/infra/public/store/local/metric_time/actions.ts b/x-pack/plugins/infra/public/store/local/metric_time/actions.ts new file mode 100644 index 0000000000000..8dec727c895c0 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/metric_time/actions.ts @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/waffle_time'); + +export interface MetricRangeTimeState { + to: number; + from: number; + interval: string; +} + +export const setRangeTime = actionCreator('SET_RANGE_TIME'); + +export const startMetricsAutoReload = actionCreator('START_METRICS_AUTO_RELOAD'); + +export const stopMetricsAutoReload = actionCreator('STOP_METRICS_AUTO_RELOAD'); diff --git a/x-pack/plugins/infra/public/store/local/metric_time/epic.ts b/x-pack/plugins/infra/public/store/local/metric_time/epic.ts new file mode 100644 index 0000000000000..aaecdc42a215b --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/metric_time/epic.ts @@ -0,0 +1,59 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import moment from 'moment'; +import { Action } from 'redux'; +import { Epic } from 'redux-observable'; +import { timer } from 'rxjs'; +import { exhaustMap, filter, map, takeUntil, withLatestFrom } from 'rxjs/operators'; + +import { setRangeTime, startMetricsAutoReload, stopMetricsAutoReload } from './actions'; + +interface MetricTimeEpicDependencies { + selectMetricTimeUpdatePolicyInterval: (state: State) => number | null; + selectMetricRangeFromTimeRange: (state: State) => number | null; +} + +export const createMetricTimeEpic = (): Epic< + Action, + Action, + State, + MetricTimeEpicDependencies +> => ( + action$, + state$, + { selectMetricTimeUpdatePolicyInterval, selectMetricRangeFromTimeRange } +) => { + const updateInterval$ = state$.pipe( + map(selectMetricTimeUpdatePolicyInterval), + filter(isNotNull) + ); + + const range$ = state$.pipe( + map(selectMetricRangeFromTimeRange), + filter(isNotNull) + ); + + return action$.pipe( + filter(startMetricsAutoReload.match), + withLatestFrom(updateInterval$, range$), + exhaustMap(([action, updateInterval, range]) => + timer(0, updateInterval).pipe( + map(() => + setRangeTime({ + from: moment() + .subtract(range, 'ms') + .valueOf(), + to: moment().valueOf(), + interval: '1m', + }) + ), + takeUntil(action$.pipe(filter(stopMetricsAutoReload.match))) + ) + ) + ); +}; + +const isNotNull = (value: T | null): value is T => value !== null; diff --git a/x-pack/plugins/infra/public/store/local/metric_time/index.ts b/x-pack/plugins/infra/public/store/local/metric_time/index.ts new file mode 100644 index 0000000000000..1df7b682d1314 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/metric_time/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as metricTimeActions from './actions'; +import * as metricTimeSelectors from './selectors'; + +export { metricTimeActions, metricTimeSelectors }; +export * from './epic'; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/metric_time/reducer.ts b/x-pack/plugins/infra/public/store/local/metric_time/reducer.ts new file mode 100644 index 0000000000000..00a4d7d311d0d --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/metric_time/reducer.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import moment from 'moment'; +import { combineReducers } from 'redux'; +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { + MetricRangeTimeState, + setRangeTime, + startMetricsAutoReload, + stopMetricsAutoReload, +} from './actions'; + +interface ManualTimeUpdatePolicy { + policy: 'manual'; +} + +interface IntervalTimeUpdatePolicy { + policy: 'interval'; + interval: number; +} + +type TimeUpdatePolicy = ManualTimeUpdatePolicy | IntervalTimeUpdatePolicy; + +export interface MetricTimeState { + timeRange: MetricRangeTimeState; + updatePolicy: TimeUpdatePolicy; +} + +export const initialMetricTimeState: MetricTimeState = { + timeRange: { + from: moment() + .subtract(1, 'hour') + .valueOf(), + to: moment().valueOf(), + interval: '>=1m', + }, + updatePolicy: { + policy: 'manual', + }, +}; + +const timeRangeReducer = reducerWithInitialState(initialMetricTimeState.timeRange).case( + setRangeTime, + (state, { to, from }) => ({ ...state, to, from }) +); + +const updatePolicyReducer = reducerWithInitialState(initialMetricTimeState.updatePolicy) + .case(startMetricsAutoReload, () => ({ + policy: 'interval', + interval: 5000, + })) + .case(stopMetricsAutoReload, () => ({ + policy: 'manual', + })); + +export const metricTimeReducer = combineReducers({ + timeRange: timeRangeReducer, + updatePolicy: updatePolicyReducer, +}); diff --git a/x-pack/plugins/infra/public/store/local/metric_time/selectors.ts b/x-pack/plugins/infra/public/store/local/metric_time/selectors.ts new file mode 100644 index 0000000000000..cac7ac2edca05 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/metric_time/selectors.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { MetricTimeState } from './reducer'; + +export const selectRangeTime = (state: MetricTimeState) => state.timeRange; + +export const selectIsAutoReloading = (state: MetricTimeState) => + state.updatePolicy.policy === 'interval'; + +export const selectTimeUpdatePolicyInterval = (state: MetricTimeState) => + state.updatePolicy.policy === 'interval' ? state.updatePolicy.interval : null; + +export const selectRangeFromTimeRange = (state: MetricTimeState) => { + const { to, from } = state.timeRange; + return to - from; +}; diff --git a/x-pack/plugins/infra/public/store/local/reducer.ts b/x-pack/plugins/infra/public/store/local/reducer.ts new file mode 100644 index 0000000000000..59e890b748d5e --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/reducer.ts @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; + +import { initialLogFilterState, logFilterReducer, LogFilterState } from './log_filter'; +import { initialLogMinimapState, logMinimapReducer, LogMinimapState } from './log_minimap'; +import { initialLogPositionState, logPositionReducer, LogPositionState } from './log_position'; +import { initialLogTextviewState, logTextviewReducer, LogTextviewState } from './log_textview'; +import { initialMetricTimeState, metricTimeReducer, MetricTimeState } from './metric_time'; +import { initialWaffleFilterState, waffleFilterReducer, WaffleFilterState } from './waffle_filter'; +import { + initialWaffleOptionsState, + waffleOptionsReducer, + WaffleOptionsState, +} from './waffle_options'; +import { initialWaffleTimeState, waffleTimeReducer, WaffleTimeState } from './waffle_time'; + +export interface LocalState { + logFilter: LogFilterState; + logMinimap: LogMinimapState; + logPosition: LogPositionState; + logTextview: LogTextviewState; + metricTime: MetricTimeState; + waffleFilter: WaffleFilterState; + waffleTime: WaffleTimeState; + waffleMetrics: WaffleOptionsState; +} + +export const initialLocalState: LocalState = { + logFilter: initialLogFilterState, + logMinimap: initialLogMinimapState, + logPosition: initialLogPositionState, + logTextview: initialLogTextviewState, + metricTime: initialMetricTimeState, + waffleFilter: initialWaffleFilterState, + waffleTime: initialWaffleTimeState, + waffleMetrics: initialWaffleOptionsState, +}; + +export const localReducer = combineReducers({ + logFilter: logFilterReducer, + logMinimap: logMinimapReducer, + logPosition: logPositionReducer, + logTextview: logTextviewReducer, + metricTime: metricTimeReducer, + waffleFilter: waffleFilterReducer, + waffleTime: waffleTimeReducer, + waffleMetrics: waffleOptionsReducer, +}); diff --git a/x-pack/plugins/infra/public/store/local/selectors.ts b/x-pack/plugins/infra/public/store/local/selectors.ts new file mode 100644 index 0000000000000..85188e144ade1 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/selectors.ts @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { globalizeSelectors } from '../../utils/typed_redux'; +import { logFilterSelectors as innerLogFilterSelectors } from './log_filter'; +import { logMinimapSelectors as innerLogMinimapSelectors } from './log_minimap'; +import { logPositionSelectors as innerLogPositionSelectors } from './log_position'; +import { logTextviewSelectors as innerLogTextviewSelectors } from './log_textview'; +import { metricTimeSelectors as innerMetricTimeSelectors } from './metric_time'; +import { LocalState } from './reducer'; +import { waffleFilterSelectors as innerWaffleFilterSelectors } from './waffle_filter'; +import { waffleOptionsSelectors as innerWaffleOptionsSelectors } from './waffle_options'; +import { waffleTimeSelectors as innerWaffleTimeSelectors } from './waffle_time'; + +export const logFilterSelectors = globalizeSelectors( + (state: LocalState) => state.logFilter, + innerLogFilterSelectors +); + +export const logMinimapSelectors = globalizeSelectors( + (state: LocalState) => state.logMinimap, + innerLogMinimapSelectors +); + +export const logPositionSelectors = globalizeSelectors( + (state: LocalState) => state.logPosition, + innerLogPositionSelectors +); + +export const logTextviewSelectors = globalizeSelectors( + (state: LocalState) => state.logTextview, + innerLogTextviewSelectors +); + +export const metricTimeSelectors = globalizeSelectors( + (state: LocalState) => state.metricTime, + innerMetricTimeSelectors +); + +export const waffleFilterSelectors = globalizeSelectors( + (state: LocalState) => state.waffleFilter, + innerWaffleFilterSelectors +); + +export const waffleTimeSelectors = globalizeSelectors( + (state: LocalState) => state.waffleTime, + innerWaffleTimeSelectors +); + +export const waffleOptionsSelectors = globalizeSelectors( + (state: LocalState) => state.waffleMetrics, + innerWaffleOptionsSelectors +); diff --git a/x-pack/plugins/infra/public/store/local/waffle_filter/actions.ts b/x-pack/plugins/infra/public/store/local/waffle_filter/actions.ts new file mode 100644 index 0000000000000..3f2c8839308c1 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_filter/actions.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +import { FilterQuery } from './reducer'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/waffle_filter'); + +export const setWaffleFilterQueryDraft = actionCreator( + 'SET_WAFFLE_FILTER_QUERY_DRAFT' +); + +export const applyWaffleFilterQuery = actionCreator('APPLY_WAFFLE_FILTER_QUERY'); diff --git a/x-pack/plugins/infra/public/store/local/waffle_filter/index.ts b/x-pack/plugins/infra/public/store/local/waffle_filter/index.ts new file mode 100644 index 0000000000000..558314f2aeda8 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_filter/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as waffleFilterActions from './actions'; +import * as waffleFilterSelectors from './selectors'; + +export { waffleFilterActions, waffleFilterSelectors }; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/waffle_filter/reducer.ts b/x-pack/plugins/infra/public/store/local/waffle_filter/reducer.ts new file mode 100644 index 0000000000000..0f6be7524e081 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_filter/reducer.ts @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { applyWaffleFilterQuery, setWaffleFilterQueryDraft } from './actions'; + +export interface KueryFilterQuery { + kind: 'kuery'; + expression: string; +} + +export type FilterQuery = KueryFilterQuery; + +export interface WaffleFilterState { + filterQuery: KueryFilterQuery | null; + filterQueryDraft: KueryFilterQuery | null; +} + +export const initialWaffleFilterState: WaffleFilterState = { + filterQuery: null, + filterQueryDraft: null, +}; + +export const waffleFilterReducer = reducerWithInitialState(initialWaffleFilterState) + .case(setWaffleFilterQueryDraft, (state, filterQueryDraft) => ({ + ...state, + filterQueryDraft, + })) + .case(applyWaffleFilterQuery, (state, filterQuery) => ({ + ...state, + filterQuery, + filterQueryDraft: filterQuery, + })) + .build(); diff --git a/x-pack/plugins/infra/public/store/local/waffle_filter/selectors.ts b/x-pack/plugins/infra/public/store/local/waffle_filter/selectors.ts new file mode 100644 index 0000000000000..ddad03b44d120 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_filter/selectors.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { fromKueryExpression } from 'ui/kuery'; + +import { WaffleFilterState } from './reducer'; + +export const selectWaffleFilterQuery = (state: WaffleFilterState) => state.filterQuery; + +export const selectWaffleFilterQueryDraft = (state: WaffleFilterState) => state.filterQueryDraft; + +export const selectIsWaffleFilterQueryDraftValid = createSelector( + selectWaffleFilterQueryDraft, + filterQueryDraft => { + if (filterQueryDraft && filterQueryDraft.kind === 'kuery') { + try { + fromKueryExpression(filterQueryDraft.expression); + } catch (err) { + return false; + } + } + + return true; + } +); diff --git a/x-pack/plugins/infra/public/store/local/waffle_options/actions.ts b/x-pack/plugins/infra/public/store/local/waffle_options/actions.ts new file mode 100644 index 0000000000000..04c0a1d112306 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_options/actions.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; +import { InfraMetricInput, InfraPathInput } from '../../../../common/graphql/types'; +import { InfraNodeType } from '../../../../server/lib/adapters/nodes'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/waffle_options'); + +export const changeMetric = actionCreator('CHANGE_METRIC'); +export const changeGroupBy = actionCreator('CHANGE_GROUP_BY'); +export const changeNodeType = actionCreator('CHANGE_NODE_TYPE'); diff --git a/x-pack/plugins/infra/public/store/local/waffle_options/index.ts b/x-pack/plugins/infra/public/store/local/waffle_options/index.ts new file mode 100644 index 0000000000000..3ecf108eb49d4 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_options/index.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as waffleOptionsActions from './actions'; +import * as waffleOptionsSelectors from './selector'; + +export { waffleOptionsActions, waffleOptionsSelectors }; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/waffle_options/reducer.ts b/x-pack/plugins/infra/public/store/local/waffle_options/reducer.ts new file mode 100644 index 0000000000000..c736aa47de39c --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_options/reducer.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; +import { reducerWithInitialState } from 'typescript-fsa-reducers'; + +import { + InfraMetricInput, + InfraMetricType, + InfraPathInput, +} from '../../../../common/graphql/types'; +import { InfraNodeType } from '../../../../server/lib/adapters/nodes'; +import { changeGroupBy, changeMetric, changeNodeType } from './actions'; + +export interface WaffleOptionsState { + metric: InfraMetricInput; + groupBy: InfraPathInput[]; + nodeType: InfraNodeType; +} + +export const initialWaffleOptionsState: WaffleOptionsState = { + metric: { type: InfraMetricType.cpu }, + groupBy: [], + nodeType: InfraNodeType.host, +}; + +const currentMetricReducer = reducerWithInitialState(initialWaffleOptionsState.metric).case( + changeMetric, + (current, target) => target +); + +const currentGroupByReducer = reducerWithInitialState(initialWaffleOptionsState.groupBy).case( + changeGroupBy, + (current, target) => target +); + +const currentNodeTypeReducer = reducerWithInitialState(initialWaffleOptionsState.nodeType).case( + changeNodeType, + (current, target) => target +); + +export const waffleOptionsReducer = combineReducers({ + metric: currentMetricReducer, + groupBy: currentGroupByReducer, + nodeType: currentNodeTypeReducer, +}); diff --git a/x-pack/plugins/infra/public/store/local/waffle_options/selector.ts b/x-pack/plugins/infra/public/store/local/waffle_options/selector.ts new file mode 100644 index 0000000000000..6889cd6150ab7 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_options/selector.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { WaffleOptionsState } from './reducer'; + +export const selectMetric = (state: WaffleOptionsState) => state.metric; +export const selectGroupBy = (state: WaffleOptionsState) => state.groupBy; +export const selectNodeType = (state: WaffleOptionsState) => state.nodeType; diff --git a/x-pack/plugins/infra/public/store/local/waffle_time/actions.ts b/x-pack/plugins/infra/public/store/local/waffle_time/actions.ts new file mode 100644 index 0000000000000..fe79f2f536a93 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_time/actions.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +const actionCreator = actionCreatorFactory('x-pack/infra/local/waffle_time'); + +export const jumpToTime = actionCreator('JUMP_TO_TIME'); + +export const startAutoReload = actionCreator('START_AUTO_RELOAD'); + +export const stopAutoReload = actionCreator('STOP_AUTO_RELOAD'); diff --git a/x-pack/plugins/infra/public/store/local/waffle_time/epic.ts b/x-pack/plugins/infra/public/store/local/waffle_time/epic.ts new file mode 100644 index 0000000000000..d9c1c825f1a25 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_time/epic.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action } from 'redux'; +import { Epic } from 'redux-observable'; +import { timer } from 'rxjs'; +import { exhaustMap, filter, map, takeUntil, withLatestFrom } from 'rxjs/operators'; + +import { jumpToTime, startAutoReload, stopAutoReload } from './actions'; + +interface WaffleTimeEpicDependencies { + selectWaffleTimeUpdatePolicyInterval: (state: State) => number | null; +} + +export const createWaffleTimeEpic = (): Epic< + Action, + Action, + State, + WaffleTimeEpicDependencies +> => (action$, state$, { selectWaffleTimeUpdatePolicyInterval }) => { + const updateInterval$ = state$.pipe( + map(selectWaffleTimeUpdatePolicyInterval), + filter(isNotNull) + ); + + return action$.pipe( + filter(startAutoReload.match), + withLatestFrom(updateInterval$), + exhaustMap(([action, updateInterval]) => + timer(0, updateInterval).pipe( + map(() => jumpToTime(Date.now())), + takeUntil(action$.pipe(filter(stopAutoReload.match))) + ) + ) + ); +}; + +const isNotNull = (value: T | null): value is T => value !== null; diff --git a/x-pack/plugins/infra/public/store/local/waffle_time/index.ts b/x-pack/plugins/infra/public/store/local/waffle_time/index.ts new file mode 100644 index 0000000000000..2b99a6d6d5760 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_time/index.ts @@ -0,0 +1,12 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as waffleTimeActions from './actions'; +import * as waffleTimeSelectors from './selectors'; + +export { waffleTimeActions, waffleTimeSelectors }; +export * from './epic'; +export * from './reducer'; diff --git a/x-pack/plugins/infra/public/store/local/waffle_time/reducer.ts b/x-pack/plugins/infra/public/store/local/waffle_time/reducer.ts new file mode 100644 index 0000000000000..026e5decf5d37 --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_time/reducer.ts @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { jumpToTime, startAutoReload, stopAutoReload } from './actions'; + +interface ManualTimeUpdatePolicy { + policy: 'manual'; +} + +interface IntervalTimeUpdatePolicy { + policy: 'interval'; + interval: number; +} + +type TimeUpdatePolicy = ManualTimeUpdatePolicy | IntervalTimeUpdatePolicy; + +export interface WaffleTimeState { + currentTime: number; + updatePolicy: TimeUpdatePolicy; +} + +export const initialWaffleTimeState: WaffleTimeState = { + currentTime: Date.now(), + updatePolicy: { + policy: 'manual', + }, +}; + +const currentTimeReducer = reducerWithInitialState(initialWaffleTimeState.currentTime).case( + jumpToTime, + (currentTime, targetTime) => targetTime +); + +const updatePolicyReducer = reducerWithInitialState(initialWaffleTimeState.updatePolicy) + .case(startAutoReload, () => ({ + policy: 'interval', + interval: 5000, + })) + .case(stopAutoReload, () => ({ + policy: 'manual', + })); + +export const waffleTimeReducer = combineReducers({ + currentTime: currentTimeReducer, + updatePolicy: updatePolicyReducer, +}); diff --git a/x-pack/plugins/infra/public/store/local/waffle_time/selectors.ts b/x-pack/plugins/infra/public/store/local/waffle_time/selectors.ts new file mode 100644 index 0000000000000..a69d742d43b1d --- /dev/null +++ b/x-pack/plugins/infra/public/store/local/waffle_time/selectors.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { WaffleTimeState } from './reducer'; + +export const selectCurrentTime = (state: WaffleTimeState) => state.currentTime; + +export const selectIsAutoReloading = (state: WaffleTimeState) => + state.updatePolicy.policy === 'interval'; + +export const selectTimeUpdatePolicyInterval = (state: WaffleTimeState) => + state.updatePolicy.policy === 'interval' ? state.updatePolicy.interval : null; + +export const selectCurrentTimeRange = createSelector(selectCurrentTime, currentTime => ({ + from: currentTime - 1000 * 60 * 60, + interval: '1m', + to: currentTime, +})); diff --git a/x-pack/plugins/infra/public/store/reducer.ts b/x-pack/plugins/infra/public/store/reducer.ts new file mode 100644 index 0000000000000..65b225d019603 --- /dev/null +++ b/x-pack/plugins/infra/public/store/reducer.ts @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; + +import { initialLocalState, localReducer, LocalState } from './local'; +import { initialRemoteState, remoteReducer, RemoteState } from './remote'; + +export interface State { + local: LocalState; + remote: RemoteState; +} + +export const initialState: State = { + local: initialLocalState, + remote: initialRemoteState, +}; + +export const reducer = combineReducers({ + local: localReducer, + remote: remoteReducer, +}); diff --git a/x-pack/plugins/infra/public/store/remote/actions.ts b/x-pack/plugins/infra/public/store/remote/actions.ts new file mode 100644 index 0000000000000..49c5d7209f7ef --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/actions.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { logEntriesActions } from './log_entries'; +export { logSummaryActions } from './log_summary'; +export { sourceActions } from './source'; diff --git a/x-pack/plugins/infra/public/store/remote/epic.ts b/x-pack/plugins/infra/public/store/remote/epic.ts new file mode 100644 index 0000000000000..22eb3c68c75c4 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/epic.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineEpics } from 'redux-observable'; + +import { createLogEntriesEpic } from './log_entries'; +import { createLogSummaryEpic } from './log_summary'; +import { createSourceEpic } from './source'; + +export const createRemoteEpic = () => + combineEpics( + createLogEntriesEpic(), + createLogSummaryEpic(), + createSourceEpic() + ); diff --git a/x-pack/plugins/infra/public/store/remote/index.ts b/x-pack/plugins/infra/public/store/remote/index.ts new file mode 100644 index 0000000000000..c2843320bfd0c --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/index.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './actions'; +export * from './epic'; +export * from './reducer'; +export * from './selectors'; diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/actions.ts b/x-pack/plugins/infra/public/store/remote/log_entries/actions.ts new file mode 100644 index 0000000000000..0110443ac1567 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/actions.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import actionCreatorFactory from 'typescript-fsa'; + +import { loadEntriesActionCreators } from './operations/load'; +import { loadMoreEntriesActionCreators } from './operations/load_more'; + +const actionCreator = actionCreatorFactory('x-pack/infra/remote/log_entries'); + +export const loadEntries = loadEntriesActionCreators.resolve; +export const loadMoreEntries = loadMoreEntriesActionCreators.resolve; + +export const loadNewerEntries = actionCreator('LOAD_NEWER_LOG_ENTRIES'); diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/epic.ts b/x-pack/plugins/infra/public/store/remote/log_entries/epic.ts new file mode 100644 index 0000000000000..25e4010fd917b --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/epic.ts @@ -0,0 +1,173 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action } from 'redux'; +import { combineEpics, Epic, EpicWithState } from 'redux-observable'; +import { merge } from 'rxjs'; +import { exhaustMap, filter, map, withLatestFrom } from 'rxjs/operators'; + +import { logFilterActions, logPositionActions } from '../..'; +import { pickTimeKey, TimeKey, timeKeyIsBetween } from '../../../../common/time'; +import { loadEntries, loadMoreEntries, loadNewerEntries } from './actions'; +import { loadEntriesEpic } from './operations/load'; +import { loadMoreEntriesEpic } from './operations/load_more'; + +const LOAD_CHUNK_SIZE = 200; +const DESIRED_BUFFER_PAGES = 2; + +interface ManageEntriesDependencies { + selectLogEntriesStart: (state: State) => TimeKey | null; + selectLogEntriesEnd: (state: State) => TimeKey | null; + selectHasMoreLogEntriesBeforeStart: (state: State) => boolean; + selectHasMoreLogEntriesAfterEnd: (state: State) => boolean; + selectIsAutoReloadingLogEntries: (state: State) => boolean; + selectIsLoadingLogEntries: (state: State) => boolean; + selectLogFilterQueryAsJson: (state: State) => string | null; + selectVisibleLogMidpointOrTarget: (state: State) => TimeKey | null; +} + +export const createLogEntriesEpic = () => + combineEpics( + createEntriesEffectsEpic(), + loadEntriesEpic as EpicWithState, + loadMoreEntriesEpic as EpicWithState + ); + +export const createEntriesEffectsEpic = (): Epic< + Action, + Action, + State, + ManageEntriesDependencies +> => ( + action$, + state$, + { + selectLogEntriesStart, + selectLogEntriesEnd, + selectHasMoreLogEntriesBeforeStart, + selectHasMoreLogEntriesAfterEnd, + selectIsAutoReloadingLogEntries, + selectIsLoadingLogEntries, + selectLogFilterQueryAsJson, + selectVisibleLogMidpointOrTarget, + } +) => { + const filterQuery$ = state$.pipe(map(selectLogFilterQueryAsJson)); + const visibleMidpointOrTarget$ = state$.pipe( + map(selectVisibleLogMidpointOrTarget), + filter(isNotNull), + map(pickTimeKey) + ); + + const shouldLoadAroundNewPosition$ = action$.pipe( + filter(logPositionActions.jumpToTargetPosition.match), + withLatestFrom(state$), + filter(([{ payload }, state]) => { + const entriesStart = selectLogEntriesStart(state); + const entriesEnd = selectLogEntriesEnd(state); + + return entriesStart && entriesEnd + ? !timeKeyIsBetween(entriesStart, entriesEnd, payload) + : true; + }), + map(([{ payload }]) => pickTimeKey(payload)) + ); + + const shouldLoadWithNewFilter$ = action$.pipe( + filter(logFilterActions.applyLogFilterQuery.match), + withLatestFrom(filterQuery$, (filterQuery, filterQueryString) => filterQueryString) + ); + + const shouldLoadMoreBefore$ = action$.pipe( + filter(logPositionActions.reportVisiblePositions.match), + filter(({ payload: { pagesBeforeStart } }) => pagesBeforeStart < DESIRED_BUFFER_PAGES), + withLatestFrom(state$), + filter( + ([action, state]) => + !selectIsAutoReloadingLogEntries(state) && + !selectIsLoadingLogEntries(state) && + selectHasMoreLogEntriesBeforeStart(state) + ), + map(([action, state]) => selectLogEntriesStart(state)), + filter(isNotNull), + map(pickTimeKey) + ); + + const shouldLoadMoreAfter$ = merge( + action$.pipe( + filter(logPositionActions.reportVisiblePositions.match), + filter(({ payload: { pagesAfterEnd } }) => pagesAfterEnd < DESIRED_BUFFER_PAGES), + withLatestFrom(state$, (action, state) => state), + filter( + state => + !selectIsAutoReloadingLogEntries(state) && + !selectIsLoadingLogEntries(state) && + selectHasMoreLogEntriesAfterEnd(state) + ) + ), + action$.pipe( + filter(loadNewerEntries.match), + withLatestFrom(state$, (action, state) => state) + ) + ).pipe( + map(state => selectLogEntriesEnd(state)), + filter(isNotNull), + map(pickTimeKey) + ); + + return merge( + shouldLoadAroundNewPosition$.pipe( + withLatestFrom(filterQuery$), + exhaustMap(([timeKey, filterQuery]) => [ + loadEntries({ + sourceId: 'default', + timeKey, + countBefore: LOAD_CHUNK_SIZE, + countAfter: LOAD_CHUNK_SIZE, + filterQuery, + }), + ]) + ), + shouldLoadWithNewFilter$.pipe( + withLatestFrom(visibleMidpointOrTarget$), + exhaustMap(([filterQuery, timeKey]) => [ + loadEntries({ + sourceId: 'default', + timeKey, + countBefore: LOAD_CHUNK_SIZE, + countAfter: LOAD_CHUNK_SIZE, + filterQuery, + }), + ]) + ), + shouldLoadMoreAfter$.pipe( + withLatestFrom(filterQuery$), + exhaustMap(([timeKey, filterQuery]) => [ + loadMoreEntries({ + sourceId: 'default', + timeKey, + countBefore: 0, + countAfter: LOAD_CHUNK_SIZE, + filterQuery, + }), + ]) + ), + shouldLoadMoreBefore$.pipe( + withLatestFrom(filterQuery$), + exhaustMap(([timeKey, filterQuery]) => [ + loadMoreEntries({ + sourceId: 'default', + timeKey, + countBefore: LOAD_CHUNK_SIZE, + countAfter: 0, + filterQuery, + }), + ]) + ) + ); +}; + +const isNotNull = (value: T | null): value is T => value !== null; diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/index.ts b/x-pack/plugins/infra/public/store/remote/log_entries/index.ts new file mode 100644 index 0000000000000..8e00425526935 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/index.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as logEntriesActions from './actions'; +import * as logEntriesSelectors from './selectors'; + +export { logEntriesActions, logEntriesSelectors }; +export * from './epic'; +export * from './reducer'; +export { initialLogEntriesState, LogEntriesState } from './state'; diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/operations/load.ts b/x-pack/plugins/infra/public/store/remote/log_entries/operations/load.ts new file mode 100644 index 0000000000000..5a92afd89024c --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/operations/load.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogEntries as LogEntriesQuery } from '../../../../../common/graphql/types'; +import { + createGraphqlOperationActionCreators, + createGraphqlOperationReducer, + createGraphqlQueryEpic, +} from '../../../../utils/remote_state/remote_graphql_state'; +import { initialLogEntriesState } from '../state'; +import { logEntriesQuery } from './log_entries.gql_query'; + +const operationKey = 'load'; + +export const loadEntriesActionCreators = createGraphqlOperationActionCreators< + LogEntriesQuery.Query, + LogEntriesQuery.Variables +>('log_entries', operationKey); + +export const loadEntriesReducer = createGraphqlOperationReducer( + operationKey, + initialLogEntriesState, + loadEntriesActionCreators, + (state, action) => action.payload.result.data.source.logEntriesAround +); + +export const loadEntriesEpic = createGraphqlQueryEpic(logEntriesQuery, loadEntriesActionCreators); diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/operations/load_more.ts b/x-pack/plugins/infra/public/store/remote/log_entries/operations/load_more.ts new file mode 100644 index 0000000000000..0f58f38e52b11 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/operations/load_more.ts @@ -0,0 +1,72 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogEntries as LogEntriesQuery } from '../../../../../common/graphql/types'; +import { + getLogEntryIndexAfterTime, + getLogEntryIndexBeforeTime, + getLogEntryKey, +} from '../../../../utils/log_entry'; +import { + createGraphqlOperationActionCreators, + createGraphqlOperationReducer, + createGraphqlQueryEpic, +} from '../../../../utils/remote_state/remote_graphql_state'; +import { initialLogEntriesState } from '../state'; +import { logEntriesQuery } from './log_entries.gql_query'; + +const operationKey = 'load_more'; + +export const loadMoreEntriesActionCreators = createGraphqlOperationActionCreators< + LogEntriesQuery.Query, + LogEntriesQuery.Variables +>('log_entries', operationKey); + +export const loadMoreEntriesReducer = createGraphqlOperationReducer( + operationKey, + initialLogEntriesState, + loadMoreEntriesActionCreators, + (state, action) => { + const logEntriesAround = action.payload.result.data.source.logEntriesAround; + const newEntries = logEntriesAround.entries; + const oldEntries = state && state.entries ? state.entries : []; + const oldStart = state && state.start ? state.start : null; + const oldEnd = state && state.end ? state.end : null; + + if (newEntries.length <= 0) { + return state; + } + + if ((action.payload.params.countBefore || 0) > 0) { + const lastLogEntry = newEntries[newEntries.length - 1]; + const prependAtIndex = getLogEntryIndexAfterTime(oldEntries, getLogEntryKey(lastLogEntry)); + return { + start: logEntriesAround.start, + end: oldEnd, + hasMoreBefore: logEntriesAround.hasMoreBefore, + hasMoreAfter: state ? state.hasMoreAfter : logEntriesAround.hasMoreAfter, + entries: [...newEntries, ...oldEntries.slice(prependAtIndex)], + }; + } else if ((action.payload.params.countAfter || 0) > 0) { + const firstLogEntry = newEntries[0]; + const appendAtIndex = getLogEntryIndexBeforeTime(oldEntries, getLogEntryKey(firstLogEntry)); + return { + start: oldStart, + end: logEntriesAround.end, + hasMoreBefore: state ? state.hasMoreBefore : logEntriesAround.hasMoreBefore, + hasMoreAfter: logEntriesAround.hasMoreAfter, + entries: [...oldEntries.slice(0, appendAtIndex), ...newEntries], + }; + } else { + return state; + } + } +); + +export const loadMoreEntriesEpic = createGraphqlQueryEpic( + logEntriesQuery, + loadMoreEntriesActionCreators +); diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/operations/log_entries.gql_query.ts b/x-pack/plugins/infra/public/store/remote/log_entries/operations/log_entries.gql_query.ts new file mode 100644 index 0000000000000..3bffc43644418 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/operations/log_entries.gql_query.ts @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +import { sharedFragments } from '../../../../../common/graphql/shared'; + +export const logEntriesQuery = gql` + query LogEntries( + $sourceId: ID = "default" + $timeKey: InfraTimeKeyInput! + $countBefore: Int = 0 + $countAfter: Int = 0 + $filterQuery: String + ) { + source(id: $sourceId) { + id + logEntriesAround( + key: $timeKey + countBefore: $countBefore + countAfter: $countAfter + filterQuery: $filterQuery + ) { + start { + ...InfraTimeKeyFields + } + end { + ...InfraTimeKeyFields + } + hasMoreBefore + hasMoreAfter + entries { + gid + key { + time + tiebreaker + } + message { + ... on InfraLogMessageFieldSegment { + field + value + } + ... on InfraLogMessageConstantSegment { + constant + } + } + } + } + } + } + + ${sharedFragments.InfraTimeKey} +`; diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/reducer.ts b/x-pack/plugins/infra/public/store/remote/log_entries/reducer.ts new file mode 100644 index 0000000000000..c0d60c4d336de --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/reducer.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import reduceReducers from 'reduce-reducers'; +import { Reducer } from 'redux'; + +import { loadEntriesReducer } from './operations/load'; +import { loadMoreEntriesReducer } from './operations/load_more'; +import { LogEntriesState } from './state'; + +export const logEntriesReducer = reduceReducers( + loadEntriesReducer, + loadMoreEntriesReducer +) as Reducer; diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/selectors.ts b/x-pack/plugins/infra/public/store/remote/log_entries/selectors.ts new file mode 100644 index 0000000000000..7520803f93ac7 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/selectors.ts @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { createGraphqlStateSelectors } from '../../../utils/remote_state/remote_graphql_state'; +import { LogEntriesRemoteState } from './state'; + +const entriesGraphlStateSelectors = createGraphqlStateSelectors(); + +export const selectEntries = createSelector( + entriesGraphlStateSelectors.selectData, + data => (data ? data.entries : []) +); + +export const selectIsLoadingEntries = entriesGraphlStateSelectors.selectIsLoading; + +export const selectIsReloadingEntries = createSelector( + entriesGraphlStateSelectors.selectIsLoading, + entriesGraphlStateSelectors.selectLoadingProgressOperationInfo, + (isLoading, operationInfo) => + isLoading && operationInfo ? operationInfo.operationKey === 'load' : false +); + +export const selectIsLoadingMoreEntries = createSelector( + entriesGraphlStateSelectors.selectIsLoading, + entriesGraphlStateSelectors.selectLoadingProgressOperationInfo, + (isLoading, operationInfo) => + isLoading && operationInfo ? operationInfo.operationKey === 'load_more' : false +); + +export const selectEntriesStart = createSelector( + entriesGraphlStateSelectors.selectData, + data => (data && data.start ? data.start : null) +); + +export const selectEntriesEnd = createSelector( + entriesGraphlStateSelectors.selectData, + data => (data && data.end ? data.end : null) +); + +export const selectHasMoreBeforeStart = createSelector( + entriesGraphlStateSelectors.selectData, + data => (data ? data.hasMoreBefore : true) +); + +export const selectHasMoreAfterEnd = createSelector( + entriesGraphlStateSelectors.selectData, + data => (data ? data.hasMoreAfter : true) +); + +export const selectEntriesLastLoadedTime = entriesGraphlStateSelectors.selectLoadingResultTime; + +export const selectEntriesStartLoadingState = entriesGraphlStateSelectors.selectLoadingState; + +export const selectEntriesEndLoadingState = entriesGraphlStateSelectors.selectLoadingState; + +export const selectFirstEntry = createSelector( + selectEntries, + entries => (entries.length > 0 ? entries[0] : null) +); + +export const selectLastEntry = createSelector( + selectEntries, + entries => (entries.length > 0 ? entries[entries.length - 1] : null) +); + +export const selectLoadedEntriesTimeInterval = createSelector( + entriesGraphlStateSelectors.selectData, + data => ({ + end: data && data.end ? data.end.time : null, + start: data && data.start ? data.start.time : null, + }) +); diff --git a/x-pack/plugins/infra/public/store/remote/log_entries/state.ts b/x-pack/plugins/infra/public/store/remote/log_entries/state.ts new file mode 100644 index 0000000000000..6f8675b1efa83 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_entries/state.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogEntries as LogEntriesQuery } from '../../../../common/graphql/types'; +import { + createGraphqlInitialState, + GraphqlState, +} from '../../../utils/remote_state/remote_graphql_state'; + +export type LogEntriesRemoteState = LogEntriesQuery.LogEntriesAround; +export type LogEntriesState = GraphqlState; + +export const initialLogEntriesState = createGraphqlInitialState(); diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/actions.ts b/x-pack/plugins/infra/public/store/remote/log_summary/actions.ts new file mode 100644 index 0000000000000..4cb77a16aeecb --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/actions.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { loadSummaryActionCreators } from './operations/load'; + +export const loadSummary = loadSummaryActionCreators.resolve; diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/epic.ts b/x-pack/plugins/infra/public/store/remote/log_summary/epic.ts new file mode 100644 index 0000000000000..8bf8b07f973be --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/epic.ts @@ -0,0 +1,99 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action } from 'redux'; +import { combineEpics, Epic, EpicWithState } from 'redux-observable'; +import { merge } from 'rxjs'; +import { exhaustMap, filter, map, withLatestFrom } from 'rxjs/operators'; + +import { logFilterActions, logPositionActions } from '../..'; +import { loadSummary } from './actions'; +import { loadSummaryEpic } from './operations/load'; + +const LOAD_BUCKETS_PER_PAGE = 100; +const MINIMUM_BUCKETS_PER_PAGE = 90; +const MINIMUM_BUFFER_PAGES = 0.5; + +interface ManageSummaryDependencies { + selectLogFilterQueryAsJson: (state: State) => string | null; + selectVisibleLogSummary: ( + state: State + ) => { + start: number | null; + end: number | null; + }; +} + +export const createLogSummaryEpic = () => + combineEpics(createSummaryEffectsEpic(), loadSummaryEpic as EpicWithState< + typeof loadSummaryEpic, + State + >); + +export const createSummaryEffectsEpic = (): Epic< + Action, + Action, + State, + ManageSummaryDependencies +> => (action$, state$, { selectLogFilterQueryAsJson, selectVisibleLogSummary }) => { + const filterQuery$ = state$.pipe(map(selectLogFilterQueryAsJson)); + const summaryInterval$ = state$.pipe( + map(selectVisibleLogSummary), + map(({ start, end }) => (start && end ? getLoadParameters(start, end) : null)), + filter(isNotNull) + ); + + const shouldLoadBetweenNewInterval$ = action$.pipe( + filter(logPositionActions.reportVisibleSummary.match), + filter( + ({ payload: { bucketsOnPage, pagesBeforeStart, pagesAfterEnd } }) => + bucketsOnPage < MINIMUM_BUCKETS_PER_PAGE || + pagesBeforeStart < MINIMUM_BUFFER_PAGES || + pagesAfterEnd < MINIMUM_BUFFER_PAGES + ), + map(({ payload: { start, end } }) => getLoadParameters(start, end)) + ); + + const shouldLoadWithNewFilter$ = action$.pipe( + filter(logFilterActions.applyLogFilterQuery.match), + withLatestFrom(filterQuery$, (filterQuery, filterQueryString) => filterQueryString) + ); + + return merge( + shouldLoadBetweenNewInterval$.pipe( + withLatestFrom(filterQuery$), + exhaustMap(([{ start, end, bucketSize }, filterQuery]) => [ + loadSummary({ + start, + end, + sourceId: 'default', + bucketSize, + filterQuery, + }), + ]) + ), + shouldLoadWithNewFilter$.pipe( + withLatestFrom(summaryInterval$), + exhaustMap(([filterQuery, { start, end, bucketSize }]) => [ + loadSummary({ + start, + end, + sourceId: 'default', + bucketSize: (end - start) / LOAD_BUCKETS_PER_PAGE, + filterQuery, + }), + ]) + ) + ); +}; + +const getLoadParameters = (start: number, end: number) => ({ + start: start - (end - start), + end: end + (end - start), + bucketSize: (end - start) / LOAD_BUCKETS_PER_PAGE, +}); + +const isNotNull = (value: T | null): value is T => value !== null; diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/index.ts b/x-pack/plugins/infra/public/store/remote/log_summary/index.ts new file mode 100644 index 0000000000000..110d65e958f82 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/index.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as logSummaryActions from './actions'; +import * as logSummarySelectors from './selectors'; + +export { logSummaryActions, logSummarySelectors }; +export * from './epic'; +export * from './reducer'; +export { initialLogSummaryState, LogSummaryState } from './state'; diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/operations/load.ts b/x-pack/plugins/infra/public/store/remote/log_summary/operations/load.ts new file mode 100644 index 0000000000000..be3303586a568 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/operations/load.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogSummary as LogSummaryQuery } from '../../../../../common/graphql/types'; +import { + createGraphqlOperationActionCreators, + createGraphqlOperationReducer, + createGraphqlQueryEpic, +} from '../../../../utils/remote_state/remote_graphql_state'; +import { initialLogSummaryState } from '../state'; +import { logSummaryQuery } from './log_summary.gql_query'; + +const operationKey = 'load'; + +export const loadSummaryActionCreators = createGraphqlOperationActionCreators< + LogSummaryQuery.Query, + LogSummaryQuery.Variables +>('log_summary', operationKey); + +export const loadSummaryReducer = createGraphqlOperationReducer( + operationKey, + initialLogSummaryState, + loadSummaryActionCreators, + (state, action) => action.payload.result.data.source.logSummaryBetween +); + +export const loadSummaryEpic = createGraphqlQueryEpic(logSummaryQuery, loadSummaryActionCreators); diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/operations/log_summary.gql_query.ts b/x-pack/plugins/infra/public/store/remote/log_summary/operations/log_summary.gql_query.ts new file mode 100644 index 0000000000000..a8bd808e51947 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/operations/log_summary.gql_query.ts @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const logSummaryQuery = gql` + query LogSummary( + $sourceId: ID = "default" + $start: Float! + $end: Float! + $bucketSize: Float! + $filterQuery: String + ) { + source(id: $sourceId) { + id + logSummaryBetween( + start: $start + end: $end + bucketSize: $bucketSize + filterQuery: $filterQuery + ) { + start + end + buckets { + start + end + entriesCount + } + } + } + } +`; diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/reducer.ts b/x-pack/plugins/infra/public/store/remote/log_summary/reducer.ts new file mode 100644 index 0000000000000..4ca900ceb20cd --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/reducer.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import reduceReducers from 'reduce-reducers'; +import { Reducer } from 'redux'; + +import { loadSummaryReducer } from './operations/load'; +import { LogSummaryState } from './state'; + +export const logSummaryReducer = reduceReducers( + loadSummaryReducer /*, loadMoreSummaryReducer*/ +) as Reducer; diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/selectors.ts b/x-pack/plugins/infra/public/store/remote/log_summary/selectors.ts new file mode 100644 index 0000000000000..52975f6306cd5 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/selectors.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { createGraphqlStateSelectors } from '../../../utils/remote_state/remote_graphql_state'; +import { LogSummaryRemoteState } from './state'; + +const summaryGraphlStateSelectors = createGraphqlStateSelectors(); + +export const selectSummaryBuckets = createSelector( + summaryGraphlStateSelectors.selectData, + data => (data ? data.buckets : []) +); diff --git a/x-pack/plugins/infra/public/store/remote/log_summary/state.ts b/x-pack/plugins/infra/public/store/remote/log_summary/state.ts new file mode 100644 index 0000000000000..d6c10e0a2f2b1 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/log_summary/state.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LogSummary as LogSummaryQuery } from '../../../../common/graphql/types'; +import { + createGraphqlInitialState, + GraphqlState, +} from '../../../utils/remote_state/remote_graphql_state'; + +export type LogSummaryRemoteState = LogSummaryQuery.LogSummaryBetween; +export type LogSummaryState = GraphqlState; + +export const initialLogSummaryState: LogSummaryState = createGraphqlInitialState< + LogSummaryRemoteState +>(); diff --git a/x-pack/plugins/infra/public/store/remote/reducer.ts b/x-pack/plugins/infra/public/store/remote/reducer.ts new file mode 100644 index 0000000000000..703e6d426f031 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/reducer.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { combineReducers } from 'redux'; +import { initialLogEntriesState, logEntriesReducer, LogEntriesState } from './log_entries'; +import { initialLogSummaryState, logSummaryReducer, LogSummaryState } from './log_summary'; +import { initialSourceState, sourceReducer, SourceState } from './source'; + +export interface RemoteState { + logEntries: LogEntriesState; + logSummary: LogSummaryState; + source: SourceState; +} + +export const initialRemoteState = { + logEntries: initialLogEntriesState, + logSummary: initialLogSummaryState, + source: initialSourceState, +}; + +export const remoteReducer = combineReducers({ + logEntries: logEntriesReducer, + logSummary: logSummaryReducer, + source: sourceReducer, +}); diff --git a/x-pack/plugins/infra/public/store/remote/selectors.ts b/x-pack/plugins/infra/public/store/remote/selectors.ts new file mode 100644 index 0000000000000..1d48af7bf5058 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/selectors.ts @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { globalizeSelectors } from '../../utils/typed_redux'; +import { logEntriesSelectors as innerLogEntriesSelectors } from './log_entries'; +import { logSummarySelectors as innerLogSummarySelectors } from './log_summary'; +import { RemoteState } from './reducer'; +import { sourceSelectors as innerSourceSelectors } from './source'; + +export const logEntriesSelectors = globalizeSelectors( + (state: RemoteState) => state.logEntries, + innerLogEntriesSelectors +); + +export const logSummarySelectors = globalizeSelectors( + (state: RemoteState) => state.logSummary, + innerLogSummarySelectors +); + +export const sourceSelectors = globalizeSelectors( + (state: RemoteState) => state.source, + innerSourceSelectors +); diff --git a/x-pack/plugins/infra/public/store/remote/source/actions.ts b/x-pack/plugins/infra/public/store/remote/source/actions.ts new file mode 100644 index 0000000000000..741b547b895e2 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/actions.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { loadSourceActionCreators } from './operations/load'; + +export const loadSource = loadSourceActionCreators.resolve; diff --git a/x-pack/plugins/infra/public/store/remote/source/epic.ts b/x-pack/plugins/infra/public/store/remote/source/epic.ts new file mode 100644 index 0000000000000..373bd7f0298df --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/epic.ts @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action } from 'redux'; +import { combineEpics, Epic, EpicWithState } from 'redux-observable'; +import { of } from 'rxjs'; + +import { loadSource } from './actions'; +import { loadSourceEpic } from './operations/load'; + +export const createSourceEpic = () => + combineEpics(createSourceEffectsEpic(), loadSourceEpic as EpicWithState< + typeof loadSourceEpic, + State + >); + +export const createSourceEffectsEpic = (): Epic => action$ => { + return of(loadSource({ sourceId: 'default' })); +}; diff --git a/x-pack/plugins/infra/public/store/remote/source/index.ts b/x-pack/plugins/infra/public/store/remote/source/index.ts new file mode 100644 index 0000000000000..c12b516f3d6a8 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/index.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as sourceActions from './actions'; +import * as sourceSelectors from './selectors'; + +export { sourceActions, sourceSelectors }; +export * from './epic'; +export * from './reducer'; +export { initialSourceState, SourceState } from './state'; diff --git a/x-pack/plugins/infra/public/store/remote/source/operations/load.ts b/x-pack/plugins/infra/public/store/remote/source/operations/load.ts new file mode 100644 index 0000000000000..44f8fbee8ca34 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/operations/load.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SourceQuery } from '../../../../../common/graphql/types'; +import { + createGraphqlOperationActionCreators, + createGraphqlOperationReducer, + createGraphqlQueryEpic, +} from '../../../../utils/remote_state/remote_graphql_state'; +import { initialSourceState } from '../state'; +import { sourceQuery } from './query_source.gql_query'; + +const operationKey = 'load'; + +export const loadSourceActionCreators = createGraphqlOperationActionCreators< + SourceQuery.Query, + SourceQuery.Variables +>('source', operationKey); + +export const loadSourceReducer = createGraphqlOperationReducer( + operationKey, + initialSourceState, + loadSourceActionCreators, + (state, action) => action.payload.result.data.source +); + +export const loadSourceEpic = createGraphqlQueryEpic(sourceQuery, loadSourceActionCreators); diff --git a/x-pack/plugins/infra/public/store/remote/source/operations/query_source.gql_query.ts b/x-pack/plugins/infra/public/store/remote/source/operations/query_source.gql_query.ts new file mode 100644 index 0000000000000..5450064467458 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/operations/query_source.gql_query.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const sourceQuery = gql` + query SourceQuery($sourceId: ID = "default") { + source(id: $sourceId) { + id + configuration { + metricAlias + logAlias + fields { + container + host + pod + } + } + status { + indexFields { + name + type + searchable + aggregatable + } + logIndicesExist + metricIndicesExist + } + } + } +`; diff --git a/x-pack/plugins/infra/public/store/remote/source/reducer.ts b/x-pack/plugins/infra/public/store/remote/source/reducer.ts new file mode 100644 index 0000000000000..811ff72c5ac9e --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/reducer.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import reduceReducers from 'reduce-reducers'; +import { Reducer } from 'redux'; + +import { loadSourceReducer } from './operations/load'; +import { SourceState } from './state'; + +export const sourceReducer = reduceReducers(loadSourceReducer) as Reducer; diff --git a/x-pack/plugins/infra/public/store/remote/source/selectors.ts b/x-pack/plugins/infra/public/store/remote/source/selectors.ts new file mode 100644 index 0000000000000..0ab3ee62745f5 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/selectors.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { createGraphqlStateSelectors } from '../../../utils/remote_state/remote_graphql_state'; +import { SourceRemoteState } from './state'; + +const sourceStatusGraphqlStateSelectors = createGraphqlStateSelectors(); + +export const selectSource = sourceStatusGraphqlStateSelectors.selectData; + +export const selectSourceConfiguration = createSelector( + selectSource, + source => (source ? source.configuration : null) +); + +export const selectSourceLogAlias = createSelector( + selectSourceConfiguration, + configuration => (configuration ? configuration.logAlias : null) +); + +export const selectSourceMetricAlias = createSelector( + selectSourceConfiguration, + configuration => (configuration ? configuration.metricAlias : null) +); + +export const selectSourceFields = createSelector( + selectSourceConfiguration, + configuration => (configuration ? configuration.fields : null) +); + +export const selectSourceStatus = createSelector( + selectSource, + source => (source ? source.status : null) +); + +export const selectSourceLogIndicesExist = createSelector( + selectSourceStatus, + sourceStatus => (sourceStatus ? sourceStatus.logIndicesExist : null) +); + +export const selectSourceMetricIndicesExist = createSelector( + selectSourceStatus, + sourceStatus => (sourceStatus ? sourceStatus.metricIndicesExist : null) +); + +export const selectSourceIndexFields = createSelector( + selectSourceStatus, + sourceStatus => (sourceStatus ? sourceStatus.indexFields : []) +); + +export const selectDerivedIndexPattern = createSelector( + selectSourceIndexFields, + selectSourceLogAlias, + selectSourceMetricAlias, + (indexFields, logAlias, metricAlias) => ({ + fields: indexFields, + title: `${logAlias},${metricAlias}`, + }) +); diff --git a/x-pack/plugins/infra/public/store/remote/source/state.ts b/x-pack/plugins/infra/public/store/remote/source/state.ts new file mode 100644 index 0000000000000..15eef7426dbb7 --- /dev/null +++ b/x-pack/plugins/infra/public/store/remote/source/state.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SourceQuery } from '../../../../common/graphql/types'; +import { + createGraphqlInitialState, + GraphqlState, +} from '../../../utils/remote_state/remote_graphql_state'; + +export type SourceRemoteState = SourceQuery.Source; +export type SourceState = GraphqlState; + +export const initialSourceState = createGraphqlInitialState(); diff --git a/x-pack/plugins/infra/public/store/selectors.ts b/x-pack/plugins/infra/public/store/selectors.ts new file mode 100644 index 0000000000000..bbe1a4455e43e --- /dev/null +++ b/x-pack/plugins/infra/public/store/selectors.ts @@ -0,0 +1,108 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { createSelector } from 'reselect'; + +import { fromKueryExpression, toElasticsearchQuery } from 'ui/kuery'; + +import { getLogEntryAtTime } from '../utils/log_entry'; +import { globalizeSelectors } from '../utils/typed_redux'; +import { + logFilterSelectors as localLogFilterSelectors, + logMinimapSelectors as localLogMinimapSelectors, + logPositionSelectors as localLogPositionSelectors, + logTextviewSelectors as localLogTextviewSelectors, + metricTimeSelectors as localMetricTimeSelectors, + waffleFilterSelectors as localWaffleFilterSelectors, + waffleOptionsSelectors as localWaffleOptionsSelectors, + waffleTimeSelectors as localWaffleTimeSelectors, +} from './local'; +import { State } from './reducer'; +import { + logEntriesSelectors as remoteLogEntriesSelectors, + logSummarySelectors as remoteLogSummarySelectors, + sourceSelectors as remoteSourceSelectors, +} from './remote'; + +/** + * local selectors + */ + +const selectLocal = (state: State) => state.local; + +export const logFilterSelectors = globalizeSelectors(selectLocal, localLogFilterSelectors); +export const logMinimapSelectors = globalizeSelectors(selectLocal, localLogMinimapSelectors); +export const logPositionSelectors = globalizeSelectors(selectLocal, localLogPositionSelectors); +export const logTextviewSelectors = globalizeSelectors(selectLocal, localLogTextviewSelectors); +export const metricTimeSelectors = globalizeSelectors(selectLocal, localMetricTimeSelectors); +export const waffleFilterSelectors = globalizeSelectors(selectLocal, localWaffleFilterSelectors); +export const waffleTimeSelectors = globalizeSelectors(selectLocal, localWaffleTimeSelectors); +export const waffleOptionsSelectors = globalizeSelectors(selectLocal, localWaffleOptionsSelectors); + +/** + * remote selectors + */ + +const selectRemote = (state: State) => state.remote; + +export const logEntriesSelectors = globalizeSelectors(selectRemote, remoteLogEntriesSelectors); +export const logSummarySelectors = globalizeSelectors(selectRemote, remoteLogSummarySelectors); +export const sourceSelectors = globalizeSelectors(selectRemote, remoteSourceSelectors); + +/** + * shared selectors + */ + +export const sharedSelectors = { + selectFirstVisibleLogEntry: createSelector( + logEntriesSelectors.selectEntries, + logPositionSelectors.selectFirstVisiblePosition, + (entries, firstVisiblePosition) => + firstVisiblePosition ? getLogEntryAtTime(entries, firstVisiblePosition) : null + ), + selectMiddleVisibleLogEntry: createSelector( + logEntriesSelectors.selectEntries, + logPositionSelectors.selectMiddleVisiblePosition, + (entries, middleVisiblePosition) => + middleVisiblePosition ? getLogEntryAtTime(entries, middleVisiblePosition) : null + ), + selectLastVisibleLogEntry: createSelector( + logEntriesSelectors.selectEntries, + logPositionSelectors.selectLastVisiblePosition, + (entries, lastVisiblePosition) => + lastVisiblePosition ? getLogEntryAtTime(entries, lastVisiblePosition) : null + ), + selectLogFilterQueryAsJson: createSelector( + logFilterSelectors.selectLogFilterQuery, + sourceSelectors.selectDerivedIndexPattern, + (filterQuery, indexPattern) => { + try { + return filterQuery + ? JSON.stringify( + toElasticsearchQuery(fromKueryExpression(filterQuery.expression), indexPattern) + ) + : null; + } catch (err) { + return null; + } + } + ), + selectWaffleFilterQueryAsJson: createSelector( + waffleFilterSelectors.selectWaffleFilterQuery, + sourceSelectors.selectDerivedIndexPattern, + (filterQuery, indexPattern) => { + try { + return filterQuery + ? JSON.stringify( + toElasticsearchQuery(fromKueryExpression(filterQuery.expression), indexPattern) + ) + : null; + } catch (err) { + return null; + } + } + ), +}; diff --git a/x-pack/plugins/infra/public/store/store.ts b/x-pack/plugins/infra/public/store/store.ts new file mode 100644 index 0000000000000..d18ef02875059 --- /dev/null +++ b/x-pack/plugins/infra/public/store/store.ts @@ -0,0 +1,72 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action, applyMiddleware, compose, createStore as createBasicStore } from 'redux'; +import { createEpicMiddleware } from 'redux-observable'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + +import { + createRootEpic, + initialState, + logEntriesSelectors, + logPositionSelectors, + metricTimeSelectors, + reducer, + sharedSelectors, + State, + waffleTimeSelectors, +} from '.'; +import { InfraApolloClient, InfraObservableApi } from '../lib/lib'; + +declare global { + interface Window { + __REDUX_DEVTOOLS_EXTENSION_COMPOSE__: typeof compose; + } +} + +export interface StoreDependencies { + apolloClient: Observable; + observableApi: Observable; +} + +export function createStore({ apolloClient, observableApi }: StoreDependencies) { + const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; + + const middlewareDependencies = { + postToApi$: observableApi.pipe(map(({ post }) => post)), + apolloClient$: apolloClient, + selectIsLoadingLogEntries: logEntriesSelectors.selectIsLoadingEntries, + selectLogEntriesEnd: logEntriesSelectors.selectEntriesEnd, + selectLogEntriesStart: logEntriesSelectors.selectEntriesStart, + selectHasMoreLogEntriesAfterEnd: logEntriesSelectors.selectHasMoreAfterEnd, + selectHasMoreLogEntriesBeforeStart: logEntriesSelectors.selectHasMoreBeforeStart, + selectIsAutoReloadingLogEntries: logPositionSelectors.selectIsAutoReloading, + selectLogFilterQueryAsJson: sharedSelectors.selectLogFilterQueryAsJson, + selectLogTargetPosition: logPositionSelectors.selectTargetPosition, + selectVisibleLogMidpointOrTarget: logPositionSelectors.selectVisibleMidpointOrTarget, + selectVisibleLogSummary: logPositionSelectors.selectVisibleSummary, + selectWaffleTimeUpdatePolicyInterval: waffleTimeSelectors.selectTimeUpdatePolicyInterval, + selectMetricTimeUpdatePolicyInterval: metricTimeSelectors.selectTimeUpdatePolicyInterval, + selectMetricRangeFromTimeRange: metricTimeSelectors.selectRangeFromTimeRange, + }; + + const epicMiddleware = createEpicMiddleware( + { + dependencies: middlewareDependencies, + } + ); + + const store = createBasicStore( + reducer, + initialState, + composeEnhancers(applyMiddleware(epicMiddleware)) + ); + + epicMiddleware.run(createRootEpic()); + + return store; +} diff --git a/x-pack/plugins/infra/public/utils/formatters/data.ts b/x-pack/plugins/infra/public/utils/formatters/data.ts new file mode 100644 index 0000000000000..07b404c84f983 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/formatters/data.ts @@ -0,0 +1,73 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraWaffleMapDataFormat } from '../../lib/lib'; +import { formatNumber } from './number'; + +/** + * The labels are derived from these two Wikipedia articles. + * https://en.wikipedia.org/wiki/Kilobit + * https://en.wikipedia.org/wiki/Kilobyte + */ +const LABELS = { + [InfraWaffleMapDataFormat.bytesDecimal]: ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], + [InfraWaffleMapDataFormat.bytesBinaryIEC]: [ + 'b', + 'Kib', + 'Mib', + 'Gib', + 'Tib', + 'Pib', + 'Eib', + 'Zib', + 'Yib', + ], + [InfraWaffleMapDataFormat.bytesBinaryJEDEC]: ['B', 'KB', 'MB', 'GB'], + [InfraWaffleMapDataFormat.bitsDecimal]: [ + 'bit', + 'kbit', + 'Mbit', + 'Gbit', + 'Tbit', + 'Pbit', + 'Ebit', + 'Zbit', + 'Ybit', + ], + [InfraWaffleMapDataFormat.bitsBinaryIEC]: [ + 'bit', + 'Kibit', + 'Mibit', + 'Gibit', + 'Tibit', + 'Pibit', + 'Eibit', + 'Zibit', + 'Yibit', + ], + [InfraWaffleMapDataFormat.bitsBinaryJEDEC]: ['bit', 'Kbit', 'Mbit', 'Gbit'], + [InfraWaffleMapDataFormat.abbreviatedNumber]: ['', 'K', 'M', 'B', 'T'], +}; + +const BASES = { + [InfraWaffleMapDataFormat.bytesDecimal]: 1000, + [InfraWaffleMapDataFormat.bytesBinaryIEC]: 1024, + [InfraWaffleMapDataFormat.bytesBinaryJEDEC]: 1024, + [InfraWaffleMapDataFormat.bitsDecimal]: 1000, + [InfraWaffleMapDataFormat.bitsBinaryIEC]: 1024, + [InfraWaffleMapDataFormat.bitsBinaryJEDEC]: 1024, + [InfraWaffleMapDataFormat.abbreviatedNumber]: 1000, +}; + +export const createDataFormatter = (format: InfraWaffleMapDataFormat) => (val: number) => { + const labels = LABELS[format]; + const base = BASES[format]; + const power = Math.min(Math.floor(Math.log(Math.abs(val)) / Math.log(base)), labels.length - 1); + if (power < 0) { + return `${formatNumber(val)}${labels[0]}`; + } + return `${formatNumber(val / Math.pow(base, power))}${labels[power]}`; +}; diff --git a/x-pack/plugins/infra/public/utils/formatters/index.ts b/x-pack/plugins/infra/public/utils/formatters/index.ts new file mode 100644 index 0000000000000..864890a43f957 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/formatters/index.ts @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Mustache from 'mustache'; +import { InfraFormatterType, InfraWaffleMapDataFormat } from '../../lib/lib'; +import { createDataFormatter } from './data'; +import { formatNumber } from './number'; +import { formatPercent } from './percent'; + +export const FORMATTERS = { + [InfraFormatterType.number]: formatNumber, + [InfraFormatterType.abbreviatedNumber]: createDataFormatter( + InfraWaffleMapDataFormat.abbreviatedNumber + ), + [InfraFormatterType.bytes]: createDataFormatter(InfraWaffleMapDataFormat.bytesDecimal), + [InfraFormatterType.bits]: createDataFormatter(InfraWaffleMapDataFormat.bitsDecimal), + [InfraFormatterType.percent]: formatPercent, +}; + +export const createFormatter = (format: InfraFormatterType, template: string = '{{value}}') => ( + val: string | number +) => { + if (val == null) { + return ''; + } + const fmtFn = FORMATTERS[format]; + const value = fmtFn(Number(val)); + return Mustache.render(template, { value }); +}; diff --git a/x-pack/plugins/infra/public/utils/formatters/number.ts b/x-pack/plugins/infra/public/utils/formatters/number.ts new file mode 100644 index 0000000000000..db4ad4190bd73 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/formatters/number.ts @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const formatNumber = (val: number) => { + return Number(val).toLocaleString('en', { + maximumFractionDigits: 1, + }); +}; diff --git a/x-pack/plugins/infra/public/utils/formatters/percent.ts b/x-pack/plugins/infra/public/utils/formatters/percent.ts new file mode 100644 index 0000000000000..c1cd9cd089d17 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/formatters/percent.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { formatNumber } from './number'; +export const formatPercent = (val: number) => { + return `${formatNumber(val * 100)}%`; +}; diff --git a/x-pack/plugins/infra/public/utils/handlers.ts b/x-pack/plugins/infra/public/utils/handlers.ts new file mode 100644 index 0000000000000..4678718169b94 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/handlers.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import isEqual from 'lodash/fp/isEqual'; + +export function callWithoutRepeats( + func: (...args: any[]) => T, + isArgsEqual: (firstArgs: any, secondArgs: any) => boolean = isEqual +) { + let previousArgs: any[]; + let previousResult: T; + + return (...args: any[]) => { + if (!isArgsEqual(args, previousArgs)) { + previousArgs = args; + previousResult = func(...args); + } + + return previousResult; + }; +} diff --git a/x-pack/plugins/infra/public/utils/loading_state/index.ts b/x-pack/plugins/infra/public/utils/loading_state/index.ts new file mode 100644 index 0000000000000..d4a1b8e52ad00 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/loading_state/index.ts @@ -0,0 +1,30 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { initialLoadingState, LoadingState } from './loading_state'; + +export { isManualLoadingPolicy, isIntervalLoadingPolicy, LoadingPolicy } from './loading_policy'; + +export { + createRunningProgressReducer, + createIdleProgressReducer, + isIdleLoadingProgress, + isRunningLoadingProgress, + LoadingProgress, +} from './loading_progress'; + +export { + createFailureResult, + createFailureResultReducer, + createSuccessResult, + createSuccessResultReducer, + getTimeOrDefault, + isExhaustedLoadingResult, + isFailureLoadingResult, + isSuccessLoadingResult, + isUninitializedLoadingResult, + LoadingResult, +} from './loading_result'; diff --git a/x-pack/plugins/infra/public/utils/loading_state/loading_policy.ts b/x-pack/plugins/infra/public/utils/loading_state/loading_policy.ts new file mode 100644 index 0000000000000..6a129e7b79c87 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/loading_state/loading_policy.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +interface ManualLoadingPolicy { + policy: 'manual'; +} + +interface IntervalLoadingPolicy { + policy: 'interval'; + delayMillis: number; +} + +export type LoadingPolicy = ManualLoadingPolicy | IntervalLoadingPolicy; + +export const isManualLoadingPolicy = ( + loadingPolicy: LoadingPolicy +): loadingPolicy is ManualLoadingPolicy => loadingPolicy.policy === 'manual'; + +export const isIntervalLoadingPolicy = ( + loadingPolicy: LoadingPolicy +): loadingPolicy is IntervalLoadingPolicy => loadingPolicy.policy === 'interval'; diff --git a/x-pack/plugins/infra/public/utils/loading_state/loading_progress.ts b/x-pack/plugins/infra/public/utils/loading_state/loading_progress.ts new file mode 100644 index 0000000000000..8e2b09ee5f1f5 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/loading_state/loading_progress.ts @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +interface IdleLoadingProgress { + progress: 'idle'; +} + +interface RunningLoadingProgress { + progress: 'running'; + time: number; + parameters: Parameters; +} + +export type LoadingProgress = IdleLoadingProgress | RunningLoadingProgress; + +export const isIdleLoadingProgress =

      ( + loadingProgress: LoadingProgress

      +): loadingProgress is IdleLoadingProgress => loadingProgress.progress === 'idle'; + +export const isRunningLoadingProgress =

      ( + loadingProgress: LoadingProgress

      +): loadingProgress is RunningLoadingProgress

      => loadingProgress.progress === 'running'; + +export const createIdleProgressReducer = () => ( + state: LoadingProgress +): IdleLoadingProgress => ({ + progress: 'idle', +}); + +export const createRunningProgressReducer = () => ( + state: LoadingProgress, + parameters: Parameters +): RunningLoadingProgress => ({ + parameters, + progress: 'running', + time: Date.now(), +}); diff --git a/x-pack/plugins/infra/public/utils/loading_state/loading_result.ts b/x-pack/plugins/infra/public/utils/loading_state/loading_result.ts new file mode 100644 index 0000000000000..e48b04743c811 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/loading_state/loading_result.ts @@ -0,0 +1,88 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +interface UninitializedLoadingResult { + result: 'uninitialized'; +} + +interface SuccessLoadingResult { + result: 'success'; + time: number; + isExhausted: boolean; + parameters: Parameters; +} + +interface FailureLoadingResult { + result: 'failure'; + time: number; + reason: string; + parameters: Parameters; +} + +export type LoadingResult = + | UninitializedLoadingResult + | SuccessLoadingResult + | FailureLoadingResult; + +export const isUninitializedLoadingResult =

      ( + loadingResult: LoadingResult

      +): loadingResult is UninitializedLoadingResult => loadingResult.result === 'uninitialized'; + +export const isSuccessLoadingResult =

      ( + loadingResult: LoadingResult

      +): loadingResult is SuccessLoadingResult

      => loadingResult.result === 'success'; + +export const isFailureLoadingResult =

      ( + loadingResult: LoadingResult

      +): loadingResult is FailureLoadingResult

      => loadingResult.result === 'failure'; + +export const isExhaustedLoadingResult =

      (loadingResult: LoadingResult

      ) => + isSuccessLoadingResult(loadingResult) && loadingResult.isExhausted; + +interface GetTimeOrDefaultT { +

      (loadingResult: LoadingResult

      ): number | null; + (loadingResult: LoadingResult

      , defaultValue: T): number | T; + (loadingResult: LoadingResult

      , defaultValue?: T): number | T | null; +} + +export const getTimeOrDefault: GetTimeOrDefaultT = ( + loadingResult: LoadingResult

      , + defaultValue?: T +) => (isUninitializedLoadingResult(loadingResult) ? defaultValue || null : loadingResult.time); + +export const createSuccessResult = ( + parameters: Parameters, + isExhausted: boolean +): SuccessLoadingResult => ({ + isExhausted, + parameters, + result: 'success', + time: Date.now(), +}); + +export const createSuccessResultReducer = ( + isExhausted: (params: Parameters, result: Payload) => boolean +) => ( + state: LoadingResult, + { params, result }: { params: Parameters; result: Payload } +): SuccessLoadingResult => createSuccessResult(params, isExhausted(params, result)); + +export const createFailureResult = ( + parameters: Parameters, + reason: string +): FailureLoadingResult => ({ + parameters, + reason, + result: 'failure', + time: Date.now(), +}); + +export const createFailureResultReducer = ( + convertErrorToString: (error: ErrorPayload) => string = error => `${error}` +) => ( + state: LoadingResult, + { params, error }: { params: Parameters; error: ErrorPayload } +): FailureLoadingResult => createFailureResult(params, convertErrorToString(error)); diff --git a/x-pack/plugins/infra/public/utils/loading_state/loading_state.ts b/x-pack/plugins/infra/public/utils/loading_state/loading_state.ts new file mode 100644 index 0000000000000..d5066dd4c9007 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/loading_state/loading_state.ts @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { LoadingPolicy } from './loading_policy'; +import { LoadingProgress } from './loading_progress'; +import { LoadingResult } from './loading_result'; + +export interface LoadingState { + current: LoadingProgress; + last: LoadingResult; + policy: LoadingPolicy; +} + +export const initialLoadingState: LoadingState = { + current: { + progress: 'idle', + }, + last: { + result: 'uninitialized', + }, + policy: { + policy: 'manual', + }, +}; diff --git a/x-pack/plugins/infra/public/utils/log_entry/index.ts b/x-pack/plugins/infra/public/utils/log_entry/index.ts new file mode 100644 index 0000000000000..66cc5108b6692 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/log_entry/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './log_entry'; diff --git a/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts b/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts new file mode 100644 index 0000000000000..d4eac795612b4 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/log_entry/log_entry.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { bisector } from 'd3-array'; + +import { LogEntries as LogEntriesQuery } from '../../../common/graphql/types'; +import { compareToTimeKey, getIndexAtTimeKey, TimeKey } from '../../../common/time'; + +export type LogEntry = LogEntriesQuery.Entries; + +export type LogEntryMessageSegment = LogEntriesQuery.Message; + +export const getLogEntryKey = (entry: LogEntry) => entry.key; + +const logEntryTimeBisector = bisector(compareToTimeKey(getLogEntryKey)); + +export const getLogEntryIndexBeforeTime = logEntryTimeBisector.left; +export const getLogEntryIndexAfterTime = logEntryTimeBisector.right; +export const getLogEntryIndexAtTime = getIndexAtTimeKey(getLogEntryKey); + +export const getLogEntryAtTime = (entries: LogEntry[], time: TimeKey) => { + const entryIndex = getLogEntryIndexAtTime(entries, time); + + return entryIndex !== null ? entries[entryIndex] : null; +}; diff --git a/x-pack/plugins/infra/public/utils/memoize_last.ts b/x-pack/plugins/infra/public/utils/memoize_last.ts new file mode 100644 index 0000000000000..fbab4ce22cf6e --- /dev/null +++ b/x-pack/plugins/infra/public/utils/memoize_last.ts @@ -0,0 +1,48 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +interface MemoizedCall { + args: any[]; + returnValue: any; + this: any; +} + +// A symbol expressing, that the memoized function has never been called +const neverCalled: unique symbol = Symbol(); +type NeverCalled = typeof neverCalled; + +/** + * A simple memoize function, that only stores the last returned value + * and uses the identity of all passed parameters as a cache key. + */ +function memoizeLast any>(func: T): T { + let prevCall: MemoizedCall | NeverCalled = neverCalled; + + // We need to use a `function` here for proper this passing. + // tslint:disable-next-line:only-arrow-functions + const memoizedFunction = function(this: any, ...args: any[]) { + if ( + prevCall !== neverCalled && + prevCall.this === this && + prevCall.args.length === args.length && + prevCall.args.every((arg, index) => arg === args[index]) + ) { + return prevCall.returnValue; + } + + prevCall = { + args, + this: this, + returnValue: func.apply(this, args), + }; + + return prevCall.returnValue; + } as T; + + return memoizedFunction; +} + +export { memoizeLast }; diff --git a/x-pack/plugins/infra/public/utils/remote_state/remote_graphql_state.ts b/x-pack/plugins/infra/public/utils/remote_state/remote_graphql_state.ts new file mode 100644 index 0000000000000..6a03def5d068d --- /dev/null +++ b/x-pack/plugins/infra/public/utils/remote_state/remote_graphql_state.ts @@ -0,0 +1,212 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { ApolloError, ApolloQueryResult } from 'apollo-client'; +import { DocumentNode } from 'graphql'; +import { Action as ReduxAction } from 'redux'; +import { Epic } from 'redux-observable'; +import { from, Observable } from 'rxjs'; +import { catchError, filter, map, startWith, switchMap, withLatestFrom } from 'rxjs/operators'; +import { Action, ActionCreator, actionCreatorFactory, Failure, Success } from 'typescript-fsa'; +import { reducerWithInitialState } from 'typescript-fsa-reducers/dist'; + +import { createSelector } from 'reselect'; +import { InfraApolloClient } from '../../lib/lib'; +import { + isFailureLoadingResult, + isIdleLoadingProgress, + isRunningLoadingProgress, + isSuccessLoadingResult, + isUninitializedLoadingResult, + LoadingPolicy, + LoadingProgress, + LoadingResult, +} from '../loading_state'; + +export interface GraphqlState { + current: LoadingProgress>; + last: LoadingResult>; + data: State | undefined; +} + +interface OperationInfo { + operationKey: string; + variables: Variables; +} + +type ResolveDonePayload = Success>; +type ResolveFailedPayload = Failure; + +interface OperationActionCreators { + resolve: ActionCreator; + resolveStarted: ActionCreator; + resolveDone: ActionCreator>; + resolveFailed: ActionCreator>; +} + +export const createGraphqlInitialState = (initialData?: State): GraphqlState => ({ + current: { + progress: 'idle', + }, + last: { + result: 'uninitialized', + }, + data: initialData, +}); + +export const createGraphqlOperationActionCreators = ( + stateKey: string, + operationKey: string +): OperationActionCreators => { + const actionCreator = actionCreatorFactory(`x-pack/infra/remote/${stateKey}/${operationKey}`); + + const resolve = actionCreator('RESOLVE'); + const resolveEffect = actionCreator.async>('RESOLVE'); + + return { + resolve, + resolveStarted: resolveEffect.started, + resolveDone: resolveEffect.done, + resolveFailed: resolveEffect.failed, + }; +}; + +export const createGraphqlOperationReducer = ( + operationKey: string, + initialState: GraphqlState, + actionCreators: OperationActionCreators, + reduceSuccess: ( + state: State | undefined, + action: Action> + ) => State | undefined = state => state +) => + reducerWithInitialState(initialState) + .caseWithAction(actionCreators.resolveStarted, (state, action) => ({ + ...state, + current: { + progress: 'running', + time: Date.now(), + parameters: { + operationKey, + variables: action.payload, + }, + }, + })) + .caseWithAction(actionCreators.resolveDone, (state, action) => ({ + ...state, + current: { + progress: 'idle', + }, + last: { + result: 'success', + parameters: { + operationKey, + variables: action.payload.params, + }, + time: Date.now(), + isExhausted: false, + }, + data: reduceSuccess(state.data, action), + })) + .caseWithAction(actionCreators.resolveFailed, (state, action) => ({ + ...state, + current: { + progress: 'idle', + }, + last: { + result: 'failure', + reason: `${action.payload}`, + time: Date.now(), + parameters: { + operationKey, + variables: action.payload.params, + }, + }, + })) + .build(); + +export const createGraphqlQueryEpic = ( + graphqlQuery: DocumentNode, + actionCreators: OperationActionCreators +): Epic< + ReduxAction, + ReduxAction, + any, + { + apolloClient$: Observable; + } +> => (action$, state$, { apolloClient$ }) => + action$.pipe( + filter(actionCreators.resolve.match), + withLatestFrom(apolloClient$), + switchMap(([{ payload: variables }, apolloClient]) => + from( + apolloClient.query({ + query: graphqlQuery, + variables, + fetchPolicy: 'no-cache', + }) + ).pipe( + map(result => actionCreators.resolveDone({ params: variables, result })), + catchError(error => [actionCreators.resolveFailed({ params: variables, error })]), + startWith(actionCreators.resolveStarted(variables)) + ) + ) + ); + +export const createGraphqlStateSelectors = ( + selectState: (parentState: any) => GraphqlState = parentState => parentState +) => { + const selectData = createSelector(selectState, state => state.data); + + const selectLoadingProgress = createSelector(selectState, state => state.current); + const selectLoadingProgressOperationInfo = createSelector( + selectLoadingProgress, + progress => (isRunningLoadingProgress(progress) ? progress.parameters : null) + ); + const selectIsLoading = createSelector(selectLoadingProgress, isRunningLoadingProgress); + const selectIsIdle = createSelector(selectLoadingProgress, isIdleLoadingProgress); + + const selectLoadingResult = createSelector(selectState, state => state.last); + const selectLoadingResultOperationInfo = createSelector( + selectLoadingResult, + result => (!isUninitializedLoadingResult(result) ? result.parameters : null) + ); + const selectLoadingResultTime = createSelector( + selectLoadingResult, + result => (!isUninitializedLoadingResult(result) ? result.time : null) + ); + const selectIsUninitialized = createSelector(selectLoadingResult, isUninitializedLoadingResult); + const selectIsSuccess = createSelector(selectLoadingResult, isSuccessLoadingResult); + const selectIsFailure = createSelector(selectLoadingResult, isFailureLoadingResult); + + const selectLoadingState = createSelector( + selectLoadingProgress, + selectLoadingResult, + (loadingProgress, loadingResult) => ({ + current: loadingProgress, + last: loadingResult, + policy: { + policy: 'manual', + } as LoadingPolicy, + }) + ); + + return { + selectData, + selectIsFailure, + selectIsIdle, + selectIsLoading, + selectIsSuccess, + selectIsUninitialized, + selectLoadingProgress, + selectLoadingProgressOperationInfo, + selectLoadingResult, + selectLoadingResultOperationInfo, + selectLoadingResultTime, + selectLoadingState, + }; +}; diff --git a/x-pack/plugins/infra/public/utils/styles.ts b/x-pack/plugins/infra/public/utils/styles.ts new file mode 100644 index 0000000000000..0dd7b47950d05 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/styles.ts @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import get from 'lodash/fp/get'; +import getOr from 'lodash/fp/getOr'; +import { parseToHsl, shade, tint } from 'polished'; + +type PropReader = (props: object, defaultValue?: Default) => Prop; + +const asPropReader = (reader: string | string[] | PropReader) => + typeof reader === 'function' + ? reader + : ( + props: Props, + defaultValue?: Default + ) => getOr(defaultValue, reader as Prop, props); + +export const switchProp = Object.assign( + (propName: string | string[] | PropReader, options: Map | object) => ( + props: object + ) => { + const propValue = asPropReader(propName)(props, switchProp.default); + if (typeof propValue === 'undefined') { + return; + } + return options instanceof Map ? options.get(propValue) : get(propValue, options); + }, + { + default: Symbol('default'), + } +); + +export const ifProp = ( + propName: string | string[] | PropReader, + pass: Pass, + fail: Fail +) => (props: object) => (asPropReader(propName)(props) ? pass : fail); + +export const tintOrShade = (textColor: 'string', color: 'string', fraction: number) => { + return parseToHsl(textColor).lightness > 0.5 ? shade(fraction, color) : tint(fraction, color); +}; diff --git a/x-pack/plugins/infra/public/utils/typed_react.tsx b/x-pack/plugins/infra/public/utils/typed_react.tsx new file mode 100644 index 0000000000000..99c43608a3044 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/typed_react.tsx @@ -0,0 +1,65 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import omit from 'lodash/fp/omit'; +import React from 'react'; +import { InferableComponentEnhancerWithProps } from 'react-redux'; + +export type RendererResult = React.ReactElement | null; +export type RendererFunction = (args: RenderArgs) => Result; + +export type ChildFunctionRendererProps = { + children: RendererFunction; + initializeOnMount?: boolean; + resetOnUnmount?: boolean; +} & RenderArgs; + +interface ChildFunctionRendererOptions { + onInitialize?: (props: RenderArgs) => void; + onCleanup?: (props: RenderArgs) => void; +} + +export const asChildFunctionRenderer = ( + hoc: InferableComponentEnhancerWithProps, + { onInitialize, onCleanup }: ChildFunctionRendererOptions = {} +) => + hoc( + class ChildFunctionRenderer extends React.Component> { + public displayName = 'ChildFunctionRenderer'; + + public componentDidMount() { + if (this.props.initializeOnMount && onInitialize) { + onInitialize(this.getRendererArgs()); + } + } + + public componentWillUnmount() { + if (this.props.resetOnUnmount && onCleanup) { + onCleanup(this.getRendererArgs()); + } + } + + public render() { + return this.props.children(this.getRendererArgs()); + } + + private getRendererArgs = () => + omit(['children', 'initializeOnMount', 'resetOnUnmount'], this.props) as Pick< + ChildFunctionRendererProps, + keyof InjectedProps + >; + } + ); + +export type StateUpdater = ( + prevState: Readonly, + prevProps: Readonly +) => State | null; + +export function composeStateUpdaters(...updaters: Array>) { + return (state: State, props: Props) => + updaters.reduce((currentState, updater) => updater(currentState, props) || currentState, state); +} diff --git a/x-pack/plugins/infra/public/utils/typed_redux.ts b/x-pack/plugins/infra/public/utils/typed_redux.ts new file mode 100644 index 0000000000000..391c580902176 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/typed_redux.ts @@ -0,0 +1,68 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { bindActionCreators, Dispatch } from 'redux'; + +/** + * Selectors + */ +export type Selector = (state: State) => Value; + +export interface Selectors { + [selectorName: string]: Selector; +} + +export type GlobalSelectors = { + [selectorName in keyof LocalSelectors]: Selector< + GlobalState, + ReturnType + > +}; + +export const globalizeSelector = < + GlobalState, + LocalSelector extends Selector, + LocalState = any, + Value = any +>( + globalizer: Selector, + selector: LocalSelector +): Selector => (globalState: GlobalState) => selector(globalizer(globalState)); + +export const globalizeSelectors = < + GlobalState, + LocalSelectors extends Selectors, + LocalState = any +>( + globalizer: (globalState: GlobalState) => LocalState, + selectors: LocalSelectors +): GlobalSelectors => { + const globalSelectors = {} as GlobalSelectors; + for (const s in selectors) { + if (selectors.hasOwnProperty(s)) { + globalSelectors[s] = globalizeSelector(globalizer, selectors[s]); + } + } + return globalSelectors; +}; + +/** + * Action Creators + */ +interface ActionCreators { + [key: string]: (arg: any) => any; +} + +type PlainActionCreator = WrappedActionCreator extends () => infer R + ? () => R + : WrappedActionCreator extends (payload: infer A) => infer R ? (payload: A) => R : never; + +export const bindPlainActionCreators = ( + actionCreators: WrappedActionCreators +) => (dispatch: Dispatch) => + bindActionCreators(actionCreators, dispatch) as { + [P in keyof WrappedActionCreators]: PlainActionCreator + }; diff --git a/x-pack/plugins/infra/public/utils/url_state.tsx b/x-pack/plugins/infra/public/utils/url_state.tsx new file mode 100644 index 0000000000000..8ed80fbb2e383 --- /dev/null +++ b/x-pack/plugins/infra/public/utils/url_state.tsx @@ -0,0 +1,164 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { History, Location } from 'history'; +import throttle from 'lodash/fp/throttle'; +import { parse as parseQueryString, stringify as stringifyQueryString } from 'querystring'; +import React from 'react'; +import { Route, RouteProps } from 'react-router'; +import { decode, encode, RisonValue } from 'rison-node'; + +interface UrlStateContainerProps { + urlState: UrlState | undefined; + urlStateKey: string; + mapToUrlState?: (value: any) => UrlState | undefined; + onChange?: (urlState: UrlState, previousUrlState: UrlState | undefined) => void; + onInitialize?: (urlState: UrlState | undefined) => void; +} + +interface UrlStateContainerLifecycleProps extends UrlStateContainerProps { + location: Location; + history: History; +} + +class UrlStateContainerLifecycle extends React.Component< + UrlStateContainerLifecycleProps +> { + public render() { + return null; + } + + public componentDidUpdate({ + location: prevLocation, + urlState: prevUrlState, + }: UrlStateContainerLifecycleProps) { + const { history, location, urlState } = this.props; + + if (urlState !== prevUrlState) { + this.replaceStateInLocation(urlState); + } + + if (history.action === 'POP' && location !== prevLocation) { + this.handleLocationChange(prevLocation, location); + } + } + + public componentDidMount() { + const { location } = this.props; + + this.handleInitialize(location); + } + + // tslint:disable-next-line:member-ordering this is really a method despite what tslint thinks + private replaceStateInLocation = throttle(1000, (urlState: UrlState | undefined) => { + const { history, location, urlStateKey } = this.props; + + const newLocation = replaceQueryStringInLocation( + location, + replaceStateKeyInQueryString(urlStateKey, urlState)(getQueryStringFromLocation(location)) + ); + + if (newLocation !== location) { + history.replace(newLocation); + } + }); + + private handleInitialize = (location: Location) => { + const { onInitialize, mapToUrlState, urlStateKey } = this.props; + + if (!onInitialize || !mapToUrlState) { + return; + } + + const newUrlStateString = getParamFromQueryString( + getQueryStringFromLocation(location), + urlStateKey + ); + const newUrlState = mapToUrlState(decodeRisonUrlState(newUrlStateString)); + + onInitialize(newUrlState); + }; + + private handleLocationChange = (prevLocation: Location, newLocation: Location) => { + const { onChange, mapToUrlState, urlStateKey } = this.props; + + if (!onChange || !mapToUrlState) { + return; + } + + const previousUrlStateString = getParamFromQueryString( + getQueryStringFromLocation(prevLocation), + urlStateKey + ); + const newUrlStateString = getParamFromQueryString( + getQueryStringFromLocation(newLocation), + urlStateKey + ); + + if (previousUrlStateString !== newUrlStateString) { + const previousUrlState = mapToUrlState(decodeRisonUrlState(previousUrlStateString)); + const newUrlState = mapToUrlState(decodeRisonUrlState(newUrlStateString)); + + if (typeof newUrlState !== 'undefined') { + onChange(newUrlState, previousUrlState); + } + } + }; +} + +export const UrlStateContainer = ( + props: UrlStateContainerProps +) => ( + > + {({ history, location }) => ( + history={history} location={location} {...props} /> + )} + +); + +export const decodeRisonUrlState = (value: string | undefined): RisonValue | undefined => { + try { + return value ? decode(value) : undefined; + } catch (error) { + if (error instanceof Error && error.message.startsWith('rison decoder error')) { + return {}; + } + throw error; + } +}; + +const encodeRisonUrlState = (state: any) => encode(state); + +export const getQueryStringFromLocation = (location: Location) => location.search.substring(1); + +export const getParamFromQueryString = (queryString: string, key: string): string | undefined => { + const queryParam = parseQueryString(queryString)[key]; + return Array.isArray(queryParam) ? queryParam[0] : queryParam; +}; + +export const replaceStateKeyInQueryString = ( + stateKey: string, + urlState: UrlState | undefined +) => (queryString: string) => { + const previousQueryValues = parseQueryString(queryString); + const encodedUrlState = + typeof urlState !== 'undefined' ? encodeRisonUrlState(urlState) : undefined; + return stringifyQueryString({ + ...previousQueryValues, + [stateKey]: encodedUrlState, + }); +}; + +const replaceQueryStringInLocation = (location: Location, queryString: string): Location => { + if (queryString === getQueryStringFromLocation(location)) { + return location; + } else { + return { + ...location, + search: `?${queryString}`, + }; + } +}; diff --git a/x-pack/plugins/infra/scripts/combined_schema.ts b/x-pack/plugins/infra/scripts/combined_schema.ts new file mode 100644 index 0000000000000..ec3628b2632c9 --- /dev/null +++ b/x-pack/plugins/infra/scripts/combined_schema.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { buildSchemaFromTypeDefinitions } from 'graphql-tools'; + +import { schemas as serverSchemas } from '../server/graphql'; + +export const schemas = [...serverSchemas]; + +// this default export is used to feed the combined types to the gql-gen tool +// which generates the corresponding typescript types +// tslint:disable-next-line:no-default-export +export default buildSchemaFromTypeDefinitions(schemas); diff --git a/x-pack/plugins/infra/scripts/generate_types_from_graphql.js b/x-pack/plugins/infra/scripts/generate_types_from_graphql.js new file mode 100644 index 0000000000000..f36979c159376 --- /dev/null +++ b/x-pack/plugins/infra/scripts/generate_types_from_graphql.js @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +const { join, resolve } = require('path'); +// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved +const { generate } = require('graphql-code-generator'); + +const GRAPHQL_GLOBS = [ + join('public', 'containers', '**', '*.gql_query.ts{,x}'), + join('public', 'store', '**', '*.gql_query.ts{,x}'), + join('common', 'graphql', '**', '*.gql_query.ts{,x}'), +]; +const CONFIG_PATH = resolve(__dirname, 'gql_gen.json'); +const OUTPUT_INTROSPECTION_PATH = resolve('common', 'graphql', 'introspection.json'); +const OUTPUT_TYPES_PATH = resolve('common', 'graphql', 'types.ts'); +const SCHEMA_PATH = resolve(__dirname, 'combined_schema.ts'); + +async function main() { + await generate( + { + args: GRAPHQL_GLOBS, + config: CONFIG_PATH, + out: OUTPUT_INTROSPECTION_PATH, + overwrite: true, + require: ['ts-node/register'], + schema: SCHEMA_PATH, + template: 'graphql-codegen-introspection-template', + }, + true + ); + await generate( + { + args: GRAPHQL_GLOBS, + config: CONFIG_PATH, + out: OUTPUT_TYPES_PATH, + overwrite: true, + schema: SCHEMA_PATH, + template: 'graphql-codegen-typescript-template', + }, + true + ); +} + +if (require.main === module) { + main(); +} diff --git a/x-pack/plugins/infra/scripts/gql_gen.json b/x-pack/plugins/infra/scripts/gql_gen.json new file mode 100644 index 0000000000000..87b8233dd1eeb --- /dev/null +++ b/x-pack/plugins/infra/scripts/gql_gen.json @@ -0,0 +1,11 @@ +{ + "flattenTypes": true, + "generatorConfig": {}, + "primitives": { + "String": "string", + "Int": "number", + "Float": "number", + "Boolean": "boolean", + "ID": "string" + } +} diff --git a/x-pack/plugins/infra/server/graphql/capabilities/index.ts b/x-pack/plugins/infra/server/graphql/capabilities/index.ts new file mode 100644 index 0000000000000..3f6f9541eda33 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/capabilities/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { createCapabilitiesResolvers } from './resolvers'; +export { capabilitiesSchema } from './schema.gql'; diff --git a/x-pack/plugins/infra/server/graphql/capabilities/resolvers.ts b/x-pack/plugins/infra/server/graphql/capabilities/resolvers.ts new file mode 100644 index 0000000000000..fa242f67b230f --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/capabilities/resolvers.ts @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceResolvers } from '../../../common/graphql/types'; +import { InfraResolvedResult, InfraResolverOf } from '../../lib/adapters/framework'; +import { InfraCapabilitiesDomain } from '../../lib/domains/capabilities_domain'; +import { InfraContext } from '../../lib/infra_types'; +import { QuerySourceResolver } from '../sources/resolvers'; + +type InfraSourceCapabilitiesByNodeResolver = InfraResolverOf< + InfraSourceResolvers.CapabilitiesByNodeResolver, + InfraResolvedResult, + InfraContext +>; + +export const createCapabilitiesResolvers = (libs: { + capabilities: InfraCapabilitiesDomain; +}): { + InfraSource: { + capabilitiesByNode: InfraSourceCapabilitiesByNodeResolver; + }; +} => ({ + InfraSource: { + async capabilitiesByNode(source, args, { req }) { + const result = await libs.capabilities.getCapabilities( + req, + source.id, + args.nodeName, + args.nodeType + ); + return result; + }, + }, +}); diff --git a/x-pack/plugins/infra/server/graphql/capabilities/schema.gql.ts b/x-pack/plugins/infra/server/graphql/capabilities/schema.gql.ts new file mode 100644 index 0000000000000..9a97ff29eeb85 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/capabilities/schema.gql.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const capabilitiesSchema = gql` + "One specific capability available on a node. A capability corresponds to a fileset or metricset" + type InfraNodeCapability { + name: String! + source: String! + } + + extend type InfraSource { + "A hierarchy of capabilities available on nodes" + capabilitiesByNode(nodeName: String!, nodeType: InfraNodeType!): [InfraNodeCapability]! + } +`; diff --git a/x-pack/plugins/infra/server/graphql/index.ts b/x-pack/plugins/infra/server/graphql/index.ts new file mode 100644 index 0000000000000..7fb3a92330352 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/index.ts @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { rootSchema } from '../../common/graphql/root/schema.gql'; +import { sharedSchema } from '../../common/graphql/shared/schema.gql'; +import { capabilitiesSchema } from './capabilities/schema.gql'; +import { logEntriesSchema } from './log_entries/schema.gql'; +import { metricsSchema } from './metrics/schema.gql'; +import { nodesSchema } from './nodes/schema.gql'; +import { sourceStatusSchema } from './source_status/schema.gql'; +import { sourcesSchema } from './sources/schema.gql'; + +export const schemas = [ + rootSchema, + sharedSchema, + capabilitiesSchema, + logEntriesSchema, + nodesSchema, + sourcesSchema, + sourceStatusSchema, + metricsSchema, +]; diff --git a/x-pack/plugins/infra/server/graphql/log_entries/index.ts b/x-pack/plugins/infra/server/graphql/log_entries/index.ts new file mode 100644 index 0000000000000..21134862663ec --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/log_entries/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { createLogEntriesResolvers } from './resolvers'; diff --git a/x-pack/plugins/infra/server/graphql/log_entries/resolvers.ts b/x-pack/plugins/infra/server/graphql/log_entries/resolvers.ts new file mode 100644 index 0000000000000..3a16ff0c341db --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/log_entries/resolvers.ts @@ -0,0 +1,143 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + InfraLogMessageConstantSegment, + InfraLogMessageFieldSegment, + InfraLogMessageSegment, + InfraSourceResolvers, +} from '../../../common/graphql/types'; +import { InfraResolvedResult, InfraResolverOf } from '../../lib/adapters/framework'; +import { InfraLogEntriesDomain } from '../../lib/domains/log_entries_domain'; +import { InfraContext } from '../../lib/infra_types'; +import { UsageCollector } from '../../usage/usage_collector'; +import { parseFilterQuery } from '../../utils/serialized_query'; +import { QuerySourceResolver } from '../sources/resolvers'; + +export type InfraSourceLogEntriesAroundResolver = InfraResolverOf< + InfraSourceResolvers.LogEntriesAroundResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceLogEntriesBetweenResolver = InfraResolverOf< + InfraSourceResolvers.LogEntriesBetweenResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceLogSummaryBetweenResolver = InfraResolverOf< + InfraSourceResolvers.LogSummaryBetweenResolver, + InfraResolvedResult, + InfraContext +>; + +export const createLogEntriesResolvers = (libs: { + logEntries: InfraLogEntriesDomain; +}): { + InfraSource: { + logEntriesAround: InfraSourceLogEntriesAroundResolver; + logEntriesBetween: InfraSourceLogEntriesBetweenResolver; + logSummaryBetween: InfraSourceLogSummaryBetweenResolver; + }; + InfraLogMessageSegment: { + __resolveType( + messageSegment: InfraLogMessageSegment + ): 'InfraLogMessageFieldSegment' | 'InfraLogMessageConstantSegment' | null; + }; +} => ({ + InfraSource: { + async logEntriesAround(source, args, { req }) { + const countBefore = args.countBefore || 0; + const countAfter = args.countAfter || 0; + + const { entriesBefore, entriesAfter } = await libs.logEntries.getLogEntriesAround( + req, + source.id, + args.key, + countBefore + 1, + countAfter + 1, + parseFilterQuery(args.filterQuery), + args.highlightQuery || undefined + ); + + const hasMoreBefore = entriesBefore.length > countBefore; + const hasMoreAfter = entriesAfter.length > countAfter; + + const entries = [ + ...(hasMoreBefore ? entriesBefore.slice(1) : entriesBefore), + ...(hasMoreAfter ? entriesAfter.slice(0, -1) : entriesAfter), + ]; + + return { + start: entries.length > 0 ? entries[0].key : null, + end: entries.length > 0 ? entries[entries.length - 1].key : null, + hasMoreBefore, + hasMoreAfter, + filterQuery: args.filterQuery, + highlightQuery: args.highlightQuery, + entries, + }; + }, + async logEntriesBetween(source, args, { req }) { + const entries = await libs.logEntries.getLogEntriesBetween( + req, + source.id, + args.startKey, + args.endKey, + parseFilterQuery(args.filterQuery), + args.highlightQuery || undefined + ); + + return { + start: entries.length > 0 ? entries[0].key : null, + end: entries.length > 0 ? entries[entries.length - 1].key : null, + hasMoreBefore: true, + hasMoreAfter: true, + filterQuery: args.filterQuery, + highlightQuery: args.highlightQuery, + entries, + }; + }, + async logSummaryBetween(source, args, { req }) { + UsageCollector.countLogs(); + const buckets = await libs.logEntries.getLogSummaryBucketsBetween( + req, + source.id, + args.start, + args.end, + args.bucketSize, + parseFilterQuery(args.filterQuery) + ); + + return { + start: buckets.length > 0 ? buckets[0].start : null, + end: buckets.length > 0 ? buckets[buckets.length - 1].end : null, + buckets, + }; + }, + }, + InfraLogMessageSegment: { + __resolveType: (messageSegment: InfraLogMessageSegment) => { + if (isConstantSegment(messageSegment)) { + return 'InfraLogMessageConstantSegment'; + } + + if (isFieldSegment(messageSegment)) { + return 'InfraLogMessageFieldSegment'; + } + + return null; + }, + }, +}); + +const isConstantSegment = ( + segment: InfraLogMessageSegment +): segment is InfraLogMessageConstantSegment => 'constant' in segment; + +const isFieldSegment = (segment: InfraLogMessageSegment): segment is InfraLogMessageFieldSegment => + 'field' in segment && 'value' in segment && 'highlights' in segment; diff --git a/x-pack/plugins/infra/server/graphql/log_entries/schema.gql.ts b/x-pack/plugins/infra/server/graphql/log_entries/schema.gql.ts new file mode 100644 index 0000000000000..e4947767ffbb1 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/log_entries/schema.gql.ts @@ -0,0 +1,118 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const logEntriesSchema = gql` + "A segment of the log entry message that was derived from a field" + type InfraLogMessageFieldSegment { + "The field the segment was derived from" + field: String! + "The segment's message" + value: String! + "A list of highlighted substrings of the value" + highlights: [String!]! + } + + "A segment of the log entry message that was derived from a field" + type InfraLogMessageConstantSegment { + "The segment's message" + constant: String! + } + + "A segment of the log entry message" + union InfraLogMessageSegment = InfraLogMessageFieldSegment | InfraLogMessageConstantSegment + + "A log entry" + type InfraLogEntry { + "A unique representation of the log entry's position in the event stream" + key: InfraTimeKey! + "The log entry's id" + gid: String! + "The source id" + source: String! + "A list of the formatted log entry segments" + message: [InfraLogMessageSegment!]! + } + + "A log summary bucket" + type InfraLogSummaryBucket { + "The start timestamp of the bucket" + start: Float! + "The end timestamp of the bucket" + end: Float! + "The number of entries inside the bucket" + entriesCount: Int! + } + + "A consecutive sequence of log entries" + type InfraLogEntryInterval { + "The key corresponding to the start of the interval covered by the entries" + start: InfraTimeKey + "The key corresponding to the end of the interval covered by the entries" + end: InfraTimeKey + "Whether there are more log entries available before the start" + hasMoreBefore: Boolean! + "Whether there are more log entries available after the end" + hasMoreAfter: Boolean! + "The query the log entries were filtered by" + filterQuery: String + "The query the log entries were highlighted with" + highlightQuery: String + "A list of the log entries" + entries: [InfraLogEntry!]! + } + + "A consecutive sequence of log summary buckets" + type InfraLogSummaryInterval { + "The millisecond timestamp corresponding to the start of the interval covered by the summary" + start: Float + "The millisecond timestamp corresponding to the end of the interval covered by the summary" + end: Float + "The query the log entries were filtered by" + filterQuery: String + "A list of the log entries" + buckets: [InfraLogSummaryBucket!]! + } + + extend type InfraSource { + "A consecutive span of log entries surrounding a point in time" + logEntriesAround( + "The sort key that corresponds to the point in time" + key: InfraTimeKeyInput! + "The maximum number of preceding to return" + countBefore: Int = 0 + "The maximum number of following to return" + countAfter: Int = 0 + "The query to filter the log entries by" + filterQuery: String + "The query to highlight the log entries with" + highlightQuery: String + ): InfraLogEntryInterval! + "A consecutive span of log entries within an interval" + logEntriesBetween( + "The sort key that corresponds to the start of the interval" + startKey: InfraTimeKeyInput! + "The sort key that corresponds to the end of the interval" + endKey: InfraTimeKeyInput! + "The query to filter the log entries by" + filterQuery: String + "The query to highlight the log entries with" + highlightQuery: String + ): InfraLogEntryInterval! + "A consecutive span of summary buckets within an interval" + logSummaryBetween( + "The millisecond timestamp that corresponds to the start of the interval" + start: Float! + "The millisecond timestamp that corresponds to the end of the interval" + end: Float! + "The size of each bucket in milliseconds" + bucketSize: Float! + "The query to filter the log entries by" + filterQuery: String + ): InfraLogSummaryInterval! + } +`; diff --git a/x-pack/plugins/infra/server/graphql/metrics/index.ts b/x-pack/plugins/infra/server/graphql/metrics/index.ts new file mode 100644 index 0000000000000..d7a789c4cda74 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/metrics/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { createMetricResolvers } from './resolvers'; +export { metricsSchema } from './schema.gql'; diff --git a/x-pack/plugins/infra/server/graphql/metrics/resolvers.ts b/x-pack/plugins/infra/server/graphql/metrics/resolvers.ts new file mode 100644 index 0000000000000..e7403f7ce3fcb --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/metrics/resolvers.ts @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceResolvers } from '../../../common/graphql/types'; +import { InfraResolvedResult, InfraResolverOf } from '../../lib/adapters/framework'; +import { InfraMetricsDomain } from '../../lib/domains/metrics_domain'; +import { InfraContext } from '../../lib/infra_types'; +import { UsageCollector } from '../../usage/usage_collector'; +import { QuerySourceResolver } from '../sources/resolvers'; + +type InfraSourceMetricsResolver = InfraResolverOf< + InfraSourceResolvers.MetricsResolver, + InfraResolvedResult, + InfraContext +>; + +interface ResolverDeps { + metrics: InfraMetricsDomain; +} + +export const createMetricResolvers = ( + libs: ResolverDeps +): { + InfraSource: { + metrics: InfraSourceMetricsResolver; + }; +} => ({ + InfraSource: { + async metrics(source, args, { req }) { + UsageCollector.countNode(args.nodeType); + const options = { + nodeId: args.nodeId, + nodeType: args.nodeType, + timerange: args.timerange, + metrics: args.metrics, + sourceConfiguration: source.configuration, + }; + return libs.metrics.getMetrics(req, options); + }, + }, +}); diff --git a/x-pack/plugins/infra/server/graphql/metrics/schema.gql.ts b/x-pack/plugins/infra/server/graphql/metrics/schema.gql.ts new file mode 100644 index 0000000000000..3218bffe95945 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/metrics/schema.gql.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const metricsSchema: any = gql` + enum InfraMetric { + hostSystemOverview + hostCpuUsage + hostFilesystem + hostK8sOverview + hostK8sCpuCap + hostK8sDiskCap + hostK8sMemoryCap + hostK8sPodCap + hostLoad + hostMemoryUsage + hostNetworkTraffic + podOverview + podCpuUsage + podMemoryUsage + podLogUsage + podNetworkTraffic + containerOverview + containerCpuKernel + containerCpuUsage + containerDiskIOOps + containerDiskIOBytes + containerMemory + containerNetworkTraffic + nginxHits + nginxRequestRate + nginxActiveConnections + nginxRequestsPerConnection + } + + type InfraMetricData { + id: InfraMetric + series: [InfraDataSeries!]! + } + + type InfraDataSeries { + id: ID! + data: [InfraDataPoint!]! + } + + type InfraDataPoint { + timestamp: Float! + value: Float + } + + extend type InfraSource { + metrics( + nodeId: ID! + nodeType: InfraNodeType! + timerange: InfraTimerangeInput! + metrics: [InfraMetric!]! + ): [InfraMetricData!]! + } +`; diff --git a/x-pack/plugins/infra/server/graphql/nodes/index.ts b/x-pack/plugins/infra/server/graphql/nodes/index.ts new file mode 100644 index 0000000000000..d61651c7b263b --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/nodes/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { createNodeResolvers } from './resolvers'; +export { nodesSchema } from './schema.gql'; diff --git a/x-pack/plugins/infra/server/graphql/nodes/resolvers.ts b/x-pack/plugins/infra/server/graphql/nodes/resolvers.ts new file mode 100644 index 0000000000000..867cfc4dd49ed --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/nodes/resolvers.ts @@ -0,0 +1,78 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraResponseResolvers, InfraSourceResolvers } from '../../../common/graphql/types'; +import { + InfraResolvedResult, + InfraResolverOf, + InfraResolverWithoutFields, +} from '../../lib/adapters/framework'; +import { InfraNodeRequestOptions } from '../../lib/adapters/nodes'; +import { extractGroupByAndNodeFromPath } from '../../lib/adapters/nodes/extract_group_by_and_node_from_path'; +import { InfraNodesDomain } from '../../lib/domains/nodes_domain'; +import { InfraContext } from '../../lib/infra_types'; +import { UsageCollector } from '../../usage/usage_collector'; +import { parseFilterQuery } from '../../utils/serialized_query'; +import { QuerySourceResolver } from '../sources/resolvers'; + +type InfraSourceMapResolver = InfraResolverWithoutFields< + InfraSourceResolvers.MapResolver, + InfraResolvedResult, + InfraContext, + 'nodes' +>; + +interface QueryMapResponse extends InfraSourceResolvers.MapArgs { + source: InfraResolvedResult; +} + +type InfraNodesResolver = InfraResolverOf< + InfraResponseResolvers.NodesResolver, + QueryMapResponse, + InfraContext +>; + +interface NodesResolversDeps { + nodes: InfraNodesDomain; +} + +export const createNodeResolvers = ( + libs: NodesResolversDeps +): { + InfraSource: { + map: InfraSourceMapResolver; + }; + InfraResponse: { + nodes: InfraNodesResolver; + }; +} => ({ + InfraSource: { + async map(source, args) { + return { + source, + timerange: args.timerange, + filterQuery: args.filterQuery, + }; + }, + }, + InfraResponse: { + async nodes(mapResponse, args, { req }) { + const { source, timerange, filterQuery } = mapResponse; + const { groupBy, nodeType } = extractGroupByAndNodeFromPath(args.path); + UsageCollector.countNode(nodeType); + const options: InfraNodeRequestOptions = { + filterQuery: parseFilterQuery(filterQuery), + nodeType, + groupBy, + sourceConfiguration: source.configuration, + metric: args.metric, + timerange, + }; + + return await libs.nodes.getNodes(req, options); + }, + }, +}); diff --git a/x-pack/plugins/infra/server/graphql/nodes/schema.gql.ts b/x-pack/plugins/infra/server/graphql/nodes/schema.gql.ts new file mode 100644 index 0000000000000..33de32f100805 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/nodes/schema.gql.ts @@ -0,0 +1,91 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const nodesSchema: any = gql` + type InfraNodeMetric { + name: InfraMetricType! + value: Float! + } + + type InfraNodePath { + value: String! + } + + type InfraNode { + path: [InfraNodePath!]! + metric: InfraNodeMetric! + } + + input InfraTimerangeInput { + "The interval string to use for last bucket. The format is '{value}{unit}'. For example '5m' would return the metrics for the last 5 minutes of the timespan." + interval: String! + "The end of the timerange" + to: Float! + "The beginning of the timerange" + from: Float! + } + + enum InfraOperator { + gt + gte + lt + lte + eq + } + + enum InfraMetricType { + count + cpu + load + memory + tx + rx + logRate + } + + input InfraMetricInput { + "The type of metric" + type: InfraMetricType! + } + + enum InfraPathType { + terms + filters + hosts + pods + containers + } + + input InfraPathInput { + "The type of path" + type: InfraPathType! + "The label to use in the results for the group by for the terms group by" + label: String + "The field to group by from a terms aggregation, this is ignored by the filter type" + field: String + "The fitlers for the filter group by" + filters: [InfraPathFilterInput!] + } + + "A group by filter" + input InfraPathFilterInput { + "The label for the filter, this will be used as the group name in the final results" + label: String! + "The query string query" + query: String! + } + + type InfraResponse { + nodes(path: [InfraPathInput!]!, metric: InfraMetricInput!): [InfraNode!]! + } + + extend type InfraSource { + "A hierarchy of hosts, pods, containers, services or arbitrary groups" + map(timerange: InfraTimerangeInput!, filterQuery: String): InfraResponse + } +`; diff --git a/x-pack/plugins/infra/server/graphql/source_status/index.ts b/x-pack/plugins/infra/server/graphql/source_status/index.ts new file mode 100644 index 0000000000000..abc91fa3815c8 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/source_status/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { createSourceStatusResolvers } from './resolvers'; diff --git a/x-pack/plugins/infra/server/graphql/source_status/resolvers.ts b/x-pack/plugins/infra/server/graphql/source_status/resolvers.ts new file mode 100644 index 0000000000000..4ae516a9c3988 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/source_status/resolvers.ts @@ -0,0 +1,98 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraIndexType, InfraSourceStatusResolvers } from '../../../common/graphql/types'; +import { InfraResolvedResult, InfraResolverOf } from '../../lib/adapters/framework'; +import { InfraFieldsDomain } from '../../lib/domains/fields_domain'; +import { InfraContext } from '../../lib/infra_types'; +import { InfraSourceStatus } from '../../lib/source_status'; +import { QuerySourceResolver } from '../sources/resolvers'; + +export type InfraSourceStatusMetricAliasExistsResolver = InfraResolverOf< + InfraSourceStatusResolvers.MetricAliasExistsResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceStatusMetricIndicesExistResolver = InfraResolverOf< + InfraSourceStatusResolvers.MetricIndicesExistResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceStatusMetricIndicesResolver = InfraResolverOf< + InfraSourceStatusResolvers.MetricIndicesResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceStatusLogAliasExistsResolver = InfraResolverOf< + InfraSourceStatusResolvers.LogAliasExistsResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceStatusLogIndicesExistResolver = InfraResolverOf< + InfraSourceStatusResolvers.LogIndicesExistResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceStatusLogIndicesResolver = InfraResolverOf< + InfraSourceStatusResolvers.LogIndicesResolver, + InfraResolvedResult, + InfraContext +>; + +export type InfraSourceStatusIndexFieldsResolver = InfraResolverOf< + InfraSourceStatusResolvers.IndexFieldsResolver, + InfraResolvedResult, + InfraContext +>; + +export const createSourceStatusResolvers = (libs: { + sourceStatus: InfraSourceStatus; + fields: InfraFieldsDomain; +}): { + InfraSourceStatus: { + metricAliasExists: InfraSourceStatusMetricAliasExistsResolver; + metricIndicesExist: InfraSourceStatusMetricIndicesExistResolver; + metricIndices: InfraSourceStatusMetricIndicesResolver; + logAliasExists: InfraSourceStatusLogAliasExistsResolver; + logIndicesExist: InfraSourceStatusLogIndicesExistResolver; + logIndices: InfraSourceStatusLogIndicesResolver; + indexFields: InfraSourceStatusIndexFieldsResolver; + }; +} => ({ + InfraSourceStatus: { + async metricAliasExists(source, args, { req }) { + return await libs.sourceStatus.hasMetricAlias(req, source.id); + }, + async metricIndicesExist(source, args, { req }) { + return await libs.sourceStatus.hasMetricIndices(req, source.id); + }, + async metricIndices(source, args, { req }) { + return await libs.sourceStatus.getMetricIndexNames(req, source.id); + }, + async logAliasExists(source, args, { req }) { + return await libs.sourceStatus.hasLogAlias(req, source.id); + }, + async logIndicesExist(source, args, { req }) { + return await libs.sourceStatus.hasLogIndices(req, source.id); + }, + async logIndices(source, args, { req }) { + return await libs.sourceStatus.getLogIndexNames(req, source.id); + }, + async indexFields(source, args, { req }) { + const fields = await libs.fields.getFields( + req, + source.id, + args.indexType || InfraIndexType.ANY + ); + return fields; + }, + }, +}); diff --git a/x-pack/plugins/infra/server/graphql/source_status/schema.gql.ts b/x-pack/plugins/infra/server/graphql/source_status/schema.gql.ts new file mode 100644 index 0000000000000..10acb9650b108 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/source_status/schema.gql.ts @@ -0,0 +1,38 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const sourceStatusSchema = gql` + "A descriptor of a field in an index" + type InfraIndexField { + "The name of the field" + name: String! + "The type of the field's values as recognized by Kibana" + type: String! + "Whether the field's values can be efficiently searched for" + searchable: Boolean! + "Whether the field's values can be aggregated" + aggregatable: Boolean! + } + + extend type InfraSourceStatus { + "Whether the configured metric alias exists" + metricAliasExists: Boolean! + "Whether the configured log alias exists" + logAliasExists: Boolean! + "Whether the configured alias or wildcard pattern resolve to any metric indices" + metricIndicesExist: Boolean! + "Whether the configured alias or wildcard pattern resolve to any log indices" + logIndicesExist: Boolean! + "The list of indices in the metric alias" + metricIndices: [String!]! + "The list of indices in the log alias" + logIndices: [String!]! + "The list of fields defined in the index mappings" + indexFields(indexType: InfraIndexType = ANY): [InfraIndexField!]! + } +`; diff --git a/x-pack/plugins/infra/server/graphql/sources/index.ts b/x-pack/plugins/infra/server/graphql/sources/index.ts new file mode 100644 index 0000000000000..ee187d8c31bec --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/sources/index.ts @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { createSourcesResolvers } from './resolvers'; +export { sourcesSchema } from './schema.gql'; diff --git a/x-pack/plugins/infra/server/graphql/sources/resolvers.ts b/x-pack/plugins/infra/server/graphql/sources/resolvers.ts new file mode 100644 index 0000000000000..5a3ab5acb76d0 --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/sources/resolvers.ts @@ -0,0 +1,73 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceResolvers, QueryResolvers } from '../../../common/graphql/types'; +import { InfraResolvedResult, InfraResolverWithFields } from '../../lib/adapters/framework'; +import { InfraContext } from '../../lib/infra_types'; +import { InfraSourceStatus } from '../../lib/source_status'; +import { InfraSources } from '../../lib/sources'; + +export type QuerySourceResolver = InfraResolverWithFields< + QueryResolvers.SourceResolver, + null, + InfraContext, + 'id' | 'configuration' +>; + +export type QueryAllSourcesResolver = InfraResolverWithFields< + QueryResolvers.AllSourcesResolver, + null, + InfraContext, + 'id' | 'configuration' +>; + +export type InfraSourceStatusResolver = InfraResolverWithFields< + InfraSourceResolvers.StatusResolver, + InfraResolvedResult, + InfraContext, + never +>; + +interface SourcesResolversDeps { + sources: InfraSources; + sourceStatus: InfraSourceStatus; +} + +export const createSourcesResolvers = ( + libs: SourcesResolversDeps +): { + Query: { + source: QuerySourceResolver; + allSources: QueryAllSourcesResolver; + }; + InfraSource: { + status: InfraSourceStatusResolver; + }; +} => ({ + Query: { + async source(root, args) { + const requestedSourceConfiguration = await libs.sources.getConfiguration(args.id); + + return { + id: args.id, + configuration: requestedSourceConfiguration, + }; + }, + async allSources() { + const sourceConfigurations = await libs.sources.getAllConfigurations(); + + return Object.entries(sourceConfigurations).map(([sourceName, sourceConfiguration]) => ({ + id: sourceName, + configuration: sourceConfiguration, + })); + }, + }, + InfraSource: { + async status(source) { + return source; + }, + }, +}); diff --git a/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts b/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts new file mode 100644 index 0000000000000..952862f76173d --- /dev/null +++ b/x-pack/plugins/infra/server/graphql/sources/schema.gql.ts @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import gql from 'graphql-tag'; + +export const sourcesSchema = gql` + "A source of infrastructure data" + type InfraSource { + "The id of the source" + id: ID! + "The raw configuration of the source" + configuration: InfraSourceConfiguration! + "The status of the source" + status: InfraSourceStatus! + } + + "The status of an infrastructure data source" + type InfraSourceStatus + + "A set of configuration options for an infrastructure data source" + type InfraSourceConfiguration { + "The alias to read metric data from" + metricAlias: String! + "The alias to read log data from" + logAlias: String! + "The field mapping to use for this source" + fields: InfraSourceFields! + } + + "A mapping of semantic fields to their document counterparts" + type InfraSourceFields { + "The field to identify a container by" + container: String! + "The fields to identify a host by" + host: String! + "The fields that may contain the log event message. The first field found win." + message: [String!]! + "The field to identify a pod by" + pod: String! + "The field to use as a tiebreaker for log events that have identical timestamps" + tiebreaker: String! + "The field to use as a timestamp for metrics and logs" + timestamp: String! + } + + extend type Query { + "Get an infrastructure data source by id" + source("The id of the source" id: ID!): InfraSource! + "Get a list of all infrastructure data sources" + allSources: [InfraSource!]! + } +`; diff --git a/x-pack/plugins/infra/server/infra_server.ts b/x-pack/plugins/infra/server/infra_server.ts new file mode 100644 index 0000000000000..eb68e44af6423 --- /dev/null +++ b/x-pack/plugins/infra/server/infra_server.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { IResolvers, makeExecutableSchema } from 'graphql-tools'; +import { schemas } from './graphql'; +import { createCapabilitiesResolvers } from './graphql/capabilities'; +import { createLogEntriesResolvers } from './graphql/log_entries'; +import { createMetricResolvers } from './graphql/metrics/resolvers'; +import { createNodeResolvers } from './graphql/nodes'; +import { createSourceStatusResolvers } from './graphql/source_status'; +import { createSourcesResolvers } from './graphql/sources'; +import { InfraBackendLibs } from './lib/infra_types'; +import { initLegacyLoggingRoutes } from './logging_legacy'; + +export const initInfraServer = (libs: InfraBackendLibs) => { + const schema = makeExecutableSchema({ + resolvers: [ + createCapabilitiesResolvers(libs) as IResolvers, + createLogEntriesResolvers(libs) as IResolvers, + createNodeResolvers(libs) as IResolvers, + createSourcesResolvers(libs) as IResolvers, + createSourceStatusResolvers(libs) as IResolvers, + createMetricResolvers(libs) as IResolvers, + ], + typeDefs: schemas, + }); + + libs.framework.registerGraphQLEndpoint('/api/infra/graphql', schema); + + initLegacyLoggingRoutes(libs.framework); +}; diff --git a/x-pack/plugins/infra/server/kibana.index.ts b/x-pack/plugins/infra/server/kibana.index.ts new file mode 100644 index 0000000000000..c916203648024 --- /dev/null +++ b/x-pack/plugins/infra/server/kibana.index.ts @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Server } from 'hapi'; +import JoiNamespace from 'joi'; +import { initInfraServer } from './infra_server'; +import { compose } from './lib/compose/kibana'; +import { UsageCollector } from './usage/usage_collector'; + +export interface KbnServer extends Server { + usage: any; +} + +export const initServerWithKibana = (kbnServer: KbnServer) => { + const libs = compose(kbnServer); + initInfraServer(libs); + + // Register a function with server to manage the collection of usage stats + kbnServer.usage.collectorSet.register(UsageCollector.getUsageCollector(kbnServer)); +}; + +export const getConfigSchema = (Joi: typeof JoiNamespace) => { + const InfraDefaultSourceConfigSchema = Joi.object({ + metricAlias: Joi.string(), + logAlias: Joi.string(), + fields: Joi.object({ + container: Joi.string(), + host: Joi.string(), + message: Joi.array() + .items(Joi.string()) + .single(), + pod: Joi.string(), + tiebreaker: Joi.string(), + timestamp: Joi.string(), + }), + }); + + const InfraSourceConfigSchema = InfraDefaultSourceConfigSchema.keys({ + metricAlias: Joi.reach(InfraDefaultSourceConfigSchema, 'metricAlias').required(), + logAlias: Joi.reach(InfraDefaultSourceConfigSchema, 'logAlias').required(), + }); + + const InfraRootConfigSchema = Joi.object({ + enabled: Joi.boolean().default(true), + query: Joi.object({ + partitionSize: Joi.number(), + partitionFactor: Joi.number(), + }).default(), + sources: Joi.object() + .keys({ + default: InfraDefaultSourceConfigSchema, + }) + .pattern(/.*/, InfraSourceConfigSchema) + .default(), + }).default(); + + return InfraRootConfigSchema; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/capabilities/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/capabilities/adapter_types.ts new file mode 100644 index 0000000000000..1486d0d9e2e38 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/capabilities/adapter_types.ts @@ -0,0 +1,23 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceConfiguration } from '../../sources'; +import { InfraCapabilityAggregationBucket, InfraFrameworkRequest } from '../framework'; + +export interface InfraCapabilitiesAdapter { + getMetricCapabilities( + req: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + nodeName: string, + nodeType: string + ): Promise; + getLogCapabilities( + req: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + nodeName: string, + nodeType: string + ): Promise; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/capabilities/elasticsearch_capabilities_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/capabilities/elasticsearch_capabilities_adapter.ts new file mode 100644 index 0000000000000..049fb864dcbc0 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/capabilities/elasticsearch_capabilities_adapter.ts @@ -0,0 +1,126 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceConfiguration } from '../../sources'; +import { + InfraBackendFrameworkAdapter, + InfraCapabilityAggregationBucket, + InfraCapabilityAggregationResponse, + InfraFrameworkRequest, +} from '../framework'; +import { InfraCapabilitiesAdapter } from './adapter_types'; + +export class ElasticsearchCapabilitiesAdapter implements InfraCapabilitiesAdapter { + private framework: InfraBackendFrameworkAdapter; + constructor(framework: InfraBackendFrameworkAdapter) { + this.framework = framework; + } + + public async getMetricCapabilities( + req: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + nodeName: string, + nodeType: 'host' | 'container' | 'pod' + ): Promise { + const idFieldName = getIdFieldName(sourceConfiguration, nodeType); + const metricQuery = { + index: sourceConfiguration.metricAlias, + body: { + query: { + bool: { + filter: { + term: { [idFieldName]: nodeName }, + }, + }, + }, + size: 0, + aggs: { + metrics: { + terms: { + field: 'metricset.module', + size: 1000, + }, + aggs: { + names: { + terms: { + field: 'metricset.name', + size: 1000, + }, + }, + }, + }, + }, + }, + }; + + const response = await this.framework.callWithRequest< + any, + { metrics?: InfraCapabilityAggregationResponse } + >(req, 'search', metricQuery); + + return response.aggregations && response.aggregations.metrics + ? response.aggregations.metrics.buckets + : []; + } + + public async getLogCapabilities( + req: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + nodeName: string, + nodeType: 'host' | 'container' | 'pod' + ): Promise { + const idFieldName = getIdFieldName(sourceConfiguration, nodeType); + const logQuery = { + index: sourceConfiguration.logAlias, + body: { + query: { + bool: { + filter: { + term: { [idFieldName]: nodeName }, + }, + }, + }, + size: 0, + aggs: { + metrics: { + terms: { + field: 'fileset.module', + size: 1000, + }, + aggs: { + names: { + terms: { + field: 'fileset.name', + size: 1000, + }, + }, + }, + }, + }, + }, + }; + + const response = await this.framework.callWithRequest< + any, + { metrics?: InfraCapabilityAggregationResponse } + >(req, 'search', logQuery); + + return response.aggregations && response.aggregations.metrics + ? response.aggregations.metrics.buckets + : []; + } +} + +const getIdFieldName = (sourceConfiguration: InfraSourceConfiguration, nodeType: string) => { + switch (nodeType) { + case 'host': + return sourceConfiguration.fields.host; + case 'container': + return sourceConfiguration.fields.container; + default: + return sourceConfiguration.fields.pod; + } +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/capabilities/index.ts b/x-pack/plugins/infra/server/lib/adapters/capabilities/index.ts new file mode 100644 index 0000000000000..4e09b5d0e9e2d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/capabilities/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './adapter_types'; diff --git a/x-pack/plugins/infra/server/lib/adapters/configuration/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/configuration/adapter_types.ts new file mode 100644 index 0000000000000..e086f67092af3 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/configuration/adapter_types.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export interface InfraConfigurationAdapter { + get(): Promise; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/configuration/index.ts b/x-pack/plugins/infra/server/lib/adapters/configuration/index.ts new file mode 100644 index 0000000000000..4e09b5d0e9e2d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/configuration/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './adapter_types'; diff --git a/x-pack/plugins/infra/server/lib/adapters/configuration/inmemory_configuration_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/configuration/inmemory_configuration_adapter.ts new file mode 100644 index 0000000000000..ed7c88fc994da --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/configuration/inmemory_configuration_adapter.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraConfigurationAdapter } from './adapter_types'; + +export class InfraInmemoryConfigurationAdapter + implements InfraConfigurationAdapter { + constructor(private readonly configuration: Configuration) {} + + public async get() { + return this.configuration; + } +} diff --git a/x-pack/plugins/infra/server/lib/adapters/configuration/kibana_configuration_adapter.test.ts b/x-pack/plugins/infra/server/lib/adapters/configuration/kibana_configuration_adapter.test.ts new file mode 100644 index 0000000000000..4d87878e9aa87 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/configuration/kibana_configuration_adapter.test.ts @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraKibanaConfigurationAdapter } from './kibana_configuration_adapter'; + +describe('the InfraKibanaConfigurationAdapter', () => { + test('queries the xpack.infra configuration of the server', async () => { + const mockConfig = { + get: jest.fn(), + }; + + const configurationAdapter = new InfraKibanaConfigurationAdapter({ + config: () => mockConfig, + }); + + await configurationAdapter.get(); + + expect(mockConfig.get).toBeCalledWith('xpack.infra'); + }); + + test('applies the query defaults', async () => { + const configurationAdapter = new InfraKibanaConfigurationAdapter({ + config: () => ({ + get: () => ({}), + }), + }); + + const configuration = await configurationAdapter.get(); + + expect(configuration).toMatchObject({ + query: { + partitionSize: expect.any(Number), + partitionFactor: expect.any(Number), + }, + }); + }); +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/configuration/kibana_configuration_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/configuration/kibana_configuration_adapter.ts new file mode 100644 index 0000000000000..62b01b3eac2a3 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/configuration/kibana_configuration_adapter.ts @@ -0,0 +1,75 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import Joi from 'joi'; + +import { InfraConfigurationAdapter } from './adapter_types'; + +export class InfraKibanaConfigurationAdapter + implements InfraConfigurationAdapter { + private readonly server: ServerWithConfig; + + constructor(server: any) { + if (!isServerWithConfig(server)) { + throw new Error('Failed to find configuration on server.'); + } + + this.server = server; + } + + public async get() { + const config = this.server.config(); + + if (!isKibanaConfiguration(config)) { + throw new Error('Failed to access configuration of server.'); + } + + const configuration = config.get('xpack.infra') || {}; + const configurationWithDefaults = { + enabled: true, + query: { + partitionSize: 75, + partitionFactor: 1.2, + ...(configuration.query || {}), + }, + sources: {}, + ...configuration, + } as Configuration; + + // we assume this to be the configuration because Kibana would have already validated it + return configurationWithDefaults; + } +} + +interface ServerWithConfig { + config(): any; +} + +function isServerWithConfig(maybeServer: any): maybeServer is ServerWithConfig { + return ( + Joi.validate( + maybeServer, + Joi.object({ + config: Joi.func().required(), + }).unknown() + ).error === null + ); +} + +interface KibanaConfiguration { + get(key: string): any; +} + +function isKibanaConfiguration(maybeConfiguration: any): maybeConfiguration is KibanaConfiguration { + return ( + Joi.validate( + maybeConfiguration, + Joi.object({ + get: Joi.func().required(), + }).unknown() + ).error === null + ); +} diff --git a/x-pack/plugins/infra/server/lib/adapters/fields/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/fields/adapter_types.ts new file mode 100644 index 0000000000000..4749999f22d26 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/fields/adapter_types.ts @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraFrameworkRequest } from '../framework'; + +export interface FieldsAdapter { + getIndexFields(req: InfraFrameworkRequest, indices: string[]): Promise; +} + +export interface IndexFieldDescriptor { + name: string; + type: string; + searchable: boolean; + aggregatable: boolean; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts new file mode 100644 index 0000000000000..37d242359b87b --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/fields/framework_fields_adapter.ts @@ -0,0 +1,27 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraBackendFrameworkAdapter, InfraFrameworkRequest } from '../framework'; +import { FieldsAdapter, IndexFieldDescriptor } from './adapter_types'; + +export class FrameworkFieldsAdapter implements FieldsAdapter { + private framework: InfraBackendFrameworkAdapter; + + constructor(framework: InfraBackendFrameworkAdapter) { + this.framework = framework; + } + + public async getIndexFields( + request: InfraFrameworkRequest, + indices: string[] + ): Promise { + const indexPatternsService = this.framework.getIndexPatternsService(request); + const response = await indexPatternsService.getFieldsForWildcard({ + pattern: indices, + }); + return response; + } +} diff --git a/x-pack/plugins/infra/server/lib/adapters/fields/index.ts b/x-pack/plugins/infra/server/lib/adapters/fields/index.ts new file mode 100644 index 0000000000000..4e09b5d0e9e2d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/fields/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './adapter_types'; diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts new file mode 100644 index 0000000000000..28378248a6384 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/framework/adapter_types.ts @@ -0,0 +1,204 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchResponse } from 'elasticsearch'; +import { GraphQLSchema } from 'graphql'; +import { Lifecycle, ResponseToolkit, RouteOptions } from 'hapi'; +import { InfraMetricModel } from '../metrics/adapter_types'; + +export * from '../../../../common/graphql/typed_resolvers'; +import { JsonObject } from '../../../../common/typed_json'; + +export const internalInfraFrameworkRequest = Symbol('internalInfraFrameworkRequest'); + +export interface InfraBackendFrameworkAdapter { + version: string; + exposeStaticDir(urlPath: string, dir: string): void; + registerGraphQLEndpoint(routePath: string, schema: GraphQLSchema): void; + registerRoute( + route: InfraFrameworkRouteOptions + ): void; + callWithRequest( + req: InfraFrameworkRequest, + method: 'search', + options?: object + ): Promise>; + callWithRequest( + req: InfraFrameworkRequest, + method: 'msearch', + options?: object + ): Promise>; + callWithRequest( + req: InfraFrameworkRequest, + method: 'fieldCaps', + options?: object + ): Promise; + callWithRequest( + req: InfraFrameworkRequest, + method: 'indices.existsAlias', + options?: object + ): Promise; + callWithRequest( + req: InfraFrameworkRequest, + method: 'indices.getAlias' | 'indices.get', + options?: object + ): Promise; + callWithRequest( + req: InfraFrameworkRequest, + method: string, + options?: object + ): Promise; + getIndexPatternsService(req: InfraFrameworkRequest): InfraFrameworkIndexPatternsService; + makeTSVBRequest( + req: InfraFrameworkRequest, + model: InfraMetricModel, + timerange: { min: number; max: number }, + filters: JsonObject[] + ): Promise; +} + +export interface InfraFrameworkRequest< + InternalRequest extends InfraWrappableRequest = InfraWrappableRequest +> { + [internalInfraFrameworkRequest]: InternalRequest; + payload: InternalRequest['payload']; + params: InternalRequest['params']; + query: InternalRequest['query']; +} + +export interface InfraWrappableRequest { + payload: Payload; + params: Params; + query: Query; +} + +export type InfraResponse = Lifecycle.ReturnValue; + +export interface InfraFrameworkPluginOptions { + register: any; + options: any; +} + +export interface InfraFrameworkRouteOptions< + RouteRequest extends InfraWrappableRequest, + RouteResponse extends InfraResponse +> { + path: string; + method: string | string[]; + vhost?: string; + handler: InfraFrameworkRouteHandler; + options?: Pick>; +} + +export type InfraFrameworkRouteHandler< + RouteRequest extends InfraWrappableRequest, + RouteResponse extends InfraResponse +> = (request: InfraFrameworkRequest, h: ResponseToolkit) => RouteResponse; + +export interface InfraDatabaseResponse { + took: number; + timeout: boolean; +} + +export interface InfraDatabaseSearchResponse + extends InfraDatabaseResponse { + aggregations?: Aggregations; + hits: { + total: number; + hits: Hit[]; + }; +} + +export interface InfraDatabaseMultiResponse extends InfraDatabaseResponse { + responses: Array>; +} + +export interface InfraDatabaseFieldCapsResponse extends InfraDatabaseResponse { + fields: InfraFieldsResponse; +} + +export interface InfraDatabaseGetIndicesResponse { + [indexName: string]: { + aliases: { + [aliasName: string]: any; + }; + }; +} + +export type SearchHit = SearchResponse['hits']['hits'][0]; + +export interface SortedSearchHit extends SearchHit { + sort: any[]; + _source: { + [field: string]: any; + }; +} + +export interface InfraDateRangeAggregationBucket { + from?: number; + to?: number; + doc_count: number; + key: string; +} + +export interface InfraDateRangeAggregationResponse { + buckets: InfraDateRangeAggregationBucket[]; +} + +export interface InfraCapabilityAggregationBucket { + key: string; + names?: { + buckets: InfraCapabilityAggregationBucket[]; + }; +} + +export interface InfraCapabilityAggregationResponse { + buckets: InfraCapabilityAggregationBucket[]; +} + +export interface InfraFieldsResponse { + [name: string]: InfraFieldDef; +} + +export interface InfraFieldDetails { + searchable: boolean; + aggregatable: boolean; + type: string; +} + +export interface InfraFieldDef { + [type: string]: InfraFieldDetails; +} + +interface InfraFrameworkIndexFieldDescriptor { + name: string; + type: string; + searchable: boolean; + aggregatable: boolean; + readFromDocValues: boolean; +} + +export interface InfraFrameworkIndexPatternsService { + getFieldsForWildcard(options: { + pattern: string | string[]; + }): Promise; +} + +export interface InfraTSVBResponse { + [key: string]: InfraTSVBPanel; +} + +export interface InfraTSVBPanel { + id: string; + series: InfraTSVBSeries[]; +} + +export interface InfraTSVBSeries { + id: string; + data: InfraTSVBDataPoint[]; +} + +export type InfraTSVBDataPoint = [number, number]; diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/apollo_server_hapi.ts b/x-pack/plugins/infra/server/lib/adapters/framework/apollo_server_hapi.ts new file mode 100644 index 0000000000000..da858217468f1 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/framework/apollo_server_hapi.ts @@ -0,0 +1,117 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as GraphiQL from 'apollo-server-module-graphiql'; +import Boom from 'boom'; +import { Plugin, Request, ResponseToolkit, RouteOptions, Server } from 'hapi'; + +import { GraphQLOptions, runHttpQuery } from 'apollo-server-core'; + +export type HapiOptionsFunction = (req: Request) => GraphQLOptions | Promise; + +export interface HapiGraphQLPluginOptions { + path: string; + vhost?: string; + route?: RouteOptions; + graphqlOptions: GraphQLOptions | HapiOptionsFunction; +} + +export const graphqlHapi: Plugin = { + name: 'graphql', + register: (server: Server, options: HapiGraphQLPluginOptions) => { + if (!options || !options.graphqlOptions) { + throw new Error('Apollo Server requires options.'); + } + + server.route({ + options: options.route || {}, + handler: async (request: Request, h: ResponseToolkit) => { + try { + const query = + request.method === 'post' + ? (request.payload as Record) + : (request.query as Record); + + const gqlResponse = await runHttpQuery([request], { + method: request.method.toUpperCase(), + options: options.graphqlOptions, + query, + }); + + return h.response(gqlResponse).type('application/json'); + } catch (error) { + if ('HttpQueryError' !== error.name) { + const queryError = Boom.boomify(error); + + queryError.output.payload.message = error.message; + + return queryError; + } + + if (error.isGraphQLError === true) { + return h + .response(error.message) + .code(error.statusCode) + .type('application/json'); + } + + const genericError = new Boom(error.message, { statusCode: error.statusCode }); + + if (error.headers) { + Object.keys(error.headers).forEach(header => { + genericError.output.headers[header] = error.headers[header]; + }); + } + + // Boom hides the error when status code is 500 + + genericError.output.payload.message = error.message; + + throw genericError; + } + }, + method: ['GET', 'POST'], + path: options.path || '/graphql', + vhost: options.vhost || undefined, + }); + }, +}; + +export type HapiGraphiQLOptionsFunction = ( + req?: Request +) => GraphiQL.GraphiQLData | Promise; + +export interface HapiGraphiQLPluginOptions { + path: string; + + route?: any; + + graphiqlOptions: GraphiQL.GraphiQLData | HapiGraphiQLOptionsFunction; +} + +export const graphiqlHapi: Plugin = { + name: 'graphiql', + register: (server: Server, options: HapiGraphiQLPluginOptions) => { + if (!options || !options.graphiqlOptions) { + throw new Error('Apollo Server GraphiQL requires options.'); + } + + server.route({ + options: options.route || {}, + handler: async (request: Request, h: ResponseToolkit) => { + const graphiqlString = await GraphiQL.resolveGraphiQLString( + request.query, + options.graphiqlOptions, + request + ); + + return h.response(graphiqlString).type('text/html'); + }, + method: 'GET', + path: options.path || '/graphiql', + }); + }, +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/index.ts b/x-pack/plugins/infra/server/lib/adapters/framework/index.ts new file mode 100644 index 0000000000000..4e09b5d0e9e2d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/framework/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './adapter_types'; diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts new file mode 100644 index 0000000000000..034ce7f66a768 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts @@ -0,0 +1,171 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { GraphQLSchema } from 'graphql'; +import { Request, ResponseToolkit, Server } from 'hapi'; + +import { InfraMetricModel } from '../metrics/adapter_types'; +import { + InfraBackendFrameworkAdapter, + InfraFrameworkIndexPatternsService, + InfraFrameworkRequest, + InfraFrameworkRouteOptions, + InfraResponse, + InfraTSVBResponse, + InfraWrappableRequest, + internalInfraFrameworkRequest, +} from './adapter_types'; +import { + graphiqlHapi, + graphqlHapi, + HapiGraphiQLPluginOptions, + HapiGraphQLPluginOptions, +} from './apollo_server_hapi'; + +declare module 'hapi' { + interface PluginProperties { + elasticsearch: any; + kibana: any; + } +} + +export class InfraKibanaBackendFrameworkAdapter implements InfraBackendFrameworkAdapter { + public version: string; + private server: Server; + + constructor(hapiServer: Server) { + this.server = hapiServer; + this.version = hapiServer.plugins.kibana.status.plugin.version; + } + + public exposeStaticDir(urlPath: string, dir: string): void { + this.server.route({ + handler: { + directory: { + path: dir, + }, + }, + method: 'GET', + path: urlPath, + }); + } + + public registerGraphQLEndpoint(routePath: string, schema: GraphQLSchema): void { + this.server.register({ + options: { + graphqlOptions: (req: Request) => ({ + context: { req: wrapRequest(req) }, + schema, + }), + path: routePath, + }, + plugin: graphqlHapi, + }); + + this.server.register({ + options: { + graphiqlOptions: { + endpointURL: routePath, + passHeader: `'kbn-version': '${this.version}'`, + }, + path: `${routePath}/graphiql`, + }, + plugin: graphiqlHapi, + }); + } + + public registerRoute< + RouteRequest extends InfraWrappableRequest, + RouteResponse extends InfraResponse + >(route: InfraFrameworkRouteOptions) { + const wrappedHandler = (request: any, h: ResponseToolkit) => + route.handler(wrapRequest(request), h); + + this.server.route({ + handler: wrappedHandler, + method: route.method, + path: route.path, + }); + } + + public async callWithRequest(req: InfraFrameworkRequest, ...rest: any[]) { + const internalRequest = req[internalInfraFrameworkRequest]; + const { elasticsearch } = internalRequest.server.plugins; + const { callWithRequest } = elasticsearch.getCluster('data'); + const fields = await callWithRequest(internalRequest, ...rest); + return fields; + } + + public getIndexPatternsService( + request: InfraFrameworkRequest + ): InfraFrameworkIndexPatternsService { + if (!isServerWithIndexPatternsServiceFactory(this.server)) { + throw new Error('Failed to access indexPatternsService for the request'); + } + return this.server.indexPatternsServiceFactory({ + callCluster: async (method: string, args: [object], ...rest: any[]) => { + const fieldCaps = await this.callWithRequest( + request, + method, + { ...args, allowNoIndices: true }, + ...rest + ); + return fieldCaps; + }, + }); + } + + public async makeTSVBRequest( + req: InfraFrameworkRequest, + model: InfraMetricModel, + timerange: { min: number; max: number }, + filters: any[] + ) { + const internalRequest = req[internalInfraFrameworkRequest]; + const server = internalRequest.server; + const request = { + url: '/api/metrics/vis/data', + method: 'POST', + headers: internalRequest.headers, + payload: { + timerange, + panels: [model], + filters, + }, + }; + + const res = await server.inject(request); + if (res.statusCode !== 200) { + throw res; + } + + return res.result as InfraTSVBResponse; + } +} + +export function wrapRequest( + req: InternalRequest +): InfraFrameworkRequest { + const { params, payload, query } = req; + + return { + [internalInfraFrameworkRequest]: req, + params, + payload, + query, + }; +} + +interface ServerWithIndexPatternsServiceFactory extends Server { + indexPatternsServiceFactory(options: { + callCluster: (...args: any[]) => any; + }): InfraFrameworkIndexPatternsService; +} + +const isServerWithIndexPatternsServiceFactory = ( + server: Server +): server is ServerWithIndexPatternsServiceFactory => + typeof (server as any).indexPatternsServiceFactory === 'function'; diff --git a/x-pack/plugins/infra/server/lib/adapters/log_entries/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/log_entries/adapter_types.ts new file mode 100644 index 0000000000000..41bc2aa258807 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/log_entries/adapter_types.ts @@ -0,0 +1,5 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ diff --git a/x-pack/plugins/infra/server/lib/adapters/log_entries/index.ts b/x-pack/plugins/infra/server/lib/adapters/log_entries/index.ts new file mode 100644 index 0000000000000..41bc2aa258807 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/log_entries/index.ts @@ -0,0 +1,5 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ diff --git a/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts new file mode 100644 index 0000000000000..2dc6fd2551ec4 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/log_entries/kibana_log_entries_adapter.ts @@ -0,0 +1,278 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { timeMilliseconds } from 'd3-time'; +import get from 'lodash/fp/get'; +import has from 'lodash/fp/has'; +import zip from 'lodash/fp/zip'; + +import { compareTimeKeys, isTimeKey, TimeKey } from '../../../../common/time'; +import { + LogEntriesAdapter, + LogEntryDocument, + LogEntryQuery, +} from '../../domains/log_entries_domain'; +import { InfraSourceConfiguration } from '../../sources'; +import { + InfraDateRangeAggregationBucket, + InfraDateRangeAggregationResponse, + InfraFrameworkRequest, + SortedSearchHit, +} from '../framework'; +import { InfraBackendFrameworkAdapter } from '../framework'; + +const DAY_MILLIS = 24 * 60 * 60 * 1000; +const LOOKUP_OFFSETS = [0, 1, 7, 30, 365, 10000, Infinity].map(days => days * DAY_MILLIS); + +export class InfraKibanaLogEntriesAdapter implements LogEntriesAdapter { + constructor(private readonly framework: InfraBackendFrameworkAdapter) {} + + public async getAdjacentLogEntryDocuments( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + fields: string[], + start: TimeKey, + direction: 'asc' | 'desc', + maxCount: number, + filterQuery: LogEntryQuery, + highlightQuery: string + ): Promise { + if (maxCount <= 0) { + return []; + } + + const intervals = getLookupIntervals(start.time, direction); + + let documents: LogEntryDocument[] = []; + for (const [intervalStart, intervalEnd] of intervals) { + if (documents.length >= maxCount) { + break; + } + + const documentsInInterval = await this.getLogEntryDocumentsBetween( + request, + sourceConfiguration, + fields, + intervalStart, + intervalEnd, + documents.length > 0 ? documents[documents.length - 1].key : start, + maxCount - documents.length, + filterQuery, + highlightQuery + ); + + documents = [...documents, ...documentsInInterval]; + } + + return direction === 'asc' ? documents : documents.reverse(); + } + + public async getContainedLogEntryDocuments( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + fields: string[], + start: TimeKey, + end: TimeKey, + filterQuery: LogEntryQuery, + highlightQuery: string + ): Promise { + const documents = await this.getLogEntryDocumentsBetween( + request, + sourceConfiguration, + fields, + start.time, + end.time, + start, + 10000, + filterQuery, + highlightQuery + ); + + return documents.filter(document => compareTimeKeys(document.key, end) < 0); + } + + public async getContainedLogSummaryBuckets( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + start: number, + end: number, + bucketSize: number, + filterQuery: LogEntryQuery + ): Promise { + const bucketIntervalStarts = timeMilliseconds(new Date(start), new Date(end), bucketSize); + + const query = { + allowNoIndices: true, + index: sourceConfiguration.logAlias, + ignoreUnavailable: true, + body: { + aggregations: { + count_by_date: { + date_range: { + field: sourceConfiguration.fields.timestamp, + ranges: bucketIntervalStarts.map(bucketIntervalStart => ({ + from: bucketIntervalStart.getTime(), + to: bucketIntervalStart.getTime() + bucketSize, + })), + }, + }, + }, + query: { + bool: { + filter: [ + ...createQueryFilterClauses(filterQuery), + { + range: { + [sourceConfiguration.fields.timestamp]: { + gte: start, + lte: end, + }, + }, + }, + ], + }, + }, + size: 0, + }, + }; + + const response = await this.framework.callWithRequest< + any, + { count_by_date?: InfraDateRangeAggregationResponse } + >(request, 'search', query); + + return response.aggregations && response.aggregations.count_by_date + ? response.aggregations.count_by_date.buckets + : []; + } + + private async getLogEntryDocumentsBetween( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + fields: string[], + start: number, + end: number, + after: TimeKey | null, + maxCount: number, + filterQuery?: LogEntryQuery, + highlightQuery?: string + ): Promise { + if (maxCount <= 0) { + return []; + } + + const sortDirection: 'asc' | 'desc' = start <= end ? 'asc' : 'desc'; + + const startRange = { + [sortDirection === 'asc' ? 'gte' : 'lte']: start, + }; + const endRange = + end === Infinity + ? {} + : { + [sortDirection === 'asc' ? 'lte' : 'gte']: end, + }; + + const highlightClause = highlightQuery + ? { + highlight: { + boundary_scanner: 'word', + fields: fields.reduce( + (highlightFieldConfigs, fieldName) => ({ + ...highlightFieldConfigs, + [fieldName]: {}, + }), + {} + ), + fragment_size: 1, + number_of_fragments: 100, + post_tags: [''], + pre_tags: [''], + }, + } + : {}; + + const searchAfterClause = isTimeKey(after) + ? { + search_after: [after.time, after.tiebreaker], + } + : {}; + + const query = { + allowNoIndices: true, + index: sourceConfiguration.logAlias, + ignoreUnavailable: true, + body: { + query: { + bool: { + filter: [ + ...createQueryFilterClauses(filterQuery), + { + range: { + [sourceConfiguration.fields.timestamp]: { + ...startRange, + ...endRange, + }, + }, + }, + ], + }, + }, + ...highlightClause, + ...searchAfterClause, + _source: fields, + size: maxCount, + sort: [ + { [sourceConfiguration.fields.timestamp]: sortDirection }, + { [sourceConfiguration.fields.tiebreaker]: sortDirection }, + ], + track_total_hits: false, + }, + }; + + const response = await this.framework.callWithRequest( + request, + 'search', + query + ); + const hits = response.hits.hits; + const documents = hits.map(convertHitToLogEntryDocument(fields)); + + return documents; + } +} + +function getLookupIntervals(start: number, direction: 'asc' | 'desc'): Array<[number, number]> { + const offsetSign = direction === 'asc' ? 1 : -1; + const translatedOffsets = LOOKUP_OFFSETS.map(offset => start + offset * offsetSign); + const intervals = zip(translatedOffsets.slice(0, -1), translatedOffsets.slice(1)) as Array< + [number, number] + >; + return intervals; +} + +const convertHitToLogEntryDocument = (fields: string[]) => ( + hit: SortedSearchHit +): LogEntryDocument => ({ + gid: hit._id, + fields: fields.reduce( + (flattenedFields, fieldName) => + has(fieldName, hit._source) + ? { + ...flattenedFields, + [fieldName]: get(fieldName, hit._source), + } + : flattenedFields, + {} as { [fieldName: string]: string | number | boolean | null } + ), + key: { + time: hit.sort[0], + tiebreaker: hit.sort[1], + }, +}); + +const createQueryFilterClauses = (filterQuery: LogEntryQuery | undefined) => + filterQuery ? [filterQuery] : []; diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts new file mode 100644 index 0000000000000..18a81e518c931 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/adapter_types.ts @@ -0,0 +1,113 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + InfraMetric, + InfraMetricData, + InfraNodeType, + InfraTimerangeInput, +} from '../../../../common/graphql/types'; + +import { InfraSourceConfiguration } from '../../sources'; +import { InfraFrameworkRequest } from '../framework'; + +export interface InfraMetricsRequestOptions { + nodeId: string; + nodeType: InfraNodeType; + sourceConfiguration: InfraSourceConfiguration; + timerange: InfraTimerangeInput; + metrics: InfraMetric[]; +} + +export interface InfraMetricsAdapter { + getMetrics( + req: InfraFrameworkRequest, + options: InfraMetricsRequestOptions + ): Promise; +} + +export enum InfraMetricModelMetricType { + avg = 'avg', + max = 'max', + min = 'min', + calculation = 'calculation', + cardinality = 'cardinality', + series_agg = 'series_agg', + positive_only = 'positive_only', + derivative = 'derivative', + count = 'count', +} + +export interface InfraMetricModel { + id: string; + requires: string[]; + index_pattern: string | string[]; + interval: string; + time_field: string; + type: string; + series: InfraMetricModelSeries[]; + filter?: string; + map_field_to?: string; +} + +export interface InfraMetricModelSeries { + id: string; + metrics: InfraMetricModelMetric[]; + split_mode: string; + terms_field?: string; + terms_size?: number; + terms_order_by?: string; +} + +export interface InfraMetricModelBasicMetric { + id: string; + field: string; + type: InfraMetricModelMetricType; +} + +export interface InfraMetricModelSeriesAgg { + id: string; + function: string; + type: InfraMetricModelMetricType.series_agg; +} + +export interface InfraMetricModelDerivative { + id: string; + field: string; + unit: string; + type: InfraMetricModelMetricType; +} + +export interface InfraMetricModelBucketScriptVariable { + field: string; + id: string; + name: string; +} + +export interface InfraMetricModelCount { + id: string; + type: InfraMetricModelMetricType.count; +} + +export interface InfraMetricModelBucketScript { + id: string; + script: string; + type: InfraMetricModelMetricType.calculation; + variables: InfraMetricModelBucketScriptVariable[]; +} + +export type InfraMetricModelMetric = + | InfraMetricModelCount + | InfraMetricModelBasicMetric + | InfraMetricModelBucketScript + | InfraMetricModelDerivative + | InfraMetricModelSeriesAgg; + +export type InfraMetricModelCreator = ( + timeField: string, + indexPattern: string | string[], + interval: string +) => InfraMetricModel; diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/index.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/index.ts new file mode 100644 index 0000000000000..4e09b5d0e9e2d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './adapter_types'; diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts new file mode 100644 index 0000000000000..bb7f7f6d2dc93 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { flatten } from 'lodash'; +import { InfraMetric, InfraMetricData, InfraNodeType } from '../../../../common/graphql/types'; +import { InfraBackendFrameworkAdapter, InfraFrameworkRequest } from '../framework'; +import { InfraMetricsAdapter, InfraMetricsRequestOptions } from './adapter_types'; +import { checkValidNode } from './lib/check_valid_node'; +import { metricModels } from './models'; + +export class KibanaMetricsAdapter implements InfraMetricsAdapter { + private framework: InfraBackendFrameworkAdapter; + + constructor(framework: InfraBackendFrameworkAdapter) { + this.framework = framework; + } + + public async getMetrics( + req: InfraFrameworkRequest, + options: InfraMetricsRequestOptions + ): Promise { + const fields = { + [InfraNodeType.host]: options.sourceConfiguration.fields.host, + [InfraNodeType.container]: options.sourceConfiguration.fields.container, + [InfraNodeType.pod]: options.sourceConfiguration.fields.pod, + }; + const indexPattern = [ + options.sourceConfiguration.metricAlias, + options.sourceConfiguration.logAlias, + ]; + const timeField = options.sourceConfiguration.fields.timestamp; + const interval = options.timerange.interval; + const nodeField = fields[options.nodeType]; + const timerange = { + min: options.timerange.from, + max: options.timerange.to, + }; + + const search = (searchOptions: object) => + this.framework.callWithRequest<{}, Aggregation>(req, 'search', searchOptions); + + const validNode = await checkValidNode(search, indexPattern, nodeField, options.nodeId); + if (!validNode) { + throw new Error(`${options.nodeId} does not exist.`); + } + + const requests = options.metrics.map(metricId => { + const model = metricModels[metricId](timeField, indexPattern, interval); + const filters = [{ match: { [nodeField]: options.nodeId } }]; + return this.framework.makeTSVBRequest(req, model, timerange, filters); + }); + return Promise.all(requests) + .then(results => { + return results.map(result => { + const metricIds = Object.keys(result).filter(k => k !== 'type'); + return metricIds.map((id: string) => { + const infraMetricId: InfraMetric = (InfraMetric as any)[id]; + if (!infraMetricId) { + throw new Error(`${id} is not a valid InfraMetric`); + } + const panel = result[infraMetricId]; + return { + id: infraMetricId, + series: panel.series.map(series => { + return { + id: series.id, + data: series.data.map(point => ({ timestamp: point[0], value: point[1] })), + }; + }), + }; + }); + }); + }) + .then(result => flatten(result)); + } +} diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/lib/check_valid_node.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/lib/check_valid_node.ts new file mode 100644 index 0000000000000..a9c6d36560b6c --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/lib/check_valid_node.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraDatabaseSearchResponse } from '../../framework'; + +export const checkValidNode = async ( + search: (options: object) => Promise>, + indexPattern: string | string[], + field: string, + id: string +): Promise => { + const params = { + index: indexPattern, + terminateAfter: 1, + body: { + size: 0, + query: { + match: { + [field]: id, + }, + }, + }, + }; + return (await search(params)).hits.total > 0; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_cpu_kernel.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_cpu_kernel.ts new file mode 100644 index 0000000000000..3fd1144b6770b --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_cpu_kernel.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerCpuKernel: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'containerCpuKernel', + requires: ['docker.cpu'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'kernel', + split_mode: 'everything', + metrics: [ + { + field: 'docker.cpu.kernel.pct', + id: 'avg-cpu-kernel', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_cpu_usage.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_cpu_usage.ts new file mode 100644 index 0000000000000..bdb52b8a9d7b5 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_cpu_usage.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerCpuUsage: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'containerCpuUsage', + requires: ['docker.cpu'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'cpu', + split_mode: 'everything', + metrics: [ + { + field: 'docker.cpu.total.pct', + id: 'avg-cpu-total', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_disk_io_bytes.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_disk_io_bytes.ts new file mode 100644 index 0000000000000..a310886ab9a0f --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_disk_io_bytes.ts @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerDiskIOBytes: InfraMetricModelCreator = ( + timeField, + indexPattern, + interval +) => ({ + id: 'containerDiskIOBytes', + requires: ['docker.disk'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'read', + split_mode: 'everything', + metrics: [ + { + field: 'docker.diskio.read.bytes', + id: 'avg-diskio-bytes', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'write', + split_mode: 'everything', + metrics: [ + { + field: 'docker.diskio.write.bytes', + id: 'avg-diskio-bytes', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_diskio_ops.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_diskio_ops.ts new file mode 100644 index 0000000000000..d09250ab1c577 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_diskio_ops.ts @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerDiskIOOps: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'containerDiskIOOps', + requires: ['docker.disk'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'read', + split_mode: 'everything', + metrics: [ + { + field: 'docker.diskio.read.ops', + id: 'avg-diskio-ops', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'write', + split_mode: 'everything', + metrics: [ + { + field: 'docker.diskio.write.ops', + id: 'avg-diskio-ops', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_memory.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_memory.ts new file mode 100644 index 0000000000000..9844fde182fe7 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_memory.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerMemory: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'containerMemory', + requires: ['docker.memory'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'memory', + split_mode: 'everything', + metrics: [ + { + field: 'docker.memory.usage.pct', + id: 'avg-memory', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_network_traffic.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_network_traffic.ts new file mode 100644 index 0000000000000..9c1ea8920f218 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_network_traffic.ts @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerNetworkTraffic: InfraMetricModelCreator = ( + timeField, + indexPattern, + interval +) => ({ + id: 'containerNetworkTraffic', + requires: ['docker.network'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'tx', + split_mode: 'everything', + metrics: [ + { + field: 'docker.network.out.bytes', + id: 'avg-network-out', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'rx', + split_mode: 'everything', + metrics: [ + { + field: 'docker.network.in.bytes', + id: 'avg-network-in', + type: InfraMetricModelMetricType.avg, + }, + { + id: 'invert-posonly-deriv-max-network-in', + script: 'params.rate * -1', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'avg-network-in', + id: 'var-rate', + name: 'rate', + }, + ], + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_overview.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_overview.ts new file mode 100644 index 0000000000000..24d1a93540104 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/container/container_overview.ts @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const containerOverview: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'containerOverview', + requires: ['docker'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'cpu', + split_mode: 'everything', + metrics: [ + { + field: 'docker.cpu.total.pct', + id: 'avg-cpu-total', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'memory', + split_mode: 'everything', + metrics: [ + { + field: 'docker.memory.usage.pct', + id: 'avg-memory', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'tx', + split_mode: 'everything', + metrics: [ + { + field: 'docker.network.out.bytes', + id: 'avg-network-out', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'rx', + split_mode: 'everything', + metrics: [ + { + field: 'docker.network.in.bytes', + id: 'avg-network-in', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_cpu_usage.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_cpu_usage.ts new file mode 100644 index 0000000000000..3d35bc59aa4df --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_cpu_usage.ts @@ -0,0 +1,249 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostCpuUsage: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostCpuUsage', + requires: ['system.cpu'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'user', + metrics: [ + { + field: 'system.cpu.user.pct', + id: 'avg-cpu-user', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + { + field: 'avg-cpu-user', + id: 'var-avg', + name: 'avg', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'system', + metrics: [ + { + field: 'system.cpu.system.pct', + id: 'avg-cpu-system', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + { + field: 'avg-cpu-system', + id: 'var-avg', + name: 'avg', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'steal', + metrics: [ + { + field: 'system.cpu.steal.pct', + id: 'avg-cpu-steal', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'avg-cpu-steal', + id: 'var-avg', + name: 'avg', + }, + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'irq', + metrics: [ + { + field: 'system.cpu.irq.pct', + id: 'avg-cpu-irq', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + { + field: 'avg-cpu-irq', + id: 'var-avg', + name: 'avg', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'softirq', + metrics: [ + { + field: 'system.cpu.softirq.pct', + id: 'avg-cpu-softirq', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + { + field: 'avg-cpu-softirq', + id: 'var-avg', + name: 'avg', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'iowait', + metrics: [ + { + field: 'system.cpu.iowait.pct', + id: 'avg-cpu-iowait', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + { + field: 'avg-cpu-iowait', + id: 'var-avg', + name: 'avg', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'nice', + metrics: [ + { + field: 'system.cpu.nice.pct', + id: 'avg-cpu-nice', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-avg-cores', + script: 'params.avg / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + { + field: 'avg-cpu-nice', + id: 'var-avg', + name: 'avg', + }, + ], + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_filesystem.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_filesystem.ts new file mode 100644 index 0000000000000..4e0dc01ab3923 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_filesystem.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostFilesystem: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostFilesystem', + requires: ['system.filesystem'], + filter: 'system.filesystem.device_name:\\/*', + index_pattern: indexPattern, + time_field: timeField, + interval, + type: 'timeseries', + series: [ + { + id: 'used', + metrics: [ + { + field: 'system.filesystem.used.pct', + id: 'avg-filesystem-used', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'terms', + terms_field: 'system.filesystem.device_name', + terms_order_by: 'used', + terms_size: 5, + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_cpu_cap.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_cpu_cap.ts new file mode 100644 index 0000000000000..685b95614425a --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_cpu_cap.ts @@ -0,0 +1,53 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostK8sCpuCap: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostK8sCpuCap', + map_field_to: 'kubernetes.node.name', + requires: ['kubernetes.node'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'capacity', + metrics: [ + { + field: 'kubernetes.node.cpu.allocatable.cores', + id: 'max-cpu-cap', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-nanocores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + id: 'var-cores', + field: 'max-cpu-cap', + name: 'cores', + }, + ], + script: 'params.cores * 1000000000', + }, + ], + split_mode: 'everything', + }, + { + id: 'used', + metrics: [ + { + field: 'kubernetes.node.cpu.usage.nanocores', + id: 'avg-cpu-usage', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_disk_cap.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_disk_cap.ts new file mode 100644 index 0000000000000..27fc70e2e00e7 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_disk_cap.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostK8sDiskCap: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostK8sDiskCap', + map_field_to: 'kubernetes.node.name', + requires: ['kubernetes.node'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'capacity', + metrics: [ + { + field: 'kubernetes.node.fs.capacity.bytes', + id: 'max-fs-cap', + type: InfraMetricModelMetricType.max, + }, + ], + split_mode: 'everything', + }, + { + id: 'used', + metrics: [ + { + field: 'kubernetes.node.fs.used.bytes', + id: 'avg-fs-used', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_memory_cap.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_memory_cap.ts new file mode 100644 index 0000000000000..7e064f7256dbd --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_memory_cap.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostK8sMemoryCap: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostK8sMemoryCap', + map_field_to: 'kubernetes.node.name', + requires: ['kubernetes.node'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'capacity', + metrics: [ + { + field: 'kubernetes.node.memory.allocatable.bytes', + id: 'max-memory-cap', + type: InfraMetricModelMetricType.max, + }, + ], + split_mode: 'everything', + }, + { + id: 'used', + metrics: [ + { + field: 'kubernetes.node.memory.usage.bytes', + id: 'avg-memory-usage', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_overview.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_overview.ts new file mode 100644 index 0000000000000..cd015d4312fd2 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_overview.ts @@ -0,0 +1,150 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostK8sOverview: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostK8sOverview', + requires: ['kubernetes'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'gauge', + series: [ + { + id: 'cpucap', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.node.cpu.allocatable.cores', + id: 'max-cpu-cap', + type: InfraMetricModelMetricType.max, + }, + { + field: 'kubernetes.node.cpu.usage.nanocores', + id: 'avg-cpu-usage', + type: InfraMetricModelMetricType.avg, + }, + { + id: 'calc-used-cap', + script: 'params.used / (params.cap * 1000000000)', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-cpu-cap', + id: 'var-cap', + name: 'cap', + }, + { + field: 'avg-cpu-usage', + id: 'var-used', + name: 'used', + }, + ], + }, + ], + }, + { + id: 'diskcap', + metrics: [ + { + field: 'kubernetes.node.fs.capacity.bytes', + id: 'max-fs-cap', + type: InfraMetricModelMetricType.max, + }, + { + field: 'kubernetes.node.fs.used.bytes', + id: 'avg-fs-used', + type: InfraMetricModelMetricType.avg, + }, + { + id: 'calc-used-cap', + script: 'params.used / params.cap', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-fs-cap', + id: 'var-cap', + name: 'cap', + }, + { + field: 'avg-fs-used', + id: 'var-used', + name: 'used', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'memorycap', + metrics: [ + { + field: 'kubernetes.node.memory.allocatable.bytes', + id: 'max-memory-cap', + type: InfraMetricModelMetricType.max, + }, + { + field: 'kubernetes.node.memory.usage.bytes', + id: 'avg-memory-usage', + type: InfraMetricModelMetricType.avg, + }, + { + id: 'calc-used-cap', + script: 'params.used / params.cap', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-memory-cap', + id: 'var-cap', + name: 'cap', + }, + { + field: 'avg-memory-usage', + id: 'var-used', + name: 'used', + }, + ], + }, + ], + split_mode: 'everything', + }, + { + id: 'podcap', + metrics: [ + { + field: 'kubernetes.node.pod.capacity.total', + id: 'max-pod-cap', + type: InfraMetricModelMetricType.max, + }, + { + field: 'kubernetes.pod.name', + id: 'card-pod-name', + type: InfraMetricModelMetricType.cardinality, + }, + { + id: 'calc-used-cap', + script: 'params.used / params.cap', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'max-pod-cap', + id: 'var-cap', + name: 'cap', + }, + { + field: 'card-pod-name', + id: 'var-used', + name: 'used', + }, + ], + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_pod_cap.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_pod_cap.ts new file mode 100644 index 0000000000000..76e37e7d5f8b8 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_k8s_pod_cap.ts @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostK8sPodCap: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostK8sPodCap', + requires: ['kubernetes.node'], + map_field_to: 'kubernetes.node.name', + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + + series: [ + { + id: 'capacity', + metrics: [ + { + field: 'kubernetes.node.pod.allocatable.total', + id: 'max-pod-cap', + type: InfraMetricModelMetricType.max, + }, + ], + split_mode: 'everything', + }, + { + id: 'used', + metrics: [ + { + field: 'kubernetes.pod.name', + id: 'avg-pod', + type: InfraMetricModelMetricType.cardinality, + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_load.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_load.ts new file mode 100644 index 0000000000000..3ee043c5676d5 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_load.ts @@ -0,0 +1,51 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostLoad: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostLoad', + requires: ['system.cpu'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'load_1m', + metrics: [ + { + field: 'system.load.1', + id: 'avg-load-1m', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + { + id: 'load_5m', + metrics: [ + { + field: 'system.load.5', + id: 'avg-load-5m', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + { + id: 'load_15m', + metrics: [ + { + field: 'system.load.15', + id: 'avg-load-15m', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_memory_usage.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_memory_usage.ts new file mode 100644 index 0000000000000..862381df1280d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_memory_usage.ts @@ -0,0 +1,73 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostMemoryUsage: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostMemoryUsage', + requires: ['system.memory'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'free', + metrics: [ + { + field: 'system.memory.free', + id: 'avg-memory-free', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + { + id: 'used', + metrics: [ + { + field: 'system.memory.actual.used.bytes', + id: 'avg-memory-used', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + { + id: 'cache', + metrics: [ + { + field: 'system.memory.actual.used.bytes', + id: 'avg-memory-actual-used', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.memory.used.bytes', + id: 'avg-memory-used', + type: InfraMetricModelMetricType.avg, + }, + { + id: 'calc-used-actual', + script: 'params.used - params.actual', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'avg-memory-actual-used', + id: 'var-actual', + name: 'actual', + }, + { + field: 'avg-memory-used', + id: 'var-used', + name: 'used', + }, + ], + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_network_traffic.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_network_traffic.ts new file mode 100644 index 0000000000000..98d10a96b3fe1 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_network_traffic.ts @@ -0,0 +1,89 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostNetworkTraffic: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostNetworkTraffic', + requires: ['system.network'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'tx', + metrics: [ + { + field: 'system.network.out.bytes', + id: 'max-net-out', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-net-out', + id: 'deriv-max-net-out', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-net-out', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-net-out' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + { + function: 'sum', + id: 'seriesagg-sum', + type: InfraMetricModelMetricType.series_agg, + }, + ], + split_mode: 'terms', + terms_field: 'system.network.name', + }, + { + id: 'rx', + label: 'Inbound (RX)', + metrics: [ + { + field: 'system.network.in.bytes', + id: 'max-net-in', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-net-in', + id: 'deriv-max-net-in', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-net-in', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-net-in' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + { + id: 'calc-invert-rate', + script: 'params.rate * -1', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'posonly-deriv-max-net-in', + id: 'var-rate', + name: 'rate', + }, + ], + }, + { + function: 'sum', + id: 'seriesagg-sum', + type: InfraMetricModelMetricType.series_agg, + }, + ], + split_mode: 'terms', + terms_field: 'system.network.name', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_system_overview.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_system_overview.ts new file mode 100644 index 0000000000000..8244fec21e5a9 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/host/host_system_overview.ts @@ -0,0 +1,141 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const hostSystemOverview: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'hostSystemOverview', + requires: ['system.cpu', 'system.memory', 'system.load', 'system.network'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'gauge', + series: [ + { + id: 'cpu', + split_mode: 'everything', + metrics: [ + { + field: 'system.cpu.user.pct', + id: 'avg-cpu-user', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'system.cpu.cores', + id: 'max-cpu-cores', + type: InfraMetricModelMetricType.max, + }, + { + field: 'system.cpu.system.pct', + id: 'avg-cpu-system', + type: InfraMetricModelMetricType.avg, + }, + { + id: 'calc-user-system-cores', + script: '(params.users + params.system) / params.cores', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'avg-cpu-user', + id: 'var-users', + name: 'users', + }, + { + field: 'avg-cpu-system', + id: 'var-system', + name: 'system', + }, + { + field: 'max-cpu-cores', + id: 'var-cores', + name: 'cores', + }, + ], + }, + ], + }, + { + id: 'load', + split_mode: 'everything', + metrics: [ + { + field: 'system.load.5', + id: 'avg-load-5m', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'memory', + split_mode: 'everything', + metrics: [ + { + field: 'system.memory.actual.used.pct', + id: 'avg-memory-actual-used', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'rx', + split_mode: 'terms', + terms_field: 'system.network.name', + metrics: [ + { + field: 'system.network.in.bytes', + id: 'max-net-in', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-net-in', + id: 'deriv-max-net-in', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-net-in', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-net-in' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + { + function: 'sum', + id: 'seriesagg-sum', + type: InfraMetricModelMetricType.series_agg, + }, + ], + }, + { + id: 'tx', + split_mode: 'terms', + terms_field: 'system.network.name', + metrics: [ + { + field: 'system.network.out.bytes', + id: 'max-net-out', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-net-out', + id: 'deriv-max-net-out', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-net-out', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-net-out' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + { + function: 'sum', + id: 'seriesagg-sum', + type: InfraMetricModelMetricType.series_agg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/index.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/index.ts new file mode 100644 index 0000000000000..0a1c6fab14a84 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/index.ts @@ -0,0 +1,74 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetric } from '../../../../../common/graphql/types'; +import { InfraMetricModelCreator } from '../adapter_types'; + +import { hostCpuUsage } from './host/host_cpu_usage'; +import { hostFilesystem } from './host/host_filesystem'; +import { hostK8sCpuCap } from './host/host_k8s_cpu_cap'; +import { hostK8sDiskCap } from './host/host_k8s_disk_cap'; +import { hostK8sMemoryCap } from './host/host_k8s_memory_cap'; +import { hostK8sOverview } from './host/host_k8s_overview'; +import { hostK8sPodCap } from './host/host_k8s_pod_cap'; +import { hostLoad } from './host/host_load'; +import { hostMemoryUsage } from './host/host_memory_usage'; +import { hostNetworkTraffic } from './host/host_network_traffic'; +import { hostSystemOverview } from './host/host_system_overview'; + +import { podCpuUsage } from './pod/pod_cpu_usage'; +import { podLogUsage } from './pod/pod_log_usage'; +import { podMemoryUsage } from './pod/pod_memory_usage'; +import { podNetworkTraffic } from './pod/pod_network_traffic'; +import { podOverview } from './pod/pod_overview'; + +import { containerCpuKernel } from './container/container_cpu_kernel'; +import { containerCpuUsage } from './container/container_cpu_usage'; +import { containerDiskIOBytes } from './container/container_disk_io_bytes'; +import { containerDiskIOOps } from './container/container_diskio_ops'; +import { containerMemory } from './container/container_memory'; +import { containerNetworkTraffic } from './container/container_network_traffic'; +import { containerOverview } from './container/container_overview'; +import { nginxActiveConnections } from './nginx/nginx_active_connections'; +import { nginxHits } from './nginx/nginx_hits'; +import { nginxRequestRate } from './nginx/nginx_request_rate'; +import { nginxRequestsPerConnection } from './nginx/nginx_requests_per_connection'; + +interface InfraMetricModels { + [key: string]: InfraMetricModelCreator; +} + +export const metricModels: InfraMetricModels = { + [InfraMetric.hostSystemOverview]: hostSystemOverview, + [InfraMetric.hostCpuUsage]: hostCpuUsage, + [InfraMetric.hostFilesystem]: hostFilesystem, + [InfraMetric.hostK8sOverview]: hostK8sOverview, + [InfraMetric.hostK8sCpuCap]: hostK8sCpuCap, + [InfraMetric.hostK8sDiskCap]: hostK8sDiskCap, + [InfraMetric.hostK8sMemoryCap]: hostK8sMemoryCap, + [InfraMetric.hostK8sPodCap]: hostK8sPodCap, + [InfraMetric.hostLoad]: hostLoad, + [InfraMetric.hostMemoryUsage]: hostMemoryUsage, + [InfraMetric.hostNetworkTraffic]: hostNetworkTraffic, + + [InfraMetric.podOverview]: podOverview, + [InfraMetric.podCpuUsage]: podCpuUsage, + [InfraMetric.podMemoryUsage]: podMemoryUsage, + [InfraMetric.podLogUsage]: podLogUsage, + [InfraMetric.podNetworkTraffic]: podNetworkTraffic, + + [InfraMetric.containerCpuKernel]: containerCpuKernel, + [InfraMetric.containerCpuUsage]: containerCpuUsage, + [InfraMetric.containerDiskIOBytes]: containerDiskIOBytes, + [InfraMetric.containerDiskIOOps]: containerDiskIOOps, + [InfraMetric.containerNetworkTraffic]: containerNetworkTraffic, + [InfraMetric.containerMemory]: containerMemory, + [InfraMetric.containerOverview]: containerOverview, + [InfraMetric.nginxHits]: nginxHits, + [InfraMetric.nginxRequestRate]: nginxRequestRate, + [InfraMetric.nginxActiveConnections]: nginxActiveConnections, + [InfraMetric.nginxRequestsPerConnection]: nginxRequestsPerConnection, +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_active_connections.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_active_connections.ts new file mode 100644 index 0000000000000..befc776661f74 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_active_connections.ts @@ -0,0 +1,33 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const nginxActiveConnections: InfraMetricModelCreator = ( + timeField, + indexPattern, + interval +) => ({ + id: 'nginxActiveConnections', + requires: ['nginx.stubstatus'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'connections', + metrics: [ + { + field: 'nginx.stubstatus.active', + id: 'avg-active', + type: InfraMetricModelMetricType.avg, + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_hits.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_hits.ts new file mode 100644 index 0000000000000..2f24c504db184 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_hits.ts @@ -0,0 +1,62 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const nginxHits: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'nginxHits', + requires: ['nginx.access'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: '200s', + metrics: [ + { + id: 'count-200', + type: InfraMetricModelMetricType.count, + }, + ], + split_mode: 'filter', + filter: 'nginx.access.response_code:[200 TO 299]', + }, + { + id: '300s', + metrics: [ + { + id: 'count-300', + type: InfraMetricModelMetricType.count, + }, + ], + split_mode: 'filter', + filter: 'nginx.access.response_code:[300 TO 399]', + }, + { + id: '400s', + metrics: [ + { + id: 'count-400', + type: InfraMetricModelMetricType.count, + }, + ], + split_mode: 'filter', + filter: 'nginx.access.response_code:[400 TO 499]', + }, + { + id: '500s', + metrics: [ + { + id: 'count-500', + type: InfraMetricModelMetricType.count, + }, + ], + split_mode: 'filter', + filter: 'nginx.access.response_code:[500 TO 599]', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_request_rate.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_request_rate.ts new file mode 100644 index 0000000000000..aca3d5432c837 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_request_rate.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const nginxRequestRate: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'nginxRequestRate', + requires: ['nginx.stubstatus'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'rate', + metrics: [ + { + field: 'nginx.stubstatus.requests', + id: 'max-requests', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-requests', + id: 'derv-max-requests', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-derv-max-requests', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'derv-max-requests' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_requests_per_connection.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_requests_per_connection.ts new file mode 100644 index 0000000000000..03d8a9458d21a --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/nginx/nginx_requests_per_connection.ts @@ -0,0 +1,48 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const nginxRequestsPerConnection: InfraMetricModelCreator = ( + timeField, + indexPattern, + interval +) => ({ + id: 'nginxRequestsPerConnection', + requires: ['nginx.stubstatus'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'reqPerConns', + metrics: [ + { + field: 'nginx.stubstatus.handled', + id: 'max-handled', + type: InfraMetricModelMetricType.max, + }, + { + field: 'nginx.stubstatus.requests', + id: 'max-requests', + type: InfraMetricModelMetricType.max, + }, + { + id: 'reqs-per-connection', + type: InfraMetricModelMetricType.calculation, + variables: [ + { id: 'var-handled', name: 'handled', field: 'max-handled' }, + { id: 'var-requests', name: 'requests', field: 'max-requests' }, + ], + script: + 'params.handled > 0.0 && params.requests > 0.0 ? params.handled / params.requests : 0.0', + }, + ], + split_mode: 'everything', + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_cpu_usage.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_cpu_usage.ts new file mode 100644 index 0000000000000..7b766e3dbda43 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_cpu_usage.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const podCpuUsage: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'podCpuUsage', + requires: ['kubernetes.pod'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'cpu', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.cpu.usage.node.pct', + id: 'avg-cpu-usage', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_log_usage.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_log_usage.ts new file mode 100644 index 0000000000000..19ce51226919e --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_log_usage.ts @@ -0,0 +1,51 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const podLogUsage: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'podLogUsage', + requires: ['kubernetes.pod'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'logs', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.container.logs.used.bytes', + id: 'avg-log-used', + type: InfraMetricModelMetricType.avg, + }, + { + field: 'kubernetes.container.logs.capacity.bytes', + id: 'max-log-cap', + type: InfraMetricModelMetricType.max, + }, + { + id: 'calc-usage-limit', + script: 'params.usage / params.limit', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'avg-log-userd', + id: 'var-usage', + name: 'usage', + }, + { + field: 'max-log-cap', + id: 'var-limit', + name: 'limit', + }, + ], + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_memory_usage.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_memory_usage.ts new file mode 100644 index 0000000000000..a8ff514877a32 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_memory_usage.ts @@ -0,0 +1,29 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const podMemoryUsage: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'podMemoryUsage', + requires: ['kubernetes.pod'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'memory', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.memory.usage.node.pct', + id: 'avg-memory-usage', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_network_traffic.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_network_traffic.ts new file mode 100644 index 0000000000000..d83695d4590f2 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_network_traffic.ts @@ -0,0 +1,76 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const podNetworkTraffic: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'podNetworkTraffic', + requires: ['kubernetes.pod'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'tx', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.network.tx.bytes', + id: 'max-network-tx', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-network-tx', + id: 'deriv-max-network-tx', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-net-tx', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-network-tx' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + ], + }, + { + id: 'rx', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.network.rx.bytes', + id: 'max-network-rx', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-network-rx', + id: 'deriv-max-network-rx', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-net-tx', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-network-tx' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + { + id: 'invert-posonly-deriv-max-network-rx', + script: 'params.rate * -1', + type: InfraMetricModelMetricType.calculation, + variables: [ + { + field: 'posonly-deriv-max-network-rx', + id: 'var-rate', + name: 'rate', + }, + ], + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_overview.ts b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_overview.ts new file mode 100644 index 0000000000000..c94def091d4c9 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/metrics/models/pod/pod_overview.ts @@ -0,0 +1,86 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricModelCreator, InfraMetricModelMetricType } from '../../adapter_types'; + +export const podOverview: InfraMetricModelCreator = (timeField, indexPattern, interval) => ({ + id: 'podOverview', + requires: ['kubernetes.pod'], + index_pattern: indexPattern, + interval, + time_field: timeField, + type: 'timeseries', + series: [ + { + id: 'cpu', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.cpu.usage.node.pct', + id: 'avg-cpu-usage', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'memory', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.memory.usage.node.pct', + id: 'avg-memory-usage', + type: InfraMetricModelMetricType.avg, + }, + ], + }, + { + id: 'rx', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.network.rx.bytes', + id: 'max-network-rx', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-network-rx', + id: 'deriv-max-network-rx', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-network-rx', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-network-rx' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + ], + }, + { + id: 'tx', + split_mode: 'everything', + metrics: [ + { + field: 'kubernetes.pod.network.tx.bytes', + id: 'max-network-tx', + type: InfraMetricModelMetricType.max, + }, + { + field: 'max-network-tx', + id: 'deriv-max-network-tx', + type: InfraMetricModelMetricType.derivative, + unit: '1s', + }, + { + id: 'posonly-deriv-max-network-tx', + type: InfraMetricModelMetricType.calculation, + variables: [{ id: 'var-rate', name: 'rate', field: 'deriv-max-network-tx' }], + script: 'params.rate > 0.0 ? params.rate : 0.0', + }, + ], + }, + ], +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/adapter_types.ts new file mode 100644 index 0000000000000..ed6fb4beda03d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/adapter_types.ts @@ -0,0 +1,237 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + InfraMetricInput, + InfraNode, + InfraPathFilterInput, + InfraPathInput, + InfraPathType, + InfraTimerangeInput, +} from '../../../../common/graphql/types'; +import { JsonObject } from '../../../../common/typed_json'; +import { InfraSourceConfiguration } from '../../sources'; +import { InfraFrameworkRequest } from '../framework'; + +export interface InfraNodesAdapter { + getNodes(req: InfraFrameworkRequest, options: InfraNodeRequestOptions): Promise; +} + +export interface InfraHostsFieldsObject { + name?: any; + metrics?: any; + groups?: [any]; +} + +export type InfraESQuery = + | InfraESBoolQuery + | InfraESRangeQuery + | InfraESExistsQuery + | InfraESQueryStringQuery + | InfraESMatchQuery + | JsonObject; + +export interface InfraESExistsQuery { + exists: { field: string }; +} + +export interface InfraESQueryStringQuery { + query_string: { + query: string; + analyze_wildcard: boolean; + }; +} + +export interface InfraESRangeQuery { + range: { + [name: string]: { + gte: number; + lte: number; + format: string; + }; + }; +} + +export interface InfraESMatchQuery { + match: { + [name: string]: { + query: string; + }; + }; +} + +export interface InfraESBoolQuery { + bool: { + must?: InfraESQuery[]; + should?: InfraESQuery[]; + filter?: InfraESQuery[]; + }; +} + +export interface InfraESMSearchHeader { + index: string[] | string; +} + +export interface InfraESSearchBody { + query?: object; + aggregations?: object; + aggs?: object; + size?: number; +} + +export type InfraESMSearchBody = InfraESSearchBody | InfraESMSearchHeader; + +export interface InfraNodeRequestOptions { + nodeType: InfraNodeType; + sourceConfiguration: InfraSourceConfiguration; + timerange: InfraTimerangeInput; + groupBy: InfraPathInput[]; + metric: InfraMetricInput; + filterQuery: InfraESQuery | undefined; +} + +export enum InfraNodesKey { + hosts = 'hosts', + pods = 'pods', + containers = 'containers', +} + +export enum InfraNodeType { + host = 'host', + pod = 'pod', + container = 'container', +} + +export interface InfraNodesAggregations { + waffle: { + nodes: { + buckets: InfraBucket[]; + }; + }; +} + +export type InfraProcessorTransformer = (doc: T) => T; + +export type InfraProcessorChainFn = ( + next: InfraProcessorTransformer +) => InfraProcessorTransformer; + +export type InfraProcessor = (options: O) => InfraProcessorChainFn; + +export interface InfraProcesorRequestOptions { + nodeType: InfraNodeType; + nodeOptions: InfraNodeRequestOptions; + partitionId: number; + numberOfPartitions: number; + nodeField: string; +} + +export interface InfraGroupByFilters { + id: string /** The UUID for the group by object */; + type: InfraPathType /** The type of aggregation to use to bucket the groups */; + label?: + | string + | null /** The label to use in the results for the group by for the terms group by */; + filters: InfraPathFilterInput[] /** The filters to use for the group by aggregation, this is ignored by the terms group by */; +} + +export interface InfraGroupByTerms { + id: string /** The UUID for the group by object */; + type: InfraPathType /** The type of aggregation to use to bucket the groups */; + label?: + | string + | null /** The label to use in the results for the group by for the terms group by */; + field: string; +} + +export interface InfraBucketWithKey { + key: string | number; + doc_count: number; +} + +export interface InfraBucketWithAggs { + [name: string]: { + buckets: InfraBucket[]; + }; +} + +export interface InfraBucketWithValues { + [name: string]: { value: number; normalized_value?: number }; +} + +export type InfraBucket = InfraBucketWithAggs & InfraBucketWithKey & InfraBucketWithValues; + +export interface InfraGroupWithNodes { + name: string; + nodes: InfraNode[]; +} + +export interface InfraGroupWithSubGroups { + name: string; + groups: InfraGroupWithNodes[]; +} + +export type InfraNodeGroup = InfraGroupWithNodes | InfraGroupWithSubGroups; + +export interface InfraNodesResponse { + total?: number; +} + +export interface InfraGroupsResponse { + total: number; + groups: InfraNodeGroup[]; +} + +export interface InfraNodesOnlyResponse { + total: number; + nodes: InfraNode[]; +} + +export interface InfraAvgAgg { + avg: { field: string }; +} + +export interface InfraMaxAgg { + max: { field: string }; +} + +export interface InfraDerivativeAgg { + derivative: { + buckets_path: string; + gap_policy: string; + unit: string; + }; +} + +export interface InfraCumulativeSumAgg { + cumulative_sum: { + buckets_path: string; + }; +} + +export interface InfraBucketScriptAgg { + bucket_script: { + buckets_path: { [key: string]: string }; + script: { + source: string; + lang: string; + }; + gap_policy: string; + }; +} + +export type InfraAgg = + | InfraBucketScriptAgg + | InfraDerivativeAgg + | InfraAvgAgg + | InfraMaxAgg + | InfraCumulativeSumAgg + | undefined; +export interface InfraNodeMetricAgg { + [key: string]: InfraAgg; +} + +export type InfraNodeMetricFn = (nodeType: InfraNodeType) => InfraNodeMetricAgg | undefined; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/constants.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/constants.ts new file mode 100644 index 0000000000000..75d8464e8efe5 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/constants.ts @@ -0,0 +1,9 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +// TODO: Make NODE_REQUEST_PARTITION_SIZE configurable from kibana.yml +export const NODE_REQUEST_PARTITION_SIZE = 75; +export const NODE_REQUEST_PARTITION_FACTOR = 1.2; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/elasticsearch_nodes_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/elasticsearch_nodes_adapter.ts new file mode 100644 index 0000000000000..97459ad0cc04b --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/elasticsearch_nodes_adapter.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraBackendFrameworkAdapter, InfraFrameworkRequest } from '../framework'; +import { + InfraBucket, + InfraNodeRequestOptions, + InfraNodesAdapter, + InfraNodesAggregations, +} from './adapter_types'; + +import { InfraNode } from '../../../../common/graphql/types'; +import { calculateCardinalityOfNodeField } from './lib/calculate_cardinality'; +import { createPartitionBodies } from './lib/create_partition_bodies'; +import { processNodes } from './lib/process_nodes'; + +export class ElasticsearchNodesAdapter implements InfraNodesAdapter { + private framework: InfraBackendFrameworkAdapter; + constructor(framework: InfraBackendFrameworkAdapter) { + this.framework = framework; + } + + public async getNodes( + req: InfraFrameworkRequest, + options: InfraNodeRequestOptions + ): Promise { + const search = (searchOptions: object) => + this.framework.callWithRequest<{}, Aggregation>(req, 'search', searchOptions); + const msearch = (msearchOptions: object) => + this.framework.callWithRequest<{}, Aggregation>(req, 'msearch', msearchOptions); + + const nodeField = options.sourceConfiguration.fields[options.nodeType]; + const totalNodes = await calculateCardinalityOfNodeField(search, nodeField, options); + + if (totalNodes === 0) { + return []; + } + + const body = createPartitionBodies(totalNodes, options.nodeType, nodeField, options); + + const response = await msearch({ + body, + }); + + if (response && response.responses) { + const nodeBuckets: InfraBucket[] = response.responses.reduce( + (current: InfraBucket[], resp) => { + if (!resp.aggregations) { + return current; + } + const buckets = resp.aggregations.waffle.nodes.buckets; + return current.concat(buckets); + }, + [] + ); + return processNodes(options, nodeBuckets); + } + + return []; + } +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/extract_group_by_and_node_from_path.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/extract_group_by_and_node_from_path.ts new file mode 100644 index 0000000000000..60fa22b4116e4 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/extract_group_by_and_node_from_path.ts @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { InfraPathInput, InfraPathType } from '../../../../common/graphql/types'; +import { InfraNodeType } from './adapter_types'; + +const getNodeType = (type: InfraPathType): InfraNodeType => { + switch (type) { + case InfraPathType.pods: + return InfraNodeType.pod; + case InfraPathType.containers: + return InfraNodeType.container; + case InfraPathType.hosts: + return InfraNodeType.host; + default: + throw new Error('Invalid InfraPathType'); + } +}; + +const isEntityType = (path: InfraPathInput) => { + if (!path) { + return false; + } + switch (path.type) { + case InfraPathType.containers: + case InfraPathType.hosts: + case InfraPathType.pods: + return true; + default: + return false; + } +}; + +const moreThenOneEntityType = (path: InfraPathInput[]) => { + return path.filter(isEntityType).length > 1; +}; + +export function extractGroupByAndNodeFromPath(path: InfraPathInput[]) { + if (moreThenOneEntityType(path)) { + throw new Error('There can be only one entity type in the path.'); + } + if (path.length > 3) { + throw new Error('The path can only have a maximum of 3 elements.'); + } + const nodePart = path[path.length - 1]; + if (!isEntityType(nodePart)) { + throw new Error( + 'The last element in the path should be either a "hosts", "containers" or "pods" path type.' + ); + } + const nodeType = getNodeType(nodePart.type); + const groupBy = path.slice(0, path.length - 1); + return { groupBy, nodeType }; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/index.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/index.ts new file mode 100644 index 0000000000000..4e09b5d0e9e2d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './adapter_types'; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/calculate_cardinality.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/calculate_cardinality.ts new file mode 100644 index 0000000000000..b1707727ff616 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/calculate_cardinality.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraDatabaseSearchResponse } from '../../framework'; +import { InfraESQuery, InfraNodeRequestOptions } from '../adapter_types'; +import { createQuery } from './create_query'; + +interface CardinalityOfFieldParams { + size: number; + query: InfraESQuery; + aggs: { + nodeCount: { cardinality: { field: string } }; + }; +} + +interface CardinalityAggregation { + nodeCount: { value: number }; +} + +export async function calculateCardinalityOfNodeField( + search: (options: object) => Promise>, + nodeField: string, + options: InfraNodeRequestOptions +): Promise { + const { sourceConfiguration }: InfraNodeRequestOptions = options; + const body: CardinalityOfFieldParams = { + aggs: { + nodeCount: { + cardinality: { field: nodeField }, + }, + }, + query: createQuery(options), + size: 0, + }; + + const resp = await search({ + body, + index: [sourceConfiguration.logAlias, sourceConfiguration.metricAlias], + }); + + if (resp.aggregations) { + return resp.aggregations.nodeCount.value; + } + + return 0; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/convert_nodes_response_to_groups.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/convert_nodes_response_to_groups.ts new file mode 100644 index 0000000000000..9ee00be17b917 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/convert_nodes_response_to_groups.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { InfraNode } from '../../../../../common/graphql/types'; +import { InfraBucket, InfraNodeRequestOptions } from '../adapter_types'; +import { extractGroupPaths } from './extract_group_paths'; + +export function convertNodesResponseToGroups( + options: InfraNodeRequestOptions, + nodes: InfraBucket[] +): InfraNode[] { + let results: InfraNode[] = []; + nodes.forEach((node: InfraBucket) => { + const nodesWithPaths = extractGroupPaths(options, node); + results = results.concat(nodesWithPaths); + }); + return results; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_base_path.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_base_path.ts new file mode 100644 index 0000000000000..f8480686cf48e --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_base_path.ts @@ -0,0 +1,13 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraPathInput } from '../../../../../common/graphql/types'; +export const createBasePath = (groupBy: InfraPathInput[]) => { + const basePath = ['aggs', 'waffle', 'aggs', 'nodes', 'aggs']; + return groupBy.reduce((acc, group, index) => { + return acc.concat([`path_${index}`, `aggs`]); + }, basePath); +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_node_item.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_node_item.ts new file mode 100644 index 0000000000000..a2d072e0897d7 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_node_item.ts @@ -0,0 +1,63 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { last } from 'lodash'; +import { isNumber } from 'lodash'; +import moment from 'moment'; +import { InfraNode, InfraNodeMetric } from '../../../../../common/graphql/types'; +import { InfraBucket, InfraNodeRequestOptions } from '../adapter_types'; +import { getBucketSizeInSeconds } from './get_bucket_size_in_seconds'; + +// TODO: Break these function into seperate files and expand beyond just documnet count +// In the code below it looks like overkill to split these three functions out +// but in reality the create metrics functions will be different per node type. + +const findLastFullBucket = ( + bucket: InfraBucket, + bucketSize: number, + options: InfraNodeRequestOptions +): InfraBucket | undefined => { + const { buckets } = bucket.timeseries; + const to = moment.utc(options.timerange.to); + return buckets.reduce((current, item) => { + const itemKey = isNumber(item.key) ? item.key : parseInt(item.key, 10); + const date = moment.utc(itemKey + bucketSize * 1000); + if (!date.isAfter(to) && item.doc_count > 0) { + return item; + } + return current; + }, last(buckets)); +}; + +function createNodeMetrics( + options: InfraNodeRequestOptions, + node: InfraBucket, + bucket: InfraBucket +): InfraNodeMetric { + const { timerange, metric } = options; + const bucketSize = getBucketSizeInSeconds(timerange.interval); + const lastBucket = findLastFullBucket(bucket, bucketSize, options); + if (!lastBucket) { + throw new Error('Date histogram returned an empty set of buckets.'); + } + const metricObj = lastBucket[metric.type]; + const value = (metricObj && (metricObj.normalized_value || metricObj.value)) || 0; + return { + name: metric.type, + value, + }; +} + +export function createNodeItem( + options: InfraNodeRequestOptions, + node: InfraBucket, + bucket: InfraBucket +): InfraNode { + return { + metric: createNodeMetrics(options, node, bucket), + path: [{ value: node.key }], + } as InfraNode; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_node_request_body.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_node_request_body.ts new file mode 100644 index 0000000000000..733e260c5e874 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_node_request_body.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraESSearchBody, InfraProcesorRequestOptions } from '../adapter_types'; +import { createLastNProcessor } from '../processors/last'; + +export function createNodeRequestBody(options: InfraProcesorRequestOptions): InfraESSearchBody { + const requestProcessor = createLastNProcessor(options); + const doc = {}; + const body = requestProcessor(doc); + return body; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_partition_bodies.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_partition_bodies.ts new file mode 100644 index 0000000000000..7c5480a4d6adb --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_partition_bodies.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { times } from 'lodash'; + +import { InfraMetricType } from '../../../../../common/graphql/types'; +import { + InfraESMSearchBody, + InfraNodeRequestOptions, + InfraNodeType, + InfraProcesorRequestOptions, +} from '../adapter_types'; +import { NODE_REQUEST_PARTITION_SIZE } from '../constants'; +import { createNodeRequestBody } from './create_node_request_body'; + +export function createPartitionBodies( + totalNodes: number, + nodeType: InfraNodeType, + nodeField: string, + nodeOptions: InfraNodeRequestOptions +): InfraESMSearchBody[] { + const { sourceConfiguration }: InfraNodeRequestOptions = nodeOptions; + const bodies: InfraESMSearchBody[] = []; + const numberOfPartitions: number = Math.ceil(totalNodes / NODE_REQUEST_PARTITION_SIZE); + const indices = + nodeOptions.metric.type === InfraMetricType.logRate + ? [sourceConfiguration.logAlias] + : [sourceConfiguration.metricAlias]; + times( + numberOfPartitions, + (partitionId: number): void => { + const processorOptions: InfraProcesorRequestOptions = { + nodeType, + nodeField, + nodeOptions, + numberOfPartitions, + partitionId, + }; + bodies.push({ + index: indices, + }); + bodies.push(createNodeRequestBody(processorOptions)); + } + ); + return bodies; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_query.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_query.ts new file mode 100644 index 0000000000000..0c56172c4c4d0 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/create_query.ts @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraPathFilterInput, InfraPathInput } from '../../../../../common/graphql/types'; + +import { + InfraESBoolQuery, + InfraESQuery, + InfraESRangeQuery, + InfraNodeRequestOptions, +} from '../adapter_types'; + +import { isGroupByFilters, isGroupByTerms } from './type_guards'; + +export function createQuery(options: InfraNodeRequestOptions): InfraESQuery { + const { timerange, sourceConfiguration, groupBy, filterQuery }: InfraNodeRequestOptions = options; + const mustClause: InfraESQuery[] = []; + const shouldClause: InfraESQuery[] = []; + const filterClause: InfraESQuery[] = []; + + const rangeFilter: InfraESRangeQuery = { + range: { + [sourceConfiguration.fields.timestamp]: { + format: 'epoch_millis', + gte: timerange.from, + lte: timerange.to, + }, + }, + }; + + filterClause.push(rangeFilter); + + if (groupBy) { + groupBy.forEach( + (group: InfraPathInput): void => { + if (isGroupByTerms(group) && group.field) { + mustClause.push({ + exists: { + field: group.field, + }, + }); + } + if (isGroupByFilters(group) && group.filters) { + group.filters!.forEach( + (groupFilter: InfraPathFilterInput | null): void => { + if (groupFilter != null && groupFilter.query) { + shouldClause.push({ + query_string: { + analyze_wildcard: true, + query: groupFilter.query, + }, + }); + } + } + ); + } + } + ); + } + + if (filterQuery) { + mustClause.push(filterQuery); + } + + const query: InfraESBoolQuery = { + bool: { + filter: filterClause, + must: mustClause, + should: shouldClause, + }, + }; + + return query; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/extract_group_paths.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/extract_group_paths.ts new file mode 100644 index 0000000000000..016a109e6e5a2 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/extract_group_paths.ts @@ -0,0 +1,52 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNode, InfraPathInput } from '../../../../../common/graphql/types'; +import { InfraBucket, InfraNodeRequestOptions } from '../adapter_types'; +import { createNodeItem } from './create_node_item'; + +export interface InfraPathItem { + path: string[]; + nodeItem: InfraNode; +} + +export function extractGroupPaths( + options: InfraNodeRequestOptions, + node: InfraBucket +): InfraNode[] { + const { groupBy } = options; + const secondGroup: InfraPathInput = groupBy[1]; + const paths: InfraNode[] = node.path_0.buckets.reduce( + (acc: InfraNode[], bucket: InfraBucket, index: number): InfraNode[] => { + const key: string = (bucket.key || index).toString(); + if (secondGroup) { + return acc.concat( + bucket.path_1.buckets.map( + (b: InfraBucket): InfraNode => { + const innerNode = createNodeItem(options, node, b); + const nodePath = [ + { value: bucket.key.toString() }, + { value: b.key.toString() }, + ].concat(innerNode.path); + return { + ...innerNode, + path: nodePath, + }; + } + ) + ); + } + const nodeItem = createNodeItem(options, node, bucket); + const path = [{ value: key }].concat(nodeItem.path); + return acc.concat({ + ...nodeItem, + path, + }); + }, + [] + ); + return paths; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/get_bucket_size_in_seconds.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/get_bucket_size_in_seconds.ts new file mode 100644 index 0000000000000..667f2d2f35745 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/get_bucket_size_in_seconds.ts @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +const intervalUnits = ['y', 'M', 'w', 'd', 'h', 'm', 's', 'ms']; +const INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + intervalUnits.join('|') + ')$'); + +interface UnitsToSeconds { + [unit: string]: number; +} + +const units: UnitsToSeconds = { + ms: 0.001, + s: 1, + m: 60, + h: 3600, + d: 86400, + w: 86400 * 7, + M: 86400 * 30, + y: 86400 * 356, +}; + +export const getBucketSizeInSeconds = (interval: string): number => { + const matches = interval.match(INTERVAL_STRING_RE); + if (matches) { + return parseFloat(matches[1]) * units[matches[2]]; + } + throw new Error('Invalid interval string format.'); +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/process_nodes.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/process_nodes.ts new file mode 100644 index 0000000000000..ef55628cb744d --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/process_nodes.ts @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNode } from '../../../../../common/graphql/types'; +import { InfraBucket, InfraNodeRequestOptions } from '../adapter_types'; +import { convertNodesResponseToGroups } from './convert_nodes_response_to_groups'; +import { createNodeItem } from './create_node_item'; + +export function processNodes(options: InfraNodeRequestOptions, nodes: any[]): InfraNode[] { + if (options.groupBy.length === 0) { + // If there are NO group by options then we need to return a + // nodes only response + const nodeResults: InfraNode[] = nodes.map( + (node: InfraBucket): InfraNode => { + return createNodeItem(options, node, node); + } + ); + return nodeResults; + } + + // Return a grouped response + return convertNodesResponseToGroups(options, nodes); +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/lib/type_guards.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/type_guards.ts new file mode 100644 index 0000000000000..14423afbe0ff3 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/lib/type_guards.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraPathInput, InfraPathType } from '../../../../../common/graphql/types'; +import { InfraGroupByFilters, InfraGroupByTerms } from '../adapter_types'; + +export function isGroupByFilters(value: InfraPathInput): value is InfraGroupByFilters { + return value.type === InfraPathType.filters; +} + +export function isGroupByTerms(value: InfraPathInput): value is InfraGroupByTerms { + return value.type === InfraPathType.terms; +} diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/count.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/count.ts new file mode 100644 index 0000000000000..3e64c50887956 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/count.ts @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeMetricFn, InfraNodeType } from '../adapter_types'; + +export const count: InfraNodeMetricFn = (nodeType: InfraNodeType) => { + return { + count: { + bucket_script: { + buckets_path: { count: '_count' }, + script: { + source: 'count * 1', + lang: 'expression', + }, + gap_policy: 'skip', + }, + }, + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/cpu.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/cpu.ts new file mode 100644 index 0000000000000..105deb28552ff --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/cpu.ts @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeMetricFn, InfraNodeType } from '../adapter_types'; + +const FIELDS = { + [InfraNodeType.host]: 'system.cpu.user.pct', + [InfraNodeType.pod]: 'kubernetes.pod.cpu.usage.node.pct', + [InfraNodeType.container]: 'docker.cpu.total.pct', +}; + +export const cpu: InfraNodeMetricFn = (nodeType: InfraNodeType) => { + if (nodeType === InfraNodeType.host) { + return { + cpu_user: { + avg: { + field: 'system.cpu.user.pct', + }, + }, + cpu_system: { + avg: { + field: 'system.cpu.system.pct', + }, + }, + cpu_cores: { + max: { + field: 'system.cpu.cores', + }, + }, + cpu: { + bucket_script: { + buckets_path: { + user: 'cpu_user', + system: 'cpu_system', + cores: 'cpu_cores', + }, + script: { + source: '(params.user + params.system) / params.cores', + lang: 'painless', + }, + gap_policy: 'skip', + }, + }, + }; + } + + const field = FIELDS[nodeType]; + return { + cpu: { + avg: { + field, + }, + }, + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/index.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/index.ts new file mode 100644 index 0000000000000..da520d1d64941 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/index.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricType } from '../../../../../common/graphql/types'; +import { count } from './count'; +import { cpu } from './cpu'; +import { load } from './load'; +import { logRate } from './log_rate'; +import { memory } from './memory'; +import { rx } from './rx'; +import { tx } from './tx'; + +export const metricAggregationCreators = { + [InfraMetricType.count]: count, + [InfraMetricType.cpu]: cpu, + [InfraMetricType.memory]: memory, + [InfraMetricType.rx]: rx, + [InfraMetricType.tx]: tx, + [InfraMetricType.load]: load, + [InfraMetricType.logRate]: logRate, +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/load.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/load.ts new file mode 100644 index 0000000000000..6b68fd5931b95 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/load.ts @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeMetricFn, InfraNodeType } from '../adapter_types'; + +const FIELDS = { + [InfraNodeType.host]: 'system.load.5', + [InfraNodeType.pod]: '', + [InfraNodeType.container]: '', +}; + +export const load: InfraNodeMetricFn = (nodeType: InfraNodeType) => { + const field = FIELDS[nodeType]; + if (field) { + return { load: { avg: { field } } }; + } +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/log_rate.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/log_rate.ts new file mode 100644 index 0000000000000..d447997e47734 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/log_rate.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeMetricFn, InfraNodeType } from '../adapter_types'; + +export const logRate: InfraNodeMetricFn = (nodeType: InfraNodeType) => { + return { + count: { + bucket_script: { + buckets_path: { count: '_count' }, + script: { + source: 'count * 1', + lang: 'expression', + }, + gap_policy: 'skip', + }, + }, + cumsum: { + cumulative_sum: { + buckets_path: 'count', + }, + }, + logRate: { + derivative: { + buckets_path: 'cumsum', + gap_policy: 'skip', + unit: '1s', + }, + }, + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/memory.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/memory.ts new file mode 100644 index 0000000000000..175a9c7e96920 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/memory.ts @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { InfraNodeMetricFn, InfraNodeType } from '../adapter_types'; + +const FIELDS = { + [InfraNodeType.host]: 'system.memory.actual.used.pct', + [InfraNodeType.pod]: 'kubernetes.pod.memory.usage.node.pct', + [InfraNodeType.container]: 'docker.memory.usage.pct', +}; + +export const memory: InfraNodeMetricFn = (nodeType: InfraNodeType) => { + const field = FIELDS[nodeType]; + return { memory: { avg: { field } } }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/rate.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/rate.ts new file mode 100644 index 0000000000000..9a315a9145992 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/rate.ts @@ -0,0 +1,41 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeMetricFn, InfraNodeType } from '../adapter_types'; + +interface Fields { + [InfraNodeType.container]: string; + [InfraNodeType.pod]: string; + [InfraNodeType.host]: string; +} + +export const rate = (id: string, fields: Fields): InfraNodeMetricFn => ( + nodeType: InfraNodeType +) => { + const field = fields[nodeType]; + if (field) { + return { + [`${id}_max`]: { max: { field } }, + [`${id}_deriv`]: { + derivative: { + buckets_path: `${id}_max`, + gap_policy: 'skip', + unit: '1s', + }, + }, + [id]: { + bucket_script: { + buckets_path: { value: `${id}_deriv[normalized_value]` }, + script: { + source: 'params.value > 0.0 ? params.value : 0.0', + lang: 'painless', + }, + gap_policy: 'skip', + }, + }, + }; + } +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/rx.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/rx.ts new file mode 100644 index 0000000000000..ab797a7b97a1b --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/rx.ts @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +import { InfraNodeType } from '../adapter_types'; +import { rate } from './rate'; + +const FIELDS = { + [InfraNodeType.host]: 'system.network.in.bytes', + [InfraNodeType.pod]: 'kubernetes.pod.network.rx.bytes', + [InfraNodeType.container]: 'docker.network.in.bytes', +}; + +export const rx = rate('rx', FIELDS); diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/tx.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/tx.ts new file mode 100644 index 0000000000000..32ea4d3e9d303 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/metric_aggregation_creators/tx.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeType } from '../adapter_types'; +import { rate } from './rate'; + +const FIELDS = { + [InfraNodeType.host]: 'system.network.out.bytes', + [InfraNodeType.pod]: 'kubernetes.pod.network.tx.bytes', + [InfraNodeType.container]: 'docker.network.out.bytes', +}; + +export const tx = rate('tx', FIELDS); diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/field_filter_processor.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/field_filter_processor.ts new file mode 100644 index 0000000000000..0cd448d58b257 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/field_filter_processor.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cloneDeep, set } from 'lodash'; + +import { InfraESSearchBody, InfraProcesorRequestOptions } from '../../adapter_types'; + +export const fieldsFilterProcessor = (options: InfraProcesorRequestOptions) => { + return (doc: InfraESSearchBody) => { + const result = cloneDeep(doc); + /* + TODO: Need to add the filter logic to find all the fields the user is requesting + and then add an exists filter for each. That way we are only looking at documents + that have the correct fields. This is because we are having to run a partioned + terms agg at the top level. Normally we wouldn't need to do this because they would + get filter out natually. + */ + set(result, 'aggs.waffle.filter.match_all', {}); + return result; + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/group_by_processor.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/group_by_processor.ts new file mode 100644 index 0000000000000..0bd07cbeeb66e --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/group_by_processor.ts @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cloneDeep, set } from 'lodash'; + +import { InfraPathFilterInput, InfraPathInput } from '../../../../../../common/graphql/types'; +import { + InfraESQueryStringQuery, + InfraESSearchBody, + InfraProcesorRequestOptions, +} from '../../adapter_types'; +import { isGroupByFilters, isGroupByTerms } from '../../lib/type_guards'; + +export const groupByProcessor = (options: InfraProcesorRequestOptions) => { + return (doc: InfraESSearchBody) => { + const result = cloneDeep(doc); + const { groupBy } = options.nodeOptions; + let aggs = {}; + set(result, 'aggs.waffle.aggs.nodes.aggs', aggs); + groupBy.forEach((grouping: InfraPathInput, index: number) => { + if (isGroupByTerms(grouping)) { + const termsAgg = { + aggs: {}, + terms: { + field: grouping.field, + size: 10, + }, + }; + set(aggs, `path_${index}`, termsAgg); + aggs = termsAgg.aggs; + } + + if (grouping && isGroupByFilters(grouping)) { + const filtersAgg = { + aggs: {}, + filters: { + filters: grouping.filters!.map( + (filter: InfraPathFilterInput): InfraESQueryStringQuery => { + return { + query_string: { + analyze_wildcard: true, + query: (filter && filter.query) || '*', + }, + }; + } + ), + }, + }; + set(aggs, `${grouping.id}`, filtersAgg); + aggs = filtersAgg.aggs; + } + }); + return result; + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/nodes_processor.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/nodes_processor.ts new file mode 100644 index 0000000000000..b161e4b04b50e --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/nodes_processor.ts @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cloneDeep, set } from 'lodash'; + +import { InfraESSearchBody, InfraNodeType, InfraProcesorRequestOptions } from '../../adapter_types'; +import { NODE_REQUEST_PARTITION_FACTOR, NODE_REQUEST_PARTITION_SIZE } from '../../constants'; + +const nodeTypeToField = (options: InfraProcesorRequestOptions): string => { + const { fields } = options.nodeOptions.sourceConfiguration; + switch (options.nodeType) { + case InfraNodeType.pod: + return fields.pod; + case InfraNodeType.container: + return fields.container; + default: + return fields.host; + } +}; + +export const nodesProcessor = (options: InfraProcesorRequestOptions) => { + return (doc: InfraESSearchBody) => { + const result = cloneDeep(doc); + const field = nodeTypeToField(options); + + set(result, 'aggs.waffle.aggs.nodes.terms', { + field, + include: { + num_partitions: options.numberOfPartitions, + partition: options.partitionId, + }, + order: { _key: 'asc' }, + size: NODE_REQUEST_PARTITION_SIZE * NODE_REQUEST_PARTITION_FACTOR, + }); + return result; + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/query_procssor.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/query_procssor.ts new file mode 100644 index 0000000000000..cc35e93c73aa2 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/common/query_procssor.ts @@ -0,0 +1,19 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cloneDeep, set } from 'lodash'; + +import { InfraESSearchBody, InfraProcesorRequestOptions } from '../../adapter_types'; +import { createQuery } from '../../lib/create_query'; + +export const queryProcessor = (options: InfraProcesorRequestOptions) => { + return (doc: InfraESSearchBody) => { + const result = cloneDeep(doc); + set(result, 'size', 0); + set(result, 'query', createQuery(options.nodeOptions)); + return result; + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/date_histogram_processor.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/date_histogram_processor.ts new file mode 100644 index 0000000000000..31ef88ed3229c --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/date_histogram_processor.ts @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cloneDeep, set } from 'lodash'; +import moment from 'moment'; +import { InfraESSearchBody, InfraProcesorRequestOptions } from '../../adapter_types'; +import { createBasePath } from '../../lib/create_base_path'; +import { getBucketSizeInSeconds } from '../../lib/get_bucket_size_in_seconds'; + +export function getBucketKey(value: number, interval: number, offset = 0) { + return Math.floor((value - offset) / interval) * interval + offset; +} + +export const calculateOffsetInSeconds = (end: number, interval: number) => { + const bucketKey = getBucketKey(end, interval); + return Math.floor(end - interval - bucketKey); +}; + +export const dateHistogramProcessor = (options: InfraProcesorRequestOptions) => { + return (doc: InfraESSearchBody) => { + const result = cloneDeep(doc); + const { timerange, sourceConfiguration, groupBy } = options.nodeOptions; + const bucketSizeInSeconds = getBucketSizeInSeconds(timerange.interval); + const boundsMin = moment + .utc(timerange.from) + .subtract(5 * bucketSizeInSeconds, 's') + .valueOf(); + const path = createBasePath(groupBy).concat('timeseries'); + const bucketOffset = calculateOffsetInSeconds(timerange.from, bucketSizeInSeconds); + const offset = `${Math.floor(bucketOffset)}s`; + set(result, path, { + date_histogram: { + field: sourceConfiguration.fields.timestamp, + interval: timerange.interval, + min_doc_count: 0, + offset, + extended_bounds: { + min: boundsMin, + max: timerange.to, + }, + }, + aggs: {}, + }); + return result; + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/index.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/index.ts new file mode 100644 index 0000000000000..28fdb432ebe8e --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/index.ts @@ -0,0 +1,31 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { pipe } from 'lodash/fp'; +import { + InfraESSearchBody, + InfraProcesorRequestOptions, + InfraProcessorTransformer, +} from '../../adapter_types'; +import { fieldsFilterProcessor } from '../common/field_filter_processor'; +import { groupByProcessor } from '../common/group_by_processor'; +import { nodesProcessor } from '../common/nodes_processor'; +import { queryProcessor } from '../common/query_procssor'; +import { dateHistogramProcessor } from './date_histogram_processor'; +import { metricBucketsProcessor } from './metric_buckets_processor'; + +export const createLastNProcessor = ( + options: InfraProcesorRequestOptions +): InfraProcessorTransformer => { + return pipe( + fieldsFilterProcessor(options), + nodesProcessor(options), + queryProcessor(options), + groupByProcessor(options), + dateHistogramProcessor(options), + metricBucketsProcessor(options) + ); +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/metric_buckets_processor.ts b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/metric_buckets_processor.ts new file mode 100644 index 0000000000000..57e8cf6012617 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/nodes/processors/last/metric_buckets_processor.ts @@ -0,0 +1,22 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { cloneDeep, set } from 'lodash'; +import { InfraESSearchBody, InfraProcesorRequestOptions } from '../../adapter_types'; +import { createBasePath } from '../../lib/create_base_path'; +import { metricAggregationCreators } from '../../metric_aggregation_creators'; + +export const metricBucketsProcessor = (options: InfraProcesorRequestOptions) => { + return (doc: InfraESSearchBody) => { + const result = cloneDeep(doc); + const { metric, groupBy } = options.nodeOptions; + const path = createBasePath(groupBy).concat(['timeseries', 'aggs']); + const aggregationCreator = metricAggregationCreators[metric.type]; + const aggs = aggregationCreator(options.nodeType); + set(result, path, aggs); + return result; + }; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/source_status/elasticsearch_source_status_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/source_status/elasticsearch_source_status_adapter.ts new file mode 100644 index 0000000000000..5b5af97880659 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/source_status/elasticsearch_source_status_adapter.ts @@ -0,0 +1,57 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceStatusAdapter } from '../../source_status'; +import { + InfraBackendFrameworkAdapter, + InfraDatabaseGetIndicesResponse, + InfraFrameworkRequest, +} from '../framework'; + +export class InfraElasticsearchSourceStatusAdapter implements InfraSourceStatusAdapter { + constructor(private readonly framework: InfraBackendFrameworkAdapter) {} + + public async getIndexNames(request: InfraFrameworkRequest, aliasName: string) { + const indexMaps = await Promise.all([ + this.framework + .callWithRequest(request, 'indices.getAlias', { + name: aliasName, + filterPath: '*.settings.index.uuid', // to keep the response size as small as possible + }) + .catch(withDefaultIfNotFound({})), + this.framework + .callWithRequest(request, 'indices.get', { + index: aliasName, + filterPath: '*.settings.index.uuid', // to keep the response size as small as possible + }) + .catch(withDefaultIfNotFound({})), + ]); + + return indexMaps.reduce( + (indexNames, indexMap) => [...indexNames, ...Object.keys(indexMap)], + [] as string[] + ); + } + + public async hasAlias(request: InfraFrameworkRequest, aliasName: string) { + return await this.framework.callWithRequest(request, 'indices.existsAlias', { + name: aliasName, + }); + } + + public async hasIndices(request: InfraFrameworkRequest, indexNames: string) { + return (await this.getIndexNames(request, indexNames)).length > 0; + } +} + +const withDefaultIfNotFound = (defaultValue: DefaultValue) => ( + error: any +): DefaultValue => { + if (error && error.status === 404) { + return defaultValue; + } + throw error; +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/source_status/index.ts b/x-pack/plugins/infra/server/lib/adapters/source_status/index.ts new file mode 100644 index 0000000000000..f5adfe190f805 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/source_status/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { InfraElasticsearchSourceStatusAdapter } from './elasticsearch_source_status_adapter'; diff --git a/x-pack/plugins/infra/server/lib/adapters/sources/adapter_types.ts b/x-pack/plugins/infra/server/lib/adapters/sources/adapter_types.ts new file mode 100644 index 0000000000000..76f17f99acc71 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/sources/adapter_types.ts @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceConfiguration } from '../../sources'; + +export type PartialInfraSourceConfigurations = { + default?: PartialInfraDefaultSourceConfiguration; +} & { + [sourceId: string]: PartialInfraSourceConfiguration; +}; + +export type PartialInfraDefaultSourceConfiguration = { + fields?: Partial; +} & Partial>>; + +export type PartialInfraSourceConfiguration = { + fields?: Partial; +} & Pick>; diff --git a/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.test.ts b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.test.ts new file mode 100644 index 0000000000000..c5ba6aed8b591 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.test.ts @@ -0,0 +1,111 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraInmemoryConfigurationAdapter } from '../configuration/inmemory_configuration_adapter'; +import { PartialInfraSourceConfiguration } from './adapter_types'; +import { InfraConfigurationSourcesAdapter } from './configuration_sources_adapter'; + +describe('the InfraConfigurationSourcesAdapter', () => { + test('adds the default source when no sources are configured', async () => { + const sourcesAdapter = new InfraConfigurationSourcesAdapter( + new InfraInmemoryConfigurationAdapter({ sources: {} }) + ); + + expect(await sourcesAdapter.getAll()).toMatchObject({ + default: { + metricAlias: expect.any(String), + logAlias: expect.any(String), + fields: { + container: expect.any(String), + host: expect.any(String), + message: expect.arrayContaining([expect.any(String)]), + pod: expect.any(String), + tiebreaker: expect.any(String), + timestamp: expect.any(String), + }, + }, + }); + }); + + test('adds missing aliases to default source when they are missing from the configuration', async () => { + const sourcesAdapter = new InfraConfigurationSourcesAdapter( + new InfraInmemoryConfigurationAdapter({ + sources: { + default: {} as PartialInfraSourceConfiguration, + }, + }) + ); + + expect(await sourcesAdapter.getAll()).toMatchObject({ + default: { + metricAlias: expect.any(String), + logAlias: expect.any(String), + }, + }); + }); + + test('adds missing fields to default source when they are missing from the configuration', async () => { + const sourcesAdapter = new InfraConfigurationSourcesAdapter( + new InfraInmemoryConfigurationAdapter({ + sources: { + default: { + metricAlias: 'METRIC_ALIAS', + logAlias: 'LOG_ALIAS', + fields: { + container: 'DIFFERENT_CONTAINER_FIELD', + }, + } as PartialInfraSourceConfiguration, + }, + }) + ); + + expect(await sourcesAdapter.getAll()).toMatchObject({ + default: { + metricAlias: 'METRIC_ALIAS', + logAlias: 'LOG_ALIAS', + fields: { + container: 'DIFFERENT_CONTAINER_FIELD', + host: expect.any(String), + message: expect.arrayContaining([expect.any(String)]), + pod: expect.any(String), + tiebreaker: expect.any(String), + timestamp: expect.any(String), + }, + }, + }); + }); + + test('adds missing fields to non-default sources when they are missing from the configuration', async () => { + const sourcesAdapter = new InfraConfigurationSourcesAdapter( + new InfraInmemoryConfigurationAdapter({ + sources: { + sourceOne: { + metricAlias: 'METRIC_ALIAS', + logAlias: 'LOG_ALIAS', + fields: { + container: 'DIFFERENT_CONTAINER_FIELD', + }, + }, + }, + }) + ); + + expect(await sourcesAdapter.getAll()).toMatchObject({ + sourceOne: { + metricAlias: 'METRIC_ALIAS', + logAlias: 'LOG_ALIAS', + fields: { + container: 'DIFFERENT_CONTAINER_FIELD', + host: expect.any(String), + message: expect.arrayContaining([expect.any(String)]), + pod: expect.any(String), + tiebreaker: expect.any(String), + timestamp: expect.any(String), + }, + }, + }); + }); +}); diff --git a/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts new file mode 100644 index 0000000000000..4b8956b5f9985 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/sources/configuration_sources_adapter.ts @@ -0,0 +1,64 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraSourceConfigurations, InfraSourcesAdapter } from '../../sources'; +import { InfraConfigurationAdapter } from '../configuration'; +import { PartialInfraSourceConfigurations } from './adapter_types'; + +interface ConfigurationWithSources { + sources?: PartialInfraSourceConfigurations; +} + +export class InfraConfigurationSourcesAdapter implements InfraSourcesAdapter { + private readonly configuration: InfraConfigurationAdapter; + + constructor(configuration: InfraConfigurationAdapter) { + this.configuration = configuration; + } + + public async getAll() { + const sourceConfigurations = (await this.configuration.get()).sources || { + default: DEFAULT_SOURCE, + }; + const sourceConfigurationsWithDefault = { + ...sourceConfigurations, + default: { + ...DEFAULT_SOURCE, + ...(sourceConfigurations.default || {}), + }, + } as PartialInfraSourceConfigurations; + + return Object.entries(sourceConfigurationsWithDefault).reduce( + (result, [sourceId, sourceConfiguration]) => + ({ + ...result, + [sourceId]: { + ...sourceConfiguration, + fields: { + ...DEFAULT_FIELDS, + ...(sourceConfiguration.fields || {}), + }, + }, + } as InfraSourceConfigurations), + {} + ); + } +} + +const DEFAULT_FIELDS = { + container: 'docker.container.name', + host: 'beat.hostname', + message: ['message', '@message'], + pod: 'kubernetes.pod.name', + tiebreaker: '_doc', + timestamp: '@timestamp', +}; + +const DEFAULT_SOURCE = { + metricAlias: 'metricbeat-*', + logAlias: 'filebeat-*', + fields: DEFAULT_FIELDS, +}; diff --git a/x-pack/plugins/infra/server/lib/adapters/sources/index.ts b/x-pack/plugins/infra/server/lib/adapters/sources/index.ts new file mode 100644 index 0000000000000..dcd9262d7ebd2 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/adapters/sources/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { InfraConfigurationSourcesAdapter } from './configuration_sources_adapter'; diff --git a/x-pack/plugins/infra/server/lib/compose/kibana.ts b/x-pack/plugins/infra/server/lib/compose/kibana.ts new file mode 100644 index 0000000000000..23c5c3a45bd23 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/compose/kibana.ts @@ -0,0 +1,58 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Server } from 'hapi'; + +import { ElasticsearchCapabilitiesAdapter } from '../adapters/capabilities/elasticsearch_capabilities_adapter'; +import { InfraKibanaConfigurationAdapter } from '../adapters/configuration/kibana_configuration_adapter'; +import { FrameworkFieldsAdapter } from '../adapters/fields/framework_fields_adapter'; +import { InfraKibanaBackendFrameworkAdapter } from '../adapters/framework/kibana_framework_adapter'; +import { InfraKibanaLogEntriesAdapter } from '../adapters/log_entries/kibana_log_entries_adapter'; +import { KibanaMetricsAdapter } from '../adapters/metrics/kibana_metrics_adapter'; +import { ElasticsearchNodesAdapter } from '../adapters/nodes/elasticsearch_nodes_adapter'; +import { InfraElasticsearchSourceStatusAdapter } from '../adapters/source_status'; +import { InfraConfigurationSourcesAdapter } from '../adapters/sources/configuration_sources_adapter'; +import { InfraCapabilitiesDomain } from '../domains/capabilities_domain'; +import { InfraFieldsDomain } from '../domains/fields_domain'; +import { InfraLogEntriesDomain } from '../domains/log_entries_domain'; +import { InfraMetricsDomain } from '../domains/metrics_domain'; +import { InfraNodesDomain } from '../domains/nodes_domain'; +import { InfraBackendLibs, InfraConfiguration, InfraDomainLibs } from '../infra_types'; +import { InfraSourceStatus } from '../source_status'; +import { InfraSources } from '../sources'; + +export function compose(server: Server): InfraBackendLibs { + const configuration = new InfraKibanaConfigurationAdapter(server); + const framework = new InfraKibanaBackendFrameworkAdapter(server); + const sources = new InfraSources(new InfraConfigurationSourcesAdapter(configuration)); + const sourceStatus = new InfraSourceStatus(new InfraElasticsearchSourceStatusAdapter(framework), { + sources, + }); + + const domainLibs: InfraDomainLibs = { + capabilities: new InfraCapabilitiesDomain(new ElasticsearchCapabilitiesAdapter(framework), { + sources, + }), + fields: new InfraFieldsDomain(new FrameworkFieldsAdapter(framework), { + sources, + }), + logEntries: new InfraLogEntriesDomain(new InfraKibanaLogEntriesAdapter(framework), { + sources, + }), + nodes: new InfraNodesDomain(new ElasticsearchNodesAdapter(framework)), + metrics: new InfraMetricsDomain(new KibanaMetricsAdapter(framework)), + }; + + const libs: InfraBackendLibs = { + configuration, + framework, + sources, + sourceStatus, + ...domainLibs, + }; + + return libs; +} diff --git a/x-pack/plugins/infra/server/lib/domains/capabilities_domain/capabilities_domain.ts b/x-pack/plugins/infra/server/lib/domains/capabilities_domain/capabilities_domain.ts new file mode 100644 index 0000000000000..2b3f73a9eccf7 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/capabilities_domain/capabilities_domain.ts @@ -0,0 +1,69 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraCapabilitiesAdapter } from '../../adapters/capabilities'; +import { InfraCapabilityAggregationBucket, InfraFrameworkRequest } from '../../adapters/framework'; +import { InfraSources } from '../../sources'; + +export class InfraCapabilitiesDomain { + constructor( + private readonly adapter: InfraCapabilitiesAdapter, + private readonly libs: { sources: InfraSources } + ) {} + + public async getCapabilities( + req: InfraFrameworkRequest, + sourceId: string, + nodeName: string, + nodeType: string + ) { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const metricsPromise = this.adapter.getMetricCapabilities( + req, + sourceConfiguration, + nodeName, + nodeType + ); + const logsPromise = this.adapter.getLogCapabilities( + req, + sourceConfiguration, + nodeName, + nodeType + ); + + const metrics = await metricsPromise; + const logs = await logsPromise; + + const metricCapabilities = pickCapabilities(metrics).map(metricCapability => { + return { name: metricCapability, source: 'metrics' }; + }); + + const logCapabilities = pickCapabilities(logs).map(logCapability => { + return { name: logCapability, source: 'logs' }; + }); + + return metricCapabilities.concat(logCapabilities); + } +} + +const pickCapabilities = (buckets: InfraCapabilityAggregationBucket[]): string[] => { + if (buckets) { + const capabilities = buckets + .map(module => { + if (module.names) { + return module.names.buckets.map(name => { + return `${module.key}.${name.key}`; + }); + } else { + return []; + } + }) + .reduce((a: string[], b: string[]) => a.concat(b), []); + return capabilities; + } else { + return []; + } +}; diff --git a/x-pack/plugins/infra/server/lib/domains/capabilities_domain/index.ts b/x-pack/plugins/infra/server/lib/domains/capabilities_domain/index.ts new file mode 100644 index 0000000000000..525e60a00f786 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/capabilities_domain/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './capabilities_domain'; diff --git a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts new file mode 100644 index 0000000000000..2b6f29e0d6e20 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraIndexField, InfraIndexType } from '../../../common/graphql/types'; +import { FieldsAdapter } from '../adapters/fields'; +import { InfraFrameworkRequest } from '../adapters/framework'; +import { InfraSources } from '../sources'; + +export class InfraFieldsDomain { + constructor( + private readonly adapter: FieldsAdapter, + private readonly libs: { sources: InfraSources } + ) {} + + public async getFields( + request: InfraFrameworkRequest, + sourceId: string, + indexType: InfraIndexType + ): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const includeMetricIndices = [InfraIndexType.ANY, InfraIndexType.METRICS].includes(indexType); + const includeLogIndices = [InfraIndexType.ANY, InfraIndexType.LOGS].includes(indexType); + + const fields = await this.adapter.getIndexFields(request, [ + ...(includeMetricIndices ? [sourceConfiguration.metricAlias] : []), + ...(includeLogIndices ? [sourceConfiguration.logAlias] : []), + ]); + + return fields; + } +} diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_apache2.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_apache2.ts new file mode 100644 index 0000000000000..cdb2ad32267ca --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_apache2.ts @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const filebeatApache2Rules = [ + { + when: { + exists: ['apache2.access'], + }, + format: [ + { + constant: 'apache2', + }, + { + constant: ' ', + }, + { + field: 'apache2.access.remote_ip', + }, + { + constant: ' ', + }, + { + field: 'apache2.access.user_name', + }, + { + constant: ' "', + }, + { + field: 'apache2.access.method', + }, + { + constant: ' ', + }, + { + field: 'apache2.access.url', + }, + { + constant: ' HTTP/', + }, + { + field: 'apache2.access.http_version', + }, + { + constant: '" ', + }, + { + field: 'apache2.access.response_code', + }, + { + constant: ' ', + }, + { + field: 'apache2.access.body_sent.bytes', + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_nginx.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_nginx.ts new file mode 100644 index 0000000000000..d44fe4924490b --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_nginx.ts @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const filebeatNginxRules = [ + { + when: { + exists: ['nginx.access'], + }, + format: [ + { + constant: 'nginx', + }, + { + constant: ' ', + }, + { + field: 'nginx.access.remote_ip', + }, + { + constant: ' ', + }, + { + field: 'nginx.access.user_name', + }, + { + constant: ' "', + }, + { + field: 'nginx.access.method', + }, + { + constant: ' ', + }, + { + field: 'nginx.access.url', + }, + { + constant: ' HTTP/', + }, + { + field: 'nginx.access.http_version', + }, + { + constant: '" ', + }, + { + field: 'nginx.access.response_code', + }, + { + constant: ' ', + }, + { + field: 'nginx.access.body_sent.bytes', + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_redis.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_redis.ts new file mode 100644 index 0000000000000..e842a54457769 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_redis.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const filebeatRedisRules = [ + { + when: { + exists: ['redis.log.message'], + }, + format: [ + { + constant: 'redis', + }, + { + constant: ' ', + }, + { + field: 'redis.log.message', + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_system.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_system.ts new file mode 100644 index 0000000000000..0a84720fc8cfb --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/filebeat_system.ts @@ -0,0 +1,72 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const filebeatSystemRules = [ + { + when: { + exists: ['system.syslog.message'], + }, + format: [ + { + field: 'system.syslog.message', + }, + ], + }, + { + when: { + exists: ['system.auth.message'], + }, + format: [ + { + field: 'system.auth.message', + }, + ], + }, + { + when: { + exists: ['system.auth.ssh.event'], + }, + format: [ + { + constant: 'ssh', + }, + { + constant: ' ', + }, + { + field: 'system.auth.ssh.event', + }, + { + constant: ' user ', + }, + { + field: 'system.auth.user', + }, + { + constant: ' from ', + }, + { + field: 'system.auth.ssh.ip', + }, + ], + }, + { + when: { + exists: ['system.auth.ssh.dropped_ip'], + }, + format: [ + { + constant: 'ssh', + }, + { + constant: ' Dropped connection from ', + }, + { + field: 'system.auth.ssh.dropped_ip', + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/generic.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/generic.ts new file mode 100644 index 0000000000000..bd0e51d5c8d30 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/generic.ts @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const genericRules = [ + { + when: { + exists: ['message'], + }, + format: [ + { + field: 'message', + }, + ], + }, + { + when: { + exists: ['@message'], + }, + format: [ + { + field: '@message', + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/index.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/index.ts new file mode 100644 index 0000000000000..2e0c5ac1a9ac6 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/builtin_rules/index.ts @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { filebeatApache2Rules } from './filebeat_apache2'; +import { filebeatNginxRules } from './filebeat_nginx'; +import { filebeatRedisRules } from './filebeat_redis'; +import { filebeatSystemRules } from './filebeat_system'; +import { genericRules } from './generic'; + +export const builtinRules = [ + ...filebeatApache2Rules, + ...filebeatNginxRules, + ...filebeatRedisRules, + ...filebeatSystemRules, + ...genericRules, + { + when: { + exists: ['source'], + }, + format: [ + { + constant: 'failed to format message from ', + }, + { + field: 'source', + }, + ], + }, + { + when: { + exists: [], + }, + format: [ + { + constant: 'failed to find message', + }, + ], + }, +]; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/index.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/index.ts new file mode 100644 index 0000000000000..2cb8140febdcd --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/index.ts @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export * from './log_entries_domain'; diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts new file mode 100644 index 0000000000000..27663abdecada --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/log_entries_domain.ts @@ -0,0 +1,186 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { + InfraLogEntry, + InfraLogMessageSegment, + InfraLogSummaryBucket, +} from '../../../../common/graphql/types'; +import { TimeKey } from '../../../../common/time'; +import { JsonObject } from '../../../../common/typed_json'; +import { InfraDateRangeAggregationBucket, InfraFrameworkRequest } from '../../adapters/framework'; +import { InfraSourceConfiguration, InfraSources } from '../../sources'; +import { builtinRules } from './builtin_rules'; +import { compileFormattingRules } from './message'; + +export class InfraLogEntriesDomain { + constructor( + private readonly adapter: LogEntriesAdapter, + private readonly libs: { sources: InfraSources } + ) {} + + public async getLogEntriesAround( + request: InfraFrameworkRequest, + sourceId: string, + key: TimeKey, + maxCountBefore: number, + maxCountAfter: number, + filterQuery?: LogEntryQuery, + highlightQuery?: string + ): Promise<{ entriesBefore: InfraLogEntry[]; entriesAfter: InfraLogEntry[] }> { + if (maxCountBefore <= 0 && maxCountAfter <= 0) { + return { + entriesBefore: [], + entriesAfter: [], + }; + } + + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const formattingRules = compileFormattingRules(builtinRules); + + const documentsBefore = await this.adapter.getAdjacentLogEntryDocuments( + request, + sourceConfiguration, + formattingRules.requiredFields, + key, + 'desc', + Math.max(maxCountBefore, 1), + filterQuery, + highlightQuery + ); + const lastKeyBefore = + documentsBefore.length > 0 + ? documentsBefore[documentsBefore.length - 1].key + : { + time: key.time - 1, + tiebreaker: 0, + }; + + const documentsAfter = await this.adapter.getAdjacentLogEntryDocuments( + request, + sourceConfiguration, + formattingRules.requiredFields, + lastKeyBefore, + 'asc', + maxCountAfter, + filterQuery, + highlightQuery + ); + + return { + entriesBefore: (maxCountBefore > 0 ? documentsBefore : []).map( + convertLogDocumentToEntry(sourceId, formattingRules.format) + ), + entriesAfter: documentsAfter.map(convertLogDocumentToEntry(sourceId, formattingRules.format)), + }; + } + + public async getLogEntriesBetween( + request: InfraFrameworkRequest, + sourceId: string, + startKey: TimeKey, + endKey: TimeKey, + filterQuery?: LogEntryQuery, + highlightQuery?: string + ): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const formattingRules = compileFormattingRules(builtinRules); + const documents = await this.adapter.getContainedLogEntryDocuments( + request, + sourceConfiguration, + formattingRules.requiredFields, + startKey, + endKey, + filterQuery, + highlightQuery + ); + const entries = documents.map(convertLogDocumentToEntry(sourceId, formattingRules.format)); + return entries; + } + + public async getLogSummaryBucketsBetween( + request: InfraFrameworkRequest, + sourceId: string, + start: number, + end: number, + bucketSize: number, + filterQuery?: LogEntryQuery + ): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const dateRangeBuckets = await this.adapter.getContainedLogSummaryBuckets( + request, + sourceConfiguration, + start, + end, + bucketSize, + filterQuery + ); + const buckets = dateRangeBuckets.map(convertDateRangeBucketToSummaryBucket); + return buckets; + } +} + +export interface LogEntriesAdapter { + getAdjacentLogEntryDocuments( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + fields: string[], + start: TimeKey, + direction: 'asc' | 'desc', + maxCount: number, + filterQuery?: LogEntryQuery, + highlightQuery?: string + ): Promise; + + getContainedLogEntryDocuments( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + fields: string[], + start: TimeKey, + end: TimeKey, + filterQuery?: LogEntryQuery, + highlightQuery?: string + ): Promise; + + getContainedLogSummaryBuckets( + request: InfraFrameworkRequest, + sourceConfiguration: InfraSourceConfiguration, + start: number, + end: number, + bucketSize: number, + filterQuery?: LogEntryQuery + ): Promise; +} + +export type LogEntryQuery = JsonObject; + +export interface LogEntryDocument { + fields: LogEntryDocumentFields; + gid: string; + key: TimeKey; +} + +export interface LogEntryDocumentFields { + [fieldName: string]: string | number | null; +} + +const convertLogDocumentToEntry = ( + sourceId: string, + formatMessage: (fields: LogEntryDocumentFields) => InfraLogMessageSegment[] +) => (document: LogEntryDocument): InfraLogEntry => ({ + key: document.key, + gid: document.gid, + source: sourceId, + message: formatMessage(document.fields), +}); + +const convertDateRangeBucketToSummaryBucket = ( + bucket: InfraDateRangeAggregationBucket +): InfraLogSummaryBucket => ({ + entriesCount: bucket.doc_count, + start: bucket.from || 0, + end: bucket.to || 0, +}); diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts new file mode 100644 index 0000000000000..b97c2704cdfba --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/message.ts @@ -0,0 +1,201 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraLogMessageSegment } from '../../../../common/graphql/types'; + +export function compileFormattingRules(rules: LogMessageFormattingRule[]) { + const compiledRules = rules.map(compileRule); + + return { + requiredFields: Array.from( + new Set( + compiledRules.reduce( + (combinedRequiredFields, { requiredFields }) => [ + ...combinedRequiredFields, + ...requiredFields, + ], + [] as string[] + ) + ) + ), + format: (fields: Fields): InfraLogMessageSegment[] => { + for (const compiledRule of compiledRules) { + if (compiledRule.fulfillsCondition(fields)) { + return compiledRule.format(fields); + } + } + + return []; + }, + }; +} + +const compileRule = (rule: LogMessageFormattingRule): CompiledLogMessageFormattingRule => { + const { conditionFields, fulfillsCondition } = compileCondition(rule.when); + const { formattingFields, format } = compileFormattingInstructions(rule.format); + + return { + requiredFields: [...conditionFields, ...formattingFields], + fulfillsCondition, + format, + }; +}; + +const compileCondition = ( + condition: LogMessageFormattingCondition +): CompiledLogMessageFormattingCondition => + [compileExistsCondition, compileFieldValueCondition].reduce( + (compiledCondition, compile) => compile(condition) || compiledCondition, + catchAllCondition + ); + +const catchAllCondition: CompiledLogMessageFormattingCondition = { + conditionFields: [] as string[], + fulfillsCondition: (fields: Fields) => false, +}; + +const compileExistsCondition = (condition: LogMessageFormattingCondition) => + 'exists' in condition + ? { + conditionFields: condition.exists, + fulfillsCondition: (fields: Fields) => + condition.exists.every(fieldName => fieldName in fields), + } + : null; + +const compileFieldValueCondition = (condition: LogMessageFormattingCondition) => + 'values' in condition + ? { + conditionFields: Object.keys(condition.values), + fulfillsCondition: (fields: Fields) => + Object.entries(condition.values).every( + ([fieldName, expectedValue]) => fields[fieldName] === expectedValue + ), + } + : null; + +const compileFormattingInstructions = ( + formattingInstructions: LogMessageFormattingInstruction[] +): CompiledLogMessageFormattingInstruction => + formattingInstructions.reduce( + (combinedFormattingInstructions, formattingInstruction) => { + const compiledFormattingInstruction = compileFormattingInstruction(formattingInstruction); + + return { + formattingFields: [ + ...combinedFormattingInstructions.formattingFields, + ...compiledFormattingInstruction.formattingFields, + ], + format: (fields: Fields) => [ + ...combinedFormattingInstructions.format(fields), + ...compiledFormattingInstruction.format(fields), + ], + }; + }, + { + formattingFields: [], + format: (fields: Fields) => [], + } as CompiledLogMessageFormattingInstruction + ); + +const compileFormattingInstruction = ( + formattingInstruction: LogMessageFormattingInstruction +): CompiledLogMessageFormattingInstruction => + [compileFieldReferenceFormattingInstruction, compileConstantFormattingInstruction].reduce( + (compiledFormattingInstruction, compile) => + compile(formattingInstruction) || compiledFormattingInstruction, + catchAllFormattingInstruction + ); + +const catchAllFormattingInstruction: CompiledLogMessageFormattingInstruction = { + formattingFields: [], + format: (fields: Fields) => [ + { + constant: 'invalid format', + }, + ], +}; + +const compileFieldReferenceFormattingInstruction = ( + formattingInstruction: LogMessageFormattingInstruction +): CompiledLogMessageFormattingInstruction | null => + 'field' in formattingInstruction + ? { + formattingFields: [formattingInstruction.field], + format: (fields: Fields) => [ + { + field: formattingInstruction.field, + value: `${fields[formattingInstruction.field]}`, + highlights: [], + }, + ], + } + : null; + +const compileConstantFormattingInstruction = ( + formattingInstruction: LogMessageFormattingInstruction +): CompiledLogMessageFormattingInstruction | null => + 'constant' in formattingInstruction + ? { + formattingFields: [] as string[], + format: (fields: Fields) => [ + { + constant: formattingInstruction.constant, + }, + ], + } + : null; + +interface Fields { + [fieldName: string]: string | number | boolean | null; +} + +interface LogMessageFormattingRule { + when: LogMessageFormattingCondition; + format: LogMessageFormattingInstruction[]; +} + +type LogMessageFormattingCondition = + | LogMessageFormattingExistsCondition + | LogMessageFormattingFieldValueCondition; + +interface LogMessageFormattingExistsCondition { + exists: string[]; +} + +interface LogMessageFormattingFieldValueCondition { + values: { + [fieldName: string]: string | number | boolean | null; + }; +} + +type LogMessageFormattingInstruction = + | LogMessageFormattingFieldReference + | LogMessageFormattingConstant; + +interface LogMessageFormattingFieldReference { + field: string; +} + +interface LogMessageFormattingConstant { + constant: string; +} + +interface CompiledLogMessageFormattingRule { + requiredFields: string[]; + fulfillsCondition(fields: Fields): boolean; + format(fields: Fields): InfraLogMessageSegment[]; +} + +interface CompiledLogMessageFormattingCondition { + conditionFields: string[]; + fulfillsCondition(fields: Fields): boolean; +} + +interface CompiledLogMessageFormattingInstruction { + formattingFields: string[]; + format(fields: Fields): InfraLogMessageSegment[]; +} diff --git a/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts b/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts new file mode 100644 index 0000000000000..522298579a5c4 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/metrics_domain.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraMetricData } from '../../../common/graphql/types'; +import { InfraFrameworkRequest } from '../adapters/framework/adapter_types'; +import { InfraMetricsAdapter, InfraMetricsRequestOptions } from '../adapters/metrics/adapter_types'; + +export class InfraMetricsDomain { + private adapter: InfraMetricsAdapter; + + constructor(adapter: InfraMetricsAdapter) { + this.adapter = adapter; + } + + public async getMetrics( + req: InfraFrameworkRequest, + options: InfraMetricsRequestOptions + ): Promise { + return await this.adapter.getMetrics(req, options); + } +} diff --git a/x-pack/plugins/infra/server/lib/domains/nodes_domain.ts b/x-pack/plugins/infra/server/lib/domains/nodes_domain.ts new file mode 100644 index 0000000000000..4c6d990dbeb95 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/domains/nodes_domain.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNode } from '../../../common/graphql/types'; +import { InfraFrameworkRequest } from '../adapters/framework'; +import { InfraNodeRequestOptions, InfraNodesAdapter } from '../adapters/nodes'; + +export class InfraNodesDomain { + private adapter: InfraNodesAdapter; + + constructor(adapter: InfraNodesAdapter) { + this.adapter = adapter; + } + + public async getNodes( + req: InfraFrameworkRequest, + options: InfraNodeRequestOptions + ): Promise { + return await this.adapter.getNodes(req, options); + } +} diff --git a/x-pack/plugins/infra/server/lib/infra_types.ts b/x-pack/plugins/infra/server/lib/infra_types.ts new file mode 100644 index 0000000000000..2a24a65daf8d6 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/infra_types.ts @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraConfigurationAdapter } from './adapters/configuration'; +import { InfraBackendFrameworkAdapter, InfraFrameworkRequest } from './adapters/framework'; +import { InfraCapabilitiesDomain } from './domains/capabilities_domain'; +import { InfraFieldsDomain } from './domains/fields_domain'; +import { InfraLogEntriesDomain } from './domains/log_entries_domain'; +import { InfraMetricsDomain } from './domains/metrics_domain'; +import { InfraNodesDomain } from './domains/nodes_domain'; +import { InfraSourceStatus } from './source_status'; +import { InfraSourceConfigurations, InfraSources } from './sources'; + +export interface InfraDomainLibs { + capabilities: InfraCapabilitiesDomain; + fields: InfraFieldsDomain; + logEntries: InfraLogEntriesDomain; + nodes: InfraNodesDomain; + metrics: InfraMetricsDomain; +} + +export interface InfraBackendLibs extends InfraDomainLibs { + configuration: InfraConfigurationAdapter; + framework: InfraBackendFrameworkAdapter; + sources: InfraSources; + sourceStatus: InfraSourceStatus; +} + +export interface InfraConfiguration { + enabled: boolean; + query: { + partitionSize: number; + partitionFactor: number; + }; + sources: InfraSourceConfigurations; +} + +export interface InfraContext { + req: InfraFrameworkRequest; +} diff --git a/x-pack/plugins/infra/server/lib/source_status.ts b/x-pack/plugins/infra/server/lib/source_status.ts new file mode 100644 index 0000000000000..1d161135b1ed8 --- /dev/null +++ b/x-pack/plugins/infra/server/lib/source_status.ts @@ -0,0 +1,61 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraFrameworkRequest } from './adapters/framework'; +import { InfraSources } from './sources'; + +export class InfraSourceStatus { + constructor( + private readonly adapter: InfraSourceStatusAdapter, + private readonly libs: { sources: InfraSources } + ) {} + + public async getLogIndexNames( + request: InfraFrameworkRequest, + sourceId: string + ): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const indexNames = await this.adapter.getIndexNames(request, sourceConfiguration.logAlias); + return indexNames; + } + public async getMetricIndexNames( + request: InfraFrameworkRequest, + sourceId: string + ): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const indexNames = await this.adapter.getIndexNames(request, sourceConfiguration.metricAlias); + return indexNames; + } + public async hasLogAlias(request: InfraFrameworkRequest, sourceId: string): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const hasAlias = await this.adapter.hasAlias(request, sourceConfiguration.logAlias); + return hasAlias; + } + public async hasMetricAlias(request: InfraFrameworkRequest, sourceId: string): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const hasAlias = await this.adapter.hasAlias(request, sourceConfiguration.metricAlias); + return hasAlias; + } + public async hasLogIndices(request: InfraFrameworkRequest, sourceId: string): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const hasIndices = await this.adapter.hasIndices(request, sourceConfiguration.logAlias); + return hasIndices; + } + public async hasMetricIndices( + request: InfraFrameworkRequest, + sourceId: string + ): Promise { + const sourceConfiguration = await this.libs.sources.getConfiguration(sourceId); + const hasIndices = await this.adapter.hasIndices(request, sourceConfiguration.metricAlias); + return hasIndices; + } +} + +export interface InfraSourceStatusAdapter { + getIndexNames(request: InfraFrameworkRequest, aliasName: string): Promise; + hasAlias(request: InfraFrameworkRequest, aliasName: string): Promise; + hasIndices(request: InfraFrameworkRequest, indexNames: string): Promise; +} diff --git a/x-pack/plugins/infra/server/lib/sources.ts b/x-pack/plugins/infra/server/lib/sources.ts new file mode 100644 index 0000000000000..4bf9ce6c61f0e --- /dev/null +++ b/x-pack/plugins/infra/server/lib/sources.ts @@ -0,0 +1,45 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export class InfraSources { + constructor(private readonly adapter: InfraSourcesAdapter) {} + + public async getConfiguration(sourceId: string) { + const sourceConfigurations = await this.getAllConfigurations(); + const requestedSourceConfiguration = sourceConfigurations[sourceId]; + + if (!requestedSourceConfiguration) { + throw new Error(`Failed to find source '${sourceId}'`); + } + + return requestedSourceConfiguration; + } + + public getAllConfigurations() { + return this.adapter.getAll(); + } +} + +export interface InfraSourcesAdapter { + getAll(): Promise; +} + +export interface InfraSourceConfigurations { + [sourceId: string]: InfraSourceConfiguration; +} + +export interface InfraSourceConfiguration { + metricAlias: string; + logAlias: string; + fields: { + container: string; + host: string; + message: string[]; + pod: string; + tiebreaker: string; + timestamp: string; + }; +} diff --git a/x-pack/plugins/infra/server/logging_legacy/adjacent_search_results.ts b/x-pack/plugins/infra/server/logging_legacy/adjacent_search_results.ts new file mode 100644 index 0000000000000..7d757329b7ca7 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/adjacent_search_results.ts @@ -0,0 +1,189 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as Boom from 'boom'; +import { SearchParams } from 'elasticsearch'; +import * as Joi from 'joi'; + +import { + AdjacentSearchResultsApiPostPayload, + AdjacentSearchResultsApiPostResponse, +} from '../../common/http_api'; +import { LogEntryFieldsMapping, LogEntryTime } from '../../common/log_entry'; +import { SearchResult } from '../../common/log_search_result'; +import { + InfraBackendFrameworkAdapter, + InfraDatabaseSearchResponse, + InfraWrappableRequest, +} from '../lib/adapters/framework'; +import { convertHitToSearchResult } from './converters'; +import { isHighlightedHit, SortedHit } from './elasticsearch'; +import { fetchLatestTime } from './latest_log_entries'; +import { indicesSchema, logEntryFieldsMappingSchema, logEntryTimeSchema } from './schemas'; + +const INITIAL_HORIZON_OFFSET = 1000 * 60 * 60 * 24; +const MAX_HORIZON = 9999999999999; + +export const initAdjacentSearchResultsRoutes = (framework: InfraBackendFrameworkAdapter) => { + const callWithRequest = framework.callWithRequest; + + framework.registerRoute< + InfraWrappableRequest, + Promise + >({ + options: { + validate: { + payload: Joi.object().keys({ + after: Joi.number() + .min(0) + .default(0), + before: Joi.number() + .min(0) + .default(0), + fields: logEntryFieldsMappingSchema.required(), + indices: indicesSchema.required(), + query: Joi.string().required(), + target: logEntryTimeSchema.required(), + }), + }, + }, + handler: async (request, h) => { + const timings = { + esRequestSent: Date.now(), + esResponseProcessed: 0, + }; + + try { + const search = (params: SearchParams) => + callWithRequest(request, 'search', params); + + const latestTime = await fetchLatestTime( + search, + request.payload.indices, + request.payload.fields.time + ); + const searchResultsAfterTarget = await fetchSearchResults( + search, + request.payload.indices, + request.payload.fields, + { + tiebreaker: request.payload.target.tiebreaker - 1, + time: request.payload.target.time, + }, + request.payload.after, + 'asc', + request.payload.query, + request.payload.target.time + INITIAL_HORIZON_OFFSET, + latestTime + ); + const searchResultsBeforeTarget = (await fetchSearchResults( + search, + request.payload.indices, + request.payload.fields, + request.payload.target, + request.payload.before, + 'desc', + request.payload.query, + request.payload.target.time - INITIAL_HORIZON_OFFSET + )).reverse(); + + timings.esResponseProcessed = Date.now(); + + return { + results: { + after: searchResultsAfterTarget, + before: searchResultsBeforeTarget, + }, + timings, + }; + } catch (requestError) { + throw Boom.boomify(requestError); + } + }, + method: 'POST', + path: '/api/logging/adjacent-search-results', + }); +}; + +export async function fetchSearchResults( + search: (params: SearchParams) => Promise>, + indices: string[], + fields: LogEntryFieldsMapping, + target: LogEntryTime, + size: number, + direction: 'asc' | 'desc', + query: string, + horizon: number, + maxHorizon: number = MAX_HORIZON +): Promise { + if (size <= 0) { + return []; + } + + const request = { + allowNoIndices: true, + body: { + _source: false, + highlight: { + boundary_scanner: 'word', + fields: { + [fields.message]: {}, + }, + fragment_size: 1, + number_of_fragments: 100, + post_tags: [''], + pre_tags: [''], + }, + query: { + bool: { + filter: [ + { + query_string: { + default_field: fields.message, + default_operator: 'AND', + query, + }, + }, + { + range: { + [fields.time]: { + [direction === 'asc' ? 'gte' : 'lte']: target.time, + [direction === 'asc' ? 'lte' : 'gte']: horizon, + }, + }, + }, + ], + }, + }, + search_after: [target.time, target.tiebreaker], + size, + sort: [{ [fields.time]: direction }, { [fields.tiebreaker]: direction }], + }, + ignoreUnavailable: true, + index: indices, + }; + const response = await search(request); + + const hits = response.hits.hits as SortedHit[]; + const nextHorizon = horizon + (horizon - target.time); + + if (hits.length >= size || nextHorizon < 0 || nextHorizon > maxHorizon) { + const filteredHits = hits.filter(isHighlightedHit); + return filteredHits.map(convertHitToSearchResult(fields)); + } else { + return fetchSearchResults( + search, + indices, + fields, + target, + size, + direction, + query, + nextHorizon, + maxHorizon + ); + } +} diff --git a/x-pack/plugins/infra/server/logging_legacy/contained_search_results.ts b/x-pack/plugins/infra/server/logging_legacy/contained_search_results.ts new file mode 100644 index 0000000000000..dbd8b1f4202dd --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/contained_search_results.ts @@ -0,0 +1,135 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as Boom from 'boom'; +import { SearchParams } from 'elasticsearch'; +import * as Joi from 'joi'; + +import { + ContainedSearchResultsApiPostPayload, + ContainedSearchResultsApiPostResponse, +} from '../../common/http_api'; +import { isLessOrEqual, LogEntryFieldsMapping, LogEntryTime } from '../../common/log_entry'; +import { SearchResult } from '../../common/log_search_result'; +import { + InfraBackendFrameworkAdapter, + InfraDatabaseSearchResponse, + InfraWrappableRequest, +} from '../lib/adapters/framework'; +import { convertHitToSearchResult } from './converters'; +import { isHighlightedHit, SortedHit } from './elasticsearch'; +import { indicesSchema, logEntryFieldsMappingSchema, logEntryTimeSchema } from './schemas'; + +export const initContainedSearchResultsRoutes = (framework: InfraBackendFrameworkAdapter) => { + const callWithRequest = framework.callWithRequest; + + framework.registerRoute< + InfraWrappableRequest, + Promise + >({ + options: { + validate: { + payload: Joi.object().keys({ + end: logEntryTimeSchema.required(), + fields: logEntryFieldsMappingSchema.required(), + indices: indicesSchema.required(), + query: Joi.string().required(), + start: logEntryTimeSchema.required(), + }), + }, + }, + handler: async request => { + const timings = { + esRequestSent: Date.now(), + esResponseProcessed: 0, + }; + + try { + const search = (params: SearchParams) => + callWithRequest(request, 'search', params); + + const searchResults = await fetchSearchResultsBetween( + search, + request.payload.indices, + request.payload.fields, + request.payload.start, + request.payload.end, + request.payload.query + ); + + timings.esResponseProcessed = Date.now(); + + return { + results: searchResults, + timings, + }; + } catch (requestError) { + throw Boom.boomify(requestError); + } + }, + method: 'POST', + path: '/api/logging/contained-search-results', + }); +}; + +export async function fetchSearchResultsBetween( + search: (params: SearchParams) => Promise>, + indices: string[], + fields: LogEntryFieldsMapping, + start: LogEntryTime, + end: LogEntryTime, + query: string +): Promise { + const request = { + allowNoIndices: true, + body: { + _source: false, + highlight: { + boundary_scanner: 'word', + fields: { + [fields.message]: {}, + }, + fragment_size: 1, + number_of_fragments: 100, + post_tags: [''], + pre_tags: [''], + }, + query: { + bool: { + filter: [ + { + query_string: { + default_field: fields.message, + default_operator: 'AND', + query, + }, + }, + { + range: { + [fields.time]: { + gte: start.time, + lte: end.time, + }, + }, + }, + ], + }, + }, + search_after: [start.time, start.tiebreaker - 1], + size: 10000, + sort: [{ [fields.time]: 'asc' }, { [fields.tiebreaker]: 'asc' }], + }, + ignoreUnavailable: true, + index: indices, + }; + const response = await search(request); + + const hits = response.hits.hits as SortedHit[]; + const filteredHits = hits + .filter(hit => isLessOrEqual({ time: hit.sort[0], tiebreaker: hit.sort[1] }, end)) + .filter(isHighlightedHit); + return filteredHits.map(convertHitToSearchResult(fields)); +} diff --git a/x-pack/plugins/infra/server/logging_legacy/converters.ts b/x-pack/plugins/infra/server/logging_legacy/converters.ts new file mode 100644 index 0000000000000..164981c2dbe18 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/converters.ts @@ -0,0 +1,70 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import invert from 'lodash/fp/invert'; +import mapKeys from 'lodash/fp/mapKeys'; + +import { LogEntryFieldsMapping } from '../../common/log_entry'; +import { SearchResult } from '../../common/log_search_result'; +import { SearchSummaryBucket } from '../../common/log_search_summary'; +import { + DateHistogramResponse, + HighlightedHit, + Hit, + HitsBucket, + isBucketWithAggregation, +} from './elasticsearch'; + +export const convertHitToSearchResult = (fields: LogEntryFieldsMapping) => { + const invertedFields = invert(fields); + return (hit: HighlightedHit): SearchResult => { + const matches = mapKeys(key => invertedFields[key], hit.highlight || {}); + return { + fields: { + tiebreaker: hit.sort[1], // use the sort property to get the normalized values + time: hit.sort[0], + }, + gid: getHitGid(hit), + matches, + }; + }; +}; + +export const convertDateHistogramToSearchSummaryBuckets = ( + fields: LogEntryFieldsMapping, + end: number +) => (buckets: DateHistogramResponse['buckets']): SearchSummaryBucket[] => + buckets.reduceRight( + ({ previousStart, aggregatedBuckets }, bucket) => { + const representative = + isBucketWithAggregation(bucket, 'top_entries') && + bucket.top_entries.hits.hits.length > 0 + ? convertHitToSearchResult(fields)(bucket.top_entries.hits.hits[0]) + : null; + return { + aggregatedBuckets: [ + ...(representative + ? [ + { + count: bucket.doc_count, + end: previousStart, + representative, + start: bucket.key, + }, + ] + : []), + ...aggregatedBuckets, + ], + previousStart: bucket.key, + }; + }, + { previousStart: end, aggregatedBuckets: [] } as { + previousStart: number; + aggregatedBuckets: SearchSummaryBucket[]; + } + ).aggregatedBuckets; + +const getHitGid = (hit: Hit): string => `${hit._index}:${hit._type}:${hit._id}`; diff --git a/x-pack/plugins/infra/server/logging_legacy/elasticsearch.ts b/x-pack/plugins/infra/server/logging_legacy/elasticsearch.ts new file mode 100644 index 0000000000000..020b9ae7ba2c7 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/elasticsearch.ts @@ -0,0 +1,79 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { MSearchParams, MSearchResponse, SearchParams, SearchResponse } from 'elasticsearch'; + +export interface ESCluster { + callWithRequest( + request: any, + endpoint: 'msearch', + clientOptions: MSearchParams, + options?: object + ): Promise>; + callWithRequest( + request: any, + endpoint: 'search', + clientOptions: SearchParams, + options?: object + ): Promise>; + callWithRequest( + request: any, + endpoint: string, + clientOptions?: object, + options?: object + ): Promise; +} + +export type Hit = SearchResponse['hits']['hits'][0]; + +export interface SortedHit extends Hit { + sort: any[]; + _source: { + [field: string]: any; + }; +} + +export interface HighlightedHit extends SortedHit { + highlight?: { + [field: string]: string[]; + }; +} + +export const isHighlightedHit = (hit: Hit): hit is HighlightedHit => !!hit.highlight; + +export interface DateHistogramBucket { + key: number; + key_as_string: string; + doc_count: number; +} + +export interface HitsBucket { + hits: { + total: number; + max_score: number | null; + hits: SortedHit[]; + }; +} + +export interface DateHistogramResponse { + buckets: DateHistogramBucket[]; +} + +export type WithSubAggregation< + SubAggregationType, + SubAggregationName extends string, + BucketType +> = BucketType & { [subAggregationName in SubAggregationName]: SubAggregationType }; + +export const isBucketWithAggregation = < + SubAggregationType extends object, + SubAggregationName extends string = any, + BucketType extends object = {} +>( + bucket: BucketType, + aggregationName: SubAggregationName +): bucket is WithSubAggregation => + aggregationName in bucket; diff --git a/x-pack/plugins/infra/server/logging_legacy/index.ts b/x-pack/plugins/infra/server/logging_legacy/index.ts new file mode 100644 index 0000000000000..e193655246016 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/index.ts @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraBackendFrameworkAdapter } from '../lib/adapters/framework'; +import { initAdjacentSearchResultsRoutes } from './adjacent_search_results'; +import { initContainedSearchResultsRoutes } from './contained_search_results'; +import { initSearchSummaryRoutes } from './search_summary'; + +export const initLegacyLoggingRoutes = (framework: InfraBackendFrameworkAdapter) => { + initAdjacentSearchResultsRoutes(framework); + initContainedSearchResultsRoutes(framework); + initSearchSummaryRoutes(framework); +}; diff --git a/x-pack/plugins/infra/server/logging_legacy/latest_log_entries.ts b/x-pack/plugins/infra/server/logging_legacy/latest_log_entries.ts new file mode 100644 index 0000000000000..2b40309b510d2 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/latest_log_entries.ts @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { SearchParams } from 'elasticsearch'; + +import { InfraDatabaseSearchResponse } from '../lib/adapters/framework'; + +export async function fetchLatestTime( + search: ( + params: SearchParams + ) => Promise>, + indices: string[], + timeField: string +): Promise { + const response = await search({ + allowNoIndices: true, + body: { + aggregations: { + max_time: { + max: { + field: timeField, + }, + }, + }, + query: { + match_all: {}, + }, + size: 0, + }, + ignoreUnavailable: true, + index: indices, + }); + + if (response.aggregations && response.aggregations.max_time) { + return response.aggregations.max_time.value; + } else { + return 0; + } +} diff --git a/x-pack/plugins/infra/server/logging_legacy/schemas.ts b/x-pack/plugins/infra/server/logging_legacy/schemas.ts new file mode 100644 index 0000000000000..12dc60d369bd6 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/schemas.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as Joi from 'joi'; + +export const timestampSchema = Joi.number() + .integer() + .min(0); + +export const logEntryFieldsMappingSchema = Joi.object().keys({ + message: Joi.string().required(), + tiebreaker: Joi.string().required(), + time: Joi.string().required(), +}); + +export const logEntryTimeSchema = Joi.object().keys({ + tiebreaker: Joi.number().integer(), + time: timestampSchema, +}); + +export const indicesSchema = Joi.array().items(Joi.string()); + +export const summaryBucketSizeSchema = Joi.object().keys({ + unit: Joi.string() + .valid(['y', 'M', 'w', 'd', 'h', 'm', 's']) + .required(), + value: Joi.number() + .integer() + .min(0) + .required(), +}); diff --git a/x-pack/plugins/infra/server/logging_legacy/search_summary.ts b/x-pack/plugins/infra/server/logging_legacy/search_summary.ts new file mode 100644 index 0000000000000..b51d4d4cabbb0 --- /dev/null +++ b/x-pack/plugins/infra/server/logging_legacy/search_summary.ts @@ -0,0 +1,156 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import * as Boom from 'boom'; +import { SearchParams } from 'elasticsearch'; +import * as Joi from 'joi'; + +import { SearchSummaryApiPostPayload, SearchSummaryApiPostResponse } from '../../common/http_api'; +import { LogEntryFieldsMapping } from '../../common/log_entry'; +import { SearchSummaryBucket } from '../../common/log_search_summary'; +import { SummaryBucketSize } from '../../common/log_summary'; +import { + InfraBackendFrameworkAdapter, + InfraDatabaseSearchResponse, + InfraWrappableRequest, +} from '../lib/adapters/framework'; +import { convertDateHistogramToSearchSummaryBuckets } from './converters'; +import { DateHistogramResponse } from './elasticsearch'; +import { + indicesSchema, + logEntryFieldsMappingSchema, + summaryBucketSizeSchema, + timestampSchema, +} from './schemas'; + +export const initSearchSummaryRoutes = (framework: InfraBackendFrameworkAdapter) => { + const callWithRequest = framework.callWithRequest; + + framework.registerRoute< + InfraWrappableRequest, + Promise + >({ + options: { + validate: { + payload: Joi.object().keys({ + bucketSize: summaryBucketSizeSchema.required(), + end: timestampSchema.required(), + fields: logEntryFieldsMappingSchema.required(), + indices: indicesSchema.required(), + query: Joi.string().required(), + start: timestampSchema.required(), + }), + }, + }, + handler: async request => { + const timings = { + esRequestSent: Date.now(), + esResponseProcessed: 0, + }; + + try { + const search = (params: SearchParams) => + callWithRequest(request, 'search', params); + const summaryBuckets = await fetchSummaryBuckets( + search, + request.payload.indices, + request.payload.fields, + request.payload.start, + request.payload.end, + request.payload.bucketSize, + request.payload.query + ); + + timings.esResponseProcessed = Date.now(); + + return { + buckets: summaryBuckets, + timings, + }; + } catch (requestError) { + throw Boom.boomify(requestError); + } + }, + method: 'POST', + path: '/api/logging/search-summary', + }); +}; + +async function fetchSummaryBuckets( + search: ( + params: SearchParams + ) => Promise>, + indices: string[], + fields: LogEntryFieldsMapping, + start: number, + end: number, + bucketSize: { + unit: SummaryBucketSize; + value: number; + }, + query: string +): Promise { + const response = await search({ + allowNoIndices: true, + body: { + aggregations: { + count_by_date: { + aggregations: { + top_entries: { + top_hits: { + _source: [fields.message], + size: 1, + sort: [{ [fields.time]: 'desc' }, { [fields.tiebreaker]: 'desc' }], + }, + }, + }, + date_histogram: { + extended_bounds: { + max: end, + min: start, + }, + field: fields.time, + interval: `${bucketSize.value}${bucketSize.unit}`, + min_doc_count: 0, + }, + }, + }, + query: { + bool: { + filter: [ + { + query_string: { + default_field: fields.message, + default_operator: 'AND', + query, + }, + }, + { + range: { + [fields.time]: { + format: 'epoch_millis', + gte: start, + lt: end, + }, + }, + }, + ], + }, + }, + size: 0, + }, + ignoreUnavailable: true, + index: indices, + }); + + if (response.aggregations && response.aggregations.count_by_date) { + return convertDateHistogramToSearchSummaryBuckets(fields, end)( + response.aggregations.count_by_date.buckets + ); + } else { + return []; + } +} diff --git a/x-pack/plugins/infra/server/usage/usage_collector.ts b/x-pack/plugins/infra/server/usage/usage_collector.ts new file mode 100644 index 0000000000000..72e8dc251da8b --- /dev/null +++ b/x-pack/plugins/infra/server/usage/usage_collector.ts @@ -0,0 +1,114 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { InfraNodeType } from '../../common/graphql/types'; +import { KbnServer } from '../kibana.index'; + +const KIBANA_REPORTING_TYPE = 'infraops'; + +interface InfraopsSum { + infraopsHosts: number; + infraopsDocker: number; + infraopsKubernetes: number; + logs: number; +} + +export class UsageCollector { + public static getUsageCollector(server: KbnServer) { + const { collectorSet } = server.usage; + + return collectorSet.makeUsageCollector({ + type: KIBANA_REPORTING_TYPE, + fetch: async () => { + return this.getReport(); + }, + }); + } + + public static countNode(nodeType: InfraNodeType) { + const bucket = this.getBucket(); + this.maybeInitializeBucket(bucket); + + switch (nodeType) { + case InfraNodeType.pod: + this.counters[bucket].infraopsKubernetes += 1; + break; + case InfraNodeType.container: + this.counters[bucket].infraopsDocker += 1; + break; + default: + this.counters[bucket].infraopsHosts += 1; + } + } + + public static countLogs() { + const bucket = this.getBucket(); + this.maybeInitializeBucket(bucket); + this.counters[bucket].logs += 1; + } + + private static counters: any = {}; + private static BUCKET_SIZE = 3600; // seconds in an hour + private static BUCKET_NUMBER = 24; // report the last 24 hours + + private static getBucket() { + const now = Math.floor(Date.now() / 1000); + return now - (now % this.BUCKET_SIZE); + } + + private static maybeInitializeBucket(bucket: any) { + if (!this.counters[bucket]) { + this.counters[bucket] = { + infraopsHosts: 0, + infraopsDocker: 0, + infraopsKubernetes: 0, + logs: 0, + }; + } + } + + private static getReport() { + const keys = Object.keys(this.counters); + + // only keep the newest BUCKET_NUMBER buckets + const cutoff = this.getBucket() - this.BUCKET_SIZE * (this.BUCKET_NUMBER - 1); + keys.forEach(key => { + if (parseInt(key, 10) < cutoff) { + delete this.counters[key]; + } + }); + + // all remaining buckets are current + const sums = Object.keys(this.counters).reduce( + (a: InfraopsSum, b: any) => { + const key = parseInt(b, 10); + return { + infraopsHosts: a.infraopsHosts + this.counters[key].infraopsHosts, + infraopsDocker: a.infraopsDocker + this.counters[key].infraopsDocker, + infraopsKubernetes: a.infraopsKubernetes + this.counters[key].infraopsKubernetes, + logs: a.logs + this.counters[key].logs, + }; + }, + { + infraopsHosts: 0, + infraopsDocker: 0, + infraopsKubernetes: 0, + logs: 0, + } + ); + + return { + last_24_hours: { + hits: { + infraops_hosts: sums.infraopsHosts, + infraops_docker: sums.infraopsDocker, + infraops_kubernetes: sums.infraopsKubernetes, + logs: sums.logs, + }, + }, + }; + } +} diff --git a/x-pack/plugins/infra/server/utils/README.md b/x-pack/plugins/infra/server/utils/README.md new file mode 100644 index 0000000000000..8a6a27aa29867 --- /dev/null +++ b/x-pack/plugins/infra/server/utils/README.md @@ -0,0 +1 @@ +Utils should be data processing functions and other tools.... all in all utils is basicly everything that is not an adaptor, or presenter and yet too much to put in a lib. \ No newline at end of file diff --git a/x-pack/plugins/infra/server/utils/serialized_query.ts b/x-pack/plugins/infra/server/utils/serialized_query.ts new file mode 100644 index 0000000000000..932df847e65d0 --- /dev/null +++ b/x-pack/plugins/infra/server/utils/serialized_query.ts @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { UserInputError } from 'apollo-server-errors'; + +import { JsonObject } from '../../common/typed_json'; + +export const parseFilterQuery = ( + filterQuery: string | null | undefined +): JsonObject | undefined => { + try { + if (filterQuery) { + const parsedFilterQuery = JSON.parse(filterQuery); + if ( + !parsedFilterQuery || + ['string', 'number', 'boolean'].includes(typeof parsedFilterQuery) || + Array.isArray(parsedFilterQuery) + ) { + throw new Error('expected value to be an object'); + } + return parsedFilterQuery; + } else { + return undefined; + } + } catch (err) { + throw new UserInputError(`Failed to parse query: ${err}`, { + query: filterQuery, + originalError: err, + }); + } +}; diff --git a/x-pack/plugins/infra/types/eui.d.ts b/x-pack/plugins/infra/types/eui.d.ts new file mode 100644 index 0000000000000..8b6c2c07cecd2 --- /dev/null +++ b/x-pack/plugins/infra/types/eui.d.ts @@ -0,0 +1,176 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +/** + * /!\ These type definitions are temporary until the upstream @elastic/eui + * package includes them. + */ + +import { CommonProps, EuiToolTipPosition } from '@elastic/eui'; +import moment from 'moment'; +import { MouseEventHandler, ReactType, Ref } from 'react'; +import { ReactDatePickerProps } from 'react-datepicker'; +import { JsonObject } from '../common/typed_json'; + +declare module '@elastic/eui' { + export interface EuiBreadcrumbDefinition { + text: React.ReactNode; + href?: string; + onClick?: React.MouseEventHandler; + } + type EuiBreadcrumbsProps = CommonProps & { + responsive?: boolean; + truncate?: boolean; + max?: number; + breadcrumbs: EuiBreadcrumbDefinition[]; + }; + + type EuiHeaderProps = CommonProps; + export const EuiHeader: React.SFC; + + export type EuiHeaderSectionSide = 'left' | 'right'; + type EuiHeaderSectionProps = CommonProps & { + side?: EuiHeaderSectionSide; + }; + export const EuiHeaderSection: React.SFC; + + type EuiHeaderBreadcrumbsProps = EuiBreadcrumbsProps; + export const EuiHeaderBreadcrumbs: React.SFC; + + type EuiDatePickerProps = CommonProps & + Pick< + ReactDatePickerProps, + Exclude< + keyof ReactDatePickerProps, + | 'monthsShown' + | 'showWeekNumbers' + | 'fixedHeight' + | 'dropdownMode' + | 'useShortMonthInDropdown' + | 'todayButton' + | 'timeCaption' + | 'disabledKeyboardNavigation' + | 'isClearable' + | 'withPortal' + | 'ref' + | 'placeholderText' + | 'selected' + > + > & { + fullWidth?: boolean; + inputRef?: Ref; + injectTimes?: moment.Moment[]; + isInvalid?: boolean; + isLoading?: boolean; + selected?: moment.Moment | null | undefined; + placeholder?: string; + shadow?: boolean; + calendarContainer?: React.ReactNode; + onChange?: (date: moment.Moment | null) => void; + startDate?: moment.Moment | undefined; + endDate?: moment.Moment | undefined; + }; + export const EuiDatePicker: React.SFC; + + type EuiFilterGroupProps = CommonProps; + export const EuiFilterGroup: React.SFC; + + type EuiFilterButtonProps = CommonProps & { + color?: ButtonColor; + href?: string; + iconSide?: ButtonIconSide; + iconType?: IconType; + isDisabled?: boolean; + isSelected?: boolean; + onClick: MouseEventHandler; + rel?: string; + target?: string; + type?: string; + }; + export const EuiFilterButton: React.SFC; + + interface EuiOutsideClickDetectorProps { + children: React.ReactNode; + isDisabled?: boolean; + onOutsideClick: React.MouseEventHandler; + } + export const EuiOutsideClickDetector: React.SFC; + + interface EuiFormControlLayoutIconProps { + type: IconType; + side?: 'left' | 'right'; + onClick?: React.MouseEventHandler; + } + + interface EuiFormControlLayoutClearIconProps { + onClick?: React.MouseEventHandler; + } + + type EuiFormControlLayoutProps = CommonProps & { + icon?: string | EuiFormControlLayoutIconProps; + clear?: EuiFormControlLayoutClearIconProps; + fullWidth?: boolean; + isLoading?: boolean; + compressed?: boolean; + prepend?: React.ReactNode; + append?: React.ReactNode; + }; + export const EuiFormControlLayout: React.SFC; + + type EuiSideNavProps = CommonProps & { + style?: any; + items: Array<{ + id: string | number; + name: string; + items: Array<{ + id: string; + name: string; + onClick: () => void; + }>; + }>; + mobileTitle?: React.ReactNode; + toggleOpenOnMobile?: () => void; + isOpenOnMobile?: boolean; + }; + export const EuiSideNav: React.SFC; + + type EuiErrorBoundaryProps = CommonProps & { + children: React.ReactNode; + }; + + export const EuiErrorBoundary: React.SFC; + + type EuiSizesResponsive = 'xs' | 's' | 'm' | 'l' | 'xl'; + type EuiResponsiveProps = CommonProps & { + children: React.ReactNode; + sizes: EuiSizesResponsive[]; + }; + + export const EuiHideFor: React.SFC; + + export const EuiShowFor: React.SFC; + + type EuiDatePickerRangeProps = CommonProps & { + startDateControl: React.ReactNode; + endDateControl: React.ReactNode; + iconType?: IconType | boolean; + fullWidth?: boolean; + disabled?: boolean; + isLoading?: boolean; + dateFormat?: string; + }; + + export const EuiDatePickerRange: React.SFC; + + export type EuiBetaBadgeProps = CommonProps & { + iconType?: IconType; + label: React.ReactNode; + title?: string; + tooltipContent?: React.ReactNode; + tooltipPosition?: EuiToolTipPosition; + }; + export const EuiBetaBadge: React.SFC; +} diff --git a/x-pack/plugins/infra/types/eui_experimental.d.ts b/x-pack/plugins/infra/types/eui_experimental.d.ts new file mode 100644 index 0000000000000..3e016f491e555 --- /dev/null +++ b/x-pack/plugins/infra/types/eui_experimental.d.ts @@ -0,0 +1,67 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +declare module '@elastic/eui/lib/experimental' { + import { CommonProps } from '@elastic/eui'; + export type EuiSeriesChartProps = CommonProps & { + xType?: string; + stackBy?: string; + statusText?: string; + yDomain?: number[]; + showCrosshair?: boolean; + showDefaultAxis?: boolean; + enableSelectionBrush?: boolean; + crosshairValue?: number; + onSelectionBrushEnd?: (args: any) => void; + onCrosshairUpdate?: (crosshairValue: number) => void; + }; + export const EuiSeriesChart: React.SFC; + + type EuiSeriesProps = CommonProps & { + data: Array<{ x: number; y: number; y0?: number }>; + lineSize?: number; + name: string; + color?: string; + marginLeft?: number; + }; + export const EuiLineSeries: React.SFC; + export const EuiAreaSeries: React.SFC; + export const EuiBarSeries: React.SFC; + + type EuiYAxisProps = CommonProps & { + tickFormat: (value: number) => string; + marginLeft?: number; + }; + export const EuiYAxis: React.SFC; + + type EuiXAxisProps = CommonProps & { + tickFormat?: (value: number) => string; + marginLeft?: number; + }; + export const EuiXAxis: React.SFC; + + export interface EuiDataPoint { + seriesIndex: number; + x: number; + y: number; + originalValues: { + x: number; + y: number; + x0?: number; + }; + } + + export interface EuiFormattedValue { + title: any; + value: any; + } + type EuiCrosshairXProps = CommonProps & { + seriesNames: string[]; + titleFormat?: (dataPoints: EuiDataPoint[]) => EuiFormattedValue | undefined; + itemsFormat?: (dataPoints: EuiDataPoint[]) => EuiFormattedValue[]; + }; + export const EuiCrosshairX: React.SFC; +} diff --git a/x-pack/plugins/infra/types/graphql_fields.d.ts b/x-pack/plugins/infra/types/graphql_fields.d.ts new file mode 100644 index 0000000000000..11d26e913015c --- /dev/null +++ b/x-pack/plugins/infra/types/graphql_fields.d.ts @@ -0,0 +1,10 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +declare module 'graphql-fields' { + function graphqlFields(info: any, obj?: any): any; + export default graphqlFields; +} diff --git a/x-pack/plugins/infra/types/redux_observable.d.ts b/x-pack/plugins/infra/types/redux_observable.d.ts new file mode 100644 index 0000000000000..6813c4bf6a054 --- /dev/null +++ b/x-pack/plugins/infra/types/redux_observable.d.ts @@ -0,0 +1,85 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import { Action, MiddlewareAPI } from 'redux'; +import { ActionsObservable, Epic } from 'redux-observable'; +import { Observable } from 'rxjs'; + +declare module 'redux-observable' { + function combineEpics< + T1 extends Action, + T2 extends Action, + O1 extends T1, + O2 extends T2, + S, + D1, + D2 + >(epic1: Epic, epic2: Epic): Epic; + function combineEpics< + T1 extends Action, + T2 extends Action, + T3 extends Action, + O1 extends T1, + O2 extends T2, + O3 extends T3, + S, + D1, + D2, + D3 + >( + epic1: Epic, + epic2: Epic, + epic3: Epic + ): Epic; + function combineEpics< + T1 extends Action, + T2 extends Action, + T3 extends Action, + T4 extends Action, + O1 extends T1, + O2 extends T2, + O3 extends T3, + O4 extends T4, + S, + D1, + D2, + D3, + D4 + >( + epic1: Epic, + epic2: Epic, + epic3: Epic, + epic4: Epic + ): Epic; + function combineEpics< + T1 extends Action, + T2 extends Action, + T3 extends Action, + T4 extends Action, + T5 extends Action, + O1 extends T1, + O2 extends T2, + O3 extends T3, + O4 extends T4, + O5 extends T5, + S, + D1, + D2, + D3, + D4, + D5 + >( + epic1: Epic, + epic2: Epic, + epic3: Epic, + epic4: Epic, + epic5: Epic + ): Epic; + + type EpicWithState = E extends Epic + ? Epic + : E; +} diff --git a/x-pack/plugins/infra/types/rison_node.d.ts b/x-pack/plugins/infra/types/rison_node.d.ts new file mode 100644 index 0000000000000..5448c4bcd74a9 --- /dev/null +++ b/x-pack/plugins/infra/types/rison_node.d.ts @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ +// tslint:disable:variable-name + +declare module 'rison-node' { + export type RisonValue = null | boolean | number | string | RisonObject | RisonArray; + + export interface RisonArray extends Array {} + + export interface RisonObject { + [key: string]: RisonValue; + } + + export const decode: (input: string) => RisonValue; + + export const decode_object: (input: string) => RisonObject; + + export const encode: (input: Input) => string; + + export const encode_object: (input: Input) => string; +} diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap index 911966fa9ebbc..c6aeef84094b0 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/add_license.test.js.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`AddLicense component when license is active should display correct verbiage 1`] = `"
      Update your license

      If you already have a new license, upload it now.

      Update license
      "`; +exports[`AddLicense component when license is active should display correct verbiage 1`] = `"
      Update your license

      If you already have a new license, upload it now.

      Update license
      "`; -exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `"
      Update your license

      If you already have a new license, upload it now.

      Update license
      "`; +exports[`AddLicense component when license is expired should display with correct verbiage 1`] = `"
      Update your license

      If you already have a new license, upload it now.

      Update license
      "`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap index 4b9e830539cb8..0d6dcc686bea7 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap @@ -1,5 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`LicenseStatus component should display display warning is expired 1`] = `"

      Your Platinum license has expired

      Your license expired on
      "`; +exports[`LicenseStatus component should display display warning is expired 1`] = `"

      Your Platinum license has expired

      Your license expired on
      "`; -exports[`LicenseStatus component should display normally when license is active 1`] = `"

      Your Gold license is active

      Your license will expire on October 12, 2099 7:00 PM EST
      "`; +exports[`LicenseStatus component should display normally when license is active 1`] = `"

      Your Gold license is active

      Your license will expire on October 12, 2099 7:00 PM EST
      "`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap index 15e3d623baf11..c27bfcd83014c 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/request_trial_extension.test.js.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"
      Extend your trial

      If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

      Extend trial
      "`; +exports[`RequestTrialExtension component should display when license is active and trial has been used 1`] = `"
      Extend your trial

      If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

      Extend trial
      "`; -exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"
      Extend your trial

      If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

      Extend trial
      "`; +exports[`RequestTrialExtension component should display when license is not active and trial has been used 1`] = `"
      Extend your trial

      If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

      Extend trial
      "`; -exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `"
      Extend your trial

      If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

      Extend trial
      "`; +exports[`RequestTrialExtension component should display when platinum license is not active and trial has been used 1`] = `"
      Extend your trial

      If you’d like to continuing using security, machine learning, and our other awesome Platinum features, request an extension now.

      Extend trial
      "`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap index 59d12b9414dea..5ffef326a6277 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/telemetry_opt_in.test.js.snap @@ -1,15 +1,105 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` - +

      - Gold and platinum customers: help support give you better service. + + Gold and platinum customers: help support give you better service. +

      @@ -28,54 +118,77 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` indeterminate={false} label={ - Send basic feature usage statistics to Elastic periodically. - - Read more - - } - className="licenseManagement__baseline" - closePopover={[Function]} - hasArrow={true} - id="readMorePopover" - isOpen={false} - ownFocus={true} - panelPaddingSize="m" - > - -

      - This feature periodically sends basic feature usage statistics. This information will not be shared outside of Elastic. See an - - example - - - or read our - - + + + } + className="eui-AlignBaseline" + closePopover={[Function]} + hasArrow={true} + id="readMorePopover" + isOpen={false} + ownFocus={true} + panelPaddingSize="m" > - telemetry privacy statement - - . You can disable this feature any time. -

      -
      -
      + +

      + + + , + "telemetryPrivacyStatementLink": + + , + } + } + /> +

      +
      + , + } + } + />
      } onChange={[Function]} @@ -99,55 +212,137 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = ` htmlFor="isOptingInToTelemetry" > - Send basic feature usage statistics to Elastic periodically. - - Read more - + + + + } + className="eui-AlignBaseline" + closePopover={[Function]} + hasArrow={true} + id="readMorePopover" + isOpen={false} + ownFocus={true} + panelPaddingSize="m" + > + +

      + + + , + "telemetryPrivacyStatementLink": + + , + } + } + /> +

      +
      +
      , + } } - className="licenseManagement__baseline" - closePopover={[Function]} - hasArrow={true} - id="readMorePopover" - isOpen={false} - ownFocus={true} - panelPaddingSize="m" > - + + + } + className="eui-AlignBaseline" + closePopover={[Function]} + hasArrow={true} + id="readMorePopover" + isOpen={false} + ownFocus={true} + panelPaddingSize="m" > -
      - - - + + +
      - -
      - + + +
      @@ -155,4 +350,89 @@ exports[`TelemetryOptIn should display when telemetry not opted in 1`] = `
      `; -exports[`TelemetryOptIn should not display when telemetry is opted in 1`] = ``; +exports[`TelemetryOptIn should not display when telemetry is opted in 1`] = ` + +`; diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap index 7797959293a36..28065c734829e 100644 --- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap +++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap @@ -2,6 +2,88 @@ exports[`UploadLicense should display a modal when license requires acknowledgement 1`] = `

      - Upload your license + + Upload your license +

      + } + confirmButtonText={ + + } onCancel={[Function]} onConfirm={[Function]} - title="Confirm License Upload" + title={ + + } > @@ -175,7 +281,13 @@ exports[`UploadLicense should display a modal when license requires acknowledgem className="euiModalHeader__title" data-test-subj="confirmModalTitleText" > - Confirm License Upload + + Confirm License Upload + @@ -187,28 +299,29 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
      - Some functionality will be lost if you replace your - TRIAL license with a - BASIC license. Review the list of features below. + Some functionality will be lost if you replace your TRIAL license with a BASIC license. Review the list of features below.
      • - Cancel + + Cancel + @@ -274,7 +393,13 @@ exports[`UploadLicense should display a modal when license requires acknowledgem - Confirm + + Confirm + @@ -290,18 +415,36 @@ exports[`UploadLicense should display a modal when license requires acknowledgem

        - Your license key is a JSON file with a signature attached. + + Your license key is a JSON file with a signature attached. +

        - Uploading a license will replace your current - - - license. + + + , + } + } + > + Uploading a license will replace your current + + license. +

        @@ -321,14 +464,21 @@ exports[`UploadLicense should display a modal when license requires acknowledgem >
        + } onChange={[Function]} >
        - Select or drag your license file + + Select or drag your license file +
      @@ -450,7 +606,13 @@ exports[`UploadLicense should display a modal when license requires acknowledgem - Cancel + + Cancel + @@ -485,7 +647,13 @@ exports[`UploadLicense should display a modal when license requires acknowledgem - Upload + + Upload + @@ -508,6 +676,88 @@ exports[`UploadLicense should display a modal when license requires acknowledgem exports[`UploadLicense should display an error when ES says license is expired 1`] = `

      - Upload your license + + Upload your license +

      - Your license key is a JSON file with a signature attached. + + Your license key is a JSON file with a signature attached. +

      - Uploading a license will replace your current - - - license. + + + , + } + } + > + Uploading a license will replace your current + + license. +

      @@ -638,18 +913,25 @@ exports[`UploadLicense should display an error when ES says license is expired 1
      + } onChange={[Function]} >
      - Select or drag your license file + + Select or drag your license file +
      + + +
      @@ -767,7 +1081,13 @@ exports[`UploadLicense should display an error when ES says license is expired 1 - Cancel + + Cancel + @@ -802,7 +1122,13 @@ exports[`UploadLicense should display an error when ES says license is expired 1 - Upload + + Upload + @@ -825,6 +1151,88 @@ exports[`UploadLicense should display an error when ES says license is expired 1 exports[`UploadLicense should display an error when ES says license is invalid 1`] = `

      - Upload your license + + Upload your license +

      - Your license key is a JSON file with a signature attached. + + Your license key is a JSON file with a signature attached. +

      - Uploading a license will replace your current - - - license. + + + , + } + } + > + Uploading a license will replace your current + + license. +

      @@ -955,18 +1388,25 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
      + } onChange={[Function]} >
      - Select or drag your license file + + Select or drag your license file +
      + + +
      @@ -1084,7 +1556,13 @@ exports[`UploadLicense should display an error when ES says license is invalid 1 - Cancel + + Cancel + @@ -1119,7 +1597,13 @@ exports[`UploadLicense should display an error when ES says license is invalid 1 - Upload + + Upload + @@ -1142,6 +1626,88 @@ exports[`UploadLicense should display an error when ES says license is invalid 1 exports[`UploadLicense should display an error when submitting invalid JSON 1`] = `

      - Upload your license + + Upload your license +

      - Your license key is a JSON file with a signature attached. + + Your license key is a JSON file with a signature attached. +

      - Uploading a license will replace your current - - - license. + + + , + } + } + > + Uploading a license will replace your current + + license. +

      @@ -1272,18 +1863,25 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
      + } onChange={[Function]} >
      - Select or drag your license file + + Select or drag your license file +
      + + +
      @@ -1401,7 +2031,13 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`] - Cancel + + Cancel + @@ -1436,7 +2072,13 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`] - Upload + + Upload + @@ -1459,6 +2101,88 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`] exports[`UploadLicense should display error when ES returns error 1`] = `

      - Upload your license + + Upload your license +

      - Your license key is a JSON file with a signature attached. + + Your license key is a JSON file with a signature attached. +

      - Uploading a license will replace your current - - - license. + + + , + } + } + > + Uploading a license will replace your current + + license. +

      @@ -1589,18 +2338,25 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
      + } onChange={[Function]} >
      - Select or drag your license file + + Select or drag your license file +
      + + +
      @@ -1718,7 +2506,13 @@ exports[`UploadLicense should display error when ES returns error 1`] = ` - Cancel + + Cancel + @@ -1753,7 +2547,13 @@ exports[`UploadLicense should display error when ES returns error 1`] = ` - Upload + + Upload + diff --git a/x-pack/plugins/license_management/__jest__/telemetry_opt_in.test.js b/x-pack/plugins/license_management/__jest__/telemetry_opt_in.test.js index d347f0895b032..3ed9a11d6d9b7 100644 --- a/x-pack/plugins/license_management/__jest__/telemetry_opt_in.test.js +++ b/x-pack/plugins/license_management/__jest__/telemetry_opt_in.test.js @@ -5,18 +5,19 @@ */ import React from 'react'; import { TelemetryOptIn } from '../public/components/telemetry_opt_in'; -import { mount } from 'enzyme'; +import { mountWithIntl } from '../../../test_utils/enzyme_helpers'; + describe('TelemetryOptIn', () => { test('should display when telemetry not opted in', () => { const telemetry = require('../public/lib/telemetry'); telemetry.showTelemetryOptIn = () => { return true; }; - const rendered = mount(); + const rendered = mountWithIntl(); expect(rendered).toMatchSnapshot(); }); test('should not display when telemetry is opted in', () => { const telemetry = require('../public/lib/telemetry'); telemetry.showTelemetryOptIn = () => { return false; }; - const rendered = mount(); + const rendered = mountWithIntl(); expect(rendered).toMatchSnapshot(); }); }); \ No newline at end of file diff --git a/x-pack/plugins/license_management/__jest__/upload_license.test.js b/x-pack/plugins/license_management/__jest__/upload_license.test.js index 19ec3eee762bf..9df68f10b2dd3 100644 --- a/x-pack/plugins/license_management/__jest__/upload_license.test.js +++ b/x-pack/plugins/license_management/__jest__/upload_license.test.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { mount } from 'enzyme'; +import { mountWithIntl } from '../../../test_utils/enzyme_helpers'; import React from 'react'; import { Provider } from 'react-redux'; import { uploadLicense } from '../public/store/actions/upload_license'; @@ -54,13 +54,13 @@ describe('UploadLicense', () => { services.kbnUrl.change.mockReset(); }); it('should display an error when submitting invalid JSON', async () => { - const rendered = mount(component); + const rendered = mountWithIntl(component); store.dispatch(uploadLicense('INVALID', 'trial')); rendered.update(); expect(rendered).toMatchSnapshot(); }); it('should display an error when ES says license is invalid', async () => { - const rendered = mount(component); + const rendered = mountWithIntl(component); const invalidLicense = JSON.stringify({ license: { type: 'basic' } }); server.respond(UPLOAD_LICENSE_INVALID); await uploadLicense(invalidLicense)(store.dispatch, null, services); @@ -68,7 +68,7 @@ describe('UploadLicense', () => { expect(rendered).toMatchSnapshot(); }); it('should display an error when ES says license is expired', async () => { - const rendered = mount(component); + const rendered = mountWithIntl(component); const invalidLicense = JSON.stringify({ license: { type: 'basic' } }); server.respond(UPLOAD_LICENSE_EXPIRED); await uploadLicense(invalidLicense)(store.dispatch, null, services); @@ -85,7 +85,7 @@ describe('UploadLicense', () => { null, services ); - const rendered = mount(component); + const rendered = mountWithIntl(component); expect(rendered).toMatchSnapshot(); }); it('should refresh xpack info and navigate to BASE_PATH when ES accepts new license', async () => { @@ -96,7 +96,7 @@ describe('UploadLicense', () => { expect(services.kbnUrl.change).toHaveBeenCalledWith(BASE_PATH); }); it('should display error when ES returns error', async () => { - const rendered = mount(component); + const rendered = mountWithIntl(component); const license = JSON.stringify({ license: { type: 'basic' } }); server.respond(UPLOAD_LICENSE_TLS_NOT_ENABLED); await uploadLicense(license)(store.dispatch, null, services); diff --git a/x-pack/plugins/license_management/__jest__/util/util.js b/x-pack/plugins/license_management/__jest__/util/util.js index 6da519777cc32..f8aa87a8f3d9e 100644 --- a/x-pack/plugins/license_management/__jest__/util/util.js +++ b/x-pack/plugins/license_management/__jest__/util/util.js @@ -7,7 +7,7 @@ import { Provider } from 'react-redux'; import { licenseManagementStore } from '../../public/store/store'; import React from 'react'; -import { mount } from 'enzyme'; +import { mountWithIntl } from '../../../../test_utils/enzyme_helpers'; const highExpirationMillis = new Date('October 13, 2099 00:00:00Z').getTime(); @@ -23,7 +23,7 @@ export const createMockLicense = ( }; export const getComponent = (initialState, Component) => { const store = licenseManagementStore(initialState); - return mount( + return mountWithIntl( diff --git a/x-pack/plugins/license_management/index.js b/x-pack/plugins/license_management/index.js index 887bad0416d94..1f0748d10d52d 100644 --- a/x-pack/plugins/license_management/index.js +++ b/x-pack/plugins/license_management/index.js @@ -14,6 +14,7 @@ export function licenseManagement(kibana) { publicDir: resolve(__dirname, 'public'), require: ['kibana', 'elasticsearch'], uiExports: { + styleSheetPaths: `${__dirname}/public/index.scss`, managementSections: [ 'plugins/license_management', ] diff --git a/x-pack/plugins/license_management/public/_license_management.scss b/x-pack/plugins/license_management/public/_license_management.scss new file mode 100644 index 0000000000000..af15d40c7b5b7 --- /dev/null +++ b/x-pack/plugins/license_management/public/_license_management.scss @@ -0,0 +1,23 @@ +.licFeature { + flex-grow: 1; + background: $euiColorLightestShade; + min-height: 100vh; +} + +.licManagement__pageBody { + padding-top: $euiSizeL; + min-height: auto; +} + +// EUITODO: Fix modal width/max-width +.licManagement__modal { + width: 70vw; +} + +.licManagement__narrowText { + width: 240px; +} + +.licManagement__ieFlex { + flex-shrink: 0; +} diff --git a/x-pack/plugins/license_management/public/app.js b/x-pack/plugins/license_management/public/app.js index c7b20c94a5cd3..f76543423693e 100644 --- a/x-pack/plugins/license_management/public/app.js +++ b/x-pack/plugins/license_management/public/app.js @@ -14,8 +14,8 @@ import { } from '@elastic/eui'; export default () => ( - - + + diff --git a/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js b/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js index 1aff356e50f6b..3aa14ca9ec17d 100644 --- a/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js +++ b/x-pack/plugins/license_management/public/components/telemetry_opt_in/telemetry_opt_in.js @@ -13,6 +13,7 @@ import { EuiPopover } from '@elastic/eui'; import { showTelemetryOptIn, getTelemetryFetcher, PRIVACY_STATEMENT_URL, OptInExampleFlyout } from '../../lib/telemetry'; +import { FormattedMessage } from '@kbn/i18n/react'; export class TelemetryOptIn extends React.Component { constructor() { @@ -60,7 +61,12 @@ export class TelemetryOptIn extends React.Component { toCurrentCustomers = ( -

      Gold and platinum customers: help support give you better service.

      +

      + +

      @@ -69,7 +75,10 @@ export class TelemetryOptIn extends React.Component { const readMoreButton = ( - Read more + ); @@ -80,23 +89,37 @@ export class TelemetryOptIn extends React.Component { button={readMoreButton} isOpen={showMoreTelemetryInfo} closePopover={this.closeReadMorePopover} - className="licenseManagement__baseline" + className="eui-AlignBaseline" > - +

      - This feature periodically sends basic feature usage statistics. - This information will not be shared outside of Elastic. - See an example - {' '} - or read our - {' '} - - telemetry privacy statement - . - You can disable this feature any time. + + + ), + telemetryPrivacyStatementLink: ( + + + + ) + }} + />

      @@ -107,7 +130,17 @@ export class TelemetryOptIn extends React.Component { {example} {toCurrentCustomers} Send basic feature usage statistics to Elastic periodically. {popover}} + label={ + + + + } id="isOptingInToTelemetry" checked={isOptingInToTelemetry} onChange={this.onChangeOptIn} diff --git a/x-pack/plugins/license_management/public/index.js b/x-pack/plugins/license_management/public/index.js index a22685c48136a..79d4f1c431cb5 100644 --- a/x-pack/plugins/license_management/public/index.js +++ b/x-pack/plugins/license_management/public/index.js @@ -5,5 +5,4 @@ */ import './management_section'; -import './register_route'; -import './styles/main.less'; +import './register_route'; \ No newline at end of file diff --git a/x-pack/plugins/license_management/public/index.scss b/x-pack/plugins/license_management/public/index.scss new file mode 100644 index 0000000000000..268372a9498d4 --- /dev/null +++ b/x-pack/plugins/license_management/public/index.scss @@ -0,0 +1,13 @@ +// EUI globals +@import 'ui/public/styles/styling_constants'; + +// License amnagement plugin styles + +// Prefix all styles with "lic" to avoid conflicts. +// Examples +// licChart +// licChart__legend +// licChart__legend--small +// licChart__legend-isLoading + +@import 'license_management'; \ No newline at end of file diff --git a/x-pack/plugins/license_management/public/main.html b/x-pack/plugins/license_management/public/main.html index dd2e2aab37798..310eda8be763a 100644 --- a/x-pack/plugins/license_management/public/main.html +++ b/x-pack/plugins/license_management/public/main.html @@ -1,3 +1,3 @@ -
      +
      diff --git a/x-pack/plugins/license_management/public/management_section.js b/x-pack/plugins/license_management/public/management_section.js index f9ead730b7453..456f7ca4b8297 100644 --- a/x-pack/plugins/license_management/public/management_section.js +++ b/x-pack/plugins/license_management/public/management_section.js @@ -6,10 +6,13 @@ import { management } from 'ui/management'; import { BASE_PATH } from '../common/constants'; +import { i18n } from '@kbn/i18n'; management.getSection('elasticsearch').register('license_management', { visible: true, - display: 'License Management', + display: i18n.translate('xpack.licenseMgmt.managementSectionDisplayName', { + defaultMessage: 'License Management', + }), order: 4, url: `#${BASE_PATH}home` }); diff --git a/x-pack/plugins/license_management/public/register_route.js b/x-pack/plugins/license_management/public/register_route.js index 528c73f7c56d5..edb2542f3b1be 100644 --- a/x-pack/plugins/license_management/public/register_route.js +++ b/x-pack/plugins/license_management/public/register_route.js @@ -9,6 +9,7 @@ import { render, unmountComponentAtNode } from 'react-dom'; import { Provider } from 'react-redux'; import { HashRouter } from 'react-router-dom'; import { setTelemetryOptInService, setTelemetryEnabled, setHttpClient, TelemetryOptInProvider } from './lib/telemetry'; +import { I18nProvider } from '@kbn/i18n/react'; import App from './app'; @@ -22,11 +23,13 @@ import { licenseManagementStore } from './store'; const renderReact = (elem, store) => { render( - - - - - , + + + + + + + , elem ); }; diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js b/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js index bd519433a2545..3c0402f974f06 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/add_license/add_license.js @@ -8,19 +8,28 @@ import React from 'react'; import { BASE_PATH } from '../../../../common/constants'; import { EuiCard, EuiButton } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export const AddLicense = ({ uploadPath = `#${BASE_PATH}upload_license` }) => { return ( )} + description={()} footer={ - Update license + } /> diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js b/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js index 2ae0863e96bd3..f5a61613e5bf8 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/license_dashboard.js @@ -20,7 +20,7 @@ import { export const LicenseDashboard = () => { return ( -
      +
      diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js b/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js index 0a6c6045eee81..a282fdc10ddfb 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.container.js @@ -7,11 +7,19 @@ import { LicenseStatus as PresentationComponent } from './license_status'; import { connect } from 'react-redux'; import { getLicense, getExpirationDateFormatted, isExpired } from '../../../store/reducers/licenseManagement'; +import { i18n } from '@kbn/i18n'; const mapStateToProps = (state) => { const { isActive, type } = getLicense(state); return { - status: isActive ? 'Active' : 'Inactive', + status: isActive ? + i18n.translate('xpack.licenseMgmt.licenseDashboard.licenseStatus.activeLicenseStatusText', { + defaultMessage: 'Active' + }) + : + i18n.translate('xpack.licenseMgmt.licenseDashboard.licenseStatus.inactiveLicenseStatusText', { + defaultMessage: 'Inactive' + }), type, isExpired: isExpired(state), expiryDate: getExpirationDateFormatted(state) diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js b/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js index 23fa577534719..1ed0ab0e58e9d 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/license_status/license_status.js @@ -14,6 +14,7 @@ import { EuiTitle, EuiSpacer, } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export class LicenseStatus extends React.PureComponent { render() { @@ -26,20 +27,58 @@ export class LicenseStatus extends React.PureComponent { icon = ; message = ( - Your license expired on {expiryDate} + {expiryDate} + ) + }} + /> ); - title = `Your ${typeTitleCase} license has expired`; + title = ( + + ); } else { icon = ; message = expiryDate ? ( - Your license will expire on {expiryDate} + {expiryDate} + ) + }} + /> ) : ( - Your license will never expire. + + + + ); + title = ( + ); - title = `Your ${typeTitleCase} license is ${status.toLowerCase()}`; } return (
      diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js b/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js index 263023ce2a545..74bd38aa41757 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/request_trial_extension/request_trial_extension.js @@ -7,6 +7,7 @@ import React from 'react'; import { EuiFlexItem, EuiCard, EuiLink, EuiButton } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export const RequestTrialExtension = ({ shouldShowRequestTrialExtension }) => { if (!shouldShowRequestTrialExtension) { @@ -14,29 +15,44 @@ export const RequestTrialExtension = ({ shouldShowRequestTrialExtension }) => { } const description = ( - If you’d like to continuing using security, machine learning, and our - other awesome{' '} - - Platinum features - , request an extension now. + + + + ) + }} + /> ); return ( )} description={description} footer={ - Extend trial + } /> diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js index 811d0598d5273..f873e53d741de 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/revert_to_basic/revert_to_basic.js @@ -15,6 +15,7 @@ import { EuiConfirmModal, EuiText } from '@elastic/eui'; +import { FormattedMessage } from '@kbn/i18n/react'; export class RevertToBasic extends React.PureComponent { cancel = () => { @@ -35,11 +36,20 @@ export class RevertToBasic extends React.PureComponent { return ( )} onCancel={cancelStartBasicLicense} onConfirm={() => startBasicLicense(licenseType, true)} - cancelButtonText="Cancel" - confirmButtonText="Confirm" + cancelButtonText={()} + confirmButtonText={()} >
      {firstLine} @@ -64,14 +74,24 @@ export class RevertToBasic extends React.PureComponent { } const description = ( - You’ll revert to our free features and lose access to security, machine - learning and other{' '} - - Platinum features - . + + + + ) + }} + /> ); @@ -79,11 +99,17 @@ export class RevertToBasic extends React.PureComponent { {this.acknowledgeModal()} )} description={description} footer={ startBasicLicense(licenseType)}> - Revert to Basic + } /> diff --git a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js index a5ff9f6c8a9e2..0ba4582816cd6 100644 --- a/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js +++ b/x-pack/plugins/license_management/public/sections/license_dashboard/start_trial/start_trial.js @@ -25,6 +25,7 @@ import { import { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } from 'ui/documentation_links'; import { TelemetryOptIn } from '../../../components/telemetry_opt_in'; import { optInToTelemetry } from '../../../lib/telemetry'; +import { FormattedMessage } from '@kbn/i18n/react'; const esBase = `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}`; const securityDocumentationLink = `${esBase}/security-settings.html`; @@ -56,12 +57,15 @@ export class StartTrial extends React.PureComponent { return ( - Start your free 30-day trial + @@ -69,40 +73,97 @@ export class StartTrial extends React.PureComponent {

      - This trial is for the full set of{' '} - - Platinum features - of the Elastic Stack. You'll get immediate access to: + + + + ) + }} + />

        -
      • Machine learning
      • -
      • Alerting
      • -
      • Graph capabilities
      • -
      • JDBC connectivity for SQL
      • +
      • + +
      • +
      • + +
      • +
      • + +
      • +
      • + +

      - Security features, such as authentication (native, AD/LDAP, SAML, - PKI), role-based access control, and auditing, require - configuration. See the{' '} - - documentation - {' '} - for instructions. + + + + ) + }} + />

      - By starting this trial, you agree that it is subject to these{' '} - - terms and conditions - . + + + + ) + }} + />

      @@ -114,18 +175,21 @@ export class StartTrial extends React.PureComponent { {this.telemetryOptIn = ref; }}/> - + - + - Cancel + - + - Start my trial + @@ -152,27 +219,42 @@ export class StartTrial extends React.PureComponent { } const description = ( - Experience what security, machine learning, and all our other{' '} - - Platinum features - {' '} - have to offer. + + + + ) + }} + /> ); const footer = ( this.setState({ showConfirmation: true })}> - Start trial + ); return ( {this.acknowledgeModal()} )} description={description} footer={footer} /> diff --git a/x-pack/plugins/license_management/public/sections/upload_license/upload_license.js b/x-pack/plugins/license_management/public/sections/upload_license/upload_license.js index 18e4caa07a6c8..f031a1572b09d 100644 --- a/x-pack/plugins/license_management/public/sections/upload_license/upload_license.js +++ b/x-pack/plugins/license_management/public/sections/upload_license/upload_license.js @@ -23,6 +23,8 @@ import { } from '@elastic/eui'; import { TelemetryOptIn } from '../../components/telemetry_opt_in'; import { optInToTelemetry } from '../../lib/telemetry'; +import { FormattedMessage } from '@kbn/i18n/react'; + export class UploadLicense extends React.PureComponent { componentDidMount() { this.props.addUploadErrorMessage(''); @@ -51,11 +53,20 @@ export class UploadLicense extends React.PureComponent { return ( } onCancel={this.cancel} onConfirm={() => this.send(true)} - cancelButtonText="Cancel" - confirmButtonText="Confirm" + cancelButtonText={} + confirmButtonText={} >
      {firstLine} @@ -89,7 +100,12 @@ export class UploadLicense extends React.PureComponent { if (this.file) { this.send(); } else { - this.props.addUploadErrorMessage('You must select a license file.'); + this.props.addUploadErrorMessage( + + ); } }; render() { @@ -97,7 +113,12 @@ export class UploadLicense extends React.PureComponent { return ( -

      Upload your license

      +

      + +

      @@ -107,10 +128,22 @@ export class UploadLicense extends React.PureComponent { {this.acknowledgeModal()} -

      Your license key is a JSON file with a signature attached.

      - Uploading a license will replace your current{' '} - {currentLicenseType.toUpperCase()} license. + +

      +

      + {currentLicenseType.toUpperCase()} + ) + }} + />

      @@ -118,7 +151,10 @@ export class UploadLicense extends React.PureComponent { } onChange={this.handleFile} /> @@ -131,7 +167,12 @@ export class UploadLicense extends React.PureComponent { - Cancel + + + - {applying ? 'Uploading...' : 'Upload'} + {applying ? + + : } diff --git a/x-pack/plugins/license_management/public/store/actions/start_basic.js b/x-pack/plugins/license_management/public/store/actions/start_basic.js index 831e5993de5e6..23b63edb706ae 100644 --- a/x-pack/plugins/license_management/public/store/actions/start_basic.js +++ b/x-pack/plugins/license_management/public/store/actions/start_basic.js @@ -7,6 +7,7 @@ import { createAction } from 'redux-actions'; import { startBasic } from '../../lib/es'; import { toastNotifications } from 'ui/notify'; +import { i18n } from '@kbn/i18n'; export const startBasicLicenseStatus = createAction( 'LICENSE_MANAGEMENT_START_BASIC_LICENSE_STATUS' @@ -36,9 +37,13 @@ export const startBasicLicense = (currentLicenseType, ack) => async ( const messages = Object.values(acknowledge).slice(1).map((item) => { return item[0]; }); - const first = `Some functionality will be lost if you replace your - ${currentLicenseType.toUpperCase()} license with a - BASIC license. Review the list of features below.`; + const first = i18n.translate('xpack.licenseMgmt.replacingCurrentLicenseWithBasicLicenseWarningMessage', { + //eslint-disable-next-line + defaultMessage: 'Some functionality will be lost if you replace your {currentLicenseType} license with a BASIC license. Review the list of features below.', + values: { + currentLicenseType: currentLicenseType.toUpperCase(), + } + }); dispatch(startBasicLicenseStatus({ acknowledge: true, messages: [ first, ...messages] })); } diff --git a/x-pack/plugins/license_management/public/store/actions/upload_license.js b/x-pack/plugins/license_management/public/store/actions/upload_license.js index fd05c945747b3..f010980c54259 100644 --- a/x-pack/plugins/license_management/public/store/actions/upload_license.js +++ b/x-pack/plugins/license_management/public/store/actions/upload_license.js @@ -9,10 +9,13 @@ import { addLicense } from '../actions/add_license'; import { BASE_PATH } from '../../../common/constants/base_path'; import { putLicense } from '../../lib/es'; import { addUploadErrorMessage } from "./add_error_message"; +import { i18n } from '@kbn/i18n'; export const uploadLicenseStatus = createAction('LICENSE_MANAGEMENT_UPLOAD_LICENSE_STATUS'); -const genericUploadError = 'Error encountered uploading license:'; +const genericUploadError = i18n.translate('xpack.licenseMgmt.uploadLicense.genericUploadErrorMessage', { + defaultMessage: 'Error encountered uploading license:' +}); const dispatchFromResponse = async (response, dispatch, currentLicenseType, newLicenseType, { xPackInfo, kbnUrl }) => { const { error, acknowledged, license_status: licenseStatus, acknowledge } = response; @@ -22,10 +25,14 @@ const dispatchFromResponse = async (response, dispatch, currentLicenseType, newL } else if (acknowledged) { if (licenseStatus === 'invalid') { dispatch(uploadLicenseStatus({})); - dispatch(addUploadErrorMessage('The supplied license is not valid for this product.')); + dispatch(addUploadErrorMessage(i18n.translate('xpack.licenseMgmt.uploadLicense.invalidLicenseErrorMessage', { + defaultMessage: 'The supplied license is not valid for this product.' + }))); } else if (licenseStatus === 'expired') { dispatch(uploadLicenseStatus({})); - dispatch(addUploadErrorMessage('The supplied license has expired.')); + dispatch(addUploadErrorMessage(i18n.translate('xpack.licenseMgmt.uploadLicense.expiredLicenseErrorMessage', { + defaultMessage: 'The supplied license has expired.' + }))); } else { await xPackInfo.refresh(); dispatch(addLicense(xPackInfo.get('license'))); @@ -38,9 +45,14 @@ const dispatchFromResponse = async (response, dispatch, currentLicenseType, newL // first message relates to command line interface, so remove it const messages = Object.values(acknowledge).slice(1); // messages can be in nested arrays - const first = `Some functionality will be lost if you replace your - ${currentLicenseType.toUpperCase()} license with a - ${newLicenseType.toUpperCase()} license. Review the list of features below.`; + const first = i18n.translate('xpack.licenseMgmt.uploadLicense.problemWithUploadedLicenseDescription', { + // eslint-disable-next-line max-len + defaultMessage: 'Some functionality will be lost if you replace your {currentLicenseType} license with a {newLicenseType} license. Review the list of features below.', + values: { + currentLicenseType: currentLicenseType.toUpperCase(), + newLicenseType: newLicenseType.toUpperCase() + } + }); dispatch(uploadLicenseStatus({ acknowledge: true, messages: [ first, ...messages] })); } @@ -53,13 +65,23 @@ export const uploadLicense = (licenseString, currentLicenseType, acknowledge) => ({ type: newLicenseType } = JSON.parse(licenseString).license); } catch (err) { dispatch(uploadLicenseStatus({})); - return dispatch(addUploadErrorMessage(`${genericUploadError} Check your license file.`)); + return dispatch(addUploadErrorMessage( + i18n.translate('xpack.licenseMgmt.uploadLicense.checkLicenseFileErrorMessage', { + defaultMessage: '{genericUploadError} Check your license file.', + values: { + genericUploadError + } + }) + )); } try { const response = await putLicense(licenseString, acknowledge); await dispatchFromResponse(response, dispatch, currentLicenseType, newLicenseType, services); } catch (err) { - const message = (err.responseJSON && err.responseJSON.error.reason) ? err.responseJSON.error.reason : 'Unknown error.'; + const message = (err.responseJSON && err.responseJSON.error.reason) ? err.responseJSON.error.reason : i18n.translate( + 'xpack.licenseMgmt.uploadLicense.unknownErrorErrorMessage', { + defaultMessage: 'Unknown error.' + }); dispatch(uploadLicenseStatus({})); dispatch(addUploadErrorMessage(`${genericUploadError} ${message}`)); } diff --git a/x-pack/plugins/license_management/public/styles/main.less b/x-pack/plugins/license_management/public/styles/main.less deleted file mode 100644 index e38d7b71522da..0000000000000 --- a/x-pack/plugins/license_management/public/styles/main.less +++ /dev/null @@ -1,33 +0,0 @@ -@import (reference) '~ui/styles/variables/colors'; - -.licenseFeature { - flex-grow: 1; - background: @globalColorLightestGray; - min-height: 100vh; -} - -.licenseManagement__pageBody { - padding-top: 24px; - min-height: auto; -} - -// EUITODO: Fix modal width/max-width -.licenseManagement__modal { - width: 70vw; - - @media only screen and (max-width: 767px) { - width: ~"calc(100vw + 2px)"; - } -} -.licenseManagement__baseline { - vertical-align: baseline; -} -.licenseManagement__narrowText { - width: 240px; -} -.licenseManagement__marginTop { - margin-top: auto; -} -.licenseManagement__ieFlex { - flex-shrink: 0; -} diff --git a/x-pack/plugins/license_management/server/lib/wrap_es_error.js b/x-pack/plugins/license_management/server/lib/wrap_es_error.js index 5dfe29fcdad11..2e639f9912b6d 100644 --- a/x-pack/plugins/license_management/server/lib/wrap_es_error.js +++ b/x-pack/plugins/license_management/server/lib/wrap_es_error.js @@ -16,7 +16,7 @@ import Boom from 'boom'; export function wrapEsError(err) { const statusCode = err.statusCode; if (statusCode === 403) { - return Boom.forbidden('Insufficient user permissions for adding a license.'); + throw Boom.forbidden('Insufficient user permissions for adding a license.'); } - return Boom.boomify(err, err.statusCode); + throw Boom.boomify(err, err.statusCode); } diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_license_route.js b/x-pack/plugins/license_management/server/routes/api/license/register_license_route.js index f311d72ed10e8..e70e61ab07e6b 100644 --- a/x-pack/plugins/license_management/server/routes/api/license/register_license_route.js +++ b/x-pack/plugins/license_management/server/routes/api/license/register_license_route.js @@ -12,9 +12,9 @@ export function registerLicenseRoute(server) { server.route({ path: '/api/license', method: 'PUT', - handler: (request, reply) => { + handler: (request) => { return putLicense(request, xpackInfo) - .then(reply, e => reply(wrapEsError(e))); + .catch(e => wrapEsError(e)); } }); } diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.js b/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.js index 2f4400a4155e4..0dbe46ca106f2 100644 --- a/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.js +++ b/x-pack/plugins/license_management/server/routes/api/license/register_start_basic_route.js @@ -12,9 +12,9 @@ export function registerStartBasicRoute(server) { server.route({ path: '/api/license/start_basic', method: 'POST', - handler: (request, reply) => { + handler: (request) => { return startBasic(request, xpackInfo) - .then(reply, e => reply(wrapEsError(e))); + .catch(e => wrapEsError(e)); } }); } diff --git a/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.js b/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.js index ef20cfdf5b9f0..43b3ffef9c301 100644 --- a/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.js +++ b/x-pack/plugins/license_management/server/routes/api/license/register_start_trial_routes.js @@ -12,17 +12,17 @@ export function registerStartTrialRoutes(server) { server.route({ path: '/api/license/start_trial', method: 'GET', - handler: (request, reply) => { + handler: (request) => { return canStartTrial(request) - .then(reply, e => reply(wrapEsError(e))); + .catch(e => wrapEsError(e)); } }); server.route({ path: '/api/license/start_trial', method: 'POST', - handler: (request, reply) => { + handler: (request) => { return startTrial(request, xpackInfo) - .then(reply, e => reply(wrapEsError(e))); + .catch(e => wrapEsError(e)); } }); } diff --git a/x-pack/plugins/logstash/README.md b/x-pack/plugins/logstash/README.md old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/editor.js b/x-pack/plugins/logstash/common/constants/editor.js deleted file mode 100644 index 5da0cc2bc156a..0000000000000 --- a/x-pack/plugins/logstash/common/constants/editor.js +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -export const EDITOR = { - /* - * The space between the top of the editor's first-line characters - * and the top border of the editor. - */ - PIPELINE_EDITOR_SCROLL_MARGIN_TOP_PX: 4, - - /* - * The space between the bottom of the editor's last-line characters - * and the bottom border of the editor. - */ - PIPELINE_EDITOR_SCROLL_MARGIN_BOTTOM_PX: 12, -}; diff --git a/x-pack/plugins/logstash/common/constants/es_scroll_settings.js b/x-pack/plugins/logstash/common/constants/es_scroll_settings.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/index.js b/x-pack/plugins/logstash/common/constants/index.js old mode 100644 new mode 100755 index c016e505045ee..03a6b4e08d9f4 --- a/x-pack/plugins/logstash/common/constants/index.js +++ b/x-pack/plugins/logstash/common/constants/index.js @@ -13,4 +13,3 @@ export { ES_SCROLL_SETTINGS } from './es_scroll_settings'; export { TOOLTIPS } from './tooltips'; export { PIPELINE } from './pipeline'; export { MONITORING } from './monitoring'; -export { EDITOR } from './editor'; diff --git a/x-pack/plugins/logstash/common/constants/index_names.js b/x-pack/plugins/logstash/common/constants/index_names.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/monitoring.js b/x-pack/plugins/logstash/common/constants/monitoring.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/pagination.js b/x-pack/plugins/logstash/common/constants/pagination.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/pipeline.js b/x-pack/plugins/logstash/common/constants/pipeline.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/plugin.js b/x-pack/plugins/logstash/common/constants/plugin.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/routes.js b/x-pack/plugins/logstash/common/constants/routes.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/tooltips.js b/x-pack/plugins/logstash/common/constants/tooltips.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/constants/type_names.js b/x-pack/plugins/logstash/common/constants/type_names.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/lib/__tests__/get_moment.js b/x-pack/plugins/logstash/common/lib/__tests__/get_moment.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/lib/get_moment.js b/x-pack/plugins/logstash/common/lib/get_moment.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/common/lib/index.js b/x-pack/plugins/logstash/common/lib/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/index.js b/x-pack/plugins/logstash/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap new file mode 100644 index 0000000000000..b068de4dbcf18 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/confirm_delete_pipeline_modal.test.js.snap @@ -0,0 +1,19 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ConfirmDeletePipelineModal component renders as expected 1`] = ` + + +

      + You cannot recover a deleted pipeline. +

      +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap new file mode 100644 index 0000000000000..dab283236b4a3 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/flex_item_setting.test.js.snap @@ -0,0 +1,42 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`FlexItemSetting component renders a null label if label/tooltip text not supplied 1`] = ` + + +

      + The child elements +

      +
      +
      +`; + +exports[`FlexItemSetting component renders component and children as expected 1`] = ` + + + } + > +

      + The child elements +

      +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap new file mode 100644 index 0000000000000..62b4578433e05 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/form_label_with_icon_tip.test.js.snap @@ -0,0 +1,16 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`FormLabelWithIconTip component renders as expected 1`] = ` +
      + + label text + +   + +
      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap new file mode 100644 index 0000000000000..0a0b75ef57880 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/__snapshots__/pipeline_editor.test.js.snap @@ -0,0 +1,1884 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`PipelineEditor component includes required error message for falsy pipeline id 1`] = ` + + + +

      + Create Pipeline +

      +
      + + + + + + + + + +
      + +
      +
      + + } + > + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + Create and deploy + + + + + Cancel + + + +
      +
      +`; + +exports[`PipelineEditor component invalidates form for invalid pipeline id input 1`] = ` + + + +

      + Create Pipeline +

      +
      + + + + + + + + + +
      + +
      +
      + + } + > + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + Create and deploy + + + + + Cancel + + + +
      +
      +`; + +exports[`PipelineEditor component invalidates form for pipeline id with spaces 1`] = ` + + + +

      + Create Pipeline +

      +
      + + + + + + + + + +
      + +
      +
      + + } + > + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + Create and deploy + + + + + Cancel + + + +
      +
      +`; + +exports[`PipelineEditor component matches snapshot for clone pipeline 1`] = ` + + + +

      + Clone Pipeline "pipelineToClone" +

      +
      + + + + + + +
      + +
      +
      + + } + > + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + Create and deploy + + + + + Cancel + + + + + Delete pipeline + + + +
      +
      +`; + +exports[`PipelineEditor component matches snapshot for create pipeline 1`] = ` + + + +

      + Create Pipeline +

      +
      + + + + + + + + + +
      + +
      +
      + + } + > + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + Create and deploy + + + + + Cancel + + + +
      +
      +`; + +exports[`PipelineEditor component matches snapshot for edit pipeline 1`] = ` + + + +

      + Edit Pipeline "pipelineId" +

      +
      + + + + + + +
      + +
      +
      + + } + > + + + + + + + + + + + + + + + + + + + + + + + + +
      + + + + + Create and deploy + + + + + Cancel + + + + + Delete pipeline + + + +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/confirm_delete_pipeline_modal.js b/x-pack/plugins/logstash/public/components/pipeline_editor/confirm_delete_pipeline_modal.js new file mode 100644 index 0000000000000..79d3a5d80c21d --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/confirm_delete_pipeline_modal.js @@ -0,0 +1,34 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { EuiConfirmModal, EUI_MODAL_CANCEL_BUTTON, EuiOverlayMask } from '@elastic/eui'; +import { PIPELINE_EDITOR } from './constants'; + +export function ConfirmDeletePipelineModal({ id, cancelDeleteModal, confirmDeletePipeline }) { + return ( + + +

      {PIPELINE_EDITOR.DELETE_PIPELINE_MODAL_MESSAGE}

      +
      +
      + ); +} + +ConfirmDeletePipelineModal.propTypes = { + cancelDeleteModal: PropTypes.func.isRequired, + confirmDeletePipeline: PropTypes.func.isRequired, + id: PropTypes.string.isRequired, +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/confirm_delete_pipeline_modal.test.js b/x-pack/plugins/logstash/public/components/pipeline_editor/confirm_delete_pipeline_modal.test.js new file mode 100644 index 0000000000000..6320c11ec5269 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/confirm_delete_pipeline_modal.test.js @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { ConfirmDeletePipelineModal } from './confirm_delete_pipeline_modal'; + +describe('ConfirmDeletePipelineModal component', () => { + let props; + + beforeEach(() => { + props = { + id: 'the id', + cancelDeleteModal: jest.fn(), + confirmDeletePipeline: jest.fn(), + }; + }); + + it('renders as expected', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/constants.js b/x-pack/plugins/logstash/public/components/pipeline_editor/constants.js new file mode 100644 index 0000000000000..acbee940072da --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/constants.js @@ -0,0 +1,56 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const PIPELINE_EDITOR = { + DELETE_PIPELINE_MODAL_MESSAGE: `You cannot recover a deleted pipeline.`, + ID_REQUIRED_ERR_MSG: 'Pipeline ID is required', + ID_FORMAT_ERR_MSG: + 'Pipeline ID must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers', + QUEUE_TYPES: [ + { + 'data-test-subj': 'selectQueueType-memory', + text: 'memory', + value: 'memory', + }, + { + 'data-test-subj': 'selectQueueType-persisted', + text: 'persisted', + value: 'persisted', + }, + ], + UNITS: [ + { + 'data-test-subj': 'selectQueueMaxBytesUnits-b', + text: 'bytes', + value: 'b', + }, + { + 'data-test-subj': 'selectQueueMaxBytesUnits-kb', + text: 'kilobytes', + value: 'kb', + }, + { + 'data-test-subj': 'selectQueueMaxBytesUnits-mb', + text: 'megabytes', + value: 'mb', + }, + { + 'data-test-subj': 'selectQueueMaxBytesUnits-gb', + text: 'gigabytes', + value: 'gb', + }, + { + 'data-test-subj': 'selectQueueMaxBytesUnits-tb', + text: 'terabytes', + value: 'tb', + }, + { + 'data-test-subj': 'selectQueueMaxBytesUnits-pb', + text: 'petabytes', + value: 'pb', + }, + ], +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/flex_item_setting.js b/x-pack/plugins/logstash/public/components/pipeline_editor/flex_item_setting.js new file mode 100644 index 0000000000000..e5a20e4b90d19 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/flex_item_setting.js @@ -0,0 +1,35 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { EuiFlexItem, EuiFormRow } from '@elastic/eui'; +import { FormLabelWithIconTip } from './form_label_with_icon_tip'; + +export function FlexItemSetting(props) { + const { formRowLabelText, formRowTooltipText } = props; + + const label = + formRowLabelText && formRowTooltipText ? ( + + ) : null; + + return ( + + + {props.children} + + + ); +} + +FlexItemSetting.propTypes = { + formRowLabelText: PropTypes.string, + formRowTooltipText: PropTypes.string, +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/flex_item_setting.test.js b/x-pack/plugins/logstash/public/components/pipeline_editor/flex_item_setting.test.js new file mode 100644 index 0000000000000..af585cb3a3425 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/flex_item_setting.test.js @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { FlexItemSetting } from './flex_item_setting'; + +describe('FlexItemSetting component', () => { + let props; + + beforeEach(() => { + props = { + formRowLabelText: 'label text', + formRowTooltipText: 'tooltip text', + }; + }); + + it('renders component and children as expected', () => { + const wrapper = shallow( + +

      The child elements

      +
      + ); + + expect(wrapper).toMatchSnapshot(); + }); + + it('renders a null label if label/tooltip text not supplied', () => { + const wrapper = shallow( + +

      The child elements

      +
      + ); + + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/form_label_with_icon_tip.js b/x-pack/plugins/logstash/public/components/pipeline_editor/form_label_with_icon_tip.js new file mode 100644 index 0000000000000..522e13e38d024 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/form_label_with_icon_tip.js @@ -0,0 +1,24 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { EuiIconTip } from '@elastic/eui'; + +export function FormLabelWithIconTip({ formRowLabelText, formRowTooltipText }) { + return ( +
      + {formRowLabelText} +   + +
      + ); +} + +FormLabelWithIconTip.propTypes = { + formRowLabelText: PropTypes.string.isRequired, + formRowTooltipText: PropTypes.string.isRequired, +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/form_label_with_icon_tip.test.js b/x-pack/plugins/logstash/public/components/pipeline_editor/form_label_with_icon_tip.test.js new file mode 100644 index 0000000000000..3eb1d9ec9f820 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/form_label_with_icon_tip.test.js @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { FormLabelWithIconTip } from './form_label_with_icon_tip'; + +describe('FormLabelWithIconTip component', () => { + let props; + + beforeEach(() => { + props = { + formRowLabelText: 'label text', + formRowTooltipText: 'tooltip text', + }; + }); + + it('renders as expected', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/index.js b/x-pack/plugins/logstash/public/components/pipeline_editor/index.js new file mode 100644 index 0000000000000..f723ed201c331 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { PipelineEditor } from './pipeline_editor'; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/pipeline_editor.js b/x-pack/plugins/logstash/public/components/pipeline_editor/pipeline_editor.js new file mode 100644 index 0000000000000..0e888bfa9e95f --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/pipeline_editor.js @@ -0,0 +1,444 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { PropTypes } from 'prop-types'; + +import 'brace/mode/plain_text'; +import 'brace/theme/github'; + +import { isEmpty } from 'lodash'; +import { TOOLTIPS } from '../../../common/constants/tooltips'; +import { + EuiButton, + EuiButtonEmpty, + EuiCodeEditor, + EuiFlexGroup, + EuiFieldNumber, + EuiFlexItem, + EuiFieldText, + EuiForm, + EuiFormRow, + EuiPage, + EuiPageContent, + EuiSelect, + EuiSpacer, + EuiTitle, +} from '@elastic/eui'; +import { ConfirmDeletePipelineModal } from './confirm_delete_pipeline_modal'; +import { FlexItemSetting } from './flex_item_setting'; +import { FormLabelWithIconTip } from './form_label_with_icon_tip'; +import { PIPELINE_EDITOR } from './constants'; + +export class PipelineEditor extends React.Component { + constructor(props) { + super(props); + + const { + pipeline: { id, description, pipeline, settings }, + username, + } = this.props; + + const pipelineWorkers = settings['pipeline.workers'] ? settings['pipeline.workers'] : 1; + + this.state = { + maxBytesNumber: settings['queue.max_bytes.number'], + maxBytesUnit: settings['queue.max_bytes.units'], + pipeline: { + id, + description, + pipeline, + settings: { + 'pipeline.batch.delay': settings['pipeline.batch.delay'], + 'pipeline.batch.size': settings['pipeline.batch.size'], + 'pipeline.workers': pipelineWorkers, + 'queue.checkpoint.writes': settings['queue.checkpoint.writes'], + 'queue.max_bytes': settings['queue.max_bytes.number'] + settings['queue.max_bytes.units'], + 'queue.type': settings['queue.type'], + }, + username, + }, + pipelineIdErrors: [], + pipelineIdPattern: /^[A-Za-z\_][A-Za-z0-9\-\_]*$/, + showConfirmDeleteModal: false, + showPipelineIdError: false, + }; + } + + componentDidMount = () => { + const { + licenseService: { isReadOnly, message }, + toastNotifications, + } = this.props; + if (isReadOnly) { + toastNotifications.addWarning(message); + } + }; + + hideConfirmDeleteModal = () => { + this.setState({ + showConfirmDeleteModal: false, + }); + }; + + showConfirmDeleteModal = () => { + this.setState({ + showConfirmDeleteModal: true, + }); + }; + + onPipelineIdChange = ({ target: { value } }) => { + const pipelineIdErrors = []; + if (!value) { + pipelineIdErrors.push(PIPELINE_EDITOR.ID_REQUIRED_ERR_MSG); + } + if (!this.state.pipelineIdPattern.test(value)) { + pipelineIdErrors.push(PIPELINE_EDITOR.ID_FORMAT_ERR_MSG); + } + + this.setState({ + pipelineIdErrors, + showPipelineIdError: !!pipelineIdErrors.length, + pipeline: { + ...this.state.pipeline, + id: value, + }, + }); + }; + + isSaveDisabled = () => { + return this.state.showPipelineIdError || isEmpty(this.state.pipeline.id); + }; + + onClose = async () => { + await this.props.close(); + }; + + open = async () => { + const { id } = this.state.pipeline; + if (id) { + await this.props.open(id); + } + }; + + onPipelineSave = () => { + const { pipelineService, toastNotifications } = this.props; + const { id } = this.state.pipeline; + return pipelineService + .savePipeline({ + id, + upstreamJSON: this.state.pipeline, + }) + .then(() => { + toastNotifications.addSuccess(`Saved "${id}"`); + this.onClose(); + }) + .catch(this.notifyOnError); + }; + + onPipelineDescriptionChange = ({ target: { value } }) => { + this.setState({ + pipeline: { + ...this.state.pipeline, + description: value, + }, + }); + }; + + onPipelineChange = e => { + this.setState({ + pipeline: { + ...this.state.pipeline, + pipeline: e, + }, + }); + }; + + handleNumberChange = (settingName, value) => { + const numberValue = parseInt(value, 10); + this.handleSettingChange(settingName, isNaN(numberValue) ? value : numberValue); + }; + + handleMaxByteNumberChange = value => { + this.setState({ maxBytesNumber: parseInt(value, 10) }); + this.handleSettingChange('queue.max_bytes', value + this.state.maxBytesUnit); + }; + + handleMaxByteUnitChange = value => { + this.setState({ maxBytesUnit: value }); + this.handleSettingChange('queue.max_bytes', this.state.maxBytesNumber + value); + }; + + handleSettingChange = (settingName, value) => { + const settings = { ...this.state.pipeline.settings }; + settings[settingName] = value; + this.setState({ + pipeline: { + ...this.state.pipeline, + settings, + }, + }); + }; + + notifyOnError = err => { + const { notifier, licenseService } = this.props; + + return licenseService.checkValidity().then(() => notifier.error(err)); + }; + + deletePipeline = () => { + const { + pipeline: { id }, + pipelineService, + toastNotifications, + } = this.props; + + this.hideConfirmDeleteModal(); + + return pipelineService + .deletePipeline(id) + .then(() => { + toastNotifications.addSuccess(`Deleted "${id}"`); + this.onClose(); + }) + .catch(this.notifyOnError); + }; + + getPipelineHeadingText = () => { + const { + routeService: { + current: { + params: { clone, id }, + }, + }, + isNewPipeline, + } = this.props; + + if (!!clone && id) { + return `Clone Pipeline "${id}"`; + } + if (!isNewPipeline) { + return `Edit Pipeline "${this.state.pipeline.id}"`; + } + return 'Create Pipeline'; + }; + + render() { + return ( + + + +

      {this.getPipelineHeadingText()}

      +
      + + + {this.props.isNewPipeline && ( + + + + )} + + + + +
      + +
      +
      + + } + > + this.handleNumberChange('pipeline.workers', e.target.value)} + value={this.state.pipeline.settings['pipeline.workers']} + /> + + + + this.handleNumberChange('pipeline.batch.size', e.target.value)} + value={this.state.pipeline.settings['pipeline.batch.size']} + /> + + + this.handleNumberChange('pipeline.batch.delay', e.target.value)} + value={this.state.pipeline.settings['pipeline.batch.delay']} + /> + + + + + this.handleSettingChange('queue.type', e.target.value)} + options={PIPELINE_EDITOR.QUEUE_TYPES} + value={this.state.pipeline.settings['queue.type']} + /> + + + this.handleMaxByteNumberChange(e.target.value)} + value={this.state.maxBytesNumber} + /> + + + this.handleMaxByteUnitChange(e.target.value)} + options={PIPELINE_EDITOR.UNITS} + value={this.state.maxBytesUnit} + /> + + + this.handleNumberChange('queue.checkpoint.writes', e.target.value)} + value={this.state.pipeline.settings['queue.checkpoint.writes']} + /> + + +
      + + + + + Create and deploy + + + + + Cancel + + + {!this.props.isNewPipeline && ( + + + Delete pipeline + + + )} + +
      + {this.state.showConfirmDeleteModal && ( + + )} +
      + ); + } +} + +PipelineEditor.propTypes = { + close: PropTypes.func.isRequired, + isNewPipeline: PropTypes.bool.isRequired, + licenseService: PropTypes.shape({ + checkValidity: PropTypes.func.isRequired, + isReadOnly: PropTypes.bool.isRequired, + message: PropTypes.string, + }).isRequired, + notifier: PropTypes.shape({ + error: PropTypes.func.isRequired, + }).isRequired, + open: PropTypes.func.isRequired, + pipeline: PropTypes.shape({ + id: PropTypes.string, + description: PropTypes.string, + pipeline: PropTypes.any, + settings: PropTypes.shape({ + 'pipeline.batch.delay': PropTypes.number.isRequired, + 'pipeline.batch.size': PropTypes.number.isRequired, + 'pipeline.workers': PropTypes.number, + 'queue.checkpoint.writes': PropTypes.number.isRequired, + 'queue.max_bytes': PropTypes.number, + 'queue.type': PropTypes.string.isRequired, + }), + }).isRequired, + pipelineService: PropTypes.shape({ + deletePipeline: PropTypes.func.isRequired, + savePipeline: PropTypes.func.isRequired, + }).isRequired, + routeService: PropTypes.shape({ + current: PropTypes.shape({ + params: PropTypes.shape({ + clone: PropTypes.oneOf([true, undefined]), + id: PropTypes.string, + }), + }), + }).isRequired, + toastNotifications: PropTypes.shape({ + addWarning: PropTypes.func.isRequired, + addSuccess: PropTypes.func.isRequired, + }).isRequired, + username: PropTypes.string, +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_editor/pipeline_editor.test.js b/x-pack/plugins/logstash/public/components/pipeline_editor/pipeline_editor.test.js new file mode 100644 index 0000000000000..41706d3714ed0 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_editor/pipeline_editor.test.js @@ -0,0 +1,176 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import 'brace'; +import { PipelineEditor } from './pipeline_editor'; + +describe('PipelineEditor component', () => { + let props; + let close; + let isNewPipeline; + let licenseService; + let notifier; + let open; + let pipeline; + let pipelineService; + let routeService; + let toastNotifications; + let username; + + beforeEach(() => { + close = jest.fn(); + isNewPipeline = false; + licenseService = { + checkValidity: jest.fn(), + isReadOnly: false, + message: 'license service message', + }; + notifier = { + error: jest.fn(), + }; + open = jest.fn(); + pipeline = { + id: 'pipelineId', + description: 'pipeline description', + pipeline: 'input { stdin { } } filter { } output { stdout { } }', + settings: { + 'pipeline.batch.delay': 10, + 'pipeline.batch.size': 256, + 'pipeline.workers': 1, + 'queue.checkpoint.writes': 100, + 'queue.max_bytes': 1024, + 'queue.type': 'MB', + }, + }; + pipelineService = { + deletePipeline: jest.fn(), + savePipeline: jest.fn(), + }; + routeService = { + current: { + params: { + clone: undefined, + id: undefined, + }, + }, + }; + toastNotifications = { + addWarning: jest.fn(), + addSuccess: jest.fn(), + }; + username = 'elastic'; + props = { + close, + isNewPipeline, + licenseService, + notifier, + open, + pipeline, + pipelineService, + routeService, + toastNotifications, + username, + }; + }); + + it('matches snapshot for edit pipeline', () => { + expect(shallow()).toMatchSnapshot(); + }); + + it('matches snapshot for clone pipeline', () => { + routeService.current.params = { + clone: true, + id: 'pipelineToClone', + }; + expect(shallow()).toMatchSnapshot(); + }); + + it('matches snapshot for create pipeline', () => { + expect(shallow()).toMatchSnapshot(); + }); + + it('updates state for pipeline id when creating', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputId"]`).simulate('change', { target: { value: 'theNewPipelineId' } }); + expect(wrapper.instance().state.pipeline.id).toBe('theNewPipelineId'); + }); + + it('updates pipeline description', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputDescription"]`).simulate('change', { target: { value: 'the new description' } }); + expect(wrapper.instance().state.pipeline.description).toBe('the new description'); + }); + + it('updates pipeline workers', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputWorkers"]`).simulate('change', { target: { value: '12' } }); + expect(wrapper.instance().state.pipeline.settings['pipeline.workers']).toBe(12); + }); + + it('updates pipeline batch size', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputBatchSize"]`).simulate('change', { target: { value: '12' } }); + expect(wrapper.instance().state.pipeline.settings['pipeline.batch.size']).toBe(12); + }); + + it('updates pipeline settings', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputWorkers"]`).simulate('change', { target: { value: '10' } }); + wrapper.find(`[data-test-subj="inputBatchSize"]`).simulate('change', { target: { value: '11' } }); + wrapper.find(`[data-test-subj="inputBatchDelay"]`).simulate('change', { target: { value: '12' } }); + wrapper.find(`[data-test-subj="inputQueueMaxBytesNumber"]`).simulate('change', { target: { value: '13' } }); + wrapper.find(`[data-test-subj="inputQueueCheckpointWrites"]`).simulate('change', { target: { value: '14' } }); + expect(wrapper.instance().state.pipeline.settings['pipeline.workers']).toBe(10); + expect(wrapper.instance().state.pipeline.settings['pipeline.batch.size']).toBe(11); + expect(wrapper.instance().state.pipeline.settings['pipeline.batch.delay']).toBe(12); + expect(wrapper.instance().state.pipeline.settings['queue.checkpoint.writes']).toBe(14); + }); + + it('calls the pipelineService delete function on delete', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="btnDeletePipeline"]`).simulate('click'); + expect(wrapper.instance().state.showConfirmDeleteModal).toBe(true); + }); + + it('only matches pipeline names that fit the acceptable parameters', () => { + const wrapper = shallow(); + const pattern = wrapper.instance().state.pipelineIdPattern; + + expect(pattern.test('_startwithunderscore')).toBe(true); + expect(pattern.test('startwithloweralpha')).toBe(true); + expect(pattern.test('Startwithupperalpha')).toBe(true); + expect(pattern.test('_us-with-dashes')).toBe(true); + expect(pattern.test('_us-With-UPPER-alpha')).toBe(true); + expect(pattern.test('contains a space')).toBe(false); + expect(pattern.test('8startswithnum')).toBe(false); + expect(pattern.test(' startswithspace')).toBe(false); + expect(pattern.test('endswithspace ')).toBe(false); + expect(pattern.test('a?')).toBe(false); + expect(pattern.test('?')).toBe(false); + expect(pattern.test('+')).toBe(false); + expect(pattern.test('f+')).toBe(false); + }); + + it('invalidates form for invalid pipeline id input', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputId"]`).simulate('change', { target: { value: '$invalid-pipeline-name' } }); + expect(wrapper).toMatchSnapshot(); + }); + + it('invalidates form for pipeline id with spaces', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputId"]`).simulate('change', { target: { value: 'pipeline id with spaces' } }); + expect(wrapper).toMatchSnapshot(); + }); + + it('includes required error message for falsy pipeline id', () => { + const wrapper = shallow(); + wrapper.find(`[data-test-subj="inputId"]`).simulate('change', { target: { value: '' } }); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap new file mode 100644 index 0000000000000..85f1f0626d802 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/add_role_alert.test.js.snap @@ -0,0 +1,14 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`AddRoleAlert component renders expected component 1`] = ` +

      + + Grant additional privileges. + + In Kibana Management, assign the + + monitoring_user + + role to your Kibana user. +

      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap new file mode 100644 index 0000000000000..5769bb98b6377 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/alert_call_out.test.js.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`AlertCallOut component renders expected component 1`] = ` + +

      + How can I see additional pipelines? +

      +
      + Some text +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap new file mode 100644 index 0000000000000..d04e9276d8642 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/confirm_delete_modal.test.js.snap @@ -0,0 +1,37 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ConfirmDeleteModal component confirms delete for multiple pipelines 1`] = ` + + +

      + You cannot recover deleted pipelines. +

      +
      +
      +`; + +exports[`ConfirmDeleteModal component confirms delete for single pipeline 1`] = ` + + +

      + You cannot recover a deleted pipeline +

      +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap new file mode 100644 index 0000000000000..1913a1ed45280 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/enable_monitoring_alert.test.js.snap @@ -0,0 +1,26 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`EnableMonitoringAlert component renders expected component 1`] = ` +

      + + Enable monitoring. + + In the + + kibana.yml + + file, set + + xpack.monitoring.enabled + + and + + xpack.monitoring.ui.enabled + + to + + true + + . +

      +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/info_alerts.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/info_alerts.test.js.snap new file mode 100644 index 0000000000000..0dd86ca37bac7 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/info_alerts.test.js.snap @@ -0,0 +1,22 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`InfoAlerts component renders AddRoleAlert and EnableMonitoringAlert if both flags are true 1`] = ` + + + + +`; + +exports[`InfoAlerts component renders AddRoleAlert if flag is true 1`] = ` + + + +`; + +exports[`InfoAlerts component renders EnableMonitoringAlert if flag is true 1`] = ` + + + +`; + +exports[`InfoAlerts component renders null if both alert flags are false 1`] = `""`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap new file mode 100644 index 0000000000000..f43378e68d017 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/__snapshots__/pipelines_table.test.js.snap @@ -0,0 +1,110 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`PipelinesTable component renders component as expected 1`] = ` + + Create pipeline + , + } + } + selection={ + Object { + "onSelectionChange": [MockFunction], + "selectable": [Function], + "selectableMessage": [Function], + } + } + sorting={true} +/> +`; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/add_role_alert.js b/x-pack/plugins/logstash/public/components/pipeline_list/add_role_alert.js new file mode 100644 index 0000000000000..ae890f6ffde97 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/add_role_alert.js @@ -0,0 +1,17 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { EuiCode } from '@elastic/eui'; + +export function AddRoleAlert() { + return ( +

      + Grant additional privileges. + In Kibana Management, assign the monitoring_user role to your Kibana user. +

      + ); +} diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/add_role_alert.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/add_role_alert.test.js new file mode 100644 index 0000000000000..d6ba14e1620a2 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/add_role_alert.test.js @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { AddRoleAlert } from './add_role_alert'; + +describe('AddRoleAlert component', () => { + it('renders expected component', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/alert_call_out.js b/x-pack/plugins/logstash/public/components/pipeline_list/alert_call_out.js new file mode 100644 index 0000000000000..24ef4359a5597 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/alert_call_out.js @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { EuiCallOut } from '@elastic/eui'; +import { PIPELINE_LIST } from './constants'; + +export function AlertCallOut(props) { + return ( + +

      How can I see additional pipelines?

      + {props.children} +
      + ); +} diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/alert_call_out.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/alert_call_out.test.js new file mode 100644 index 0000000000000..9d5d08dac9529 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/alert_call_out.test.js @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { AlertCallOut } from './alert_call_out'; + +describe('AlertCallOut component', () => { + it('renders expected component', () => { + const wrapper = shallow( + +
      Some text
      +
      + ); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/confirm_delete_modal.js b/x-pack/plugins/logstash/public/components/pipeline_list/confirm_delete_modal.js new file mode 100644 index 0000000000000..0190af7ae2a79 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/confirm_delete_modal.js @@ -0,0 +1,49 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { EuiConfirmModal, EUI_MODAL_CANCEL_BUTTON, EuiOverlayMask } from '@elastic/eui'; + +export function ConfirmDeleteModal({ + cancelDeletePipelines, + deleteSelectedPipelines, + selection, + showConfirmDeleteModal, +}) { + if (!showConfirmDeleteModal) { + return null; + } + const numPipelinesSelected = selection.length; + + const confirmText = + numPipelinesSelected === 1 + ? { + message: 'You cannot recover a deleted pipeline', + button: `Delete pipeline`, + title: `Delete pipeline "${selection[0].id}"`, + } + : { + message: `You cannot recover deleted pipelines.`, + button: `Delete ${numPipelinesSelected} pipelines`, + title: `Delete ${numPipelinesSelected} pipelines`, + }; + + return ( + + +

      {confirmText.message}

      +
      +
      + ); +} diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/confirm_delete_modal.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/confirm_delete_modal.test.js new file mode 100644 index 0000000000000..6dfd68b7043e4 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/confirm_delete_modal.test.js @@ -0,0 +1,60 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { mount, shallow } from 'enzyme'; +import { ConfirmDeleteModal } from './confirm_delete_modal'; + +describe('ConfirmDeleteModal component', () => { + let props; + beforeEach(() => { + props = { + cancelDeletePipelines: jest.fn(), + deleteSelectedPipelines: jest.fn(), + selection: [ + { + id: 'testId', + }, + ], + showConfirmDeleteModal: jest.fn(), + }; + }); + + it('confirms delete for single pipeline', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); + + it('confirms delete for multiple pipelines', () => { + props.selection = [{ id: 'testId' }, { id: 'testId2' }]; + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); + + it('calls cancel delete', () => { + const wrapper = mount(); + wrapper + .find('[data-test-subj="confirmModalCancelButton"]') + .first() + .simulate('click'); + expect(props.cancelDeletePipelines).toHaveBeenCalled(); + }); + + it('calls deleteSelectedPipelines', () => { + const wrapper = mount(); + wrapper + .find('[data-test-subj="confirmModalConfirmButton"]') + .first() + .simulate('click'); + expect(props.deleteSelectedPipelines).toHaveBeenCalled(); + }); + + it('does not render a component if modal is hidden', () => { + props.showConfirmDeleteModal = false; + const wrapper = mount(); + expect(wrapper.instance()).toBeNull(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/constants.js b/x-pack/plugins/logstash/public/components/pipeline_list/constants.js new file mode 100644 index 0000000000000..7e16c471c51f7 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/constants.js @@ -0,0 +1,15 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const PIPELINE_LIST = { + INITIAL_PAGE_SIZE: 20, + PAGE_SIZE_OPTIONS: [5, 8, 20, 50], + PIPELINE_NOT_CENTRALLY_MANAGED_TOOLTIP_TEXT: + `This pipeline wasn't created using Centralized Configuration Management. It can't be managed or edited here.`, + INFO_ALERTS: { + CALL_OUT_TITLE: 'Only pipelines created in Kibana Management appear here', + }, +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/enable_monitoring_alert.js b/x-pack/plugins/logstash/public/components/pipeline_list/enable_monitoring_alert.js new file mode 100644 index 0000000000000..190359ab97f31 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/enable_monitoring_alert.js @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { EuiCode } from '@elastic/eui'; + +export function EnableMonitoringAlert() { + return ( +

      + Enable monitoring. + In the kibana.yml file, set + xpack.monitoring.enabled and + xpack.monitoring.ui.enabled to + true. +

      + ); +} diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/enable_monitoring_alert.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/enable_monitoring_alert.test.js new file mode 100644 index 0000000000000..0faddfbee7bb4 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/enable_monitoring_alert.test.js @@ -0,0 +1,16 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { EnableMonitoringAlert } from './enable_monitoring_alert'; + +describe('EnableMonitoringAlert component', () => { + it('renders expected component', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/index.js b/x-pack/plugins/logstash/public/components/pipeline_list/index.js new file mode 100644 index 0000000000000..aa17c2ed84832 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { PipelineList } from './pipeline_list'; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/info_alerts.js b/x-pack/plugins/logstash/public/components/pipeline_list/info_alerts.js new file mode 100644 index 0000000000000..3130d215b221d --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/info_alerts.js @@ -0,0 +1,25 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { AddRoleAlert } from './add_role_alert'; +import { AlertCallOut } from './alert_call_out'; +import { EnableMonitoringAlert } from './enable_monitoring_alert'; + +export function InfoAlerts({ showAddRoleAlert, showEnableMonitoringAlert }) { + return showAddRoleAlert || showEnableMonitoringAlert ? ( + + {showAddRoleAlert && } + {showEnableMonitoringAlert && } + + ) : null; +} + +InfoAlerts.propTypes = { + showAddRoleAlert: PropTypes.bool.isRequired, + showEnableMonitoringAlert: PropTypes.bool.isRequired, +}; diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/info_alerts.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/info_alerts.test.js new file mode 100644 index 0000000000000..c22fc538359f7 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/info_alerts.test.js @@ -0,0 +1,44 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { InfoAlerts } from './info_alerts'; + +describe('InfoAlerts component', () => { + it('renders null if both alert flags are false', () => { + const wrapper = shallow( + + ); + + expect(wrapper).toMatchSnapshot(); + expect(wrapper.instance()).toBeNull(); + }); + + it('renders AddRoleAlert if flag is true', () => { + const wrapper = shallow( + + ); + + expect(wrapper).toMatchSnapshot(); + }); + + it('renders EnableMonitoringAlert if flag is true', () => { + const wrapper = shallow( + + ); + + expect(wrapper).toMatchSnapshot(); + }); + + it('renders AddRoleAlert and EnableMonitoringAlert if both flags are true', () => { + const wrapper = shallow( + + ); + + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/pipeline_list.js b/x-pack/plugins/logstash/public/components/pipeline_list/pipeline_list.js new file mode 100644 index 0000000000000..b983111724262 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/pipeline_list.js @@ -0,0 +1,235 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import pluralize from 'pluralize'; + +import { + EuiCallOut, + EuiEmptyPrompt, + EuiLoadingSpinner, + EuiPage, + EuiPageContent, +} from '@elastic/eui'; + +import { InfoAlerts } from './info_alerts'; +import { PipelinesTable } from './pipelines_table'; +import { ConfirmDeleteModal } from './confirm_delete_modal'; + +export class PipelineList extends React.Component { + constructor(props) { + super(props); + + this.state = { + columns: [], + isForbidden: false, + isLoading: true, + isSelectable: false, + pipelines: [], + showAddRoleAlert: false, + showConfirmDeleteModal: false, + showEnableMonitoringAlert: false, + selection: [], + }; + } + + componentDidMount = () => { + const { isReadOnly, licenseService, toastNotifications } = this.props; + + this.loadPipelines().then(() => { + if (isReadOnly) { + toastNotifications.addWarning(licenseService.message); + } + }); + + this.checkMonitoringAccess(); + }; + + getEmptyPrompt = () => ( + No pipelines} + titleSize="xs" + body="There are no pipelines defined." + /> + ); + + getErrorPrompt = () => ( + Error} + titleSize="xs" + body="Error encountered while loading pipelines." + /> + ); + + loadPipelines = () => { + const { isReadOnly, licenseService, pipelinesService, toastNotifications } = this.props; + + this.setState({ + message: ( +
      + +   Loading pipelines.... +
      + ), + }); + + return pipelinesService + .getPipelineList() + .then(pipelines => { + this.setState({ + isLoading: false, + isForbidden: false, + isSelectable: true, + pipelines, + }); + + if (!pipelines.length) { + this.setState({ + columns: [], + message: this.getEmptyPrompt(), + isSelectable: false, + }); + } + }) + .catch(err => { + this.setState({ + isLoading: false, + message: this.getErrorPrompt(), + }); + return licenseService.checkValidity().then(() => { + if (err.status === 403) { + this.setState({ isLoading: false }); + + if (isReadOnly) { + this.setState({ isForbidden: false }); + } else { + this.setState({ isForbidden: true }); + } + } else { + this.setState({ isForbidden: false }); + toastNotifications.addDanger(`Couldn't load pipeline. Error: "${err.statusText}".`); + } + }); + }); + }; + + checkMonitoringAccess = () => { + const { clusterService, monitoringService } = this.props; + + clusterService.isClusterInfoAvailable().then(isAvailable => { + this.setState({ + showAddRoleAlert: !isAvailable, + showEnableMonitoringAlert: !monitoringService.isMonitoringEnabled(), + }); + }); + }; + + renderNoPermissionCallOut = () => { + const { isForbidden, isLoading } = this.state; + return isForbidden && !isLoading ? ( + +

      Please contact your administrator.

      +
      + ) : null; + }; + + hideDeletePipelinesModal = () => { + this.setState({ + showConfirmDeleteModal: false, + }); + }; + + showDeletePipelinesModal = () => { + this.setState({ + showConfirmDeleteModal: true, + }); + }; + + cancelDeletePipelines = () => { + this.hideDeletePipelinesModal(); + }; + + deleteSelectedPipelines = () => { + this.hideDeletePipelinesModal(); + const { licenseService, pipelinesService, toastNotifications } = this.props; + const { selection } = this.state; + const numPipelinesSelected = selection.length; + const totalPluralized = pluralize('Pipeline', numPipelinesSelected); + + const pipelineIds = selection.map(({ id }) => id); + return pipelinesService + .deletePipelines(pipelineIds) + .then(results => { + const { numSuccesses, numErrors } = results; + const errorPluralized = pluralize('Pipeline', numErrors); + + if (numSuccesses === 1 && numErrors === 0) { + toastNotifications.addSuccess(`Deleted "${selection[0].id}"`); + } else if (numSuccesses) { + let text; + if (numErrors) { + text = `But ${numErrors} ${errorPluralized} couldn't be deleted.`; + } + + toastNotifications.addSuccess({ + title: `Deleted ${numSuccesses} out of ${numPipelinesSelected} ${totalPluralized}`, + text, + }); + } else if (numErrors) { + toastNotifications.addError(`Failed to delete ${numErrors} ${errorPluralized}`); + } + + this.loadPipelines(); + }) + .catch(err => { + return licenseService.checkValidity().then(() => toastNotifications.addDanger(err)); + }); + }; + + onDeleteSelectedPipelines = () => { + this.showDeletePipelinesModal(); + }; + + onSelectionChange = selection => this.setState({ selection }); + + render() { + const { clonePipeline, createPipeline, isReadOnly, openPipeline } = this.props; + const { isSelectable, message, pipelines, selection, showConfirmDeleteModal } = this.state; + return ( + + + {this.renderNoPermissionCallOut()} + + + + + + ); + } +} diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/pipeline_list.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/pipeline_list.test.js new file mode 100644 index 0000000000000..d5197aae00363 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/pipeline_list.test.js @@ -0,0 +1,111 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { PipelineList } from './pipeline_list'; + +describe('PipelineList component', () => { + let props; + let addDanger; + let addSuccess; + let addWarning; + + let pipelines; + + const getGetPipelineList = (isSuccess, result) => + isSuccess ? () => Promise.resolve(result) : () => Promise.reject(result); + + const getIsClusterInfoAvailable = isAvailable => () => Promise.resolve(isAvailable); + + const getDeleteSelectedPipelines = isSuccess => + isSuccess ? () => Promise.resolve({}) : () => Promise.reject({}); + + beforeEach(() => { + pipelines = [{ id: 'test', description: 'test description' }]; + addDanger = jest.fn(); + addSuccess = jest.fn(); + addWarning = jest.fn(); + props = { + clusterService: { + isClusterInfoAvailable: getIsClusterInfoAvailable(true), + deleteSelectedPipelines: getDeleteSelectedPipelines(true), + }, + isReadOnly: false, + licenseService: { + checkValidity: () => Promise.resolve(), + message: 'the license service message', + }, + monitoringService: { + isMonitoringEnabled: () => true, + }, + pipelinesService: { + getPipelineList: getGetPipelineList(true, pipelines), + }, + toastNotifications: { + addDanger, + addSuccess, + addWarning, + }, + }; + }); + + async function renderWithProps() { + const wrapper = shallow(); + await Promise.all([wrapper.instance().componentDidMount]); + return wrapper; + } + + it('notifies the user if readonly after pipeline load', async () => { + props.isReadOnly = true; + await renderWithProps(); + expect(addWarning).toBeCalledWith('the license service message'); + }); + + it('does not notify if not readonly', async () => { + await renderWithProps(); + expect(addWarning).not.toBeCalled(); + }); + + it('renders empty prompt for no pipelines', async () => { + props.pipelinesService.getPipelineList = getGetPipelineList(true, []); + const wrapper = await renderWithProps(); + const component = wrapper.instance(); + expect(component.state.message).toEqual(component.getEmptyPrompt()); + }); + + it('notifies the user if pipeline load fails', async () => { + props.pipelinesService.getPipelineList = getGetPipelineList(false, { + status: 401, + statusText: 'Unauthorized access', + }); + props.isReadOnly = false; + await renderWithProps(); + expect(addDanger).toBeCalledWith(`Couldn't load pipeline. Error: "Unauthorized access".`); + }); + + it('sets state to forbidden if 403 error and not readonly', async () => { + props.pipelinesService.getPipelineList = getGetPipelineList(false, { + status: 403, + }); + props.isReadOnly = false; + const wrapper = await renderWithProps(); + const component = wrapper.instance(); + expect(component.state.isLoading).toBe(false); + expect(component.state.isForbidden).toBe(true); + }); + + it('is not forbidden if 403 and readonly is true', async () => { + props.pipelinesService.getPipelineList = getGetPipelineList(false, { + status: 403, + }); + props.isReadOnly = true; + const wrapper = await renderWithProps(); + const component = wrapper.instance(); + expect(component.state.isLoading).toBe(false); + expect(component.state.isForbidden).toBe(false); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/pipelines_table.js b/x-pack/plugins/logstash/public/components/pipeline_list/pipelines_table.js new file mode 100644 index 0000000000000..62ca8dc0634b3 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/pipelines_table.js @@ -0,0 +1,170 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { EuiButton, EuiButtonEmpty, EuiIconTip, EuiInMemoryTable, EuiLink } from '@elastic/eui'; +import { PIPELINE_LIST } from './constants'; + +function getColumns(openPipeline, clonePipeline) { + return [ + { + field: 'id', + name: 'Id', + sortable: true, + render: (id, { isCentrallyManaged }) => { + const openPipelineClicked = () => openPipeline(id); + return isCentrallyManaged ? ( + + {id} + + ) : ( + + {id}   + + + ); + }, + }, + { + field: 'description', + name: 'Description', + render: description => {description}, + sortable: true, + truncateText: true, + }, + { + field: 'lastModifiedHumanized', + name: 'Last Modified', + render: lastModified => {lastModified}, + sortable: true, + }, + { + field: 'username', + name: 'Modified By', + render: username => {username}, + sortable: true, + }, + { + field: 'id', + name: '', + render: (id, { isCentrallyManaged }) => { + const cloneClicked = () => { + clonePipeline(id); + }; + return isCentrallyManaged ? ( + + Clone + + ) : null; + }, + sortable: false, + width: '100px', + }, + ]; +} + +export function PipelinesTable({ + clonePipeline, + createPipeline, + isReadOnly, + isSelectable, + message, + onDeleteSelectedPipelines, + onSelectionChange, + openPipeline, + pipelines, + selection, + pageIndex, +}) { + const pagination = { + pageIndex, + initialPageSize: PIPELINE_LIST.INITIAL_PAGE_SIZE, + totalItemCount: pipelines.length, + pageSizeOptions: PIPELINE_LIST.PAGE_SIZE_OPTIONS, + }; + + const selectableMessage = (selectable, { id }) => + selectable + ? `Select pipeline "${id}"` + : PIPELINE_LIST.PIPELINE_NOT_CENTRALLY_MANAGED_TOOLTIP_TEXT; + + const selectionOptions = isSelectable + ? { + selectable: ({ isCentrallyManaged }) => isCentrallyManaged, + selectableMessage, + onSelectionChange, + } + : null; + + // display when > 0 selected and user has write permission + const deleteButton = + selection.length && !isReadOnly ? ( + + Delete + + ) : null; + + const search = { + box: { incremental: true, 'data-test-subj': 'filter' }, + filters: [ + { + type: 'field_value_selection', + field: 'id', + name: 'Filter by ID', + multiSelect: false, + options: pipelines.map(({ id }) => { + return { + value: id, + name: id, + view: id, + }; + }), + }, + ], + toolsLeft: deleteButton, + toolsRight: ( + + Create pipeline + + ), + }; + + const columns = getColumns(openPipeline, clonePipeline); + + return ( + + ); +} diff --git a/x-pack/plugins/logstash/public/components/pipeline_list/pipelines_table.test.js b/x-pack/plugins/logstash/public/components/pipeline_list/pipelines_table.test.js new file mode 100644 index 0000000000000..2d5412da3293b --- /dev/null +++ b/x-pack/plugins/logstash/public/components/pipeline_list/pipelines_table.test.js @@ -0,0 +1,71 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { mount, shallow } from 'enzyme'; +import { PipelinesTable } from './pipelines_table'; + +describe('PipelinesTable component', () => { + let props; + let clonePipeline; + let createPipeline; + let onDeleteSelectedPipelines; + let onSelectionChange; + let openPipeline; + + beforeEach(() => { + clonePipeline = jest.fn(); + createPipeline = jest.fn(); + onDeleteSelectedPipelines = jest.fn(); + onSelectionChange = jest.fn(); + openPipeline = jest.fn(); + + props = { + clonePipeline, + createPipeline, + isReadOnly: false, + isSelectable: true, + message: null, + onDeleteSelectedPipelines, + onSelectionChange, + openPipeline, + pipelines: [{ id: 'testPipeline' }], + selection: [], + }; + }); + + it('renders component as expected', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); + + it('calls clone when cloned button clicked', () => { + props.pipelines = [{ id: 'testPipeline', isCentrallyManaged: true }]; + const wrapper = mount(); + wrapper.find('[iconType="copy"]').simulate('click'); + expect(clonePipeline).toHaveBeenCalled(); + }); + + it('calls createPipeline on create button clicked', () => { + const wrapper = mount(); + wrapper.find('.euiButton--primary').simulate('click'); + expect(createPipeline).toHaveBeenCalled(); + }); + + it('calls delete prompt on delete click', () => { + props.selection = [{ id: 'testPipeline' }]; + const wrapper = mount(); + wrapper.find('.euiButton--danger').simulate('click'); + expect(onDeleteSelectedPipelines).toHaveBeenCalled(); + }); + + it('calls openPipeline on id click', () => { + props.pipelines = [{ id: 'testPipeline', isCentrallyManaged: true }]; + const wrapper = mount(); + wrapper.find('EuiLink').simulate('click'); + expect(openPipeline).toHaveBeenCalledWith('testPipeline'); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/tooltip/index.js b/x-pack/plugins/logstash/public/components/tooltip/index.js deleted file mode 100644 index 4812ceef7dc30..0000000000000 --- a/x-pack/plugins/logstash/public/components/tooltip/index.js +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import './tooltip'; diff --git a/x-pack/plugins/logstash/public/components/tooltip/tooltip.html b/x-pack/plugins/logstash/public/components/tooltip/tooltip.html deleted file mode 100644 index b40ba2587a800..0000000000000 --- a/x-pack/plugins/logstash/public/components/tooltip/tooltip.html +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/x-pack/plugins/logstash/public/components/tooltip/tooltip.js b/x-pack/plugins/logstash/public/components/tooltip/tooltip.js deleted file mode 100644 index c36c36acfd671..0000000000000 --- a/x-pack/plugins/logstash/public/components/tooltip/tooltip.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import { uiModules } from 'ui/modules'; -import template from './tooltip.html'; -import './tooltip.less'; - -const app = uiModules.get('xpack/logstash'); - -app.directive('logstashTooltip', function () { - return { - restrict: 'E', - template: template, - scope: { - text: '@' - }, - bindToController: true, - controllerAs: 'tooltip', - controller: class TooltipController {} - }; -}); diff --git a/x-pack/plugins/logstash/public/components/tooltip/tooltip.less b/x-pack/plugins/logstash/public/components/tooltip/tooltip.less deleted file mode 100644 index 683e9580c3893..0000000000000 --- a/x-pack/plugins/logstash/public/components/tooltip/tooltip.less +++ /dev/null @@ -1,3 +0,0 @@ -.logstash-tooltip { - display: none; -} diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap b/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap new file mode 100644 index 0000000000000..5d5efb47dc8ac --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap @@ -0,0 +1,950 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`UpgradeFailure component passes expected text for new pipeline 1`] = ` + + +
      + + +
      + + } + body={ +

      + Before you can add a pipeline, we need to upgrade your configuration. +

      + } + iconColor="subdued" + title={ + + } + > +
      + + + + + +
      + +
      + + + + + + + + + + +
      +
      + +
      + +

      + Upgrade failed +

      +
      +
      +
      +
      +
      +
      +
      + +
      + + +
      +

      + Before you can add a pipeline, we need to upgrade your configuration. +

      +
      +
      + + + +
      + + +
      + + + +
      + +
      + + + +
      +
      + +
      + + + +
      +
      +
      +
      +
      +
      + +
      + + +
      + + +`; + +exports[`UpgradeFailure component passes expected text for not manual upgrade 1`] = ` + + +
      + + +
      + + } + body={ +

      + Before you can add a pipeline, we need to upgrade your configuration. +

      + } + iconColor="subdued" + title={ + + } + > +
      + + + + + +
      + +
      + + + + + + + + + + +
      +
      + +
      + +

      + Time for an upgrade! +

      +
      +
      +
      +
      +
      +
      +
      + +
      + + +
      +

      + Before you can add a pipeline, we need to upgrade your configuration. +

      +
      +
      + + + +
      + + +
      + + + +
      + +
      + + + +
      +
      + +
      + + + +
      +
      +
      +
      +
      +
      + +
      + + +
      + + +`; + +exports[`UpgradeFailure component passes expected text for not new pipeline 1`] = ` + + +
      + + +
      + + } + body={ +

      + Before you can edit this pipeline, we need to upgrade your configuration. +

      + } + iconColor="subdued" + title={ + + } + > +
      + + + + + +
      + +
      + + + + + + + + + + +
      +
      + +
      + +

      + Upgrade failed +

      +
      +
      +
      +
      +
      +
      +
      + +
      + + +
      +

      + Before you can edit this pipeline, we need to upgrade your configuration. +

      +
      +
      + + + +
      + + +
      + + + +
      + +
      + + + +
      +
      + +
      + + + +
      +
      +
      +
      +
      +
      + +
      + + +
      + + +`; + +exports[`UpgradeFailure component renders component as expected 1`] = ` + + + + } + body={ +

      + Before you can add a pipeline, we need to upgrade your configuration. +

      + } + iconColor="subdued" + title={ + + } + /> +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap b/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap new file mode 100644 index 0000000000000..c68cd8315f8aa --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_actions.test.js.snap @@ -0,0 +1,41 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`UpgradeFailureActions component renders component as expected 1`] = ` + + + + upgrade button text + + + + + Go back + + + +`; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_title.test.js.snap b/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_title.test.js.snap new file mode 100644 index 0000000000000..d4b62be7bde2d --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/__snapshots__/upgrade_failure_title.test.js.snap @@ -0,0 +1,36 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`UpgradeFailureTitle component renders component as expected 1`] = ` + + + + + + +

      + the Title +

      +
      +
      +
      +`; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/constants.js b/x-pack/plugins/logstash/public/components/upgrade_failure/constants.js new file mode 100644 index 0000000000000..1c0d598782870 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/constants.js @@ -0,0 +1,20 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const UPGRADE_FAILURE = { + TITLE: { + IS_MANUAL_UPGRADE: 'Upgrade failed', + NOT_MANUAL_UPGRADE: 'Time for an upgrade!', + }, + MESSAGE: { + IS_NEW_PIPELINE: 'Before you can add a pipeline, we need to upgrade your configuration.', + NOT_NEW_PIPELINE: 'Before you can edit this pipeline, we need to upgrade your configuration.', + }, + UPGRADE_BUTTON_TEXT: { + IS_MANUAL_UPGRADE: 'Try again', + NOT_MANUAL_UPGRADE: 'Upgrade', + }, +}; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/index.js b/x-pack/plugins/logstash/public/components/upgrade_failure/index.js new file mode 100644 index 0000000000000..0aa757bca5236 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/index.js @@ -0,0 +1,7 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export { UpgradeFailure } from './upgrade_failure'; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure.js b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure.js new file mode 100644 index 0000000000000..a107917913faf --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure.js @@ -0,0 +1,43 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { EuiEmptyPrompt, EuiPage, EuiPageContent } from '@elastic/eui'; +import { UpgradeFailureTitle } from './upgrade_failure_title'; +import { UpgradeFailureActions } from './upgrade_failure_actions'; +import { UPGRADE_FAILURE } from './constants'; + +export function UpgradeFailure({ isNewPipeline, isManualUpgrade, onClose, onRetry }) { + const titleText = isManualUpgrade + ? UPGRADE_FAILURE.TITLE.IS_MANUAL_UPGRADE + : UPGRADE_FAILURE.TITLE.NOT_MANUAL_UPGRADE; + + const messageText = isNewPipeline + ? UPGRADE_FAILURE.MESSAGE.IS_NEW_PIPELINE + : UPGRADE_FAILURE.MESSAGE.NOT_NEW_PIPELINE; + + const upgradeButtonText = isManualUpgrade + ? UPGRADE_FAILURE.UPGRADE_BUTTON_TEXT.IS_MANUAL_UPGRADE + : UPGRADE_FAILURE.UPGRADE_BUTTON_TEXT.NOT_MANUAL_UPGRADE; + + return ( + + + + } + title={} + body={

      {messageText}

      } + /> +
      +
      + ); +} diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure.test.js b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure.test.js new file mode 100644 index 0000000000000..2d9e02e0d2942 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure.test.js @@ -0,0 +1,55 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { mount, shallow } from 'enzyme'; +import { UpgradeFailure } from './upgrade_failure'; + +describe('UpgradeFailure component', () => { + let props; + let onClose; + let onRetry; + + beforeEach(() => { + onClose = jest.fn(); + onRetry = jest.fn(); + + props = { + isManualUpgrade: true, + isNewPipeline: true, + onClose, + onRetry, + }; + }); + + it('renders component as expected', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); + + it('passes expected text for new pipeline', () => { + const wrapper = mount(); + expect(wrapper).toMatchSnapshot(); + }); + + it('passes expected text for not new pipeline', () => { + props.isNewPipeline = false; + const wrapper = mount(); + expect(wrapper).toMatchSnapshot(); + }); + + it('passes expected text for not manual upgrade', () => { + props.isManualUpgrade = false; + const wrapper = mount(); + expect(wrapper).toMatchSnapshot(); + }); + + it('propogates onClose and onRetry functions to child', () => { + const wrapper = mount(); + expect(wrapper.find('UpgradeFailureActions').props().onClose).toEqual(onClose); + expect(wrapper.find('UpgradeFailureActions').props().onRetry).toEqual(onRetry); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_actions.js b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_actions.js new file mode 100644 index 0000000000000..bb9abff27714b --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_actions.js @@ -0,0 +1,32 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; + +export function UpgradeFailureActions({ onClose, onRetry, upgradeButtonText }) { + return ( + + + + {upgradeButtonText} + + + + + Go back + + + + ); +} + +UpgradeFailureActions.propTypes = { + onClose: PropTypes.func.isRequired, + onRetry: PropTypes.func.isRequired, + upgradeButtonText: PropTypes.string.isRequired, +}; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_actions.test.js b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_actions.test.js new file mode 100644 index 0000000000000..0408dd2ca4682 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_actions.test.js @@ -0,0 +1,42 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { mount, shallow } from 'enzyme'; +import { UpgradeFailureActions } from './upgrade_failure_actions'; + +describe('UpgradeFailureActions component', () => { + let props; + let onClose; + let onRetry; + + beforeEach(() => { + onClose = jest.fn(); + onRetry = jest.fn(); + props = { + onClose, + onRetry, + upgradeButtonText: 'upgrade button text', + }; + }); + + it('renders component as expected', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); + + it('calls onRetry on update click', () => { + const wrapper = mount(); + wrapper.find('EuiButton').simulate('click'); + expect(onRetry).toHaveBeenCalledTimes(1); + }); + + it('calls onClose on "Go back" click', () => { + const wrapper = mount(); + wrapper.find('EuiButtonEmpty').simulate('click'); + expect(onClose).toHaveBeenCalledTimes(1); + }); +}); diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_title.js b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_title.js new file mode 100644 index 0000000000000..749c49ea2257e --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_title.js @@ -0,0 +1,28 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import PropTypes from 'prop-types'; +import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiTitle } from '@elastic/eui'; + +export function UpgradeFailureTitle({ titleText }) { + return ( + + + + + + +

      {titleText}

      +
      +
      +
      + ); +} + +UpgradeFailureTitle.propTypes = { + titleText: PropTypes.string.isRequired, +}; diff --git a/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_title.test.js b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_title.test.js new file mode 100644 index 0000000000000..7fd5ad8f732b2 --- /dev/null +++ b/x-pack/plugins/logstash/public/components/upgrade_failure/upgrade_failure_title.test.js @@ -0,0 +1,21 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { UpgradeFailureTitle } from './upgrade_failure_title'; + +describe('UpgradeFailureTitle component', () => { + let props; + beforeEach(() => { + props = { titleText: 'the Title' }; + }); + + it('renders component as expected', () => { + const wrapper = shallow(); + expect(wrapper).toMatchSnapshot(); + }); +}); diff --git a/x-pack/plugins/logstash/public/lib/get_search_value/get_search_value.js b/x-pack/plugins/logstash/public/lib/get_search_value/get_search_value.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/lib/get_search_value/index.js b/x-pack/plugins/logstash/public/lib/get_search_value/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/lib/register_home_feature/index.js b/x-pack/plugins/logstash/public/lib/register_home_feature/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/lib/register_home_feature/register_home_feature.js b/x-pack/plugins/logstash/public/lib/register_home_feature/register_home_feature.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/lib/update_management_sections/index.js b/x-pack/plugins/logstash/public/lib/update_management_sections/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/lib/update_management_sections/update_logstash_sections.js b/x-pack/plugins/logstash/public/lib/update_management_sections/update_logstash_sections.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/models/cluster/cluster.js b/x-pack/plugins/logstash/public/models/cluster/cluster.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/models/cluster/index.js b/x-pack/plugins/logstash/public/models/cluster/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/models/pipeline/index.js b/x-pack/plugins/logstash/public/models/pipeline/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/models/pipeline/pipeline.js b/x-pack/plugins/logstash/public/models/pipeline/pipeline.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/models/pipeline_list_item/index.js b/x-pack/plugins/logstash/public/models/pipeline_list_item/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/models/pipeline_list_item/pipeline_list_item.js b/x-pack/plugins/logstash/public/models/pipeline_list_item/pipeline_list_item.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/index.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.html b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.html deleted file mode 100644 index 07e133fe17550..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.html +++ /dev/null @@ -1,292 +0,0 @@ - -
      -
      -
      -
      -
      - - - -
      -
      -
      -
      - -
      -
      -
      - - -
      - Pipeline ID must begin with a letter or underscore and contain only letters, underscores, dashes, and numbers -
      -
      - Pipeline ID is required -
      -
      -
      - - -
      - -
      -
      - -
      -
      -
      -
      - - - -
      -
      -
      -
      - - -
      -
      -
      - -
      -
      -
      - - -
      -
      - - -
      -
      -
      - -
      -
      -
      - - -
      -
      - - - -
      -
      - - -
      -
      -
      - -
      -
      -
      diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js old mode 100644 new mode 100755 index b7411b45b3ab4..29e453dd1347b --- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js +++ b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.js @@ -4,16 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ +import React from 'react'; +import { render } from 'react-dom'; import { isEmpty } from 'lodash'; import { uiModules } from 'ui/modules'; -import { InitAfterBindingsWorkaround } from 'ui/compat'; -import { toastNotifications } from 'ui/notify'; -import template from './pipeline_edit.html'; +import { Notifier, toastNotifications } from 'ui/notify'; +import { PipelineEditor } from '../../../../components/pipeline_editor'; import 'plugins/logstash/services/license'; import 'plugins/logstash/services/security'; -import './pipeline_edit.less'; -import '../../../../components/tooltip'; -import { EDITOR, TOOLTIPS } from '../../../../../common/constants'; import 'ace'; const app = uiModules.get('xpack/logstash'); @@ -23,109 +21,39 @@ app.directive('pipelineEdit', function ($injector) { const licenseService = $injector.get('logstashLicenseService'); const securityService = $injector.get('logstashSecurityService'); const kbnUrl = $injector.get('kbnUrl'); - const confirmModal = $injector.get('confirmModal'); + const shieldUser = $injector.get('ShieldUser'); + const $route = $injector.get('$route'); return { restrict: 'E', - template: template, + link: async (scope, el) => { + const close = () => scope.$evalAsync(kbnUrl.change('/management/logstash/pipelines', {})); + const open = id => + scope.$evalAsync(kbnUrl.change(`/management/logstash/pipelines/${id}/edit`)); + + const userResource = securityService.isSecurityEnabled + ? await shieldUser.getCurrent().$promise + : null; + + render( + , + el[0] + ); + }, scope: { pipeline: '=', }, - bindToController: true, - controllerAs: 'pipelineEdit', - controller: class PipelineEditController extends InitAfterBindingsWorkaround { - initAfterBindings($scope) { - this.originalPipeline = { ...this.pipeline }; - this.isNewPipeline = isEmpty(this.pipeline.id); - // only if security is enabled and available, we tack on the username. - if (securityService.isSecurityEnabled) { - $scope.user = $injector.get('ShieldUser').getCurrent(); - } else { - $scope.user = null; - } - $scope.aceLoaded = editor => { - this.editor = editor; - /* - * This sets the space between the editor's borders and the - * edges of the top/bottom lines to make for a less-crowded - * typing experience. - */ - editor.renderer.setScrollMargin( - EDITOR.PIPELINE_EDITOR_SCROLL_MARGIN_TOP_PX, - EDITOR.PIPELINE_EDITOR_SCROLL_MARGIN_BOTTOM_PX, - 0, - 0 - ); - editor.setReadOnly(this.isReadOnly); - editor.setOptions({ - minLines: 25, - maxLines: Infinity, - }); - editor.$blockScrolling = Infinity; - }; - if (this.isReadOnly) { - toastNotifications.addWarning(licenseService.message); - } - - this.tooltips = TOOLTIPS; - } - - onPipelineSave = username => { - this.pipeline.username = username; - return pipelineService - .savePipeline(this.pipeline) - .then(() => { - toastNotifications.addSuccess(`Saved '${this.pipeline.id}'`); - this.close(); - }) - .catch(err => { - return licenseService - .checkValidity() - .then(() => toastNotifications.addDanger(err)); - }); - }; - - onPipelineDelete = pipelineId => { - const confirmModalOptions = { - onConfirm: this.deletePipeline, - confirmButtonText: `Delete pipeline ${pipelineId}`, - }; - - return confirmModal( - 'You cannot recover a deleted pipeline.', - confirmModalOptions - ); - }; - - onClose = () => { - this.close(); - }; - - deletePipeline = () => { - return pipelineService - .deletePipeline(this.pipeline.id) - .then(() => { - toastNotifications.addSuccess(`Deleted '${this.pipeline.id}'`); - this.close(); - }) - .catch(err => { - return licenseService - .checkValidity() - .then(() => toastNotifications.addDanger(err)); - }); - }; - - close = () => { - kbnUrl.change('/management/logstash/pipelines', {}); - }; - - get isSaveEnabled() { - return !(this.form.$invalid || this.jsonForm.$invalid); - } - - get isReadOnly() { - return licenseService.isReadOnly; - } - }, }; }); diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less deleted file mode 100644 index f5c00fc6a495f..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/pipeline_edit/pipeline_edit.less +++ /dev/null @@ -1,9 +0,0 @@ -@import (reference) "~ui/styles/variables"; -@import (reference) "~ui/styles/mixins"; -@import (reference) "~ui/styles/theme"; - -pipeline-edit { - .pipeline-editor { - border: 1px solid #ecf0f1; - } -} diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/index.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.html b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.html deleted file mode 100644 index 6a0970d650f6e..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.html +++ /dev/null @@ -1,59 +0,0 @@ - -
      -
      -
      -
      -
      - Time for an upgrade! - Upgrade failed -
      -
      -
      -

      - Before you can - add a - edit this - pipeline, we need to upgrade your configuration. -

      -

      - This upgrade is required before you can - add a - edit this - pipeline. -

      -
      - - -
      -
      -
      -
      -
      -
      diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.js old mode 100644 new mode 100755 index 62f03638ddbc4..4d46fb7e5d2a4 --- a/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.js +++ b/x-pack/plugins/logstash/public/sections/pipeline_edit/components/upgrade_failure/upgrade_failure.js @@ -4,40 +4,43 @@ * you may not use this file except in compliance with the Elastic License. */ +import React from 'react'; +import { render } from 'react-dom'; import { isEmpty } from 'lodash'; import { uiModules } from 'ui/modules'; -import { InitAfterBindingsWorkaround } from 'ui/compat'; -import template from './upgrade_failure.html'; +import { UpgradeFailure } from '../../../../components/upgrade_failure'; const app = uiModules.get('xpack/logstash'); -app.directive('upgradeFailure', function ($injector) { +app.directive('upgradeFailure', $injector => { const $route = $injector.get('$route'); const kbnUrl = $injector.get('kbnUrl'); return { - restrict: 'E', - template: template, - scope: { - pipeline: '=' - }, - bindToController: true, - controllerAs: 'upgradeFailure', - controller: class UpgradeController extends InitAfterBindingsWorkaround { - initAfterBindings() { - this.isNewPipeline = isEmpty(this.pipeline.id); - this.isManualUpgrade = !!$route.current.params.retry; - } - - onRetry = () => { - // Reloading the route re-attempts the upgrade + link: (scope, el) => { + const onRetry = () => { $route.updateParams({ retry: true }); $route.reload(); - } + }; + const onClose = () => { + scope.$evalAsync(kbnUrl.change('management/logstash/pipelines', {})); + }; + const isNewPipeline = isEmpty(scope.pipeline.id); + const isManualUpgrade = !!$route.current.params.retry; - onClose = () => { - kbnUrl.change('/management/logstash/pipelines', {}); - } - } + render( + , + el[0] + ); + }, + restrict: 'E', + scope: { + pipeline: '=', + }, }; }); diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/index.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/pipeline_edit_route.html b/x-pack/plugins/logstash/public/sections/pipeline_edit/pipeline_edit_route.html old mode 100644 new mode 100755 index 00764de4458a8..6a19416ef0e3d --- a/x-pack/plugins/logstash/public/sections/pipeline_edit/pipeline_edit_route.html +++ b/x-pack/plugins/logstash/public/sections/pipeline_edit/pipeline_edit_route.html @@ -1,9 +1,5 @@ - + + - + + diff --git a/x-pack/plugins/logstash/public/sections/pipeline_edit/pipeline_edit_route.js b/x-pack/plugins/logstash/public/sections/pipeline_edit/pipeline_edit_route.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/index.js b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.html b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.html deleted file mode 100644 index ceaacf9f715d6..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.html +++ /dev/null @@ -1,125 +0,0 @@ - -
      -
      -

      - - You do not have permission to manage Logstash pipelines. -

      -
      - Please contact your administrator. -
      -
      -
      - -
      -
      -
      -
      - -
      - -
      - - -
      - -
      - - -
      -
      - - - Loading pipelines - - - No pipelines found - - - - -
      -
      -
      -
      -
      - Only pipelines created in Kibana Management appear here -
      -
      -
      - -
      -

      How can I see additional pipelines?

      - -
        -
      • Grant additional privileges. In Kibana Management, assign the monitoring_user role to your Kibana user.
      • -
      • Enable monitoring. In the kibana.yml file, set xpack.monitoring.enabled and xpack.monitoring.ui.enabled to true.
      • -
      - -

      - Grant additional privileges. In Kibana Management, assign the monitoring_user role to your Kibana user. -

      - -

      - Enable monitoring. In the kibana.yml file, set xpack.monitoring.enabled and xpack.monitoring.ui.enabled to true. -

      -
      -
      -
      -
      - -
      diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.js b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.js old mode 100644 new mode 100755 index 3bc03877ceef9..1af69bcdb79f9 --- a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.js +++ b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_list/pipeline_list.js @@ -4,16 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ -import pluralize from 'pluralize'; +import React from 'react'; +import { render } from 'react-dom'; import { uiModules } from 'ui/modules'; import { toastNotifications } from 'ui/notify'; -import template from './pipeline_list.html'; -import '../pipeline_table'; -import { PAGINATION } from 'plugins/logstash/../common/constants'; -import 'ui/pager_control'; -import 'ui/pager'; -import 'ui/react_components'; -import 'ui/table_info'; +import { PipelineList } from '../../../../components/pipeline_list'; import 'plugins/logstash/services/pipelines'; import 'plugins/logstash/services/license'; import 'plugins/logstash/services/cluster'; @@ -22,193 +17,39 @@ import 'plugins/logstash/services/monitoring'; const app = uiModules.get('xpack/logstash'); app.directive('pipelineList', function ($injector) { - const pagerFactory = $injector.get('pagerFactory'); const pipelinesService = $injector.get('pipelinesService'); const licenseService = $injector.get('logstashLicenseService'); const clusterService = $injector.get('xpackLogstashClusterService'); const monitoringService = $injector.get('xpackLogstashMonitoringService'); - const confirmModal = $injector.get('confirmModal'); const kbnUrl = $injector.get('kbnUrl'); - const $filter = $injector.get('$filter'); - const filter = $filter('filter'); - const orderBy = $filter('orderBy'); - const limitTo = $filter('limitTo'); - return { restrict: 'E', - template: template, + link: (scope, el) => { + const openPipeline = id => + scope.$evalAsync(kbnUrl.change(`management/logstash/pipelines/pipeline/${id}/edit`)); + const createPipeline = () => + scope.$evalAsync(kbnUrl.change('management/logstash/pipelines/new-pipeline')); + const clonePipeline = id => + scope.$evalAsync(kbnUrl.change(`management/logstash/pipelines/pipeline/${id}/edit?clone`)); + render( + , + el[0] + ); + }, scope: {}, controllerAs: 'pipelineList', - controller: class PipelineListController { - constructor($scope) { - this.isForbidden = true; - this.isLoading = true; - this.pipelines = []; - this.selectedPipelines = []; - this.pageOfPipelines = []; - this.sortField = 'status.sortOrder'; - this.sortReverse = false; - - this.pager = pagerFactory.create(this.pipelines.length, PAGINATION.PAGE_SIZE, 1); - - // load pipelines - this.loadPipelines() - .then(() => { - // notify the users if the UI is read-only only after we - // successfully loaded pipelines - if (this.isReadOnly) { - toastNotifications.addWarning(licenseService.message); - } - }); - - this.checkMonitoringAccess(); - - // react to pipeline and ui changes - $scope.$watchMulti([ - 'pipelineList.pipelines', - 'pipelineList.sortField', - 'pipelineList.sortReverse', - 'pipelineList.query', - 'pipelineList.pager.currentPage' - ], this.applyFilters); - } - - loadPipelines = () => { - return pipelinesService.getPipelineList() - .then(pipelines => { - this.isLoading = false; - this.isForbidden = false; - this.pipelines = pipelines; - }) - .catch(err => { - return licenseService.checkValidity() - .then(() => { - if (err.status === 403) { - this.isLoading = false; - // check if the 403 is from license check or a RBAC permission issue with the index - if (this.isReadOnly) { - // if read only, we show the contents - this.isForbidden = false; - } else { - this.isForbidden = true; - } - } else { - this.isForbidden = false; - toastNotifications.addDanger(`Couldn't load pipeline. Error: '${err.statusText}'.`); - } - }); - }); - } - - checkMonitoringAccess = () => { - clusterService.isClusterInfoAvailable() - .then(isAvailable => { - this.showAddRoleAlert = !isAvailable; - this.showEnableMonitoringAlert = !monitoringService.isMonitoringEnabled(); - }); - } - - get hasPageOfPipelines() { - return this.pageOfPipelines.length > 0; - } - - get hasSelectedPipelines() { - return this.selectedPipelines.length > 0; - } - - get isReadOnly() { - return licenseService.isReadOnly; - } - - onNewPipeline() { - kbnUrl.change('/management/logstash/pipelines/new-pipeline'); - } - - onQueryChange = (query) => { - this.query = query; - }; - - onPageNext = () => { - this.pager.nextPage(); - }; - - onPagePrevious = () => { - this.pager.previousPage(); - }; - - onSortChange = (field, reverse) => { - this.sortField = field; - this.sortReverse = reverse; - }; - - onSelectedPipelinesDelete = () => { - const numPipelinesToDelete = this.selectedPipelines.length; - - const confirmModalText = numPipelinesToDelete === 1 - ? 'You cannot recover a deleted pipeline.' - : `Delete ${numPipelinesToDelete} pipelines? You cannot recover deleted pipelines.`; - - const confirmButtonText = numPipelinesToDelete === 1 - ? `Delete pipeline ${this.selectedPipelines[0].id}` - : `Delete ${numPipelinesToDelete} pipelines`; - - const confirmModalOptions = { - confirmButtonText, - onConfirm: this.deleteSelectedPipelines - }; - - return confirmModal(confirmModalText, confirmModalOptions); - }; - - deleteSelectedPipelines = () => { - const numPipelinesToDelete = this.selectedPipelines.length; - const pipelinesStr = pluralize('Pipeline', numPipelinesToDelete); - - const pipelineIds = this.selectedPipelines.map(pipeline => pipeline.id); - return pipelinesService.deletePipelines(pipelineIds) - .then(results => { - const numSuccesses = results.numSuccesses; - const numErrors = results.numErrors; - const numTotal = this.selectedPipelines.length; - - if (numSuccesses > 0) { - let text; - if (numErrors > 0) { - text = `But ${numErrors} ${pipelinesStr} couldn't be deleted`; - } - - toastNotifications.addSuccess({ - title: `Deleted ${numSuccesses} out of ${numTotal} selected ${pipelinesStr}`, - text, - }); - } else if (numErrors > 0) { - toastNotifications.addError(`Couldn't delete any of the ${numTotal} selected ${pipelinesStr}`); - } - - this.loadPipelines(); - }) - .catch(err => { - return licenseService.checkValidity() - .then(() => toastNotifications.addDanger(err)); - }); - } - - onSelectedChange = (selectedPipelines) => { - this.selectedPipelines = selectedPipelines; - }; - - applyFilters = () => { - let filteredPipelines = this.pipelines; - let pageOfPipelines = []; - - filteredPipelines = filter(filteredPipelines, { searchValue: this.query }); - filteredPipelines = orderBy(filteredPipelines, this.sortField, this.sortReverse); - pageOfPipelines = limitTo(filteredPipelines, this.pager.pageSize, this.pager.startIndex); - - this.pageOfPipelines = pageOfPipelines; - this.pager.setTotalItems(filteredPipelines.length); - }; - } }; }); diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/index.js b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/index.js deleted file mode 100644 index 8769f6eb505f1..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/index.js +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import './pipeline_table'; diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/pipeline_table.html b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/pipeline_table.html deleted file mode 100644 index 7fc41e229cc8d..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/pipeline_table.html +++ /dev/null @@ -1,117 +0,0 @@ -

      - - - - - - - - - - - - - - - - - - - - - -
      -
      - -
      -
      - - ID - - - Description - - - Last modified - - - Modified by -
      -
      - -
      -
      -
      - - {{item.pipeline.id}} - - - {{item.pipeline.id}} - - -
      -
      -
      - {{item.pipeline.description}} -
      -
      -
      - - {{ item.pipeline.lastModifiedHumanized }} - -
      -
      -
      - {{item.pipeline.username}} -
      -
      - -
      diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/pipeline_table.js b/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/pipeline_table.js deleted file mode 100644 index e0ee0af7aee8c..0000000000000 --- a/x-pack/plugins/logstash/public/sections/pipeline_list/components/pipeline_table/pipeline_table.js +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import _ from 'lodash'; -import moment from 'moment-timezone'; -import { uiModules } from 'ui/modules'; -import 'ui/filters/moment'; -import 'ui/check_box'; -import 'ui/sortable_column'; -import template from './pipeline_table.html'; -import 'plugins/logstash/services/security'; -import '../../../../components/tooltip'; - -const app = uiModules.get('xpack/logstash'); - -app.directive('pipelineTable', function ($injector) { - const config = $injector.get('config'); - const securityService = $injector.get('logstashSecurityService'); - moment.tz.setDefault(config.get('dateFormat:tz')); - - return { - restrict: 'E', - template: template, - scope: { - pipelines: '=', - sortField: '=', - sortReverse: '=', - onSortChange: '=', - onSelectChange: '=' - }, - controllerAs: 'pipelineTable', - bindToController: true, - controller: class PipelineTableController { - constructor($scope) { - this.allSelected = false; - $scope.$watch('pipelineTable.pipelines', (pipelines) => { - const previousItems = this.items; - - this.items = _.map(pipelines, (pipeline) => { - const matchedItem = _.find(previousItems, previousItem => previousItem.pipeline.id === pipeline.id); - const selected = Boolean(_.get(matchedItem, 'selected')); - return { pipeline: pipeline, selected: selected }; - }); - this.updateSelectedPipelines(); - }); - } - - onAllSelectedChange = (itemId, allSelected) => { - this.items - .filter(item => item.pipeline.isCentrallyManaged) - .forEach(item => item.selected = allSelected); - this.updateSelectedPipelines(); - }; - - onPipelineSelectedChange = (pipelineId, selected) => { - _.find(this.items, item => item.pipeline.id === pipelineId).selected = selected; - this.updateSelectedPipelines(); - }; - - updateSelectedPipelines = () => { - const selectedItems = _.filter(this.items, item => item.selected); - const selectedPipelines = _.map(selectedItems, item => item.pipeline); - - this.allSelected = selectedPipelines.length > 0 - && (selectedPipelines.length === this.items.filter(item => item.pipeline.isCentrallyManaged).length); - this.onSelectChange(selectedPipelines); - }; - - get isSecurityEnabled() { - return securityService.isSecurityEnabled; - } - } - }; -}); diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/index.js b/x-pack/plugins/logstash/public/sections/pipeline_list/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/pipeline_list_route.html b/x-pack/plugins/logstash/public/sections/pipeline_list/pipeline_list_route.html old mode 100644 new mode 100755 index b064e5fe45a3d..fc46d3bdea44b --- a/x-pack/plugins/logstash/public/sections/pipeline_list/pipeline_list_route.html +++ b/x-pack/plugins/logstash/public/sections/pipeline_list/pipeline_list_route.html @@ -1 +1,3 @@ - + + + diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/pipeline_list_route.js b/x-pack/plugins/logstash/public/sections/pipeline_list/pipeline_list_route.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/sections/pipeline_list/register_management_section.js b/x-pack/plugins/logstash/public/sections/pipeline_list/register_management_section.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/cluster/cluster_service.factory.js b/x-pack/plugins/logstash/public/services/cluster/cluster_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/cluster/cluster_service.js b/x-pack/plugins/logstash/public/services/cluster/cluster_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/cluster/index.js b/x-pack/plugins/logstash/public/services/cluster/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/license/index.js b/x-pack/plugins/logstash/public/services/license/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/license/license_service.factory.js b/x-pack/plugins/logstash/public/services/license/license_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/license/logstash_license_service.js b/x-pack/plugins/logstash/public/services/license/logstash_license_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/monitoring/index.js b/x-pack/plugins/logstash/public/services/monitoring/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.factory.js b/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js b/x-pack/plugins/logstash/public/services/monitoring/monitoring_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/pipeline/index.js b/x-pack/plugins/logstash/public/services/pipeline/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.factory.js b/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js b/x-pack/plugins/logstash/public/services/pipeline/pipeline_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/pipelines/index.js b/x-pack/plugins/logstash/public/services/pipelines/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.factory.js b/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js b/x-pack/plugins/logstash/public/services/pipelines/pipelines_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/security/index.js b/x-pack/plugins/logstash/public/services/security/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/security/logstash_security_service.js b/x-pack/plugins/logstash/public/services/security/logstash_security_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/security/security_service.factory.js b/x-pack/plugins/logstash/public/services/security/security_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/upgrade/index.js b/x-pack/plugins/logstash/public/services/upgrade/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/upgrade/upgrade_service.factory.js b/x-pack/plugins/logstash/public/services/upgrade/upgrade_service.factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/public/services/upgrade/upgrade_service.js b/x-pack/plugins/logstash/public/services/upgrade/upgrade_service.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/call_with_request_factory/call_with_request_factory.js b/x-pack/plugins/logstash/server/lib/call_with_request_factory/call_with_request_factory.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/call_with_request_factory/index.js b/x-pack/plugins/logstash/server/lib/call_with_request_factory/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/check_license/__tests__/check_license.js b/x-pack/plugins/logstash/server/lib/check_license/__tests__/check_license.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/check_license/check_license.js b/x-pack/plugins/logstash/server/lib/check_license/check_license.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/check_license/index.js b/x-pack/plugins/logstash/server/lib/check_license/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_custom_error.js b/x-pack/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_custom_error.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_es_error.js b/x-pack/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_es_error.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_unknown_error.js b/x-pack/plugins/logstash/server/lib/error_wrappers/__tests__/wrap_unknown_error.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/index.js b/x-pack/plugins/logstash/server/lib/error_wrappers/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_custom_error.js b/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_custom_error.js old mode 100644 new mode 100755 index 890a366ac65c1..3295113d38ee5 --- a/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_custom_error.js +++ b/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_custom_error.js @@ -14,5 +14,5 @@ import Boom from 'boom'; * @return Object Boom error response */ export function wrapCustomError(err, statusCode) { - return Boom.wrap(err, statusCode); + return Boom.boomify(err, { statusCode }); } diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_es_error.js b/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_es_error.js old mode 100644 new mode 100755 index 3673de6470bb9..112efc6749ae1 --- a/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_es_error.js +++ b/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_es_error.js @@ -18,5 +18,5 @@ export function wrapEsError(err) { if (statusCode === 403) { return Boom.forbidden('Insufficient user permissions for managing Logstash pipelines'); } - return Boom.wrap(err, err.statusCode); + return Boom.boomify(err, { statusCode: err.statusCode }); } diff --git a/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_unknown_error.js b/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_unknown_error.js old mode 100644 new mode 100755 index b0cdced7adbef..ffd915c513362 --- a/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_unknown_error.js +++ b/x-pack/plugins/logstash/server/lib/error_wrappers/wrap_unknown_error.js @@ -13,5 +13,5 @@ import Boom from 'boom'; * @return Object Boom error response */ export function wrapUnknownError(err) { - return Boom.wrap(err); + return Boom.boomify(err); } diff --git a/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/__tests__/fetch_all_from_scroll.js b/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/__tests__/fetch_all_from_scroll.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.js b/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/fetch_all_from_scroll.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/index.js b/x-pack/plugins/logstash/server/lib/fetch_all_from_scroll/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js b/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js old mode 100644 new mode 100755 index c543d79814dd3..c63eef750bee9 --- a/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js +++ b/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/__tests__/license_pre_routing_factory.js @@ -40,14 +40,13 @@ describe('license_pre_routing_factory', () => { }; }); - it ('replies with 403', (done) => { + it ('replies with 403', () => { const licensePreRouting = licensePreRoutingFactory(mockServer); const stubRequest = {}; - licensePreRouting(stubRequest, (response) => { + expect(() => licensePreRouting(stubRequest)).to.throwException((response) => { expect(response).to.be.an(Error); expect(response.isBoom).to.be(true); expect(response.output.statusCode).to.be(403); - done(); }); }); }); @@ -59,13 +58,11 @@ describe('license_pre_routing_factory', () => { }; }); - it ('replies with nothing', (done) => { + it ('replies with nothing', () => { const licensePreRouting = licensePreRoutingFactory(mockServer); const stubRequest = {}; - licensePreRouting(stubRequest, (response) => { - expect(response).to.be(undefined); - done(); - }); + const response = licensePreRouting(stubRequest); + expect(response).to.be(null); }); }); }); diff --git a/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/index.js b/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/license_pre_routing_factory.js b/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/license_pre_routing_factory.js old mode 100644 new mode 100755 index 4ae31f692bfd7..862ed8a575ba5 --- a/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/license_pre_routing_factory.js +++ b/x-pack/plugins/logstash/server/lib/license_pre_routing_factory/license_pre_routing_factory.js @@ -12,16 +12,15 @@ export const licensePreRoutingFactory = once((server) => { const xpackMainPlugin = server.plugins.xpack_main; // License checking and enable/disable logic - function licensePreRouting(request, reply) { + function licensePreRouting() { const licenseCheckResults = xpackMainPlugin.info.feature(PLUGIN.ID).getLicenseCheckResults(); if (!licenseCheckResults.isAvailable) { const error = new Error(licenseCheckResults.message); const statusCode = 403; - const wrappedError = wrapCustomError(error, statusCode); - reply(wrappedError); - } else { - reply(); + throw wrapCustomError(error, statusCode); } + + return null; } return licensePreRouting; diff --git a/x-pack/plugins/logstash/server/lib/register_license_checker/index.js b/x-pack/plugins/logstash/server/lib/register_license_checker/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/lib/register_license_checker/register_license_checker.js b/x-pack/plugins/logstash/server/lib/register_license_checker/register_license_checker.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/cluster/__tests__/cluster.js b/x-pack/plugins/logstash/server/models/cluster/__tests__/cluster.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.js b/x-pack/plugins/logstash/server/models/cluster/cluster.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/cluster/index.js b/x-pack/plugins/logstash/server/models/cluster/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/pipeline/__tests__/pipeline.js b/x-pack/plugins/logstash/server/models/pipeline/__tests__/pipeline.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/pipeline/index.js b/x-pack/plugins/logstash/server/models/pipeline/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/pipeline/pipeline.js b/x-pack/plugins/logstash/server/models/pipeline/pipeline.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/pipeline_list_item/__tests__/pipeline_list_item.js b/x-pack/plugins/logstash/server/models/pipeline_list_item/__tests__/pipeline_list_item.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/pipeline_list_item/index.js b/x-pack/plugins/logstash/server/models/pipeline_list_item/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/models/pipeline_list_item/pipeline_list_item.js b/x-pack/plugins/logstash/server/models/pipeline_list_item/pipeline_list_item.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/cluster/index.js b/x-pack/plugins/logstash/server/routes/api/cluster/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/cluster/register_cluster_routes.js b/x-pack/plugins/logstash/server/routes/api/cluster/register_cluster_routes.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/cluster/register_load_route.js b/x-pack/plugins/logstash/server/routes/api/cluster/register_load_route.js old mode 100644 new mode 100755 index 0d565f80299c5..3f6a363f424d7 --- a/x-pack/plugins/logstash/server/routes/api/cluster/register_load_route.js +++ b/x-pack/plugins/logstash/server/routes/api/cluster/register_load_route.js @@ -19,16 +19,18 @@ export function registerLoadRoute(server) { server.route({ path: '/api/logstash/cluster', method: 'GET', - handler: (request, reply) => { + handler: (request, h) => { const callWithRequest = callWithRequestFactory(server, request); return fetchCluster(callWithRequest) - .then(responseFromES => reply({ cluster: Cluster.fromUpstreamJSON(responseFromES).downstreamJSON })) + .then(responseFromES => ({ + cluster: Cluster.fromUpstreamJSON(responseFromES).downstreamJSON + })) .catch((e) => { if (e.status === 403) { - return reply(); + return h.response(); } - reply(Boom.internal(e)); + throw Boom.internal(e); }); }, config: { diff --git a/x-pack/plugins/logstash/server/routes/api/pipeline/index.js b/x-pack/plugins/logstash/server/routes/api/pipeline/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/pipeline/register_delete_route.js b/x-pack/plugins/logstash/server/routes/api/pipeline/register_delete_route.js old mode 100644 new mode 100755 index 179504d753add..9702e35ac5152 --- a/x-pack/plugins/logstash/server/routes/api/pipeline/register_delete_route.js +++ b/x-pack/plugins/logstash/server/routes/api/pipeline/register_delete_route.js @@ -24,13 +24,13 @@ export function registerDeleteRoute(server) { server.route({ path: '/api/logstash/pipeline/{id}', method: 'DELETE', - handler: (request, reply) => { + handler: (request, h) => { const callWithRequest = callWithRequestFactory(server, request); const pipelineId = request.params.id; return deletePipeline(callWithRequest, pipelineId) - .then(() => reply().code(204)) - .catch(e => reply(wrapEsError(e))); + .then(() => h.response().code(204)) + .catch(e => wrapEsError(e)); }, config: { pre: [ licensePreRouting ] diff --git a/x-pack/plugins/logstash/server/routes/api/pipeline/register_load_route.js b/x-pack/plugins/logstash/server/routes/api/pipeline/register_load_route.js old mode 100644 new mode 100755 index 789ea81b19395..90e897a18eb86 --- a/x-pack/plugins/logstash/server/routes/api/pipeline/register_load_route.js +++ b/x-pack/plugins/logstash/server/routes/api/pipeline/register_load_route.js @@ -31,20 +31,20 @@ export function registerLoadRoute(server) { server.route({ path: '/api/logstash/pipeline/{id}', method: 'GET', - handler: (request, reply) => { + handler: (request) => { const callWithRequest = callWithRequestFactory(server, request); const pipelineId = request.params.id; return fetchPipeline(callWithRequest, pipelineId) .then((pipelineResponseFromES) => { if (!pipelineResponseFromES.found) { - return reply(Boom.notFound()); + throw Boom.notFound(); } const pipeline = Pipeline.fromUpstreamJSON(pipelineResponseFromES); - reply(pipeline.downstreamJSON); + return pipeline.downstreamJSON; }) - .catch((e) => reply(Boom.internal(e))); + .catch((e) => Boom.boomify(e)); }, config: { pre: [ licensePreRouting ] diff --git a/x-pack/plugins/logstash/server/routes/api/pipeline/register_pipeline_routes.js b/x-pack/plugins/logstash/server/routes/api/pipeline/register_pipeline_routes.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/pipeline/register_save_route.js b/x-pack/plugins/logstash/server/routes/api/pipeline/register_save_route.js old mode 100644 new mode 100755 index 7af9baaa122da..235392e42620b --- a/x-pack/plugins/logstash/server/routes/api/pipeline/register_save_route.js +++ b/x-pack/plugins/logstash/server/routes/api/pipeline/register_save_route.js @@ -27,7 +27,7 @@ export function registerSaveRoute(server) { server.route({ path: '/api/logstash/pipeline/{id}', method: 'PUT', - handler: async (request, reply) => { + handler: async (request, h) => { let username; if (server.plugins.security) { const user = await server.plugins.security.getUser(request); @@ -39,8 +39,8 @@ export function registerSaveRoute(server) { const pipeline = Pipeline.fromDownstreamJSON(request.payload, pipelineId, username); return savePipeline(callWithRequest, pipeline.id, pipeline.upstreamJSON) - .then(() => reply().code(204)) - .catch(e => reply(wrapEsError(e))); + .then(() => h.response().code(204)) + .catch(e => wrapEsError(e)); }, config: { pre: [ licensePreRouting ] diff --git a/x-pack/plugins/logstash/server/routes/api/pipelines/index.js b/x-pack/plugins/logstash/server/routes/api/pipelines/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/pipelines/register_delete_route.js b/x-pack/plugins/logstash/server/routes/api/pipelines/register_delete_route.js old mode 100644 new mode 100755 index e0d754563ea59..e733ae46e20f9 --- a/x-pack/plugins/logstash/server/routes/api/pipelines/register_delete_route.js +++ b/x-pack/plugins/logstash/server/routes/api/pipelines/register_delete_route.js @@ -39,16 +39,12 @@ export function registerDeleteRoute(server) { server.route({ path: '/api/logstash/pipelines', method: 'DELETE', - handler: (request, reply) => { + handler: (request) => { const callWithRequest = callWithRequestFactory(server, request); return deletePipelines(callWithRequest, request.payload.pipelineIds) - .then(results => { - reply({ results }); - }) - .catch(err => { - reply(wrapUnknownError(err)); - }); + .then(results => ({ results })) + .catch(err => wrapUnknownError(err)); }, config: { pre: [ licensePreRouting ] diff --git a/x-pack/plugins/logstash/server/routes/api/pipelines/register_list_route.js b/x-pack/plugins/logstash/server/routes/api/pipelines/register_list_route.js old mode 100644 new mode 100755 index f942e2080be6e..6d9eab891276c --- a/x-pack/plugins/logstash/server/routes/api/pipelines/register_list_route.js +++ b/x-pack/plugins/logstash/server/routes/api/pipelines/register_list_route.js @@ -31,7 +31,7 @@ export function registerListRoute(server) { server.route({ path: '/api/logstash/pipelines', method: 'GET', - handler: (request, reply) => { + handler: (request) => { const callWithRequest = callWithRequestFactory(server, request); return fetchPipelines(callWithRequest) @@ -41,10 +41,9 @@ export function registerListRoute(server) { return PipelineListItem.fromUpstreamJSON(pipeline).downstreamJSON; }); - reply({ pipelines }); - + return { pipelines }; }) - .catch(e => reply(wrapEsError(e))); + .catch(e => wrapEsError(e)); }, config: { pre: [ licensePreRouting ] diff --git a/x-pack/plugins/logstash/server/routes/api/pipelines/register_pipelines_routes.js b/x-pack/plugins/logstash/server/routes/api/pipelines/register_pipelines_routes.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/upgrade/index.js b/x-pack/plugins/logstash/server/routes/api/upgrade/index.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/logstash/server/routes/api/upgrade/register_execute_route.js b/x-pack/plugins/logstash/server/routes/api/upgrade/register_execute_route.js old mode 100644 new mode 100755 index 843525e28375c..7bdeb136576cb --- a/x-pack/plugins/logstash/server/routes/api/upgrade/register_execute_route.js +++ b/x-pack/plugins/logstash/server/routes/api/upgrade/register_execute_route.js @@ -42,13 +42,13 @@ export function registerExecuteRoute(server) { server.route({ path: '/api/logstash/upgrade', method: 'POST', - handler: async (request, reply) => { + handler: async (request) => { const callWithRequest = callWithRequestFactory(server, request); try { await executeUpgrade(callWithRequest); - reply({ is_upgraded: true }); + return { is_upgraded: true }; } catch(err) { - reply(wrapUnknownError(err)); + throw wrapUnknownError(err); } }, config: { diff --git a/x-pack/plugins/logstash/server/routes/api/upgrade/register_upgrade_routes.js b/x-pack/plugins/logstash/server/routes/api/upgrade/register_upgrade_routes.js old mode 100644 new mode 100755 diff --git a/x-pack/plugins/ml/common/constants/field_types.js b/x-pack/plugins/ml/common/constants/field_types.js index 3dd265c5c76ec..d8041b5b936b3 100644 --- a/x-pack/plugins/ml/common/constants/field_types.js +++ b/x-pack/plugins/ml/common/constants/field_types.js @@ -27,7 +27,7 @@ export const ES_FIELD_TYPES = { TOKEN_COUNT: 'token_count', _ID: '_id', _SOURCE: '_source', - _TYPE: '_type' + _TYPE: '_type', }; export const KBN_FIELD_TYPES = { @@ -52,6 +52,7 @@ export const ML_JOB_FIELD_TYPES = { IP: 'ip', KEYWORD: 'keyword', NUMBER: 'number', - TEXT: 'text' + TEXT: 'text', + UNKNOWN: 'unknown', }; diff --git a/x-pack/plugins/ml/common/constants/file_datavisualizer.js b/x-pack/plugins/ml/common/constants/file_datavisualizer.js new file mode 100644 index 0000000000000..262e2a1a337a0 --- /dev/null +++ b/x-pack/plugins/ml/common/constants/file_datavisualizer.js @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +export const MAX_BYTES = 104857600; diff --git a/x-pack/plugins/ml/common/constants/license.js b/x-pack/plugins/ml/common/constants/license.js new file mode 100644 index 0000000000000..9f4b06bbbc954 --- /dev/null +++ b/x-pack/plugins/ml/common/constants/license.js @@ -0,0 +1,11 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +export const LICENSE_TYPE = { + BASIC: 0, + FULL: 1, +}; diff --git a/x-pack/plugins/ml/common/constants/multi_bucket_impact.js b/x-pack/plugins/ml/common/constants/multi_bucket_impact.js new file mode 100644 index 0000000000000..5c3a25954dbb7 --- /dev/null +++ b/x-pack/plugins/ml/common/constants/multi_bucket_impact.js @@ -0,0 +1,18 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +// Thresholds for indicating the impact of multi-bucket features in an anomaly. +// As a rule-of-thumb, a threshold value T corresponds to the multi-bucket probability +// being 1000^(T/5) times smaller than the single bucket probability. +// So, for example, for HIGH it is 63 times smaller. +export const MULTI_BUCKET_IMPACT = { + HIGH: 3, + MEDIUM: 2, + LOW: 1, + NONE: -5 +}; diff --git a/x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js b/x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js index 408eb1d7d599a..e093db28ba233 100644 --- a/x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js +++ b/x-pack/plugins/ml/common/util/__tests__/anomaly_utils.js @@ -11,6 +11,7 @@ import { getSeverity, getSeverityWithLow, getSeverityColor, + getMultiBucketImpactLabel, getEntityFieldName, getEntityFieldValue, showActualForFunction, @@ -281,6 +282,35 @@ describe('ML - anomaly utils', () => { }); + describe('getMultiBucketImpactLabel', () => { + + it('returns high for 3 <= score <= 5', () => { + expect(getMultiBucketImpactLabel(3)).to.be('high'); + expect(getMultiBucketImpactLabel(5)).to.be('high'); + }); + + it('returns medium for 2 <= score < 3', () => { + expect(getMultiBucketImpactLabel(2)).to.be('medium'); + expect(getMultiBucketImpactLabel(2.99)).to.be('medium'); + }); + + it('returns low for 1 <= score < 2', () => { + expect(getMultiBucketImpactLabel(1)).to.be('low'); + expect(getMultiBucketImpactLabel(1.99)).to.be('low'); + }); + + it('returns none for -5 <= score < 1', () => { + expect(getMultiBucketImpactLabel(-5)).to.be('none'); + expect(getMultiBucketImpactLabel(0.99)).to.be('none'); + }); + + it('returns expected label when impact outside normal bounds', () => { + expect(getMultiBucketImpactLabel(10)).to.be('high'); + expect(getMultiBucketImpactLabel(-10)).to.be('none'); + }); + + }); + describe('getEntityFieldName', () => { it('returns the by field name', () => { expect(getEntityFieldName(byEntityRecord)).to.be('airline'); diff --git a/x-pack/plugins/ml/common/util/anomaly_utils.js b/x-pack/plugins/ml/common/util/anomaly_utils.js index c85538fc1b7a1..5adf1b0d4d2e5 100644 --- a/x-pack/plugins/ml/common/util/anomaly_utils.js +++ b/x-pack/plugins/ml/common/util/anomaly_utils.js @@ -13,6 +13,7 @@ import _ from 'lodash'; import { CONDITIONS_NOT_SUPPORTED_FUNCTIONS } from '../constants/detector_rule'; +import { MULTI_BUCKET_IMPACT } from '../constants/multi_bucket_impact'; // List of function descriptions for which actual values from record level results should be displayed. const DISPLAY_ACTUAL_FUNCTIONS = ['count', 'distinct_count', 'lat_long', 'mean', 'max', 'min', 'sum', @@ -75,6 +76,21 @@ export function getSeverityColor(normalizedScore) { } } +// Returns a label to use for the multi-bucket impact of an anomaly +// according to the value of the multi_bucket_impact field of a record, +// which ranges from -5 to +5. +export function getMultiBucketImpactLabel(multiBucketImpact) { + if (multiBucketImpact >= MULTI_BUCKET_IMPACT.HIGH) { + return 'high'; + } else if (multiBucketImpact >= MULTI_BUCKET_IMPACT.MEDIUM) { + return 'medium'; + } else if (multiBucketImpact >= MULTI_BUCKET_IMPACT.LOW) { + return 'low'; + } else { + return 'none'; + } +} + // Returns the name of the field to use as the entity name from the source record // obtained from Elasticsearch. The function looks first for a by_field, then over_field, // then partition_field, returning undefined if none of these fields are present. diff --git a/x-pack/plugins/ml/index.js b/x-pack/plugins/ml/index.js index ce511ad3f7d84..c84bf9d56eb5b 100644 --- a/x-pack/plugins/ml/index.js +++ b/x-pack/plugins/ml/index.js @@ -24,6 +24,7 @@ import { filtersRoutes } from './server/routes/filters'; import { resultsServiceRoutes } from './server/routes/results_service'; import { jobServiceRoutes } from './server/routes/job_service'; import { jobAuditMessagesRoutes } from './server/routes/job_audit_messages'; +import { fileDataVisualizerRoutes } from './server/routes/file_data_visualizer'; export const ml = (kibana) => { return new kibana.Plugin({ @@ -37,10 +38,18 @@ export const ml = (kibana) => { title: 'Machine Learning', description: 'Machine Learning for the Elastic Stack', icon: 'plugins/ml/ml.svg', + euiIconType: 'machineLearningApp', main: 'plugins/ml/app', }, + styleSheetPaths: `${__dirname}/public/index.scss`, hacks: ['plugins/ml/hacks/toggle_app_link_in_nav'], - home: ['plugins/ml/register_feature'] + home: ['plugins/ml/register_feature'], + injectDefaultVars(server) { + const config = server.config(); + return { + mlEnabled: config.get('xpack.ml.enabled'), + }; + }, }, @@ -57,12 +66,12 @@ export const ml = (kibana) => { // Add server routes and initialize the plugin here const commonRouteConfig = { pre: [ - function forbidApiAccess(request, reply) { + function forbidApiAccess() { const licenseCheckResults = xpackMainPlugin.info.feature(thisPlugin.id).getLicenseCheckResults(); if (licenseCheckResults.isAvailable) { - reply(); + return null; } else { - reply(Boom.forbidden(licenseCheckResults.message)); + throw Boom.forbidden(licenseCheckResults.message); } } ] @@ -72,7 +81,7 @@ export const ml = (kibana) => { const config = server.config(); return { kbnIndex: config.get('kibana.index'), - esServerUrl: config.get('elasticsearch.url') + esServerUrl: config.get('elasticsearch.url'), }; }); @@ -90,6 +99,7 @@ export const ml = (kibana) => { resultsServiceRoutes(server, commonRouteConfig); jobServiceRoutes(server, commonRouteConfig); jobAuditMessagesRoutes(server, commonRouteConfig); + fileDataVisualizerRoutes(server, commonRouteConfig); } }); diff --git a/x-pack/plugins/ml/public/app.js b/x-pack/plugins/ml/public/app.js index ad76c56cfdf19..1af1b28286b98 100644 --- a/x-pack/plugins/ml/public/app.js +++ b/x-pack/plugins/ml/public/app.js @@ -32,6 +32,7 @@ import 'plugins/ml/components/confirm_modal'; import 'plugins/ml/components/nav_menu'; import 'plugins/ml/components/loading_indicator'; import 'plugins/ml/settings'; +import 'plugins/ml/file_datavisualizer'; import uiRoutes from 'ui/routes'; diff --git a/x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg b/x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg deleted file mode 100644 index c29639b0b16cb..0000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_advanced_job.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg b/x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg deleted file mode 100644 index 6f7f35be34e1d..0000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_multi_metric_job.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/x-pack/plugins/ml/public/assets/ml_create_population_job.svg b/x-pack/plugins/ml/public/assets/ml_create_population_job.svg deleted file mode 100644 index 300e473045f13..0000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_population_job.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg b/x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg deleted file mode 100644 index 398ee246aeb0d..0000000000000 --- a/x-pack/plugins/ml/public/assets/ml_create_single_metric_job.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/x-pack/plugins/ml/public/assets/ml_data_visualizer.svg b/x-pack/plugins/ml/public/assets/ml_data_visualizer.svg deleted file mode 100644 index 092444438ffe3..0000000000000 --- a/x-pack/plugins/ml/public/assets/ml_data_visualizer.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js b/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js index fdd12e1e59606..8ef9cc25dc0bf 100644 --- a/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js +++ b/x-pack/plugins/ml/public/components/anomalies_table/anomaly_details.js @@ -25,11 +25,13 @@ import { formatDate } from '@elastic/eui/lib/services/format'; import { EntityCell } from './entity_cell'; import { + getMultiBucketImpactLabel, getSeverity, showActualForFunction, - showTypicalForFunction -} from 'plugins/ml/../common/util/anomaly_utils'; -import { formatValue } from 'plugins/ml/formatters/format_value'; + showTypicalForFunction, +} from '../../../common/util/anomaly_utils'; +import { MULTI_BUCKET_IMPACT } from '../../../common/constants/multi_bucket_impact'; +import { formatValue } from '../../formatters/format_value'; const TIME_FIELD_NAME = 'timestamp'; @@ -152,6 +154,14 @@ function getDetailsItems(anomaly, examples, filter) { description: anomaly.jobId }); + if (source.multi_bucket_impact !== undefined && + source.multi_bucket_impact >= MULTI_BUCKET_IMPACT.LOW) { + items.push({ + title: 'multi-bucket impact', + description: getMultiBucketImpactLabel(source.multi_bucket_impact) + }); + } + items.push({ title: 'probability', description: source.probability @@ -209,7 +219,7 @@ export class AnomalyDetails extends Component { return ( -
      Description
      +

      Description

      {anomalyDescription}
      {(mvDescription !== undefined) && @@ -226,11 +236,11 @@ export class AnomalyDetails extends Component { const isInterimResult = _.get(this.props.anomaly, 'source.is_interim', false); return ( - + {this.props.isAggregatedData === true ? ( -
      Details on highest severity anomaly
      +

      Details on highest severity anomaly

      ) : ( -
      Anomaly details
      +

      Anomaly details

      )} {isInterimResult === true && @@ -277,8 +287,8 @@ export class AnomalyDetails extends Component { return ( - -
      Influencers
      + +

      Influencers

      { + beforeEach(() => { + ngMock.module('kibana'); + }); + + it('Initialize Confirm Modal Controller', (done) => { + ngMock.inject(function ($rootScope, $controller) { + const scope = $rootScope.$new(); + $controller('MlConfirmModal', { + $scope: scope, + $modalInstance: mockModalInstance, + params: {} + }); + + expect(scope.okLabel).to.be('OK'); + done(); + }); + }); +}); diff --git a/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.js b/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.js index a27b594f1aac2..03c608082b982 100644 --- a/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.js +++ b/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.js @@ -11,34 +11,40 @@ */ import PropTypes from 'prop-types'; import _ from 'lodash'; -import React, { Component } from 'react'; +import React, { Component, Fragment } from 'react'; import { - EuiComboBox, - EuiHighlight, EuiHealth, + EuiSpacer, + EuiSuperSelect, + EuiText, } from '@elastic/eui'; import './styles/main.less'; -import { getSeverityColor } from 'plugins/ml/../common/util/anomaly_utils'; +import { getSeverityColor } from '../../../../common/util/anomaly_utils'; const OPTIONS = [ - { value: 0, label: 'warning', color: getSeverityColor(0) }, - { value: 25, label: 'minor', color: getSeverityColor(25) }, - { value: 50, label: 'major', color: getSeverityColor(50) }, - { value: 75, label: 'critical', color: getSeverityColor(75) } + { val: 0, display: 'warning', color: getSeverityColor(0) }, + { val: 25, display: 'minor', color: getSeverityColor(25) }, + { val: 50, display: 'major', color: getSeverityColor(50) }, + { val: 75, display: 'critical', color: getSeverityColor(75) }, ]; +const optionsMap = { + 'warning': 0, + 'minor': 25, + 'major': 50, + 'critical': 75, +}; + function optionValueToThreshold(value) { - // Builds the corresponding threshold object with the required display and val properties - // from the specified value. - const option = OPTIONS.find(opt => (opt.value === value)); + // Get corresponding threshold object with required display and val properties from the specified value. + let threshold = OPTIONS.find(opt => (opt.val === value)); // Default to warning if supplied value doesn't map to one of the options. - let threshold = OPTIONS[0]; - if (option !== undefined) { - threshold = { display: option.label, val: option.value }; + if (threshold === undefined) { + threshold = OPTIONS[0]; } return threshold; @@ -53,59 +59,61 @@ class SelectSeverity extends Component { const thresholdState = this.mlSelectSeverityService.state.get('threshold'); const thresholdValue = _.get(thresholdState, 'val', 0); const threshold = optionValueToThreshold(thresholdValue); - const selectedOption = OPTIONS.find(opt => (opt.value === threshold.val)); - + // set initial selected option equal to threshold value + const selectedOption = OPTIONS.find(opt => (opt.val === threshold.val)); this.mlSelectSeverityService.state.set('threshold', threshold); this.state = { - selectedOptions: [selectedOption] + valueDisplay: selectedOption.display, }; } - onChange = (selectedOptions) => { - if (selectedOptions.length === 0) { - // Don't allow no options to be selected. - return; - } - + onChange = (valueDisplay) => { this.setState({ - selectedOptions, + valueDisplay: valueDisplay, }); - - const threshold = optionValueToThreshold(selectedOptions[0].value); + const threshold = optionValueToThreshold(optionsMap[valueDisplay]); this.mlSelectSeverityService.state.set('threshold', threshold).changed(); - }; + } - renderOption = (option, searchValue, contentClassName) => { - const { color, label, value } = option; - return ( - - - - {label} - -   - ({value}) - - - ); - }; + getOptions = () => + OPTIONS.map(({ color, display, val }) => ({ + value: display, + inputDisplay: ( + + + {display} + + + ), + dropdownDisplay: ( + + + {display} + + + +

      {`score ${val} and above`}

      +
      +
      + ), + })); render() { - const { selectedOptions } = this.state; + const { valueDisplay } = this.state; + const options = this.getOptions(); + return ( - ); } } + SelectSeverity.propTypes = { mlSelectSeverityService: PropTypes.object.isRequired, }; diff --git a/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.test.js b/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.test.js new file mode 100644 index 0000000000000..0a694e3197544 --- /dev/null +++ b/x-pack/plugins/ml/public/components/controls/select_severity/select_severity.test.js @@ -0,0 +1,77 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; +import { shallow } from 'enzyme'; +import { SelectSeverity } from './select_severity'; + + +const severityService = { + state: { + 'threshold': { color: '#d2e9f7', display: 'warning', val: 0 }, + get: () => ({ color: '#d2e9f7', display: 'warning', val: 0 }), + set: () => ({ + changed: () => {} + }) + } +}; + +describe('SelectSeverity', () => { + + test('creates correct severity options and initial selected value', () => { + const wrapper = shallow(); + const options = wrapper.props().options; + const defaultSelectedValue = wrapper.props().valueOfSelected; + + expect(defaultSelectedValue).toBe('warning'); + expect(options.length).toEqual(4); + + // excpect options Array to equal Array containing Object that contains the property + expect(options).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + value: 'warning' + }) + ]) + ); + + expect(options).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + value: 'minor' + }) + ]) + ); + + expect(options).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + value: 'major' + }) + ]) + ); + + expect(options).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + value: 'critical' + }) + ]) + ); + }); + + test('state for currently selected value is updated correctly on click', () => { + const wrapper = shallow(); + + const defaultSelectedValue = wrapper.props().valueOfSelected; + expect(defaultSelectedValue).toBe('warning'); + + wrapper.simulate('change', 'critical'); + const updatedSelectedValue = wrapper.props().valueOfSelected; + expect(updatedSelectedValue).toBe('critical'); + }); + +}); diff --git a/x-pack/plugins/ml/public/components/data_recognizer/recognized_result.js b/x-pack/plugins/ml/public/components/data_recognizer/recognized_result.js index d35635ace8f39..44894e2e54910 100644 --- a/x-pack/plugins/ml/public/components/data_recognizer/recognized_result.js +++ b/x-pack/plugins/ml/public/components/data_recognizer/recognized_result.js @@ -24,7 +24,7 @@ export const RecognizedResult = ({ // if a logo is available, use that, otherwise display the id // the logo should be a base64 encoded image if (config.logo && config.logo.src) { - logo =
      ; + logo =
      ; } else { logo =

      {config.id}

      ; } diff --git a/x-pack/plugins/ml/public/components/field_data_card/styles/main.less b/x-pack/plugins/ml/public/components/field_data_card/styles/main.less index 740e82b3d976e..1776afe87fec1 100644 --- a/x-pack/plugins/ml/public/components/field_data_card/styles/main.less +++ b/x-pack/plugins/ml/public/components/field_data_card/styles/main.less @@ -34,7 +34,7 @@ background-color: #920000; } - .type-other { + .type-other, .unknown { background-color: #bfa180; } diff --git a/x-pack/plugins/ml/public/components/field_type_icon/field_type_icon.js b/x-pack/plugins/ml/public/components/field_type_icon/field_type_icon.js index cf23fa1468f7d..5b1868d0598d5 100644 --- a/x-pack/plugins/ml/public/components/field_type_icon/field_type_icon.js +++ b/x-pack/plugins/ml/public/components/field_type_icon/field_type_icon.js @@ -47,6 +47,10 @@ export function FieldTypeIcon({ tooltipEnabled = false, type }) { ariaLabel = 'IP type'; iconClass = 'fa-laptop'; break; + case ML_JOB_FIELD_TYPES.UNKNOWN: + ariaLabel = 'Unknown type'; + iconChar = '?'; + break; default: // if type doesn't match one of ML_JOB_FIELD_TYPES // don't render the component at all diff --git a/x-pack/plugins/ml/public/components/json_tooltip/tooltips.json b/x-pack/plugins/ml/public/components/json_tooltip/tooltips.json index 35b90c9ff073b..b6cbc55699822 100644 --- a/x-pack/plugins/ml/public/components/json_tooltip/tooltips.json +++ b/x-pack/plugins/ml/public/components/json_tooltip/tooltips.json @@ -72,7 +72,7 @@ "text": "Character used to encapsulate values containing reserved characters." }, "new_job_enable_datafeed_job": { - "text": "Required for jobs that analyze data from Elasticsearch.\nRequires data format to be set to Elasticsearch/" + "text": "Required for jobs that analyze data from Elasticsearch." }, "new_job_data_source": { "text": "Elasticsearch versions 1.7.x and 2+ supported." @@ -107,6 +107,9 @@ "new_job_dedicated_index": { "text": "Select to store results in a separate index for this job." }, + "new_job_enable_model_plot": { + "text": "Select to enable model plot. Stores model information along with results. Can add considerable overhead to the performance of the system." + }, "new_job_model_memory_limit": { "text": "An approximate limit for the amount of memory used by the analytical models." }, diff --git a/x-pack/plugins/ml/public/components/messagebar/__tests__/messagebar.js b/x-pack/plugins/ml/public/components/messagebar/__tests__/messagebar.js new file mode 100644 index 0000000000000..b39cc57757eb9 --- /dev/null +++ b/x-pack/plugins/ml/public/components/messagebar/__tests__/messagebar.js @@ -0,0 +1,26 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + + +import ngMock from 'ng_mock'; +import expect from 'expect.js'; + +describe('ML - Message Bar Controller', () => { + beforeEach(() => { + ngMock.module('kibana'); + }); + + it('Initialize Message Bar Controller', (done) => { + ngMock.inject(function ($rootScope, $controller) { + const scope = $rootScope.$new(); + $controller('MlMessageBarController', { $scope: scope }); + + expect(scope.messages).to.eql([]); + done(); + }); + }); +}); diff --git a/x-pack/plugins/ml/public/components/nav_menu/_index.scss b/x-pack/plugins/ml/public/components/nav_menu/_index.scss new file mode 100644 index 0000000000000..a5981e1022e15 --- /dev/null +++ b/x-pack/plugins/ml/public/components/nav_menu/_index.scss @@ -0,0 +1 @@ +@import 'nav_menu' diff --git a/x-pack/plugins/ml/public/components/nav_menu/_nav_menu.scss b/x-pack/plugins/ml/public/components/nav_menu/_nav_menu.scss new file mode 100644 index 0000000000000..6b1be3c238390 --- /dev/null +++ b/x-pack/plugins/ml/public/components/nav_menu/_nav_menu.scss @@ -0,0 +1,4 @@ +.disabled-nav-link { + color: $euiColorMediumShade; + pointer-events: none; +} diff --git a/x-pack/plugins/ml/public/components/nav_menu/nav_menu.html b/x-pack/plugins/ml/public/components/nav_menu/nav_menu.html index 3c426a925aa76..345ed3bddb97e 100644 --- a/x-pack/plugins/ml/public/components/nav_menu/nav_menu.html +++ b/x-pack/plugins/ml/public/components/nav_menu/nav_menu.html @@ -1,27 +1,39 @@
      -
      -
      - {{ crumb.label }} - {{ crumb.label }} +
      +
      +
      + {{ crumb.label }} + {{ crumb.label }} +
      - Job Management + ng-class="{'kuiLocalTab-isSelected': isActiveTab('jobs'), 'disabled-nav-link': disableLinks}"> + Job Management + - Anomaly Explorer + ng-class="{'kuiLocalTab-isSelected': isActiveTab('explorer'), 'disabled-nav-link': disableLinks}"> + Anomaly Explorer + - Single Metric Viewer + ng-class="{'kuiLocalTab-isSelected': isActiveTab('timeseriesexplorer'), 'disabled-nav-link': disableLinks}"> + Single Metric Viewer + + + Data Visualizer + - Settings + ng-class="{'kuiLocalTab-isSelected': isActiveTab('settings'), 'disabled-nav-link': disableLinks}"> + Settings +
      diff --git a/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js b/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js index 72686c4a13546..2ead5f96dd404 100644 --- a/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js +++ b/x-pack/plugins/ml/public/components/nav_menu/nav_menu.js @@ -10,23 +10,28 @@ import _ from 'lodash'; import $ from 'jquery'; import template from './nav_menu.html'; import uiRouter from 'ui/routes'; +import { isFullLicense } from '../../license/check_license'; import { uiModules } from 'ui/modules'; const module = uiModules.get('apps/ml'); -module.directive('mlNavMenu', function () { +module.directive('mlNavMenu', function (breadcrumbState, config) { return { restrict: 'E', transclude: true, template, link: function (scope, el, attrs) { + + // Tabs scope.name = attrs.name; scope.showTabs = false; if (scope.name === 'jobs' || scope.name === 'settings' || + scope.name === 'datavisualizer' || + scope.name === 'filedatavisualizer' || scope.name === 'timeseriesexplorer' || scope.name === 'explorer') { scope.showTabs = true; @@ -35,6 +40,8 @@ module.directive('mlNavMenu', function () { return scope.name === path; }; + scope.disableLinks = (isFullLicense() === false); + // Breadcrumbs const crumbNames = { jobs: { label: 'Job Management', url: '#/jobs' }, @@ -44,6 +51,7 @@ module.directive('mlNavMenu', function () { population: { label: 'Population job', url: '' }, advanced: { label: 'Advanced Job Configuration', url: '' }, datavisualizer: { label: 'Data Visualizer', url: '' }, + filedatavisualizer: { label: 'File Data Visualizer (Experimental)', url: '' }, explorer: { label: 'Anomaly Explorer', url: '#/explorer' }, timeseriesexplorer: { label: 'Single Metric Viewer', url: '#/timeseriesexplorer' }, settings: { label: 'Settings', url: '#/settings' }, @@ -64,6 +72,9 @@ module.directive('mlNavMenu', function () { }); scope.breadcrumbs = breadcrumbs.filter(Boolean); + config.watch('k7design', (val) => scope.showPluginBreadcrumbs = !val); + breadcrumbState.set(scope.breadcrumbs.map(b => ({ text: b.label, href: b.url }))); + // when the page loads, focus on the first breadcrumb el.ready(() => { const $crumbs = $('.kuiLocalBreadcrumbs a'); diff --git a/x-pack/plugins/ml/public/components/paginated_table/index.js b/x-pack/plugins/ml/public/components/paginated_table/index.js deleted file mode 100644 index 753d5c46f9f3a..0000000000000 --- a/x-pack/plugins/ml/public/components/paginated_table/index.js +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -import './paginated_table'; diff --git a/x-pack/plugins/ml/public/components/paginated_table/open.html b/x-pack/plugins/ml/public/components/paginated_table/open.html deleted file mode 100644 index 3fb31ca48b01c..0000000000000 --- a/x-pack/plugins/ml/public/components/paginated_table/open.html +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/x-pack/plugins/ml/public/components/paginated_table/paginated_table.html b/x-pack/plugins/ml/public/components/paginated_table/paginated_table.html deleted file mode 100644 index ace2535934c41..0000000000000 --- a/x-pack/plugins/ml/public/components/paginated_table/paginated_table.html +++ /dev/null @@ -1,55 +0,0 @@ - -
      - - - - - - - - -
      - - - - - - - - -
      -
      - - - -
      - -
      diff --git a/x-pack/plugins/ml/public/components/paginated_table/paginated_table.js b/x-pack/plugins/ml/public/components/paginated_table/paginated_table.js deleted file mode 100644 index 6aa1d2b7d6653..0000000000000 --- a/x-pack/plugins/ml/public/components/paginated_table/paginated_table.js +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -// copy of Kibana's ui/public/paginated_table/paginated_table.js -// but with the one-time binding removed from the scope columns object -// in the paginated_table.html template, to allow dynamic changes to -// the list of columns shown in the table. - -import './row'; - -import './styles/main.less'; -import 'ui/directives/paginate'; -import 'ui/styles/pagination.less'; -import _ from 'lodash'; -import template from './paginated_table.html'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.directive('mlPaginatedTable', function ($filter) { - const orderBy = $filter('orderBy'); - - return { - restrict: 'E', - template, - transclude: true, - scope: { - rows: '=', - columns: '=', - perPage: '=?', - sortHandler: '=?', - showSelector: '=?' - }, - controllerAs: 'mlPaginatedTable', - controller: function ($scope) { - const self = this; - self.sort = { - columnIndex: null, - direction: null - }; - - self.sortColumn = function (colIndex) { - const col = $scope.columns[colIndex]; - - if (!col) return; - if (col.sortable === false) return; - - let sortDirection; - - if (self.sort.columnIndex !== colIndex) { - sortDirection = 'asc'; - } else { - const directions = { - null: 'asc', - 'asc': 'desc', - 'desc': null - }; - sortDirection = directions[self.sort.direction]; - } - - self.sort.columnIndex = colIndex; - self.sort.direction = sortDirection; - self._setSortGetter(colIndex); - }; - - self._setSortGetter = function (index) { - if (_.isFunction($scope.sortHandler)) { - // use custom sort handler - self.sort.getter = $scope.sortHandler(index); - } else { - // use generic sort handler - self.sort.getter = function (row) { - const value = row[index]; - if (value && value.value !== undefined && value.value !== null) { - if (typeof value.value === 'function') { - return value.value(); - } else { - return value.value; - } - } else { - return value; - } - }; - } - }; - - // update the sortedRows result - $scope.$watchMulti([ - 'rows', - 'columns', - '[]mlPaginatedTable.sort' - ], function resortRows() { - if (!$scope.rows || !$scope.columns) { - $scope.sortedRows = false; - return; - } - - const sort = self.sort; - if (sort.direction == null) { - $scope.sortedRows = $scope.rows.slice(0); - } else { - $scope.sortedRows = orderBy($scope.rows, sort.getter, sort.direction === 'desc'); - } - }); - } - }; -}); diff --git a/x-pack/plugins/ml/public/components/paginated_table/row.js b/x-pack/plugins/ml/public/components/paginated_table/row.js deleted file mode 100644 index 2cf377eb08655..0000000000000 --- a/x-pack/plugins/ml/public/components/paginated_table/row.js +++ /dev/null @@ -1,162 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - - - -// copy of ui/public/directives/row.js -// overridden to add the option for row expansion. - -import $ from 'jquery'; -import _ from 'lodash'; -import AggConfigResult from 'ui/vis/agg_config_result'; -import { FilterBarClickHandlerProvider } from 'ui/filter_bar/filter_bar_click_handler'; - -import { uiModules } from 'ui/modules'; -const module = uiModules.get('apps/ml'); - -module.directive('mlRows', function ($compile, getAppState, Private) { - const filterBarClickHandler = Private(FilterBarClickHandlerProvider); - return { - restrict: 'A', - - link: function ($scope, $el, attr) { - function addCell($tr, contents) { - let $cell = $(document.createElement('td')); - - // TODO: It would be better to actually check the type of the field, but we don't have - // access to it here. This may become a problem with the switch to BigNumber - if (_.isNumber(contents)) { - $cell.addClass('numeric-value'); - } - - const createAggConfigResultCell = function (aggConfigResult) { - const $resultCell = $(document.createElement('td')); - const $state = getAppState(); - const clickHandler = filterBarClickHandler($state); - $resultCell.scope = $scope.$new(); - $resultCell.addClass('cell-hover'); - $resultCell.attr('ng-click', 'clickHandler($event)'); - $resultCell.scope.clickHandler = function (event) { - if ($(event.target).is('a')) return; // Don't add filter if a link was clicked - clickHandler({ point: { aggConfigResult: aggConfigResult } }); - }; - return $compile($resultCell)($cell.scope); - }; - - if (contents instanceof AggConfigResult) { - if (contents.type === 'bucket' && contents.aggConfig.field() && contents.aggConfig.field().filterable) { - $cell = createAggConfigResultCell(contents); - } - contents = contents.toString('html'); - } - - if (_.isObject(contents)) { - if (contents.attr) { - $cell.attr(contents.attr); - } - - if (contents.class) { - $cell.addClass(contents.class); - } - - if (contents.scope) { - $cell = $compile($cell.html(contents.markup))(contents.scope); - } else { - $cell.html(contents.markup); - } - } else { - if (contents === '') { - $cell.html(' '); - } else { - $cell.html(contents); - } - } - - $tr.append($cell); - } - - $scope.$watchMulti([ - attr.mlRows, - attr.mlRowsMin - ], function (vals) { - let rows = vals[0]; - const min = vals[1]; - - $el.empty(); - - if (!_.isArray(rows)) { - rows = []; - } - - if (isFinite(min) && rows.length < min) { - // clone the rows so that we can add elements to it without upsetting the original - rows = _.clone(rows); - } - - rows.forEach(function (row) { - if (row.length) { - const rowScope = row[0].scope; - const $tr = $(document.createElement('tr')).appendTo($el); - - if (rowScope && - rowScope.mouseenterRow !== undefined && typeof rowScope.mouseenterRow === 'function') { - // Add mousenter and mouseleave events to the row - $tr.attr({ 'ng-mouseenter': 'mouseenterRow($event)' }); - $tr.attr({ 'ng-mouseleave': 'mouseleaveRow($event)' }); - $compile($tr)(rowScope); - } - - row.forEach(function (cell) { - addCell($tr, cell); - }); - - if (rowScope && - rowScope.expandable && - rowScope.expandElement && // the tag name of the element which contains the expanded row's contents - row.join('') !== '') { // empty rows are passed in as an array of empty cols, i.e., ['','',''] - - if (rowScope.open === undefined) { - rowScope.open = false; - } - - if (rowScope.rowInitialised === undefined) { - rowScope.rowInitialised = false; - } - - rowScope.toggleRow = function () { - this.open = !this.open; - if (this.initRow && this.rowInitialised === false) { - this.rowInitialised = true; - this.initRow(); - } - }; - - const $trExpand = $(document.createElement('tr')).appendTo($el); - $trExpand.attr('ng-show', 'open'); - $trExpand.addClass('row-expand'); - - const $td = $(document.createElement('td')).appendTo($trExpand); - $td.attr('colspan', row.length); - - const expEl = rowScope.expandElement; - const $exp = $(document.createElement(expEl)).appendTo($td); - - // if expand element already exits and has child elements, - // copy them to the new expand element - if (rowScope.$expandElement && rowScope.$expandElement.children().length) { - $exp.append(rowScope.$expandElement.children()[0]); - } - - $compile($trExpand)(rowScope); - rowScope.$expandElement = $exp; - } - - } - }); - }); - } - }; -}); diff --git a/x-pack/plugins/ml/public/components/paginated_table/styles/main.less b/x-pack/plugins/ml/public/components/paginated_table/styles/main.less deleted file mode 100644 index d9c93dabcaadc..0000000000000 --- a/x-pack/plugins/ml/public/components/paginated_table/styles/main.less +++ /dev/null @@ -1,49 +0,0 @@ -@import "~ui/styles/variables"; - -ml-paginated-table { - - .col-expand-arrow { - width: 10px; - } - - .table-header-button { - border: none; - background: none; - padding: 0; - } - - table th { - font-weight: bold; - text-align: left; - } - - table th button.fa-sort { - color: @table-sort-color; - } - - tr.row-expand td:hover, - tr.row-expand td:hover td { - background-color: #FFFFFF; - } - - .discover-table-open-button { - background-color: #FFFFFF; - border: none; - min-width: 20px; - } - .discover-table-open-button:focus { - outline: none; - } - - paginate-controls { - button.euiPaginationButton { - padding: 1px 7px 2px; - } - - label { - line-height: 1.5; - font-size: 12px; - font-weight: bold; - } - } -} diff --git a/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/actions_section.test.js.snap b/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/actions_section.test.js.snap index 35f10f8cd724b..eb9b511f29bc4 100644 --- a/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/actions_section.test.js.snap +++ b/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/actions_section.test.js.snap @@ -4,6 +4,7 @@ exports[`ActionsSection renders with no actions selected 1`] = `

      Choose the action(s) to take when the rule matches an anomaly. @@ -94,6 +95,7 @@ exports[`ActionsSection renders with skip_result and skip_model_update selected

      Choose the action(s) to take when the rule matches an anomaly. @@ -184,6 +186,7 @@ exports[`ActionsSection renders with skip_result selected 1`] = `

      Choose the action(s) to take when the rule matches an anomaly. diff --git a/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap b/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap index 8fea0d1cf2473..0349682357f5e 100644 --- a/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap +++ b/x-pack/plugins/ml/public/components/rule_editor/__snapshots__/rule_editor_flyout.test.js.snap @@ -21,6 +21,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule >

      Rules instruct anomaly detectors to change their behavior based on domain-specific knowledge that you provide. When you create a rule, you can specify conditions, scope, and actions. When the conditions of a rule are satisfied, its actions are triggered. @@ -109,6 +111,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule />

      Action @@ -128,6 +131,7 @@ exports[`RuleEditorFlyout renders the flyout after adding a condition to a rule />

      Conditions @@ -251,6 +255,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`] >

      Rules instruct anomaly detectors to change their behavior based on domain-specific knowledge that you provide. When you create a rule, you can specify conditions, scope, and actions. When the conditions of a rule are satisfied, its actions are triggered. @@ -353,6 +359,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`] />

      Action @@ -372,6 +379,7 @@ exports[`RuleEditorFlyout renders the flyout after setting the rule to edit 1`] />

      Conditions @@ -495,6 +503,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions >

      Rules instruct anomaly detectors to change their behavior based on domain-specific knowledge that you provide. When you create a rule, you can specify conditions, scope, and actions. When the conditions of a rule are satisfied, its actions are triggered. @@ -583,6 +593,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions />

      Action @@ -602,6 +613,7 @@ exports[`RuleEditorFlyout renders the flyout for creating a rule with conditions />

      Conditions @@ -717,6 +729,7 @@ exports[`RuleEditorFlyout renders the select action component for a detector wit >

      Scope @@ -39,6 +40,7 @@ exports[`ScopeSection renders when enabled with no scope supplied 1`] = `

      Scope @@ -86,6 +88,7 @@ exports[`ScopeSection renders when enabled with scope supplied 1`] = `

      Scope @@ -133,6 +136,7 @@ exports[`ScopeSection renders when not enabled 1`] = `

      Scope @@ -163,6 +167,7 @@ exports[`ScopeSection show NoFilterListsCallOut when no filter list IDs 1`] = `

      Scope diff --git a/x-pack/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap b/x-pack/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap index 1347debe0a1fe..2abf49fd666f6 100644 --- a/x-pack/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap +++ b/x-pack/plugins/ml/public/components/rule_editor/select_rule_action/__snapshots__/edit_condition_link.test.js.snap @@ -16,6 +16,7 @@ exports[`EditConditionLink renders for a condition using actual 1`] = ` > Update rule condition from 5 @@ -69,6 +70,7 @@ exports[`EditConditionLink renders for a condition using diff from typical 1`] = > Update rule condition from 5 @@ -122,6 +124,7 @@ exports[`EditConditionLink renders for a condition using typical 1`] = ` > Update rule condition from 5 diff --git a/x-pack/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap b/x-pack/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap index 50ea6c2fc67e5..e5ecbd03bf28a 100644 --- a/x-pack/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap +++ b/x-pack/plugins/ml/public/components/validate_job/__snapshots__/validate_job_view.test.js.snap @@ -33,11 +33,13 @@ exports[`ValidateJob renders button and modal with a message 1`] = ` /> Job validation performs certain checks against job configurations and underlying source data and provides specific advice on how to adjust settings that are more likely to produce insightful results. For more information, see Job validation performs certain checks against job configurations and underlying source data and provides specific advice on how to adjust settings that are more likely to produce insightful results. For more information, see { + beforeEach(() => { + ngMock.module('kibana'); + }); + + it('Initialize Data Visualizer View Fields Controller', (done) => { + const stub1 = sinon.stub(newJobUtils, 'createSearchItems').callsFake(() => ({ + indexPattern: {}, + savedSearch: {}, + combinedQuery: {} + })); + const stub2 = sinon.stub(indexUtils, 'timeBasedIndexCheck').callsFake(() => false); + ngMock.inject(function ($rootScope, $controller) { + const scope = $rootScope.$new(); + $controller('MlDataVisualizerViewFields', { $scope: scope }); + + expect(scope.metricCards).to.eql([]); + stub1.restore(); + stub2.restore(); + done(); + }); + }); +}); diff --git a/x-pack/plugins/ml/public/datavisualizer/_index.scss b/x-pack/plugins/ml/public/datavisualizer/_index.scss new file mode 100644 index 0000000000000..af259ce363a56 --- /dev/null +++ b/x-pack/plugins/ml/public/datavisualizer/_index.scss @@ -0,0 +1 @@ +@import './selector/index'; diff --git a/x-pack/plugins/ml/public/datavisualizer/datavisualizer.html b/x-pack/plugins/ml/public/datavisualizer/datavisualizer.html index 3719bafece2fe..4a4b782602ad1 100644 --- a/x-pack/plugins/ml/public/datavisualizer/datavisualizer.html +++ b/x-pack/plugins/ml/public/datavisualizer/datavisualizer.html @@ -11,7 +11,10 @@

      {{indexPattern.title}}

      -
      +
      @@ -170,7 +173,7 @@

      Fields

      -
      +
      diff --git a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js index d5ca427c06610..28af872abfc12 100644 --- a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js +++ b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_controller.js @@ -24,7 +24,7 @@ import { decorateQuery, luceneStringToDsl } from 'ui/courier'; import { ML_JOB_FIELD_TYPES, KBN_FIELD_TYPES } from 'plugins/ml/../common/constants/field_types'; import { kbnTypeToMLJobType } from 'plugins/ml/util/field_types_utils'; import { IntervalHelperProvider } from 'plugins/ml/util/ml_time_buckets'; -import { checkLicenseExpired } from 'plugins/ml/license/check_license'; +import { checkBasicLicense, isFullLicense } from 'plugins/ml/license/check_license'; import { checkGetJobsPrivilege } from 'plugins/ml/privilege/check_privilege'; import { createSearchItems } from 'plugins/ml/jobs/new_job/utils/new_job_utils'; import { loadCurrentIndexPattern, loadCurrentSavedSearch, timeBasedIndexCheck } from 'plugins/ml/util/index_utils'; @@ -37,7 +37,7 @@ uiRoutes .when('/jobs/new_job/datavisualizer', { template, resolve: { - CheckLicense: checkLicenseExpired, + CheckLicense: checkBasicLicense, privileges: checkGetJobsPrivilege, indexPattern: loadCurrentIndexPattern, savedSearch: loadCurrentSavedSearch, @@ -93,6 +93,8 @@ module $scope.fieldFilter = ''; $scope.recognizerResults = { count: 0 }; + $scope.showSidebar = isFullLicense(); + // Check for a saved query in the AppState or via a savedSearchId in the URL. $scope.searchQueryText = ''; if (_.has($scope.appState, 'query')) { diff --git a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html index b149bed1a32dc..2f700e7a1c473 100644 --- a/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html +++ b/x-pack/plugins/ml/public/datavisualizer/datavisualizer_sidebar.html @@ -21,7 +21,7 @@

      Create Job

      - Advanced job +

      Advanced

      diff --git a/x-pack/plugins/ml/public/datavisualizer/index.js b/x-pack/plugins/ml/public/datavisualizer/index.js index e94162faefcc6..6d5d234989988 100644 --- a/x-pack/plugins/ml/public/datavisualizer/index.js +++ b/x-pack/plugins/ml/public/datavisualizer/index.js @@ -7,6 +7,7 @@ import './styles/main.less'; +import './selector'; import './datavisualizer_controller'; import 'plugins/ml/components/data_recognizer'; import 'plugins/ml/components/field_data_card'; diff --git a/x-pack/plugins/ml/public/datavisualizer/selector/_index.scss b/x-pack/plugins/ml/public/datavisualizer/selector/_index.scss new file mode 100644 index 0000000000000..75f8d1c014393 --- /dev/null +++ b/x-pack/plugins/ml/public/datavisualizer/selector/_index.scss @@ -0,0 +1 @@ +@import 'selector'; diff --git a/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss b/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss new file mode 100644 index 0000000000000..a6007a63620ed --- /dev/null +++ b/x-pack/plugins/ml/public/datavisualizer/selector/_selector.scss @@ -0,0 +1,5 @@ +.ml-datavisualizer-selector { + flex-grow: 1; + background-color: $euiColorLightestShade; + min-height: 100vh; +} diff --git a/x-pack/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js b/x-pack/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js new file mode 100644 index 0000000000000..f7107f12f012c --- /dev/null +++ b/x-pack/plugins/ml/public/datavisualizer/selector/datavisualizer_selector.js @@ -0,0 +1,124 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import React from 'react'; + +import { + EuiButton, + EuiCard, + EuiFlexGroup, + EuiFlexItem, + EuiIcon, + EuiLink, + EuiPage, + EuiPageBody, + EuiSpacer, + EuiText, + EuiTitle, +} from '@elastic/eui'; + +import { isFullLicense } from '../../license/check_license'; + +function startTrialDescription() { + return ( + + To experience the full Machine Learning features that a {' '} + + Platinum subscription + {' '} + offers, start a 30-day trial. + + ); +} + + +export function DatavisualizerSelector() { + + const startTrialVisible = (isFullLicense() === false); + + return ( + + + + + +

      Data Visualizer

      +
      +
      +
      + + + + + The Machine Learning Data Visualizer tool helps you understand your data, by analyzing the metrics and fields in + a log file or an existing Elasticsearch index. + + + + + + + } + title="Import data" + description="Import data from a log file. You can upload files up to 100 MB." + betaBadgeLabel="Experimental" + betaBadgeTooltipContent="Experimental feature. We'd love to hear your feedback." + footer={ + + Upload file + + } + /> + + + } + title="Select an index pattern" + description="Visualize the data in an existing Elasticsearch index." + footer={ + + Select index + + } + /> + + + {startTrialVisible === true && + + + + + + + Start trial + + } + /> + + + + } +
      +
      + ); +} diff --git a/x-pack/plugins/ml/public/datavisualizer/selector/directive.js b/x-pack/plugins/ml/public/datavisualizer/selector/directive.js new file mode 100644 index 0000000000000..206ebcd96ed86 --- /dev/null +++ b/x-pack/plugins/ml/public/datavisualizer/selector/directive.js @@ -0,0 +1,37 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +import 'ngreact'; + +import { uiModules } from 'ui/modules'; +const module = uiModules.get('apps/ml', ['react']); + +import { checkBasicLicense } from 'plugins/ml/license/check_license'; +import { checkFindFileStructurePrivilege } from 'plugins/ml/privilege/check_privilege'; +import { initPromise } from 'plugins/ml/util/promise'; + +import uiRoutes from 'ui/routes'; + +const template = ``; + +uiRoutes + .when('/datavisualizer', { + template, + resolve: { + CheckLicense: checkBasicLicense, + privileges: checkFindFileStructurePrivilege, + initPromise: initPromise(false) + } + }); + + +import { DatavisualizerSelector } from './datavisualizer_selector'; + +module.directive('datavisualizerSelector', function ($injector) { + const reactDirective = $injector.get('reactDirective'); + + return reactDirective(DatavisualizerSelector, undefined, { restrict: 'E' }, { }); +}); diff --git a/x-pack/plugins/ml/public/datavisualizer/selector/index.js b/x-pack/plugins/ml/public/datavisualizer/selector/index.js new file mode 100644 index 0000000000000..3839017291326 --- /dev/null +++ b/x-pack/plugins/ml/public/datavisualizer/selector/index.js @@ -0,0 +1,8 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + + +import './directive'; diff --git a/x-pack/plugins/ml/public/datavisualizer/styles/main.less b/x-pack/plugins/ml/public/datavisualizer/styles/main.less index 64595835e608d..b5d85f8228826 100644 --- a/x-pack/plugins/ml/public/datavisualizer/styles/main.less +++ b/x-pack/plugins/ml/public/datavisualizer/styles/main.less @@ -25,6 +25,9 @@ display: inline-block; padding-right: 10px; } + .no-sidebar { + width: 100%; + } .datavisualizer-sidebar { width: 290px; @@ -96,6 +99,7 @@ .card-container { display: inline-grid; + display: -ms-inline-grid; padding: 0px 10px 10px 0px; } diff --git a/x-pack/plugins/ml/public/explorer/__tests__/explorer_controller.js b/x-pack/plugins/ml/public/explorer/__tests__/explorer_controller.js index 40109b4c329ff..671cf0fea1b7b 100644 --- a/x-pack/plugins/ml/public/explorer/__tests__/explorer_controller.js +++ b/x-pack/plugins/ml/public/explorer/__tests__/explorer_controller.js @@ -19,6 +19,7 @@ describe('ML - Explorer Controller', () => { const scope = $rootScope.$new(); $controller('MlExplorerController', { $scope: scope }); + expect(Array.isArray(scope.anomalyChartRecords)).to.be(true); expect(scope.loading).to.be(true); }); }); diff --git a/x-pack/plugins/ml/public/explorer/explorer.html b/x-pack/plugins/ml/public/explorer/explorer.html index 857a3755a7771..d94296e3ad6a4 100644 --- a/x-pack/plugins/ml/public/explorer/explorer.html +++ b/x-pack/plugins/ml/public/explorer/explorer.html @@ -131,6 +131,8 @@

      No {{swimlaneViewByFieldName}} influencers

      +
      +
      diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/__mocks__/mock_chart_data_rare.js b/x-pack/plugins/ml/public/explorer/explorer_charts/__mocks__/mock_chart_data_rare.js new file mode 100644 index 0000000000000..3cc8b41ea7ac3 --- /dev/null +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/__mocks__/mock_chart_data_rare.js @@ -0,0 +1,40 @@ +/* + * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one + * or more contributor license agreements. Licensed under the Elastic License; + * you may not use this file except in compliance with the Elastic License. + */ + +export const chartData = [ + { + date: 1487899800000, + entity: '200', + value: 1741.5652200000002 + }, + { + date: 1487899800000, + entity: '404', + value: 494.30564000000004 + }, + { + date: 1487899800000, + entity: '304', + value: 160.93672 + }, + { + date: 1487899800000, + entity: '301', + value: 57.4774 + }, + { + date: 1487837700000, + value: 42, + entity: '303', + anomalyScore: 84.08759, + actual: [ + 1 + ], + typical: [ + 0.00028318796131582025 + ] + } +]; diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/__mocks__/mock_series_config_rare.json b/x-pack/plugins/ml/public/explorer/explorer_charts/__mocks__/mock_series_config_rare.json new file mode 100644 index 0000000000000..07c13d7cd8b7f --- /dev/null +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/__mocks__/mock_series_config_rare.json @@ -0,0 +1,56 @@ +{ + "jobId": "ffb-rare-by-response-code-0942", + "detectorIndex": 0, + "metricFunction": "count", + "timeField": "@timestamp", + "interval": "15m", + "datafeedConfig": { + "datafeed_id": "datafeed-ffb-rare-by-response-code-0942", + "job_id": "ffb-rare-by-response-code-0942", + "query_delay": "66615ms", + "indices": [ + "filebeat-6.0.0-2017-nginx-elasticco-anon" + ], + "types": [], + "query": { + "match_all": { + "boost": 1 + } + }, + "scroll_size": 1000, + "chunking_config": { + "mode": "auto" + }, + "state": "stopped" + }, + "functionDescription": "rare", + "bucketSpanSeconds": 900, + "detectorLabel": "rare by \"nginx.access.response_code\"", + "entityFields": [ + { + "fieldName": "nginx.access.response_code", + "fieldValue": "303", + "fieldType": "by" + } + ], + "infoTooltip": { + "jobId": "ffb-rare-by-response-code-0942", + "aggregationInterval": "15m", + "chartFunction": "count", + "entityFields": [ + { + "fieldName": "nginx.access.response_code", + "fieldValue": "303" + } + ] + }, + "loading": false, + "plotEarliest": 1487774250000, + "plotLatest": 1487900250000, + "selectedEarliest": 1487836800000, + "selectedLatest": 1487837699999, + "chartLimits": { + "max": 9294.095580000001, + "min": 5.74774 + } +} diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_config_builder.test.js.snap b/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_config_builder.test.js.snap index f899ee14003b7..ca27cd1065623 100644 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_config_builder.test.js.snap +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_config_builder.test.js.snap @@ -27,6 +27,7 @@ Object { "entityFields": Array [ Object { "fieldName": "airline", + "fieldType": "partition", "fieldValue": "JAL", }, ], diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_info_tooltip.test.js.snap b/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_info_tooltip.test.js.snap new file mode 100644 index 0000000000000..b331c5e496c26 --- /dev/null +++ b/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_info_tooltip.test.js.snap @@ -0,0 +1,30 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ExplorerChartTooltip Render tooltip based on infoTooltip data. 1`] = ` +
      + +
      +`; diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_tooltip.test.js.snap b/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_tooltip.test.js.snap deleted file mode 100644 index c602bc0373c51..0000000000000 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_chart_tooltip.test.js.snap +++ /dev/null @@ -1,24 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`ExplorerChartTooltip Render tooltip based on infoTooltip data. 1`] = ` -
      - job ID: - mock-job-id -
      - aggregation interval: - 15m -
      - chart function: - avg responsetime - -
      - airline - : - JAL -
      -
      -`; diff --git a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_charts_container.test.js.snap b/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_charts_container.test.js.snap deleted file mode 100644 index 087558cfa4ed4..0000000000000 --- a/x-pack/plugins/ml/public/explorer/explorer_charts/__snapshots__/explorer_charts_container.test.js.snap +++ /dev/null @@ -1,54 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`ExplorerChartsContainer Initialization with chart data 1`] = ` -
      -
      - - high_sum(nginx.access.body_sent.bytes) over nginx.access.remote_ip (population-03) - - - - - nginx.access.remote_ip - - 72.57.0.53 - -
      - - } - position="left" - size="s" - type="questionInCircle" - /> - - View -